Cheesy patch for gcc-2 compilers.

Package-Manager: portage-2.1.1_pre5-r3

4 files changed, 76 insertions, 10 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 022b2b2bd3f8..f9b4798c4a1a 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.43 2006/07/09 06:49:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.44 2006/08/26 07:35:33 vapier Exp $
+
+  26 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/psmisc-22.2-gcc2.patch, psmisc-22.2.ebuild:
+  Cheesy patch for gcc-2 compilers.
 
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> psmisc-22.2.ebuild:
   Marked stable on mips.
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 15cb3bd144ca..96397dddb33f 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX psmisc-22.1-force-locale.patch 334 RMD160 e64d4133ce306dd1b86a7a31036527bfa0e32f7b SHA1 9f014141408f6adc8a6fd2d655ed40a91f0e4cc1 SHA256 e40c65f07b1d2d5e7cc24d905a6f340b6d2262120ff536efaa65ce7bf5a03071
 MD5 fbd6d2d8f9aca96690539b33ccce8ff8 files/psmisc-22.1-force-locale.patch 334
 RMD160 e64d4133ce306dd1b86a7a31036527bfa0e32f7b files/psmisc-22.1-force-locale.patch 334
 SHA256 e40c65f07b1d2d5e7cc24d905a6f340b6d2262120ff536efaa65ce7bf5a03071 files/psmisc-22.1-force-locale.patch 334
+AUX psmisc-22.2-gcc2.patch 1625 RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 SHA1 bb779b02988837bff2dbaec5aa7909d5e84a050f SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5
+MD5 4b14fe14a62770a45a7e3bc5cd54ea26 files/psmisc-22.2-gcc2.patch 1625
+RMD160 8e1b80c56a5a3dfea3db3ae554f9a33f910b9699 files/psmisc-22.2-gcc2.patch 1625
+SHA256 6a710d66db02902db9b99d57abde991ab172b7a41b29b33eb3e552422e0843b5 files/psmisc-22.2-gcc2.patch 1625
 DIST psmisc-21.9.tar.gz 232172 RMD160 f7739425611c7d3621dfdddbba382332ab9492f8 SHA1 b8e67ff6badb3212c67acda05c73b063d41f25d8 SHA256 90fd6844a4a527021d2ef3efada0fc5384d0778a09dce91ab11effed4ce34a44
 DIST psmisc-22.1.tar.gz 236267 RMD160 94a5454b11363c670780490933ace260af08b4d3 SHA1 c33860e5de5dbab1ba3ceca21d9422a08b645d8a SHA256 25a3006a491b4ca9b53c1ef951d9197de8b1b45d05ac9c9115fac9710e22b0d2
 DIST psmisc-22.2.tar.gz 244247 RMD160 aaa11a5bb4139fbe571177518ebc79198e9e2d57 SHA1 1ae222803c5b5967a1b93e69f08330e0cdc1a554 SHA256 6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f
@@ -13,14 +20,14 @@ EBUILD psmisc-22.1.ebuild 1189 RMD160 17b4487d45bf4e72f1e4533e37d7fa1051d69360 S
 MD5 8b4ee154fc00c2ae0d13d4eb46d69286 psmisc-22.1.ebuild 1189
 RMD160 17b4487d45bf4e72f1e4533e37d7fa1051d69360 psmisc-22.1.ebuild 1189
 SHA256 5113951bf0660d05b9f221870949a80c1982969b3c1882724423860c5ddd0113 psmisc-22.1.ebuild 1189
-EBUILD psmisc-22.2.ebuild 1067 RMD160 001044b726c5c73418f471e543f42e062951f44f SHA1 bb93642cb9637b3b9de83c9c668cd41f50b8ba7d SHA256 ca5378b588084b9150939112e0f4124095c350cf630db78bad52191d2fc86935
-MD5 9aaab9be317dff3076c9bd38004e1c63 psmisc-22.2.ebuild 1067
-RMD160 001044b726c5c73418f471e543f42e062951f44f psmisc-22.2.ebuild 1067
-SHA256 ca5378b588084b9150939112e0f4124095c350cf630db78bad52191d2fc86935 psmisc-22.2.ebuild 1067
-MISC ChangeLog 11017 RMD160 53650b7c1def662054439c2fd24aef69aafc7d34 SHA1 dbba175d355194f35ccd7c1441c0e83ea63ce2b6 SHA256 fc7096941106f8f77e992b0f9dc8e4ecae90eed095752bf4b149d79b04b9b670
-MD5 dd8c8240425fde3d6cbc65af60692d9d ChangeLog 11017
-RMD160 53650b7c1def662054439c2fd24aef69aafc7d34 ChangeLog 11017
-SHA256 fc7096941106f8f77e992b0f9dc8e4ecae90eed095752bf4b149d79b04b9b670 ChangeLog 11017
+EBUILD psmisc-22.2.ebuild 1164 RMD160 c55898aded8eaef22dd14d932a8fb2c18ae2e989 SHA1 a2796fafb9f18b05ede925b7441cdebefb5d8d5e SHA256 8d954ab7afeddbc58d7edeabb2be5f7ddf3beeb9b4a0a6adcc06cab95e0b6335
+MD5 7d80ba50be4e1c5429ce03bada67b025 psmisc-22.2.ebuild 1164
+RMD160 c55898aded8eaef22dd14d932a8fb2c18ae2e989 psmisc-22.2.ebuild 1164
+SHA256 8d954ab7afeddbc58d7edeabb2be5f7ddf3beeb9b4a0a6adcc06cab95e0b6335 psmisc-22.2.ebuild 1164
+MISC ChangeLog 11158 RMD160 4dd71f5da83a9137e23f428d81e0068004981c39 SHA1 615fc495f54aa1b8520997b8eb76d6d89260693c SHA256 84602562ff86ecc5bd530be451881dbab553446b7d4b9a85a3db9340a2fb7010
+MD5 db86b4140ddfcc0846117f0de6529a7b ChangeLog 11158
+RMD160 4dd71f5da83a9137e23f428d81e0068004981c39 ChangeLog 11158
+SHA256 84602562ff86ecc5bd530be451881dbab553446b7d4b9a85a3db9340a2fb7010 ChangeLog 11158
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -34,3 +41,10 @@ SHA256 1beec9d747f08d64810fd445f3599bf33679cde2f21dcf71a060f9ce4d1a372b files/di
 MD5 31b893fab6c1a7d95752e63dd94bfa26 files/digest-psmisc-22.2 235
 RMD160 0c806149c35f520fcf5a4eaebf1329073c2336c6 files/digest-psmisc-22.2 235
 SHA256 c0e455a65fcd13cc2d90c37eae7101a58bfdfd99e0c7a50886fa7667021d16e7 files/digest-psmisc-22.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE7/osamhnQswr0vIRApdKAKCsPAG04k9a6zieXUMVoqVAbUHiwACgrqqm
+HoCgXt/E/trmRpd+gtFSJrY=
+=CIUn
+-----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.2-gcc2.patch b/sys-process/psmisc/files/psmisc-22.2-gcc2.patch
new file mode 100644
index 000000000000..181fb78b9c98
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.2-gcc2.patch
@@ -0,0 +1,40 @@
+cheesy ass workaround for gcc-2:
+i686-pc-linux-gnu-gcc -Wall -DLOCALEDIR=\"/usr/share/locale\" -march=i686 -O2 -pipe   -o pstree  pstree.o -lncurses 
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c:103: warning: preprocessing directive not recognized within macro arg
+fuser.c: In function `usage':
+fuser.c:98: undefined or invalid # directive
+fuser.c:101: undefined or invalid # directive
+make[3]: *** [fuser.o] Error 1
+
+--- src/fuser.c
++++ src/fuser.c
+@@ -82,6 +82,11 @@ static void usage (const char *errormsg)
+ 	if (errormsg != NULL)
+ 		fprintf(stderr, "%s\n", errormsg);
+ 
++#ifdef WITH_IPV6
++# define _IPv6(x) x
++#else
++# define _IPv6(x)
++#endif
+   fprintf (stderr, _(
+     "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
+     "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
+@@ -101,10 +106,10 @@ static void usage (const char *errormsg)
+     "    -u        display user IDs\n"
+     "    -v        verbose output\n"
+     "    -V        display version information\n"
+-#ifdef WITH_IPV6
++_IPv6(
+     "    -4        search IPv4 sockets only\n"
+     "    -6        search IPv6 sockets only\n"
+-#endif
++)
+     "    -         reset options\n\n"
+     "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n\n"));
+   exit (1);
diff --git a/sys-process/psmisc/psmisc-22.2.ebuild b/sys-process/psmisc/psmisc-22.2.ebuild
index 3ca741bb727f..bb242d2963fe 100644
--- a/sys-process/psmisc/psmisc-22.2.ebuild
+++ b/sys-process/psmisc/psmisc-22.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.2.ebuild,v 1.12 2006/07/09 06:49:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.2.ebuild,v 1.13 2006/08/26 07:35:33 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -17,6 +19,12 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc2.patch
+}
+
 src_compile() {
 	econf \
 		--bindir=/bin \