Modular X fixes, bug 147232.

Package-Manager: portage-2.1.2_pre2-r6

5 files changed, 127 insertions, 6 deletions

diff --git a/x11-plugins/ascpu/ChangeLog b/x11-plugins/ascpu/ChangeLog
index 2a0332d7a5e6..db151081da4e 100644
--- a/x11-plugins/ascpu/ChangeLog
+++ b/x11-plugins/ascpu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/ascpu
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ChangeLog,v 1.15 2006/01/02 10:51:17 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ChangeLog,v 1.16 2006/10/10 18:55:33 kloeri Exp $
+
+*ascpu-1.11 (10 Oct 2006)
+
+  10 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +files/ascpu-1.11-gentoo.patch, +ascpu-1.11.ebuild:
+  Modular X fixes, bug 147232.
 
   02 Jan 2006; Michele Noberasco <s4t4n@gentoo.org> ascpu-1.10.ebuild, ascpu-1.9.ebuild:
   removed LICENSE and INSTALL from dodoc.
diff --git a/x11-plugins/ascpu/Manifest b/x11-plugins/ascpu/Manifest
index 81d081dff966..0819df1f5a24 100644
--- a/x11-plugins/ascpu/Manifest
+++ b/x11-plugins/ascpu/Manifest
@@ -1,8 +1,44 @@
-MD5 7e69bb5130baaefe2fd0a6d748c601c4 ChangeLog 1555
-MD5 198a5989158898bec412804a458996e7 ascpu-1.10.ebuild 690
-MD5 1da1745e9de0cb6cf4b794d41cefd312 ascpu-1.9.ebuild 669
+AUX ascpu-1.10-gentoo.patch 947 RMD160 b638d5da9368ba8ab2a7c0657a786b52b6064b9a SHA1 17ca9c8e732353a60eea0cc76b82541af0c41528 SHA256 6951ca2264377818e959ac74723dae38aea5204feba18947075ee6e1defd43ea
 MD5 6718d1f1daa4d22b0edb9ec4f4b14571 files/ascpu-1.10-gentoo.patch 947
+RMD160 b638d5da9368ba8ab2a7c0657a786b52b6064b9a files/ascpu-1.10-gentoo.patch 947
+SHA256 6951ca2264377818e959ac74723dae38aea5204feba18947075ee6e1defd43ea files/ascpu-1.10-gentoo.patch 947
+AUX ascpu-1.11-gentoo.patch 1033 RMD160 003fb0425f1b157f8cf10b4a2a8c0063303216ea SHA1 6f94f02dd1bd46da91d97db2da1090da2c9421e0 SHA256 9254571485fa81a6b56fe3bf01c5923e88622217a86473b57e4a960e950126ee
+MD5 83248a20e178039f4e1aeaf1623302e7 files/ascpu-1.11-gentoo.patch 1033
+RMD160 003fb0425f1b157f8cf10b4a2a8c0063303216ea files/ascpu-1.11-gentoo.patch 1033
+SHA256 9254571485fa81a6b56fe3bf01c5923e88622217a86473b57e4a960e950126ee files/ascpu-1.11-gentoo.patch 1033
+AUX ascpu-1.9-gentoo.patch 763 RMD160 a42107c1d3bfbaabd0de894e006f164f1cbb4b8f SHA1 521151ce43eea69a81b87ee10878ad023a68b45b SHA256 a29341c9a7bf9ee66aa8e5f11bc562e9ebb4c41a04cc522bd80db4d231389f69
 MD5 d8501577130cd99a4eb4543995c90c2f files/ascpu-1.9-gentoo.patch 763
+RMD160 a42107c1d3bfbaabd0de894e006f164f1cbb4b8f files/ascpu-1.9-gentoo.patch 763
+SHA256 a29341c9a7bf9ee66aa8e5f11bc562e9ebb4c41a04cc522bd80db4d231389f69 files/ascpu-1.9-gentoo.patch 763
+DIST ascpu-1.10.tar.gz 43622
+DIST ascpu-1.11.tar.gz 43867 RMD160 d196e73f8e97822b43ab58affbb648c73b8ebfd6 SHA1 09a201e1be30b0b63c1b2214494b9a735bbbc3fb SHA256 fdd2ee8a6cd006bbb2d6d1871b92c33b18f7bd5e1ab8a367572e4b4f1f53c0a2
+DIST ascpu-1.9.tar.gz 42512
+EBUILD ascpu-1.10.ebuild 690 RMD160 fad11b2db0875713e3fcc40b510d689a94f3448b SHA1 3722c27460ccff3edeab9eb29e3230ad3be726b5 SHA256 1e708fb854ed0f7267c85b2b8aeaccc8b9473f022314b53445cb2acdeed16236
+MD5 198a5989158898bec412804a458996e7 ascpu-1.10.ebuild 690
+RMD160 fad11b2db0875713e3fcc40b510d689a94f3448b ascpu-1.10.ebuild 690
+SHA256 1e708fb854ed0f7267c85b2b8aeaccc8b9473f022314b53445cb2acdeed16236 ascpu-1.10.ebuild 690
+EBUILD ascpu-1.11.ebuild 934 RMD160 578bcd67085fdec41140d9281bd696eb70cf7e13 SHA1 22c73875b00b9c89d3a1f624daa62bc206221105 SHA256 c8632733c7881d46f1b9436b9394579b40d51335e9c39fa28fac4f769c72227a
+MD5 f1a9910c155a6d80ebd3951240d8df16 ascpu-1.11.ebuild 934
+RMD160 578bcd67085fdec41140d9281bd696eb70cf7e13 ascpu-1.11.ebuild 934
+SHA256 c8632733c7881d46f1b9436b9394579b40d51335e9c39fa28fac4f769c72227a ascpu-1.11.ebuild 934
+EBUILD ascpu-1.9.ebuild 669 RMD160 d5a56ad4197d74c924868efbb17f8067e9e22c44 SHA1 4f8c20276608f4d5375cc31f9627371c76d2def0 SHA256 4407797b401a7e0fb1e3edb625bea54d5ed2fbd2b333b5ebab42365a6bb55385
+MD5 1da1745e9de0cb6cf4b794d41cefd312 ascpu-1.9.ebuild 669
+RMD160 d5a56ad4197d74c924868efbb17f8067e9e22c44 ascpu-1.9.ebuild 669
+SHA256 4407797b401a7e0fb1e3edb625bea54d5ed2fbd2b333b5ebab42365a6bb55385 ascpu-1.9.ebuild 669
+MISC ChangeLog 1722 RMD160 27e881f6ad4d366a3b6e79c6453c3481b7a20bed SHA1 4b5038d7b044948a5e874bff7fc50021bbe42d6d SHA256 248267c097567e662a8b2ca4e8e730121def627cd816f7eaf9cafab4dcd5cb09
+MD5 628b8096ba9f1df5190f68600f8a3bec ChangeLog 1722
+RMD160 27e881f6ad4d366a3b6e79c6453c3481b7a20bed ChangeLog 1722
+SHA256 248267c097567e662a8b2ca4e8e730121def627cd816f7eaf9cafab4dcd5cb09 ChangeLog 1722
+MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c
+MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+RMD160 46208909b296ad228342e5181a46ef97a03129c7 metadata.xml 163
+SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c metadata.xml 163
 MD5 a566b5b5a9c4e940161813e32d9673a6 files/digest-ascpu-1.10 61
+RMD160 842d7fd231e40a0105f01c5a8e3d7d551b584298 files/digest-ascpu-1.10 61
+SHA256 b7ec55aa86c0ee8fadcb363084c671ab140c66140ca28cd8f43c159dab50bef3 files/digest-ascpu-1.10 61
+MD5 10a1613eacb30b04a7e3ecbbee7e1933 files/digest-ascpu-1.11 229
+RMD160 41e10742d230f52310fab9b83ad43a3a6ba88e6b files/digest-ascpu-1.11 229
+SHA256 2b96eaef781be86cfdc5685887fbb71f36adf7604f07b33bdcaaba7ebce75d4d files/digest-ascpu-1.11 229
 MD5 683348a20ecc2ea05fc85877e60846a0 files/digest-ascpu-1.9 60
-MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
+RMD160 e49cd53e4f4adeb611b1f300da400d17057b4897 files/digest-ascpu-1.9 60
+SHA256 982f193de404fc5ccb1e1066f90c0de45d7e111896c13fc3a68b6cb73b814011 files/digest-ascpu-1.9 60
diff --git a/x11-plugins/ascpu/ascpu-1.11.ebuild b/x11-plugins/ascpu/ascpu-1.11.ebuild
new file mode 100644
index 000000000000..7ac1d767c872
--- /dev/null
+++ b/x11-plugins/ascpu/ascpu-1.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/ascpu/ascpu-1.11.ebuild,v 1.1 2006/10/10 18:55:33 kloeri Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE="jpeg"
+DESCRIPTION="CPU statistics monitor utility for X Windows"
+SRC_URI="http://www.tigr.net/afterstep/download/ascpu/${P}.tar.gz"
+HOMEPAGE="http://www.tigr.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~ppc64 ~amd64"
+
+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 "emake install failed"
+	dodoc README
+}
diff --git a/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch b/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch
new file mode 100644
index 000000000000..b26374a4ac03
--- /dev/null
+++ b/x11-plugins/ascpu/files/ascpu-1.11-gentoo.patch
@@ -0,0 +1,36 @@
+--- autoconf/Makefile.common.in.orig	1999-05-06 23:35:32.000000000 +0200
++++ autoconf/Makefile.common.in	2006-09-11 23:07:41.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	1999-05-06 23:35:32.000000000 +0200
++++ autoconf/Makefile.defines.in	2006-09-11 23:17:40.000000000 +0200
+@@ -2,6 +2,7 @@
+ # Copyright (c) 1998, Guylhem AZNAR <guylhem@oeil.qc.ca>
+ #
+ 
++DESTDIR		=
+ CC		= @CC@
+ CCFLAGS         = @CFLAGS@
+ # -march=pentiumpro -mcpu=pentiumpro
+@@ -21,7 +22,7 @@
+ LEXFLAGS	=
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL@ -s -m 755
++INSTALL_PROGRAM	= @INSTALL@ -m 755
+ INSTALL_DATA	= @INSTALL@ -m 644
+ 
+ INCS_X		= @X_CFLAGS@
+
diff --git a/x11-plugins/ascpu/files/digest-ascpu-1.11 b/x11-plugins/ascpu/files/digest-ascpu-1.11
new file mode 100644
index 000000000000..cd80598921e0
--- /dev/null
+++ b/x11-plugins/ascpu/files/digest-ascpu-1.11
@@ -0,0 +1,3 @@
+MD5 4629775ce07d2ef2f9fe827e6452b25a ascpu-1.11.tar.gz 43867
+RMD160 d196e73f8e97822b43ab58affbb648c73b8ebfd6 ascpu-1.11.tar.gz 43867
+SHA256 fdd2ee8a6cd006bbb2d6d1871b92c33b18f7bd5e1ab8a367572e4b4f1f53c0a2 ascpu-1.11.tar.gz 43867