summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-plugins/asmem')
-rw-r--r--x11-plugins/asmem/ChangeLog8
-rw-r--r--x11-plugins/asmem/asmem-1.12.ebuild6
-rw-r--r--x11-plugins/asmem/files/asmem-1.10-gentoo.patch35
3 files changed, 9 insertions, 40 deletions
diff --git a/x11-plugins/asmem/ChangeLog b/x11-plugins/asmem/ChangeLog
index 653bb4cd666c..d144e272b173 100644
--- a/x11-plugins/asmem/ChangeLog
+++ b/x11-plugins/asmem/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/asmem
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.24 2008/06/27 20:47:47 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.25 2010/11/08 16:31:39 voyageur Exp $
+
+ 08 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
+ -files/asmem-1.10-gentoo.patch, asmem-1.12.ebuild:
+ Move to virtual/jpeg, drop old versions
27 Jun 2008; Raúl Porcel <armin76@gentoo.org> asmem-1.12.ebuild:
x86 stable wrt #229541
diff --git a/x11-plugins/asmem/asmem-1.12.ebuild b/x11-plugins/asmem/asmem-1.12.ebuild
index 400af321812b..bc8f92eebbb7 100644
--- a/x11-plugins/asmem/asmem-1.12.ebuild
+++ b/x11-plugins/asmem/asmem-1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.12.ebuild,v 1.6 2008/06/27 20:47:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.12.ebuild,v 1.7 2010/11/08 16:31:39 voyageur Exp $
inherit toolchain-funcs
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/libX11
x11-libs/libSM
x11-libs/libXpm
x11-libs/libXext
- jpeg? ( media-libs/jpeg )"
+ jpeg? ( virtual/jpeg )"
DEPEND="${RDEPEND}
x11-proto/xproto"
diff --git a/x11-plugins/asmem/files/asmem-1.10-gentoo.patch b/x11-plugins/asmem/files/asmem-1.10-gentoo.patch
deleted file mode 100644
index 9a59ae0c7304..000000000000
--- a/x11-plugins/asmem/files/asmem-1.10-gentoo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- autoconf/Makefile.common.in.orig 1999-03-07 14:12:42.000000000 +0100
-+++ autoconf/Makefile.common.in 2006-09-12 00:01:00.000000000 +0200
-@@ -9,11 +9,10 @@
- install: install.bin install.man
-
- install.bin: $(PROG)
-- $(STRIP) $(PROG)
-- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
-+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(AFTER_BIN_DIR)
-
- install.man:
-- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
-+ $(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x
-
- uninstall:
- $(RMF) $(AFTER_BIN_DIR)/$(PROG)
---- autoconf/Makefile.defines.in.orig 2000-06-16 16:01:50.000000000 +0200
-+++ autoconf/Makefile.defines.in 2006-09-12 00:01:33.000000000 +0200
-@@ -2,6 +2,7 @@
- # Copyright (c) 1998, Guylhem AZNAR <guylhem@oeil.qc.ca>
- #
-
-+DESTDIR =
- CC = @CC@
- CCFLAGS = @CFLAGS@
- # -march=pentiumpro -mcpu=pentiumpro
-@@ -22,7 +23,7 @@
- INSTALL_MODE = @INSTALL_MODE@
-
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL@ -s @INSTALL_MODE@
-+INSTALL_PROGRAM = @INSTALL@ -m 755 @INSTALL_MODE@
- INSTALL_DATA = @INSTALL@ -m 644
-
- INCS_X = @X_CFLAGS@