Modular X fixes, bug 147238.

Package-Manager: portage-2.1.2_pre2-r6

5 files changed, 82 insertions, 18 deletions

diff --git a/x11-plugins/asmem/ChangeLog b/x11-plugins/asmem/ChangeLog
index f39b0b3ff31d..766a4efffbb2 100644
--- a/x11-plugins/asmem/ChangeLog
+++ b/x11-plugins/asmem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/asmem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.11 2006/06/06 22:54:54 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/ChangeLog,v 1.12 2006/10/10 19:04:48 kloeri Exp $
+
+*asmem-1.10-r1 (10 Oct 2006)
+
+  10 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+  files/asmem-1.10-gentoo.patch, +asmem-1.10-r1.ebuild:
+  Modular X fixes, bug 147238.
 
   06 Jun 2006; Jason Wever <weeve@gentoo.org> asmem-1.10.ebuild:
   Stable on SPARC.
diff --git a/x11-plugins/asmem/Manifest b/x11-plugins/asmem/Manifest
index 5b4407b3ddcc..ad7a12619699 100644
--- a/x11-plugins/asmem/Manifest
+++ b/x11-plugins/asmem/Manifest
@@ -1,16 +1,20 @@
-AUX asmem-1.10-gentoo.patch 762 RMD160 96a1f9137041d72a26d8e6dd6ee435987a252b34 SHA1 190768a52c6d8dfbfff99649887ab4f289056b77 SHA256 b230e4e6b467cc5096b01ffa37eee215aafc241f3ff5b22eb2587fcc3c6a39e0
-MD5 329806857b8a65ad34c7528cf9cd6e9d files/asmem-1.10-gentoo.patch 762
-RMD160 96a1f9137041d72a26d8e6dd6ee435987a252b34 files/asmem-1.10-gentoo.patch 762
-SHA256 b230e4e6b467cc5096b01ffa37eee215aafc241f3ff5b22eb2587fcc3c6a39e0 files/asmem-1.10-gentoo.patch 762
+AUX asmem-1.10-gentoo.patch 1074 RMD160 50f99986e83e9947a7ec2d9b8c147e9f99868070 SHA1 dacc9965e536390fa9d3e0fae5887e2ab841468f SHA256 a51ab2424cea1d1f6f7d0c01d141d7e144064eb86e88e36e934770f7eba1d105
+MD5 cba2e0e3e15363b1c07cbcd8d9cfed58 files/asmem-1.10-gentoo.patch 1074
+RMD160 50f99986e83e9947a7ec2d9b8c147e9f99868070 files/asmem-1.10-gentoo.patch 1074
+SHA256 a51ab2424cea1d1f6f7d0c01d141d7e144064eb86e88e36e934770f7eba1d105 files/asmem-1.10-gentoo.patch 1074
 DIST asmem-1.10.tar.gz 47802 RMD160 b6aec0ba9ac5a2f9a591223465ba15cb3a58ea7b SHA1 f5e2e03a862fbdce0f710ade3cfd7fff2c70730d SHA256 fc484d4be3d32c39feffd190293475412f4e3bd601ae7368923efd24f001a177
+EBUILD asmem-1.10-r1.ebuild 918 RMD160 97efb4d1f4afb8fbdbc38b4a949acc049d5e11cc SHA1 706aa916e5c7a962b4dc762d58030e514864533b SHA256 38634b71d22e04faee01b6484aa80086f1e03bcec21ae3371207416e96cd9571
+MD5 526133db26bab4c487544edc2d42da70 asmem-1.10-r1.ebuild 918
+RMD160 97efb4d1f4afb8fbdbc38b4a949acc049d5e11cc asmem-1.10-r1.ebuild 918
+SHA256 38634b71d22e04faee01b6484aa80086f1e03bcec21ae3371207416e96cd9571 asmem-1.10-r1.ebuild 918
 EBUILD asmem-1.10.ebuild 685 RMD160 aa70cd2380bb8e994ce6c10bdec16fbd3ec15671 SHA1 4a82eae32899da3617d3c42cc7c98f9791fef189 SHA256 4a176c84d0fe99760ef172670ada3843b7d8f4a7a8252ae01c2a85b20d79cbc1
 MD5 cac2ab9c93b1288e41d5e3c6cd5fa701 asmem-1.10.ebuild 685
 RMD160 aa70cd2380bb8e994ce6c10bdec16fbd3ec15671 asmem-1.10.ebuild 685
 SHA256 4a176c84d0fe99760ef172670ada3843b7d8f4a7a8252ae01c2a85b20d79cbc1 asmem-1.10.ebuild 685
-MISC ChangeLog 1284 RMD160 7fb7ec987aa12031bbbf923622c87af199e6917e SHA1 5c0efbbf85ea7a92c3a42fe6c5d08cd0afef025b SHA256 ecf96474c6a591590dd9dad7fd90fc8375f11976e35a5a218f083620f5cef521
-MD5 f44cd60d5635626b1e84d821ff6fae84 ChangeLog 1284
-RMD160 7fb7ec987aa12031bbbf923622c87af199e6917e ChangeLog 1284
-SHA256 ecf96474c6a591590dd9dad7fd90fc8375f11976e35a5a218f083620f5cef521 ChangeLog 1284
+MISC ChangeLog 1456 RMD160 7532be082e02d5802fbf69244b058aaecb302b59 SHA1 cfd9e0986917600da26689d4b221bd91e9cc00c4 SHA256 d02d09f038f1bf1989e3925ae46d5edee5bccbcecd5007151c0e9ca49108fe08
+MD5 5823590c3517c859cf27c1f94b3a20d4 ChangeLog 1456
+RMD160 7532be082e02d5802fbf69244b058aaecb302b59 ChangeLog 1456
+SHA256 d02d09f038f1bf1989e3925ae46d5edee5bccbcecd5007151c0e9ca49108fe08 ChangeLog 1456
 MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c
 MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
 RMD160 46208909b296ad228342e5181a46ef97a03129c7 metadata.xml 163
@@ -18,3 +22,6 @@ SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c metadata
 MD5 800b3dd908567d7ff216388a353597e5 files/digest-asmem-1.10 229
 RMD160 af8cc324da6d3b70bb7d23bf450ec696b06ffe9c files/digest-asmem-1.10 229
 SHA256 980497e51bf3e4606771301f94d6e5d80bd101b5fe5b770f98da18d6eb5a4145 files/digest-asmem-1.10 229
+MD5 800b3dd908567d7ff216388a353597e5 files/digest-asmem-1.10-r1 229
+RMD160 af8cc324da6d3b70bb7d23bf450ec696b06ffe9c files/digest-asmem-1.10-r1 229
+SHA256 980497e51bf3e4606771301f94d6e5d80bd101b5fe5b770f98da18d6eb5a4145 files/digest-asmem-1.10-r1 229
diff --git a/x11-plugins/asmem/asmem-1.10-r1.ebuild b/x11-plugins/asmem/asmem-1.10-r1.ebuild
new file mode 100644
index 000000000000..2d479f2f4e92
--- /dev/null
+++ b/x11-plugins/asmem/asmem-1.10-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmem/asmem-1.10-r1.ebuild,v 1.1 2006/10/10 19:04:48 kloeri Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="jpeg"
+DESCRIPTION="Memory statistics monitor utility for X Windows"
+SRC_URI="http://www.tigr.net/afterstep/download/asmem/${P}.tar.gz"
+HOMEPAGE="http://www.tigr.net"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libSM
+	jpeg? ( media-libs/jpeg )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	econf $(use_enable jpeg) || die "econf failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES README
+}
diff --git a/x11-plugins/asmem/files/asmem-1.10-gentoo.patch b/x11-plugins/asmem/files/asmem-1.10-gentoo.patch
index 6f1481806b61..9a59ae0c7304 100644
--- a/x11-plugins/asmem/files/asmem-1.10-gentoo.patch
+++ b/x11-plugins/asmem/files/asmem-1.10-gentoo.patch
@@ -1,26 +1,35 @@
---- autoconf/Makefile.common.in	Sat Aug 17 00:03:35 2002
-+++ autoconf/Makefile.common.in	Sat Aug 17 00:05:20 2002
-@@ -10,10 +10,10 @@
+--- 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)
+-		$(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).1
++		$(INSTALL_DATA) $(PROG).man $(DESTDIR)$(AFTER_MAN_DIR)/$(PROG).1x
  
  uninstall:
  		$(RMF) $(AFTER_BIN_DIR)/$(PROG)
---- autoconf//Makefile.defines.in	Sat Aug 17 00:06:03 2002
-+++ autoconf/Makefile.defines.in	Sat Aug 17 00:06:15 2002
-@@ -2,6 +2,8 @@
+--- 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@
diff --git a/x11-plugins/asmem/files/digest-asmem-1.10-r1 b/x11-plugins/asmem/files/digest-asmem-1.10-r1
new file mode 100644
index 000000000000..2dc5f95269ce
--- /dev/null
+++ b/x11-plugins/asmem/files/digest-asmem-1.10-r1
@@ -0,0 +1,3 @@
+MD5 b770016b0d1bc4c9fca247827bb25293 asmem-1.10.tar.gz 47802
+RMD160 b6aec0ba9ac5a2f9a591223465ba15cb3a58ea7b asmem-1.10.tar.gz 47802
+SHA256 fc484d4be3d32c39feffd190293475412f4e3bd601ae7368923efd24f001a177 asmem-1.10.tar.gz 47802