Remove USE gcc-libffi because it's conflicting with dev-libs/libffi in ld.so.conf.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 14 insertions, 23 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 7e9b9f3969a8..b6dd05e3181d 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.89 2009/09/22 02:18:13 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.90 2009/10/14 09:48:03 ssuominen Exp $
+
+  14 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gnustep-base-1.16.3.ebuild, metadata.xml:
+  Remove USE gcc-libffi because it's conflicting with dev-libs/libffi in
+  ld.so.conf.
 
   21 Sep 2009; Tom Gall <tgall@gentoo.org> gnustep-base-1.18.0-r4.ebuild:
   keyword ~ppc64
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 7c54dc9b47c4..c388bb88dad5 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -2,7 +2,7 @@ AUX 50-gnustep-revdep 35 RMD160 f9508891da2de58ef884baabf9206577653a409b SHA1 40
 AUX gnustep-base-1.18.0-mdns_configure.patch 899 RMD160 1accfd45753666d95ffbac304f91d9f7f93fed10 SHA1 c847efcbfd2b3ce43ba79bec94c8ba4c0fcc54bf SHA256 a6613e90f24bbc18d43a9fe4ee669afedc613853eaac33547a95cc6a6e2848e2
 DIST gnustep-base-1.16.3.tar.gz 2532346 RMD160 11d387437b13b0fe439df6b354ebece767ccee2a SHA1 a06ffac4972416b814682821f959bcf29bead47a SHA256 81e1f150c4d2547877066fda4ce9d0b07c18a489b94e6b171cbb16ccdcb4137b
 DIST gnustep-base-1.18.0.tar.gz 2565694 RMD160 8cad9ac1ea0775ca4d2af0db76f1f457eda5784d SHA1 30c13e673ad550c988f03adb9c545a8de1a17d19 SHA256 3c94ce1711b188b34fb750176d5d2e81d0010e323625bc4b79d550846a299ddd
-EBUILD gnustep-base-1.16.3.ebuild 2638 RMD160 a27e0b2397f9c879ee66cddf4f4f26d457b44a4a SHA1 a7b9e6e528c18b0e5ff93277e50f96a990cf81e7 SHA256 7aa08c2df017280ddd9e6bdeedb256224ee7be35c39fb2d571b08c57d57824c9
+EBUILD gnustep-base-1.16.3.ebuild 2068 RMD160 d98ef35afabe1c327f5593dabb65af4e3d53d75e SHA1 95928eb1ef38bbfc7da785102f1fcf1abc200422 SHA256 c42c9764b5ed079ad9e7bfdcacecfb39b81b0af098504cb29f16c0a9ed4f3207
 EBUILD gnustep-base-1.18.0-r4.ebuild 2607 RMD160 8aae4888b6f93b1b3a7257f6641e347b9fa1f65f SHA1 16c91c34e5ff228568bd3d7883f92dfeb86d4d71 SHA256 ab61150de9898d772a0d0615cf9c00d797637b59fc15673d77bc53b62477c963
-MISC ChangeLog 19420 RMD160 f1442028830e5589fc5e0305bb90347cb88f90bb SHA1 a7e26c202cfd898c669a0ddb6ff45b92097df58a SHA256 a70bde0e7a1de4e919e9cbd720f531ad363e4b0a1c42fa16da450213ffe9df17
-MISC metadata.xml 968 RMD160 fa9a95bbd230615a2b87a90d4fce772d8ff485f0 SHA1 109a94bb550067087ab18e0b27cc61c7cc4021d4 SHA256 06a58beac6750dc03f6264d183d83a394384b176d9636b5b09c48b8e67b8ec1a
+MISC ChangeLog 19610 RMD160 6743bb81537bfdba3f0e7292a6c5d91986e7bf4b SHA1 e30d7dd412ef4f4b3b814281db8d4fa611a2c275 SHA256 4235d17db41078e3690c61c22c82472c9ef3e299a5f077a605009dc40718429c
+MISC metadata.xml 780 RMD160 ba5d751d9c5ea583109639f2aeb932fdf562c7a2 SHA1 3d0a3b8ca2af826ca0baa820cb62eafb462d0dbc SHA256 164fd2e1b78e8755408bb322e7ea11175d1cfc58d8d5d447ea9acc8a7ca88b43
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild
index 318749405f40..55129dbd89f1 100644
--- a/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild
+++ b/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild,v 1.4 2008/10/03 17:21:15 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.16.3.ebuild,v 1.5 2009/10/14 09:48:03 ssuominen Exp $
 
 inherit gnustep-base
 
@@ -12,12 +12,11 @@ KEYWORDS="~alpha amd64 ppc sparc x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
 
-IUSE="gcc-libffi gnutls"
+IUSE="gnutls"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	>=gnustep-base/gnustep-make-2.0
-	!gcc-libffi? ( dev-libs/ffcall )
-	gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+	dev-libs/ffcall
 	gnutls? ( net-libs/gnutls )
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libxslt-1.1
@@ -28,25 +27,13 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	gnustep-base_pkg_setup
-
-	if use gcc-libffi && ! built_with_use sys-devel/gcc libffi; then
-		eerror "You have enabled the gcc-libffi USE flag, however gcc was not compiled with USE=libffi"
-		eerror "Please recompile sys-libs/gcc with USE=libffi, or disable the gcc-libffi USE flag"
-		die "libffi support not available"
-	fi
 }
 
 src_compile() {
 	egnustep_env
 
 	local myconf
-	if use gcc-libffi;
-	then
-		myconf="--enable-libffi --disable-ffcall"
-		myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include/libffi"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
+	myconf="--disable-libffi --enable-ffcall"
 
 	myconf="$myconf $(use_enable gnutls tls)"
 	myconf="$myconf --with-xml-prefix=/usr"
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
index ec4eb9c55595..58d7e0986ffe 100644
--- a/gnustep-base/gnustep-base/metadata.xml
+++ b/gnustep-base/gnustep-base/metadata.xml
@@ -13,7 +13,6 @@ It provides functionality that aims to implement the non-graphical
 portion of the OpenStep standard (the Foundation library).
 </longdescription>
 <use>
-	<flag name='gcc-libffi'>Use <pkg>dev-libs/libffi</pkg> from <pkg>sys-devel/gcc</pkg> instead of <pkg>dev-libs/ffcall</pkg>. Requires <pkg>sys-devel/gcc</pkg> built with USE=libffi</flag>
 	<flag name='libffi'>Use <pkg>dev-libs/libffi</pkg> instead of <pkg>dev-libs/ffcall</pkg></flag>
 </use>
 </pkgmetadata>