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

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 11 insertions, 20 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/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>