QA fixes for bug #141378: build is not really used, so remove its trails. Remove gnustep as maintainer, gnustep-base is moving away from it.

Package-Manager: portage-2.1-r1

11 files changed, 82 insertions, 87 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index c8ef4fbaa2ea..9c7727a464d1 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.38 2006/06/06 01:23:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.39 2006/07/27 17:16:09 grobian Exp $
+
+  27 Jul 2006; Fabian Groffen <grobian@gentoo.org> libffi-3.3.5.ebuild,
+  libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild:
+  QA fixes for bug #141378: build is not really used, so remove its trails.
+  Remove gnustep as maintainer, gnustep-base is moving away from it.
 
   06 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
   libffi-3.3.5.ebuild, libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild,
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index af9d718d0c5b..acc397004e8c 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libffi-soversion.dpatch 1943 RMD160 4213f8ff8ab4e19921f8e3d90a30fd7c843a1d9a SHA1 ed6c640021e16fa1f035ac5d6ea30bbb1482a9de SHA256 660ba9118f2960d13466b07effc5af56300d438be089ec4c944e34a90e3c4171
 MD5 78c9b1a1b40fcc12f8cf34d57a970f00 files/libffi-soversion.dpatch 1943
 RMD160 4213f8ff8ab4e19921f8e3d90a30fd7c843a1d9a files/libffi-soversion.dpatch 1943
@@ -9,57 +6,50 @@ AUX libffi-without-libgcj.dpatch 2255 RMD160 d21e1628455945ef6e540fad3972f6782b6
 MD5 1ca677e646f4d209e68601c9ba83c629 files/libffi-without-libgcj.dpatch 2255
 RMD160 d21e1628455945ef6e540fad3972f6782b6c4331 files/libffi-without-libgcj.dpatch 2255
 SHA256 58439bbdc99d435483fedbd3b08e28d38081c5d2b943e19ea2edae930d47f812 files/libffi-without-libgcj.dpatch 2255
-DIST gcc-3.3.5.tar.bz2 23833856
-DIST gcc-3.4.1.tar.bz2 27182385
-DIST gcc-3.4.3.tar.bz2 27425338
+DIST gcc-3.3.5.tar.bz2 23833856 RMD160 34adf1a6f7ea302e9937c1a06ccf362711e25c58 SHA1 ab24a8690040de967c25a1fc8560d7ecc25bd460 SHA256 4ae90c6948d2654a254116fabb0cc7e474abf51ea841e6ef5cd8e6c161a9fa74
+DIST gcc-3.4.1.tar.bz2 27182385 RMD160 b25352913fde37121e2dfe5521149bdaf08b0f5d SHA1 04de377eff57e614b089b8946a520de0dac7248e SHA256 5f3685533f8dc4b42b926fe70bb371b31e1368223a0ad7398ba27ea3a20e8e7a
+DIST gcc-3.4.3.tar.bz2 27425338 RMD160 0a688fd34b58548b99e08ccf778281bf470f925d SHA1 f20c691662831e8022c7f9588cbd6aeb9c40fd2a SHA256 63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913
 DIST libffi-1.20.tar.gz 109484
 EBUILD libffi-1.20.ebuild 604 RMD160 ef6993c5c44b164fc3e1b092f5712d7f85a6f825 SHA1 248a53b56d08c68e898abc6b8033cd8fd13e4933 SHA256 250b875852e6d910ab29f90bf7480016f211a1663b5a1652a995b13bd002fad1
 MD5 ea5e2ecd7602d6f2fb898c3f25f6e353 libffi-1.20.ebuild 604
 RMD160 ef6993c5c44b164fc3e1b092f5712d7f85a6f825 libffi-1.20.ebuild 604
 SHA256 250b875852e6d910ab29f90bf7480016f211a1663b5a1652a995b13bd002fad1 libffi-1.20.ebuild 604
-EBUILD libffi-3.3.5.ebuild 6664 RMD160 630446b65516120e0b986361712c4dc1f261b4da SHA1 ac6680aa7c586920f1d71610c1ea22a54a8d7e2e SHA256 2271b988fcee0dba6a6d61c89123e52ef04710fffedc2ae4ceac817d8c1f6daf
-MD5 e9e073796c249e172c044b239b658ddd libffi-3.3.5.ebuild 6664
-RMD160 630446b65516120e0b986361712c4dc1f261b4da libffi-3.3.5.ebuild 6664
-SHA256 2271b988fcee0dba6a6d61c89123e52ef04710fffedc2ae4ceac817d8c1f6daf libffi-3.3.5.ebuild 6664
-EBUILD libffi-3.4.1-r1.ebuild 5862 RMD160 b727feff5f600892d0c8a586d1e9f235111bfa51 SHA1 655063ef84b94b62884c4a9930ac032f56a220a1 SHA256 abdeb483586fd24990e8a8c38b89a5a328b0666cf774ef32ac958db4f77a76a6
-MD5 46884866587b203ee82f041a6926e9f0 libffi-3.4.1-r1.ebuild 5862
-RMD160 b727feff5f600892d0c8a586d1e9f235111bfa51 libffi-3.4.1-r1.ebuild 5862
-SHA256 abdeb483586fd24990e8a8c38b89a5a328b0666cf774ef32ac958db4f77a76a6 libffi-3.4.1-r1.ebuild 5862
-EBUILD libffi-3.4.1.ebuild 7154 RMD160 4d0d9b4d7fa60fb6eda7b7df2e240cd55d055fbc SHA1 c99b6481d034e79f2851c8aac6702189bad9e4dd SHA256 e8d233bb59efeb4ffc7769885bb45e7df2cc13c8c687d2815eb83a01cd56fe7f
-MD5 1d294bcff1526990d3f0a50d0b0913c3 libffi-3.4.1.ebuild 7154
-RMD160 4d0d9b4d7fa60fb6eda7b7df2e240cd55d055fbc libffi-3.4.1.ebuild 7154
-SHA256 e8d233bb59efeb4ffc7769885bb45e7df2cc13c8c687d2815eb83a01cd56fe7f libffi-3.4.1.ebuild 7154
-EBUILD libffi-3.4.3.ebuild 5810 RMD160 5b9a544520f46e2ffc0da30a8879d6f4ebf1627b SHA1 7ab989323b3ced493b3f77d289d8565345230609 SHA256 8eefa9c12147e42873e90aad3d973eaad0d4159ddfd701cad9aefd043277da6f
-MD5 f8ab21c2d823b8a3b20dcd199ef91a53 libffi-3.4.3.ebuild 5810
-RMD160 5b9a544520f46e2ffc0da30a8879d6f4ebf1627b libffi-3.4.3.ebuild 5810
-SHA256 8eefa9c12147e42873e90aad3d973eaad0d4159ddfd701cad9aefd043277da6f libffi-3.4.3.ebuild 5810
-MISC ChangeLog 5793 RMD160 1b54363efc3f5e2344c1707112e4ebdc9e67f756 SHA1 96dfbb8e7b2ce13cbac63274d3df3ba905c44a9e SHA256 fe408f61fccfe0df3de9d7c22b8fe29b3bb7454ebf849fc209a6ff56eb9139f3
-MD5 c13b01cd8a35ffa36d10116f0c6d7c60 ChangeLog 5793
-RMD160 1b54363efc3f5e2344c1707112e4ebdc9e67f756 ChangeLog 5793
-SHA256 fe408f61fccfe0df3de9d7c22b8fe29b3bb7454ebf849fc209a6ff56eb9139f3 ChangeLog 5793
-MISC metadata.xml 1640 RMD160 039bf82b258177278c1a39a3dce9538da1d02116 SHA1 5e210cc7586d6a1bea2404558784e05becb8d315 SHA256 cf7c3e0a41d99a5169b6584dfc421a104c3f46ec8445ffe6cd5009265c73130c
-MD5 69b9426ffb7fbf18457c88389fc79022 metadata.xml 1640
-RMD160 039bf82b258177278c1a39a3dce9538da1d02116 metadata.xml 1640
-SHA256 cf7c3e0a41d99a5169b6584dfc421a104c3f46ec8445ffe6cd5009265c73130c metadata.xml 1640
+EBUILD libffi-3.3.5.ebuild 6576 RMD160 566c581c93a0461ff324f561b93c36c554472022 SHA1 06629b5c95fb393b981a2ccbaddcb8ff59c2568d SHA256 ad6fe761664f6f5c9f14ec4fe04cc60186db688beaedd3860ec4a3d4a24f42e4
+MD5 488f512f83aae68dc978cad91fd208e2 libffi-3.3.5.ebuild 6576
+RMD160 566c581c93a0461ff324f561b93c36c554472022 libffi-3.3.5.ebuild 6576
+SHA256 ad6fe761664f6f5c9f14ec4fe04cc60186db688beaedd3860ec4a3d4a24f42e4 libffi-3.3.5.ebuild 6576
+EBUILD libffi-3.4.1-r1.ebuild 5774 RMD160 1500a90b79a32e7d5c92f694a522e9667430eece SHA1 d0116ad152d487a0f0260a5c9c3aa0e988604db9 SHA256 940412137fbf28c5a882be8305482f6fd6253fbd86b0e7f4ec25bcdc7c8d574b
+MD5 23a256a31a8449dca0e8181cc2a837c7 libffi-3.4.1-r1.ebuild 5774
+RMD160 1500a90b79a32e7d5c92f694a522e9667430eece libffi-3.4.1-r1.ebuild 5774
+SHA256 940412137fbf28c5a882be8305482f6fd6253fbd86b0e7f4ec25bcdc7c8d574b libffi-3.4.1-r1.ebuild 5774
+EBUILD libffi-3.4.1.ebuild 7069 RMD160 4be796396a3a986be3a99cd71403c61f02a25e2c SHA1 d2784c405a861ef29d986d5f62f7d0389ee71010 SHA256 c9c4999cc76141d0428a39902a9176b4c3140c97f646b479dd348b780b11e459
+MD5 95b2bbb187e447462b6e803c55e80437 libffi-3.4.1.ebuild 7069
+RMD160 4be796396a3a986be3a99cd71403c61f02a25e2c libffi-3.4.1.ebuild 7069
+SHA256 c9c4999cc76141d0428a39902a9176b4c3140c97f646b479dd348b780b11e459 libffi-3.4.1.ebuild 7069
+EBUILD libffi-3.4.3.ebuild 5725 RMD160 9b06a35dd200f84da5ffecfbc028ccf9b0b1c82f SHA1 9b4516d1e40afaf40e23a817b8c705c4a444e1e2 SHA256 4e1e761662c86d5e7aef6765642ae0df0ed62908b4776a53e601c13a9017bbfe
+MD5 b5c416340eaa867fad43fe5f95020bac libffi-3.4.3.ebuild 5725
+RMD160 9b06a35dd200f84da5ffecfbc028ccf9b0b1c82f libffi-3.4.3.ebuild 5725
+SHA256 4e1e761662c86d5e7aef6765642ae0df0ed62908b4776a53e601c13a9017bbfe libffi-3.4.3.ebuild 5725
+MISC ChangeLog 6076 RMD160 1cc590dc8ee34a876a3c2f3a51df6d1185d5e283 SHA1 85acf94178d5be41ca248996bc5446035de68e21 SHA256 46fda853b1494efb3735ec0e3338f7aba7328ca8be6fb4bf5774669686829902
+MD5 f805cc278220ac6f376a4d4af23970cb ChangeLog 6076
+RMD160 1cc590dc8ee34a876a3c2f3a51df6d1185d5e283 ChangeLog 6076
+SHA256 46fda853b1494efb3735ec0e3338f7aba7328ca8be6fb4bf5774669686829902 ChangeLog 6076
+MISC metadata.xml 1623 RMD160 a005567b44b3d4811ac1a8d666cd69efbe35a832 SHA1 1f4b95db85eee8120a0392c3720d46d5a0149e6b SHA256 ffbf37ac66d97b2ed7f6988b2d76938f8211b48c8871325aa2ad9d1523345b11
+MD5 8161cc67336bc464a1b70356df7b4be4 metadata.xml 1623
+RMD160 a005567b44b3d4811ac1a8d666cd69efbe35a832 metadata.xml 1623
+SHA256 ffbf37ac66d97b2ed7f6988b2d76938f8211b48c8871325aa2ad9d1523345b11 metadata.xml 1623
 MD5 ed8f1e978198c34ad3dc3b81c4804199 files/digest-libffi-1.20 63
 RMD160 b2e34d85aef8d600d8a9ae284ba4ef41b3efcd71 files/digest-libffi-1.20 63
 SHA256 acfd918543dd76eb140a70e61d25907b1c9d8833ebe393dd3821132c58caedfb files/digest-libffi-1.20 63
-MD5 595fc5d3e417d76d1f7e7f0a8439535a files/digest-libffi-3.3.5 64
-RMD160 724bb02f4944d66e98b897a7c9bcb94b81cfd073 files/digest-libffi-3.3.5 64
-SHA256 9597e39411ed2f2cdc58249a4413b1eb1168b71a292adbd140e8c760c088eaf3 files/digest-libffi-3.3.5 64
-MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1 64
-RMD160 2ae4f4a561dee47f30812c7f1366c080129bc4ad files/digest-libffi-3.4.1 64
-SHA256 38eb3ead61421a155ec51e3e4277137753488fc771942cbb1bb29a42400d45e7 files/digest-libffi-3.4.1 64
-MD5 03a0e46a8ce1aff598b68a731112c13a files/digest-libffi-3.4.1-r1 64
-RMD160 2ae4f4a561dee47f30812c7f1366c080129bc4ad files/digest-libffi-3.4.1-r1 64
-SHA256 38eb3ead61421a155ec51e3e4277137753488fc771942cbb1bb29a42400d45e7 files/digest-libffi-3.4.1-r1 64
-MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-libffi-3.4.3 64
-RMD160 0cb02f70b4b35e3456e17c5aa15d4b71275ce07e files/digest-libffi-3.4.3 64
-SHA256 6ad26bb4b1deb5d1c9d6206181213555403db511450e31a43b3a172ec5d3ecc2 files/digest-libffi-3.4.3 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEhNkVOpjtAl+gMRURAv+TAKDAIbq2jjkTf9/qXaJbblgXKrVSkACeNezH
-MnYuXVTu2CokTyRvyHf4oio=
-=K1Mf
------END PGP SIGNATURE-----
+MD5 b540173210bd54366913f4fad9b4177c files/digest-libffi-3.3.5 238
+RMD160 0327edf876eafd7df1c1f04f872402f1dd1ea444 files/digest-libffi-3.3.5 238
+SHA256 29a7e9e5ee6a56847e2aec07f3e909370917b6758e8f212ab939df6ec9a5ef3b files/digest-libffi-3.3.5 238
+MD5 b719b68510aafadf22bb8bb84b3d36ef files/digest-libffi-3.4.1 238
+RMD160 ba30d97b9ee06a095eae12af7a69a2b0bb44e5a4 files/digest-libffi-3.4.1 238
+SHA256 dbc57068f33b6a7485a908e1a276174929e094ce54dc7025843871dce6412631 files/digest-libffi-3.4.1 238
+MD5 b719b68510aafadf22bb8bb84b3d36ef files/digest-libffi-3.4.1-r1 238
+RMD160 ba30d97b9ee06a095eae12af7a69a2b0bb44e5a4 files/digest-libffi-3.4.1-r1 238
+SHA256 dbc57068f33b6a7485a908e1a276174929e094ce54dc7025843871dce6412631 files/digest-libffi-3.4.1-r1 238
+MD5 e29931cfa79b4d270d869112ca4d8abb files/digest-libffi-3.4.3 238
+RMD160 f61ea9b141da0fb9204b9eb73a4affb9f271f146 files/digest-libffi-3.4.3 238
+SHA256 598c11efdf33e2c698a1aa83604c90b4ec09f5e7c4be1cd88b614cd485059bc0 files/digest-libffi-3.4.3 238
diff --git a/dev-libs/libffi/files/digest-libffi-3.3.5 b/dev-libs/libffi/files/digest-libffi-3.3.5
index 9678fe79d93d..2991f2cc36f7 100644
--- a/dev-libs/libffi/files/digest-libffi-3.3.5
+++ b/dev-libs/libffi/files/digest-libffi-3.3.5
@@ -1 +1,3 @@
 MD5 70ee088b498741bb08c779f9617df3a5 gcc-3.3.5.tar.bz2 23833856
+RMD160 34adf1a6f7ea302e9937c1a06ccf362711e25c58 gcc-3.3.5.tar.bz2 23833856
+SHA256 4ae90c6948d2654a254116fabb0cc7e474abf51ea841e6ef5cd8e6c161a9fa74 gcc-3.3.5.tar.bz2 23833856
diff --git a/dev-libs/libffi/files/digest-libffi-3.4.1 b/dev-libs/libffi/files/digest-libffi-3.4.1
index ba271506dd42..96326482ff90 100644
--- a/dev-libs/libffi/files/digest-libffi-3.4.1
+++ b/dev-libs/libffi/files/digest-libffi-3.4.1
@@ -1 +1,3 @@
 MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
+RMD160 b25352913fde37121e2dfe5521149bdaf08b0f5d gcc-3.4.1.tar.bz2 27182385
+SHA256 5f3685533f8dc4b42b926fe70bb371b31e1368223a0ad7398ba27ea3a20e8e7a gcc-3.4.1.tar.bz2 27182385
diff --git a/dev-libs/libffi/files/digest-libffi-3.4.1-r1 b/dev-libs/libffi/files/digest-libffi-3.4.1-r1
index ba271506dd42..96326482ff90 100644
--- a/dev-libs/libffi/files/digest-libffi-3.4.1-r1
+++ b/dev-libs/libffi/files/digest-libffi-3.4.1-r1
@@ -1 +1,3 @@
 MD5 31b459062499f9f68d451db9cbf3205c gcc-3.4.1.tar.bz2 27182385
+RMD160 b25352913fde37121e2dfe5521149bdaf08b0f5d gcc-3.4.1.tar.bz2 27182385
+SHA256 5f3685533f8dc4b42b926fe70bb371b31e1368223a0ad7398ba27ea3a20e8e7a gcc-3.4.1.tar.bz2 27182385
diff --git a/dev-libs/libffi/files/digest-libffi-3.4.3 b/dev-libs/libffi/files/digest-libffi-3.4.3
index a7535796098b..4703ac5940c8 100644
--- a/dev-libs/libffi/files/digest-libffi-3.4.3
+++ b/dev-libs/libffi/files/digest-libffi-3.4.3
@@ -1 +1,3 @@
 MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
+RMD160 0a688fd34b58548b99e08ccf778281bf470f925d gcc-3.4.3.tar.bz2 27425338
+SHA256 63dc1c03a107ec73871151bb765da7d5dfc1d699c0d0d6a3d244cf5ccb030913 gcc-3.4.3.tar.bz2 27425338
diff --git a/dev-libs/libffi/libffi-3.3.5.ebuild b/dev-libs/libffi/libffi-3.3.5.ebuild
index 2aa9f14e558e..671b87376d51 100644
--- a/dev-libs/libffi/libffi-3.3.5.ebuild
+++ b/dev-libs/libffi/libffi-3.3.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.5.ebuild,v 1.7 2006/06/06 01:23:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.3.5.ebuild,v 1.8 2006/07/27 17:16:09 grobian Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
 # This ebuild mod'd from libstdc++ compatbility package ebuild to create
 #   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
+#   __Armando Di Cianno <fafhrd@gentoo.org> (no longer a dev)
 
 do_filter_flags() {
 	declare setting
@@ -97,15 +97,13 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	=sys-devel/gcc-3.3.5*
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
+	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+	>=sys-apps/texinfo-4.2-r4"
 
 pkg_setup() {
 	if test_version_info ${PV}
@@ -138,11 +136,11 @@ src_compile() {
 
 	local myconf=
 
-	if ! use nls || use build
+	if use nls
 	then
-		myconf="${myconf} --disable-nls"
-	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
 	fi
 
 	#use amd64 && myconf="${myconf} --disable-multilib"
diff --git a/dev-libs/libffi/libffi-3.4.1-r1.ebuild b/dev-libs/libffi/libffi-3.4.1-r1.ebuild
index 3b66e86806f9..23a3e78a85cb 100644
--- a/dev-libs/libffi/libffi-3.4.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.10 2006/06/06 01:23:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1-r1.ebuild,v 1.11 2006/07/27 17:16:09 grobian Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
 # This ebuild mod'd from libstdc++ compatbility package ebuild to create
 #   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
+#   __Armando Di Cianno <fafhrd@gentoo.org> (no longer a dev)
 
 do_filter_flags() {
 	declare setting
@@ -75,15 +75,13 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-devel/gcc-3.4.1
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
+	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+	>=sys-apps/texinfo-4.2-r4"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
 
@@ -108,11 +106,11 @@ src_compile() {
 
 	local myconf=
 
-	if ! use nls || use build
+	if use nls
 	then
-		myconf="${myconf} --disable-nls"
-	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
 	fi
 
 	use amd64 && myconf="${myconf} --disable-multilib"
diff --git a/dev-libs/libffi/libffi-3.4.1.ebuild b/dev-libs/libffi/libffi-3.4.1.ebuild
index 826b37bcdac2..1de16ae18d1c 100644
--- a/dev-libs/libffi/libffi-3.4.1.ebuild
+++ b/dev-libs/libffi/libffi-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.12 2006/06/06 01:23:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.13 2006/07/27 17:16:09 grobian Exp $
 
 IUSE="nls nptl"
 SLOT="0"
@@ -8,7 +8,7 @@ inherit eutils flag-o-matic libtool versionator multilib
 
 # This ebuild mod'd from libstdc++ compatbility package ebuild to create
 #   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
+#   __Armando Di Cianno <fafhrd@gentoo.org> (not a dev any more)
 
 # Compile problems with these (bug #6641 among others)...
 #filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr"
@@ -93,15 +93,13 @@ DEPEND="virtual/libc
 	>=sys-devel/binutils-2.14.90.0.8-r1
 	>=sys-devel/bison-1.875
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
+	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( >=sys-libs/glibc-2.3.2-r3 )
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+	>=sys-apps/texinfo-4.2-r4"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
 
@@ -130,11 +128,11 @@ src_compile() {
 
 	local myconf=
 
-	if ! use nls || use build
+	if use nls
 	then
-		myconf="${myconf} --disable-nls"
-	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
 	fi
 
 	use amd64 && myconf="${myconf} --disable-multilib"
diff --git a/dev-libs/libffi/libffi-3.4.3.ebuild b/dev-libs/libffi/libffi-3.4.3.ebuild
index 2cb1a47eb563..370b522f9858 100644
--- a/dev-libs/libffi/libffi-3.4.3.ebuild
+++ b/dev-libs/libffi/libffi-3.4.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.3.ebuild,v 1.11 2006/06/06 01:23:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.3.ebuild,v 1.12 2006/07/27 17:16:09 grobian Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig versionator
 
 # This ebuild mod'd from libstdc++ compatbility package ebuild to create
 #   a similar structure for libffi, which is also included in gcc sources.
-#   __Armando Di Cianno <fafhrd@gentoo.org>
+#   __Armando Di Cianno <fafhrd@gentoo.org> (not a dev any more)
 
 do_filter_flags() {
 	declare setting
@@ -72,15 +72,13 @@ DEPEND="virtual/libc
 	>=sys-devel/bison-1.875
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-devel/gcc-3.4.3
-	!build? ( >=sys-libs/ncurses-5.2-r2
-	          nls? ( sys-devel/gettext ) )"
+	nls? ( sys-devel/gettext )"
 
 RDEPEND="virtual/libc
 	!nptl? ( !uclibc? ( >=sys-libs/glibc-2.3.2-r3 ) )
 	|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.1 )
 	>=sys-libs/zlib-1.1.4
-	>=sys-apps/texinfo-4.2-r4
-	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+	>=sys-apps/texinfo-4.2-r4"
 
 PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )"
 
@@ -105,11 +103,11 @@ src_compile() {
 
 	local myconf=
 
-	if ! use nls || use build
+	if use nls
 	then
-		myconf="${myconf} --disable-nls"
-	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
+	else
+		myconf="${myconf} --disable-nls"
 	fi
 
 	use amd64 && myconf="${myconf} --disable-multilib"
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index dfa13918819b..d173ef5d02f5 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd restrict="&gt;=dev-libs/libffi-3.3.3">gnustep</herd>
+<herd>maintainer-needed@gentoo.org</herd>
 <longdescription>
 Compilers for high level languages generate code that follow certain
 conventions. These conventions are necessary, in part, for separate