Remove n32 USE flag and patch, bug 371278

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

7 files changed, 20 insertions, 62 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index f6184f4b9cc7..2b18c8356814 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.47 2011/06/08 13:16:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.48 2011/06/14 20:35:27 mattst88 Exp $
+
+  14 Jun 2011; Matt Turner <mattst88@gentoo.org>
+  -files/procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch,
+  procps-3.2.8.ebuild, procps-3.2.8-r1.ebuild, procps-3.2.8-r2.ebuild,
+  metadata.xml:
+  Remove n32 USE flag and patch, bug 371278
 
   08 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> procps-3.2.8-r2.ebuild:
   ppc64 stable wrt #367279
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 47d459969da6..eca22df00138 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -1,9 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.2.5-top-sort.patch 1384 RMD160 7ab964b4dd310d5032826abe64a46b8b6e968a80 SHA1 ad7782f3f4d118fa67c667d611a1eb2f4c736808 SHA256 bd52bdde8f43e9f1428d18efa13691abd83a25ea2f99d8c44fabccd7f2ba902b
 AUX procps-3.2.3-noproc.patch 911 RMD160 0c6714c16424a31cde28f8e667f05a46e71402d1 SHA1 6cc1c4fc8f7e39347619f4c9f1432dfc6d0164a1 SHA256 e3897fe3e8df43750f514e8fc84a82f5e00c0bc2245bbd21ad2d8ff9789087f1
-AUX procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch 380 RMD160 1f0796a5e1745d32ac12786e712823ae0359c986 SHA1 145e81079f980913327f3a2680e87d1ebba87f4f SHA256 7fa2c0891f8c96072e0cd6578228b122ca69602e89416e7a73c370895d93a267
 AUX procps-3.2.7-proc-mount.patch 657 RMD160 90d0dae26d4a514ef0dbcb3c90ba167d0890d14e SHA1 07bdfb5484189daad7beb18fd5e2f280e3de3cad SHA256 17194621e6f5307c1712fab15a13a7da0e10315cf8b45b34403b54c70013b2ba
 AUX procps-3.2.8+gmake-3.82.patch 366 RMD160 8de2f12ffcf2dee2b1074ab16f37c8b664e8d268 SHA1 c1f5e83507dbcbfaf3328accdb9cf9b2d3fe4c1b SHA256 8b74a3ee39ab8535a414931f86b85320a38ef3dc39d65c75ed51fa6d7c041cdb
 AUX procps-3.2.8-forest-prefix.patch 1129 RMD160 b3f7d39cfab5fcf7bc4740a392d9471be1a54c7a SHA1 7974f857634698650953d40a38ed9cdbcaad613b SHA256 4773f42d2c9bd2dafe14431b2b1e41d79bfbf9b567b4003b2a383ed6c65cd930
@@ -11,17 +7,8 @@ AUX procps-3.2.8-linux-ver-init.patch 823 RMD160 e029ee04df0be7ca11878c3bb4e3c54
 AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
-EBUILD procps-3.2.8-r1.ebuild 2580 RMD160 560c99b7653f566d53972df36521e00b79d97006 SHA1 580ce76f41c5c6cb829308ac76e3ed9386df2529 SHA256 f3e68ba0ef0f9926d0dbd0ccb9cb7d3abc8253f2b831dcab6eb70e8337e7f3f6
-EBUILD procps-3.2.8-r2.ebuild 2688 RMD160 59f9e59df447063cde9fcb08feb52c9a3b3086b1 SHA1 c5ef7c44b174d6f8eb840bde98b13898680e5775 SHA256 757c8a6e2453d4b6d309f0ebe4dde46728f8a69d0c88c84e8debb81ec193e47b
-EBUILD procps-3.2.8.ebuild 2457 RMD160 967038956d5cfff8fa4a8890092e94275a932b35 SHA1 42d0731ae16c97c917605b27c8c384e5ea0c5e00 SHA256 13692c647d833b8e122abb8bae7670ee9beb301d0b13e4c2ad1bf296ece4e40e
-MISC ChangeLog 22466 RMD160 46f9c42614d747237d6a60a85a3f183d93389333 SHA1 fb562c7fb8dba5006057a5051a5007dbff661922 SHA256 1756086f9fd5795e574871f2533b7de54415ed89f42a6a0f1748d4f9279817a9
-MISC metadata.xml 233 RMD160 eb1f965766a567d9532906b72a415ac9f26568cf SHA1 0d2f3cf7a995f93a571490b449e326f955f49f4f SHA256 3b65bcd57075074266dba6e86dbe969592d58f69469e31072736cd1a42a76932
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk3vdkMACgkQIiMqcbOVdxSCgQP9F5waphc67nXmXe5hocdoFG7G
-IairIPtofFdoCL73XG5FDvsJmhbkyG7+zIW1aSdJwQ1KgFfAmYeHJ4/OIOyKqWi/
-q36y2DTb7mLE6oIRcb7v1CjT1kuukCXwr7bdNHSFFVE79CjVI6ukcUryUtLSTmFo
-B8XZ/DWQuaAfGkmk1Os=
-=cr7e
------END PGP SIGNATURE-----
+EBUILD procps-3.2.8-r1.ebuild 2297 RMD160 33568cf3dbc91f41dbc77a91e68a629359e438ab SHA1 f8d3285f5bd5e48b7e3012002056499f8524820e SHA256 8792660ca782802a70bebd9209d418d399daa19b86c5f88f3810cb4708d6e843
+EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456b0 SHA1 8b2bcc0c9be52cdd3f76a1220a9c06d9cbc85cf2 SHA256 288127656d1c50ed1a4da866a41179bedc29fa37836e3aefae33bba40edd2107
+EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
+MISC ChangeLog 22709 RMD160 8ae073b5a706c08d3730cc4b3e619fca5df71fd6 SHA1 6f2a8dd15cb8489cca8d70da21fbd0c8fc8bedb0 SHA256 e3a7133b28d4c570d97bd5e17d6dead727bcf6cfe405e5fb6ff175e69ae3d5e4
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-process/procps/files/procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch b/sys-process/procps/files/procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
deleted file mode 100644
index 25e0f1b217fd..000000000000
--- a/sys-process/procps/files/procps-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proc/procps.h.orig	2005-12-21 19:12:11.000000000 -0500
-+++ proc/procps.h	2005-12-21 19:12:17.000000000 -0500
-@@ -31,7 +31,7 @@
- //
- // Unknown: PA-RISC and zSeries
- //
--#if defined(k64test) || (defined(_ABIN32) && _MIPS_SIM == _ABIN32)
-+#if defined(k64test)
- #define KLONG long long    // not typedef; want "unsigned KLONG" to work
- #define KLF "L"
- #define STRTOUKL strtoull
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index ad2208b3d39c..96a2d586367d 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<use>
-	<flag name='n32'>Enable n32 ABI support on mips</flag>
-</use>
 </pkgmetadata>
diff --git a/sys-process/procps/procps-3.2.8-r1.ebuild b/sys-process/procps/procps-3.2.8-r1.ebuild
index 2cb94e3ed0c7..64f96fb78ce2 100644
--- a/sys-process/procps/procps-3.2.8-r1.ebuild
+++ b/sys-process/procps/procps-3.2.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.2 2010/09/22 15:24:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r1.ebuild,v 1.3 2011/06/14 20:35:27 mattst88 Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="n32 unicode"
+IUSE="unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -43,13 +43,6 @@ src_unpack() {
 
 	# lame unicode stuff checks glibc defines
 	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-
-	# n32 isn't completly reliable of an ABI on mips64 at the current
-	# time.  Eventually, it will be, but for now, we need to make sure
-	# procps doesn't try to force it on us.
-	if ! use n32 ; then
-		epatch "${FILESDIR}"/${PN}-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
-	fi
 }
 
 src_compile() {
diff --git a/sys-process/procps/procps-3.2.8-r2.ebuild b/sys-process/procps/procps-3.2.8-r2.ebuild
index 444d8c88f3a9..f4838b34b520 100644
--- a/sys-process/procps/procps-3.2.8-r2.ebuild
+++ b/sys-process/procps/procps-3.2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r2.ebuild,v 1.7 2011/06/08 13:16:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8-r2.ebuild,v 1.8 2011/06/14 20:35:27 mattst88 Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="n32 unicode"
+IUSE="unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -45,13 +45,6 @@ src_unpack() {
 
 	# lame unicode stuff checks glibc defines
 	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-
-	# n32 isn't completly reliable of an ABI on mips64 at the current
-	# time.  Eventually, it will be, but for now, we need to make sure
-	# procps doesn't try to force it on us.
-	if ! use n32 ; then
-		epatch "${FILESDIR}"/${PN}-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
-	fi
 }
 
 src_compile() {
diff --git a/sys-process/procps/procps-3.2.8.ebuild b/sys-process/procps/procps-3.2.8.ebuild
index 693cb15b438b..840f6ca5f4cc 100644
--- a/sys-process/procps/procps-3.2.8.ebuild
+++ b/sys-process/procps/procps-3.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8.ebuild,v 1.9 2009/11/23 04:56:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.2.8.ebuild,v 1.10 2011/06/14 20:35:27 mattst88 Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://procps.sourceforge.net/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="n32 unicode"
+IUSE="unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r2"
 
@@ -41,13 +41,6 @@ src_unpack() {
 
 	# lame unicode stuff checks glibc defines
 	sed -i "s:__GNU_LIBRARY__ >= 6:0 == $(use unicode; echo $?):" proc/escape.c || die
-
-	# n32 isn't completly reliable of an ABI on mips64 at the current
-	# time.  Eventually, it will be, but for now, we need to make sure
-	# procps doesn't try to force it on us.
-	if ! use n32 ; then
-		epatch "${FILESDIR}"/${PN}-3.2.6-mips-n32_isnt_usable_on_mips64_yet.patch
-	fi
 }
 
 src_compile() {