fix pre-stripped binaries for QA, thanks to jakub Moc for the patch

Package-Manager: portage-2.1.2_pre3-r9

5 files changed, 47 insertions, 20 deletions

diff --git a/app-admin/procinfo/ChangeLog b/app-admin/procinfo/ChangeLog
index c3e09c66f09d..b1244ff102b3 100644
--- a/app-admin/procinfo/ChangeLog
+++ b/app-admin/procinfo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/procinfo
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.18 2006/02/08 21:42:23 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.19 2006/12/02 01:41:55 antarus Exp $
+
+  02 Dec 2006; Alec Warner <antarus@gentoo.org> +files/procinfo-flags.patch,
+  procinfo-18-r1.ebuild:
+  fix pre-stripped binaries for QA, thanks to jakub Moc for the patch
 
   25 Nov 2005; Tom Gall <tgall@gentoo.org> procinfo-18-r1.ebuild:
   stable on ppc64
diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest
index 08ae5d4d3b02..9e83b1a3ab1c 100644
--- a/app-admin/procinfo/Manifest
+++ b/app-admin/procinfo/Manifest
@@ -6,19 +6,23 @@ AUX kernel-2.6.patch 9954 RMD160 84fbd47891bcbc8bf616efaca8821ba847551e0d SHA1 8
 MD5 497d7a408c5707532bcd8608e56e9901 files/kernel-2.6.patch 9954
 RMD160 84fbd47891bcbc8bf616efaca8821ba847551e0d files/kernel-2.6.patch 9954
 SHA256 db154ead361395186e9fe3a120eb71ce1b3cd8df04560459ec44398db7a0b9a1 files/kernel-2.6.patch 9954
-DIST procinfo-18.tar.gz 24365
-EBUILD procinfo-18-r1.ebuild 872 RMD160 776d4220239afc7a28067846296d749d745f681e SHA1 bc6ba36aa590e2cfa1cebb9e1532db3e432ebe4f SHA256 575bf02c9c1c826c276f965d2afc9adb7b61c9df3bf97ad2ad8a63790646c33c
-MD5 830215523160121b99c3f9b3693640a0 procinfo-18-r1.ebuild 872
-RMD160 776d4220239afc7a28067846296d749d745f681e procinfo-18-r1.ebuild 872
-SHA256 575bf02c9c1c826c276f965d2afc9adb7b61c9df3bf97ad2ad8a63790646c33c procinfo-18-r1.ebuild 872
-MISC ChangeLog 1930 RMD160 5d62fbce882af37ebe0f4bc6f4d292f6faae4e14 SHA1 917620cb981c2a95973ee2667642c64fb06edf38 SHA256 6e09257d1dc899628727e7a5e7b1e5fa10e348d4130ef40473cccb3932f83842
-MD5 eb9b0beb520e759ccfc30c7a44b07f37 ChangeLog 1930
-RMD160 5d62fbce882af37ebe0f4bc6f4d292f6faae4e14 ChangeLog 1930
-SHA256 6e09257d1dc899628727e7a5e7b1e5fa10e348d4130ef40473cccb3932f83842 ChangeLog 1930
+AUX procinfo-flags.patch 373 RMD160 a7530daea19ff2d911c2eef8bd12b43f4d84a45e SHA1 597a13414f698bd207b5fac8c71024b97146576c SHA256 80b65c4444ce0367876e6e083de99402a5abafc5065bee15e5951d5c274e75be
+MD5 5e09068bb6ce1ee4a53624ebf099e920 files/procinfo-flags.patch 373
+RMD160 a7530daea19ff2d911c2eef8bd12b43f4d84a45e files/procinfo-flags.patch 373
+SHA256 80b65c4444ce0367876e6e083de99402a5abafc5065bee15e5951d5c274e75be files/procinfo-flags.patch 373
+DIST procinfo-18.tar.gz 24365 RMD160 be29226d308aa5c437498d56bf5613f7ed7f0290 SHA1 8bc75669cbd27775c3a837209425c5ce76238ebc SHA256 c114e625b87fb06585484eb9f3ff868de165b3e61926fee55479d1bd3de09b99
+EBUILD procinfo-18-r1.ebuild 949 RMD160 45b1571df28c2d24f2765467de7dc646ad74a289 SHA1 4aadf634f6190d4b6c82d40d0026b6f675b1beab SHA256 dfbce2726288dd895d773e53eb717487e79225146f418c1336a8e8f391755807
+MD5 4538df9a461c54c5a6e3aa07470561d0 procinfo-18-r1.ebuild 949
+RMD160 45b1571df28c2d24f2765467de7dc646ad74a289 procinfo-18-r1.ebuild 949
+SHA256 dfbce2726288dd895d773e53eb717487e79225146f418c1336a8e8f391755807 procinfo-18-r1.ebuild 949
+MISC ChangeLog 2106 RMD160 f5cadceb1045d8bf63829b5d7c2ba49406e1ea15 SHA1 9ad9eec91a05fb5de793558f0f8c6712248b5c70 SHA256 153f0441cf4a389040070ab11f7895b070c5540c982e32e20bd9d6107754725b
+MD5 3a6fa212c500ceef1830223aea07c82f ChangeLog 2106
+RMD160 f5cadceb1045d8bf63829b5d7c2ba49406e1ea15 ChangeLog 2106
+SHA256 153f0441cf4a389040070ab11f7895b070c5540c982e32e20bd9d6107754725b ChangeLog 2106
 MISC metadata.xml 300 RMD160 78a4001e90c80121589e17a7cb8764c857365e24 SHA1 e7ef96db2b9acdd8cbcb6b19e40bef20da6067d3 SHA256 0cf62ea28ee39872a67b83cab572152d12b7a8f50d766b16782a44d4c0560edd
 MD5 e7931fe03535f2b6636e6136d0d5ea70 metadata.xml 300
 RMD160 78a4001e90c80121589e17a7cb8764c857365e24 metadata.xml 300
 SHA256 0cf62ea28ee39872a67b83cab572152d12b7a8f50d766b16782a44d4c0560edd metadata.xml 300
-MD5 0659fb612618a1291088cff94cb61e2b files/digest-procinfo-18-r1 62
-RMD160 c37a60c8b65b446b74ba638f34147d05cf29acba files/digest-procinfo-18-r1 62
-SHA256 898094fe1301fb7cb5c52ce7d9a0a66e0cc916c0d6a541890ed86907c3dfcdb6 files/digest-procinfo-18-r1 62
+MD5 31ad19be76b33cba499e3e128c7970d7 files/digest-procinfo-18-r1 232
+RMD160 95b89200f850640389882b9d70a7af1598c7bf25 files/digest-procinfo-18-r1 232
+SHA256 8c228d78497ef0a63fed052dbe46e2e3ea52bdc77e044b3ac347373b0103d81f files/digest-procinfo-18-r1 232
diff --git a/app-admin/procinfo/files/digest-procinfo-18-r1 b/app-admin/procinfo/files/digest-procinfo-18-r1
index 355fe0072975..db6882b5a1f5 100644
--- a/app-admin/procinfo/files/digest-procinfo-18-r1
+++ b/app-admin/procinfo/files/digest-procinfo-18-r1
@@ -1 +1,3 @@
 MD5 27658d0a69040aca05a65b9888599d50 procinfo-18.tar.gz 24365
+RMD160 be29226d308aa5c437498d56bf5613f7ed7f0290 procinfo-18.tar.gz 24365
+SHA256 c114e625b87fb06585484eb9f3ff868de165b3e61926fee55479d1bd3de09b99 procinfo-18.tar.gz 24365
diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch
new file mode 100644
index 000000000000..e254c254e1a9
--- /dev/null
+++ b/app-admin/procinfo/files/procinfo-flags.patch
@@ -0,0 +1,16 @@
+--- procinfo-18/Makefile.orig	2001-02-25 00:29:53.000000000 +0100
++++ procinfo-18/Makefile	2006-10-21 13:57:47.000000000 +0200
+@@ -2,10 +2,10 @@
+ 
+ prefix=/usr
+ 
+-CC = gcc -Wall -Wstrict-prototypes
++CC += 
+ 
+-CFLAGS = -O2
+-LDFLAGS = -s
++CFLAGS += -Wall -Wstrict-prototypes
++LDFLAGS +=
+ 
+ # If you get lots of `undefined references', you probably need -lncurses
+ # instead:
diff --git a/app-admin/procinfo/procinfo-18-r1.ebuild b/app-admin/procinfo/procinfo-18-r1.ebuild
index f7839bc4dc4e..a41b00eacdaa 100644
--- a/app-admin/procinfo/procinfo-18-r1.ebuild
+++ b/app-admin/procinfo/procinfo-18-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.7 2005/11/25 16:45:17 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.8 2006/12/02 01:41:55 antarus Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A utility to prettyprint /proc/*"
 SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
@@ -17,14 +17,15 @@ RDEPEND="dev-lang/perl"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/kernel-2.6.patch
-	epatch ${FILESDIR}/cpu-usage-fix.patch
+	epatch "${FILESDIR}"/kernel-2.6.patch
+	epatch "${FILESDIR}"/cpu-usage-fix.patch
+	epatch "${FILESDIR}"/${PN}-flags.patch
 }
 
 src_compile() {
 	# -ltermcap is default and isn't available in gentoo
 	# but -lncurses works just as good
-	emake LDLIBS=-lncurses || die
+	emake CC=$(tc-getCC) LDLIBS=-lncurses || die
 }
 
 src_install() {