Added optional dependency for ffcall -- prefer ffcall over libffi; gnustep user of libffi is buggy

(Portage version: 2.0.51.22-r1)

4 files changed, 132 insertions, 20 deletions

diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog
index 03bca3a19e55..a7ecf3b4f440 100644
--- a/gnustep-base/gnustep-base/ChangeLog
+++ b/gnustep-base/gnustep-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-base
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.26 2005/06/09 14:40:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.27 2005/06/22 21:15:42 fafhrd Exp $
+
+*gnustep-base-1.10.3-r1 (22 Jun 2005)
+
+  22 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +gnustep-base-1.10.3-r1.ebuild:
+  Added optional dependency for ffcall -- prefer ffcall over libffi; gnustep
+  user of libffi is buggy
 
   09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnustep-base-1.10.3.ebuild:
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
index fd5b501bdea8..adc89437e299 100644
--- a/gnustep-base/gnustep-base/Manifest
+++ b/gnustep-base/gnustep-base/Manifest
@@ -1,26 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
-MD5 a8ff035244a3446f02254d5189a462ad gnustep-base-1.10.2_pre20050312.ebuild 3359
 MD5 90b1b58d3762bb3e438f438cf3114896 gnustep-base-1.10.3.ebuild 2994
-MD5 ca7252c0bfbc3096c161bc3ff235c971 ChangeLog 8716
-MD5 6f47dd2e168c43ec9a8f6cd88d92db01 gnustep-base-1.10.2.ebuild 2979
+MD5 a8ff035244a3446f02254d5189a462ad gnustep-base-1.10.2_pre20050312.ebuild 3359
 MD5 203de462a749fe35be96547e50aeb84d gnustep-base-1.10.2-r1.ebuild 3057
+MD5 6f47dd2e168c43ec9a8f6cd88d92db01 gnustep-base-1.10.2.ebuild 2979
 MD5 bc7c604a29503f7eaa51220c8919f118 gnustep-base-1.10.1-r1.ebuild 2974
-MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
-MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3 72
-MD5 3a635544722f08220cbdfe346c41c125 files/base-user-defaults.patch-1.10.2_pre20050312 1096
-MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
-MD5 ec6765fbba5bf4048f63898acc20ce6e files/base-path.patch-gsstartup-0.10.2 487
+MD5 ca7252c0bfbc3096c161bc3ff235c971 ChangeLog 8716
+MD5 6054f8e4a94313852ff8e1294c8abd88 metadata.xml 670
+MD5 02095ff4c3b6ebc8ed54ba888f192a6f gnustep-base-1.10.3-r1.ebuild 3061
 MD5 deded00aa5a335854582a82255ddc2f3 files/digest-gnustep-base-1.10.1-r1 72
 MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2-r1 72
+MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3-r1 72
+MD5 efda24cf74398ac3ddce6cba6071561a files/config-gnustep-base.sh 559
+MD5 ec6765fbba5bf4048f63898acc20ce6e files/base-path.patch-gsstartup-0.10.2 487
 MD5 1d0f2a1118d08b617edef7ae05c4001e files/digest-gnustep-base-1.10.2 72
+MD5 353cee9163437665f9a7e18d77ba6a65 files/digest-gnustep-base-1.10.3 72
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-base-1.10.2_pre20050312 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCqFULKRy60XGEcJIRArU6AJ4yB3IQV/KQ962ToOUEFNoPzpGZcwCeMylp
-VrNm5zptmg/SPWjSNOOnn9Y=
-=P1ZH
------END PGP SIGNATURE-----
+MD5 3a635544722f08220cbdfe346c41c125 files/base-user-defaults.patch-1.10.2_pre20050312 1096
+MD5 1e1e21f737b0d25c8faabb89bd286988 files/base-user-defaults.patch-1.10.0 1069
diff --git a/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1 b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1
new file mode 100644
index 000000000000..258b08f6c6b4
--- /dev/null
+++ b/gnustep-base/gnustep-base/files/digest-gnustep-base-1.10.3-r1
@@ -0,0 +1 @@
+MD5 48d4f1dd5d01747c54c444a76b06a87d gnustep-base-1.10.3.tar.gz 1925587
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild
new file mode 100644
index 000000000000..00fee319ebd7
--- /dev/null
+++ b/gnustep-base/gnustep-base/gnustep-base-1.10.3-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2005 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.10.3-r1.ebuild,v 1.1 2005/06/22 21:15:42 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="The GNUstep Base Library is 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="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="${IUSE} doc ffcall gcc-libffi"
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	~gnustep-base/gnustep-make-1.10.0
+	|| (
+		ffcall? ( dev-libs/ffcall )
+		gcc-libffi? ( >=sys-devel/gcc-3.3.5 )
+		>=dev-libs/libffi-3.3.5
+	)
+	>=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
+	sys-apps/sed
+	${DOC_DEPEND}"
+RDEPEND="${DEPEND}
+	${DEBUG_DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+pkg_setup() {
+	# Order of preferences: ffcall, libffi from gcc, dev-libs/libffi
+	if ! use ffcall; then
+		if use gcc-libffi; then
+			if [ "$(ffi_available)" == "no" ]; then
+				ffi_not_available_info
+				die "libffi is not available"
+			fi
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/base-user-defaults.patch-1.10.0
+}
+
+src_compile() {
+	egnustep_env
+	local myconf
+	if use ffcall; then
+		einfo "Using ffcall for FFI, not libffi"
+		myconf="--disable-libffi --enable-ffcall"
+	else
+		einfo "Using libffi for FFI, not ffcall"
+		myconf="--enable-libffi --disable-ffcall"
+		if use gcc-libffi; then
+			myconf="${myconf} --with-ffi-library=$(gcc-config -L) --with-ffi-include=$(gcc-config -L | sed 's/:.*//')/include"
+		else
+			myconf="${myconf} --with-ffi-library=/usr/lib/libffi --with-ffi-include=/usr/include/libffi"
+		fi
+	fi
+
+	myconf="$myconf --with-xml-prefix=/usr"
+	myconf="$myconf --with-gmp-include=/usr/include --with-gmp-library=/usr/lib"
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+}
+
+src_install() {
+	egnustep_env
+	egnustep_install || die
+
+	local base_temp_lib_path
+	if [ ! -z $GNUSTEP_FLATTENED ]; then
+		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries"
+	else
+		base_temp_lib_path="$(egnustep_install_domain)/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO"
+	fi
+
+	if use doc ; then
+		local make_eval="INSTALL_ROOT=\${D} \
+			GNUSTEP_SYSTEM_ROOT=\${D}\$(egnustep_system_root) \
+			GNUSTEP_NETWORK_ROOT=\$(egnustep_network_root) \
+			GNUSTEP_LOCAL_ROOT=\$(egnustep_local_root) \
+			GNUSTEP_MAKEFILES=\$(egnustep_system_root)/Library/Makefiles \
+			GNUSTEP_USER_ROOT=\${TMP} \
+			GNUSTEP_DEFAULTS_ROOT=\${TMP}/\${__GS_USER_ROOT_POSTFIX} \
+			LD_LIBRARY_PATH=\"\${D}\${base_temp_lib_path}:\${LD_LIBRARY_PATH}\" \
+			GNUSTEP_INSTALLATION_DIR=\${D}\$(egnustep_install_domain) \
+			-j1"
+		if use debug ; then
+			make_eval="${make_eval} debug=yes"
+		fi
+		if use verbose ; then
+			make_eval="${make_eval} verbose=yes"
+		fi
+
+		cd ${S}/Documentation
+		eval emake ${make_eval} all || die "doc make has failed"
+		eval emake ${make_eval} install || die "doc install has failed"
+		cd ..
+	fi
+	egnustep_package_config
+}
+