Use virtual/libffi instead of gcc[libffi], bug #272062

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

4 files changed, 103 insertions, 7 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 04a3e13d13c4..b5ac0706a2d6 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-base
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.84 2009/03/24 13:16:57 voyageur Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.85 2009/06/02 16:46:49 voyageur Exp $
+
+*gnustep-base-1.18.0-r4 (02 Jun 2009)
+
+  02 Jun 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +gnustep-base-1.18.0-r4.ebuild, metadata.xml:
+  Use virtual/libffi instead of gcc[libffi], bug #272062
 
   24 Mar 2009; Bernard Cafarelli <voyageur@gentoo.org>
   -gnustep-base-1.16.3-r1.ebuild, -gnustep-base-1.18.0-r1.ebuild,
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index 6cb4695020ab..fd5507c7b79c 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -6,5 +6,6 @@ DIST gnustep-base-1.18.0.tar.gz 2565694 RMD160 8cad9ac1ea0775ca4d2af0db76f1f457e
 EBUILD gnustep-base-1.16.3.ebuild 2638 RMD160 a27e0b2397f9c879ee66cddf4f4f26d457b44a4a SHA1 a7b9e6e528c18b0e5ff93277e50f96a990cf81e7 SHA256 7aa08c2df017280ddd9e6bdeedb256224ee7be35c39fb2d571b08c57d57824c9
 EBUILD gnustep-base-1.16.5.ebuild 2180 RMD160 46ccb49b3302c46ebe683b82e4cdaf8dbc1e2b95 SHA1 f6ae413cbf0582813be4dfc2644ff9e40e89e2de SHA256 65eda7fcc1e06711e536774e3302d8a52686d17c5a4bdcc67924d58083cced29
 EBUILD gnustep-base-1.18.0-r3.ebuild 2554 RMD160 92225b752abaf8b706ac6b161ab1c07d20677a25 SHA1 581deb61483a36f858d3640cb17dc74e85bdc7b9 SHA256 d69d0a7c05a02bbdbcf5b274e14bbf82668148879806ae0b49eda885cedb883f
-MISC ChangeLog 18812 RMD160 5ae9674361cee20324e9023ebc4e2377c6aa7a23 SHA1 da66cb54f825c0acc494fec9ddffbe302fa76041 SHA256 489245c8141e54b5490baa5424d08d01313358c1f1ee7f9072d4ffd433657a25
-MISC metadata.xml 875 RMD160 7a28660f89920d727869012e040494f292901337 SHA1 024ba545246147e0faf54166b23cbe154121ae3a SHA256 df8f3539ebc1ccd382871fc3d02a346dc152bedc112b4c4ce3380769ea99bff1
+EBUILD gnustep-base-1.18.0-r4.ebuild 2606 RMD160 1b852a32badb761f7a25a63172695d0231835c7d SHA1 3eedcb083ac35014d58b0bdcd8c9235dcd99446e SHA256 7dd9c330f94104faace01e0a403c61b4fb95845b7ee2b61cf8dafb64842725e4
+MISC ChangeLog 19012 RMD160 cdd6ea42cfc9ef7b0c43347cf37c3c412cf437c8 SHA1 dd672299508c8dc484ecbe8f29f57d19482db821 SHA256 d70b4145de6d8da3c99c310c202ac50a3303ad3591df97d95b7a0e11621999bd
+MISC metadata.xml 968 RMD160 fa9a95bbd230615a2b87a90d4fce772d8ff485f0 SHA1 109a94bb550067087ab18e0b27cc61c7cc4021d4 SHA256 06a58beac6750dc03f6264d183d83a394384b176d9636b5b09c48b8e67b8ec1a
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.18.0-r4.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r4.ebuild
new file mode 100644
index 000000000000..661cb5ea2656
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.18.0-r4.ebuild
@@ -0,0 +1,90 @@
+# 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.18.0-r4.ebuild,v 1.1 2009/06/02 16:46:49 voyageur Exp $
+
+EAPI=2
+
+inherit autotools gnustep-base
+
+DESCRIPTION="A library of general-purpose, non-graphical Objective C objects."
+
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="libffi gnutls zeroconf"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	>=gnustep-base/gnustep-make-2.0.8
+	!libffi? ( dev-libs/ffcall
+		gnustep-base/gnustep-make[-native-exceptions] )
+	libffi? ( virtual/libffi )
+	gnutls? ( net-libs/gnutls )
+	>=dev-libs/libxml2-2.6
+	>=dev-libs/libxslt-1.1
+	>=dev-libs/gmp-4.1
+	>=dev-libs/openssl-0.9.7
+	>=sys-libs/zlib-1.2
+	zeroconf? ( || (
+		net-dns/avahi[mdnsresponder-compat]
+		net-misc/mDNSResponder ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	# Automagic dependency on mdns-responder
+	epatch "${FILESDIR}"/${P}-mdns_configure.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	egnustep_env
+
+	local myconf
+	if use libffi;
+	then
+		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
+	else
+		myconf="--disable-libffi --enable-ffcall"
+	fi
+
+	myconf="$myconf $(use_enable gnutls tls)"
+	myconf="$myconf $(use_enable zeroconf)"
+	myconf="$myconf --with-xml-prefix=/usr"
+	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
+	myconf="$myconf --with-default-config=/etc/GNUstep/GNUstep.conf"
+
+	econf $myconf || die "configure failed"
+}
+
+src_install() {
+	# We need to set LD_LIBRARY_PATH because the doc generation program
+	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
+	# environment" including our LD_LIBRARY_PATH, we're left no choice
+	# but doing it like this.
+
+	egnustep_env
+	egnustep_install
+
+	if use doc ; then
+		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
+		egnustep_doc
+	fi
+	egnustep_install_config
+
+	dodir /etc/revdep-rebuild
+	sed -e 's|$GNUSTEP_SEARCH_DIRS|'"$GNUSTEP_SYSTEM_LIBRARIES $GNUSTEP_SYSTEM_TOOLS $GNUSTEP_LOCAL_LIBRARIES $GNUSTEP_LOCAL_TOOLS"'|' \
+		"${FILESDIR}"/50-gnustep-revdep \
+		> "${D}/etc/revdep-rebuild/50-gnustep-revdep"
+}
+
+pkg_postinst() {
+	ewarn "The shared library version has changed in this release."
+	ewarn "You will need to recompile all Applications/Tools/etc in order"
+	ewarn "to use this library."
+	ewarn "Run:"
+	ewarn "revdep-rebuild --library \"libgnustep-base.so.1.1[0-6]\""
+}
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
index 1eed32da9900..ec4eb9c55595 100644
--- a/gnustep-base/gnustep-base/metadata.xml
+++ b/gnustep-base/gnustep-base/metadata.xml
@@ -13,8 +13,7 @@ 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='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>