Version bump, mostly test framework changes and Android build target

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 144 insertions, 17 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 45aeba85a45f..172b25b7ab9f 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-base/gnustep-make
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.116 2013/03/17 15:37:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.117 2013/04/05 21:12:35 voyageur Exp $
+
+*gnustep-make-2.6.4 (05 Apr 2013)
+
+  05 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  +gnustep-make-2.6.4.ebuild:
+  Version bump, mostly test framework changes and Android build target
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 54eb2990c396..722be7b8f451 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -7,27 +7,17 @@ AUX gnustep-make-2.0.1-destdir.patch 975 SHA256 68e386ad5dfeb90138723081ce0d45fd
 AUX testlibobjc.m 229 SHA256 25543e39b6a1fac508439fa07036b37e7ec0068773c2c29d10af033bb94053e0 SHA512 cd64fb0ae2178a830e1aab2b18b9ec44723483e5e1514dd55394a03c6995b49420dcadc552d04dd5cf2bdc43113e8b7c37bdbe47c7a8933bdd6125e80e9b241e WHIRLPOOL 4654bdaf475516fb81318a7163699ca8e8864c8a137824cb2e96d132f96cd2a50030f1b4793d578e0929b73b7ed2b1e183cd158dd7f85afb2846cc6d6bcf580e
 DIST gnustep-make-2.6.2.tar.gz 562770 SHA256 7a95b3fc5bf14f6b06c4f1f716b48e9de13a11c1fa972aa3cc87736cd98f3e3a SHA512 5ef7889418e7e5acc40cd045772b08d178333dd7cb396b46bfcc117b8953c868cffff5ad41153f6cf2029f1d78d7213516cf1c2cfc88f028ffb883d0e83ea6a4 WHIRLPOOL 73f0953ba044323349a60393ca644031bac13ea48dab6ccbbf533ee5e52daa8411f6b7bdc4fc8928536c37c5edcaf3a6ef40c3c2ee335c0608b5c8d3a6d890d5
 DIST gnustep-make-2.6.3.tar.gz 569167 SHA256 aca6f87087289c62c0f68431ac86aae4cc859bae12c947c9dd9af6624c37de06 SHA512 27f5ba3815824ed2688318bad8b16d38c3703fb36bb68c122f2c6340846bcb65f9ec78e04521c96aa8acf0bf7d35c53e75737bf8a202e9b9a526c31aaf0c2c01 WHIRLPOOL 03e591c3456408641b8d3acc065744ad7383ed13cd0018d17b7f158a54e50e9b51e98c78d5c4538407f66aad9978217f725d0c9faa4fbaeddd811874bbcbd359
+DIST gnustep-make-2.6.4.tar.gz 571004 SHA256 cd79284b7d7da627975724fd66943e4a699f00d11ef6e8e74725d70a7dafdc57 SHA512 6d3a6310f36f37961fde30eb12c2cd69f9e48a9a85a73d5731c9fc508fcb7f74cb12037cefc0d89c96b1bc4762fbef52439517b02290980e9d8899d411233645 WHIRLPOOL bae0b4dd0c3dc6b918f452219959bb06d2d966b422b698fbe43c0cf351c520329123df20256b36e0d032741c26281392498beb9b779ffa63717f46ed8ab63ff7
 EBUILD gnustep-make-2.6.2-r2.ebuild 3892 SHA256 9bf7474be3dbbc09753aadf4c99a53eb0e67242f4051155f71370c06e47d6681 SHA512 0e5bd786965c95529f95851e999793d915c18ed953b06d3bf5f59923a197e78ebf7bc23fedaeeb01732a3315dc7b490e5daa3d1918db9cd528c04123cf2f2282 WHIRLPOOL e2cc5d707a9f78fe9aa921cc9808a5bd30cc58fe8509790e4eb4dfcf9882ae4cd32abd5cfc31ce9c25c6e18817a4ab1e85e96b3258d9447ccecad83fe4b0280d
 EBUILD gnustep-make-2.6.2.ebuild 3794 SHA256 c82707db430df9af2e4e6c78305f7a468cea3ceb2ffc308941f50ba8b2e2506a SHA512 f11886beea99befdc538d4271fabc0400ae50e85270d6008d5dec81ac2de402714633b26fcabbb1862280d022cedef036728a025e295bc09c807f0bd4a22066b WHIRLPOOL 724f63628067f41190defd2299221cdd0e9dbd3897888bbe247142d5848aeadbdb3f7560cbdcb437ec8a944252549f7c2aa8816e6ad39c414ca924b5970b8d84
 EBUILD gnustep-make-2.6.3.ebuild 3889 SHA256 12168e6a1c095d979c2e34bebd1276061a4a4714f211ac1c1b3f83f53f0aef91 SHA512 4cd2d473e061376437b8733a221eb4d12e4ef22189a1a4eb8854396955573702a10817198974c51dabe42512d87ac7946897326f693c4b9b3d6432c5cc7258e7 WHIRLPOOL bc0c49519d7132f0b3d73edc807aa309cbb1ec8408bae6804db366906fb774a00c9c3446269bfd1d5eeb0ab3e56f36bd253dc72f705b7b8584e6b7b48ad10020
-MISC ChangeLog 21333 SHA256 5c11088d65435f3173109ca38d586e73eeb7673b9790f00d4137cbd1f69cf1ce SHA512 5f0c770fdbfe975b7bb230c7bba7e9cdebec82a91265c53fbd115ce53df636184c5faa1c7a56a1552bce42c627a9bd4f69006495aa984e1dd38794c0ce8ec3ad WHIRLPOOL 46dd3378996bbe3cfb544d106311980af270748cf3da7816a5d87db6865a9f354964e4adeef14f4363757da9a642b0d193417c993dd4b08d08ae7865600db308
+EBUILD gnustep-make-2.6.4.ebuild 3889 SHA256 a1147c8ae52fb08ababafee41ff74bcdfc8c3b6ee7d902938750aa04a0f1cb56 SHA512 ecbc45b20f9eaed9738114de4c9cc009a90aa3c14e02762e238366b5d5d28b1020889dfd1f55ef8779412ce77802a05bdbaa42b35c16be61952c3b26613027c6 WHIRLPOOL 628ed9d739d6b68a17758ad2314e0d23059965bcde06d24a68c3012b5abfa1b0d7f974459e07f21496ecb46fcaba1a654a41a271e0b6df6303d71973de1851e7
+MISC ChangeLog 21525 SHA256 65eb527c6823e6b1b7901a1da12d1ac04456c88285a2746353d16f2b27f8a2bd SHA512 03f7266f49b468328c15f0b68379738a084365f7eceba31af25e669cd8a598c0654256f9715d5733c95ccb5bef388c9c94f40960b0ccebf36ab967cbff5a85e4 WHIRLPOOL 85ebca8800f922121aa54221e89d4141baa0bb893bf4c2d7ed965cb9782f5401a4bb30cf6f14310d858221175bb7d8318eb3167fa4c280069cb365a6d7d8eb30
 MISC metadata.xml 929 SHA256 9def40fd32c963254dca8c34cd47b3cec9505de5280d4581486268c554ccaa8e SHA512 ab8867e76c04c2b8f2d48b91c4f1da6bb53bb4755a617bbe17bb6d5e28c44ccb5b8947ad6661d19a2e358d6e1a35a737702d197f7e9edfd8a9681f8917172116 WHIRLPOOL 95d468383b12988b80e45c614f55ecf1f12e1a0f0b7b492ae10862c6d822706c42a2b7d3603eab9464d3b5319ae54f9f02732005e90bb138bd63015496027ac3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRReNVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun886a4QAL4fcfvmJnBCxC7Kdg1SQkrM
-Gj/hR7nD0L7nSXXBD+kAvpXHNFqpPdF5urPLFizxiPVUT7KDeqxAxT79A4XRkhJY
-FCJK1a/xuY1On5qqUsnN+yYErJj6t5ILEJdDKJ7Cy/KpqH16xnxGKCt0YDbaNy9H
-MmhxpUZ8Ve+cEAJyzaIj6Jy8wZZmZHT6nfNywPQjw0rOG3M0RMHLBfxUnXCRAsi1
-kmYpG+9etGCP+Ux1aXrhc67zyAY4OBCFQZASedBcHBnu/pEPTbayM+Jd6LFHaWYn
-JUDXwico3Fj3yVZS5ZSb+18eV2tsmSUP1dguYXWWlHlWB3y3fh+R0S9XsY+7nPuz
-HRTFm6NByJOfRiGhFK+eG4KnMujICd4ECV1jMPyL1pqaBjIUxO3rnPpWZW5bfEGg
-dvlpOvQGaSBDHrfZ6fqzQlOp8g+1enZWQPCMb1izO1mlYevuUNAnDimVyc6r697G
-bphjm+fUC8YEQA3T2e//VbxAiPCl0rMcSNz/ToTblL9CiedUH/K8EKEMrWJQmB8w
-aK9PtDXTZai3cKlQ9RmHxWAJTKxxOVqaDSnoDH+eejzMtF/8B4ZoBQV40rkU//lE
-/Xk4+Ka+qbfSfNl/2VBGKDJfk2MgndR82eJaZTCyNYsNODq7VUx8W2NZfYRJysGM
-akk3kPXJMmp9U2KOxUfm
-=thK6
+iF4EAREIAAYFAlFfPk0ACgkQFYEBGcdFJfJR9QD/WZsU96Xun8CgHlfK5IAjZadT
+OefS4f2XeDG2tFWJaPIBAIf8eJb1wcYcLs7/GMhScR31XvpdIx/kQV/qxzkaAFjQ
+=7hea
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild
new file mode 100644
index 000000000000..cd27790d8919
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild,v 1.1 2013/04/05 21:12:35 voyageur Exp $
+
+EAPI=5
+inherit gnustep-base eutils prefix toolchain-funcs
+
+DESCRIPTION="GNUstep Makefile Package"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="libobjc2 native-exceptions"
+
+DEPEND="${GNUSTEP_CORE_DEPEND}
+	>=sys-devel/make-3.75
+	libobjc2? ( gnustep-base/libobjc2
+		>=sys-devel/clang-2.9 )
+	!libobjc2? ( >=sys-devel/gcc-3.3[objc]
+		!!gnustep-base/libobjc2 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Determine libobjc.so to use
+	if use libobjc2; then
+		libobjc_version=libobjc.so.4
+	else
+		# Find version in active gcc
+		for ver in {2..5};
+		do
+			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} \
+				"${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null;
+			then
+				libobjc_version=libobjc.so.${ver}
+			fi
+		done
+	fi
+
+	# Stop if we could not get libobjc.so
+	if [[ -z ${libobjc_version} ]]; then
+		die "Could not find Objective-C runtime"
+	fi
+
+	# For existing installations, determine if we will use another libobjc.so
+	if has_version gnustep-base/gnustep-make; then
+		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
+		# Old installations did not set this explicitely
+		: ${current_libobjc:=libobjc.so.2}
+
+		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
+			ewarn "Warning: changed libobjc.so version!!"
+			ewarn "The libobjc.so version used for gnustep-make has changed"
+			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
+			ewarn "You must rebuild all gnustep packages installed."
+			ewarn ""
+			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
+			ewarn "# gnustep-updater -l"
+		fi
+	fi
+
+	if use libobjc2; then
+		export CC=clang
+	fi
+}
+
+src_prepare() {
+	# Multilib-strict
+	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-2.0.1-destdir.patch
+	cp "${FILESDIR}"/gnustep-4.{csh,sh} "${T}"/
+	eprefixify "${T}"/gnustep-4.{csh,sh}
+}
+
+src_configure() {
+	#--enable-objc-nonfragile-abi: only working in clang for now
+	econf \
+		--with-layout=fhs-system \
+		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
+		--with-objc-lib-flag=-l:${libobjc_version} \
+		$(use_enable libobjc2 objc-nonfragile-abi) \
+		$(use_enable native-exceptions native-objc-exceptions)
+}
+
+src_compile() {
+	emake
+	# Prepare doc here (needed when no gnustep-make is already installed)
+	if use doc ; then
+		# If a gnustep-1 environment is set
+		unset GNUSTEP_MAKEFILES
+		pushd Documentation &> /dev/null
+		emake all install
+		popd &> /dev/null
+	fi
+}
+
+src_install() {
+	# Get GNUSTEP_* variables
+	. ./GNUstep.conf
+
+	local make_eval
+	use debug || make_eval="${make_eval} debug=no"
+	make_eval="${make_eval} verbose=yes"
+
+	emake ${make_eval} DESTDIR="${D}" install
+
+	# Copy the documentation
+	if use doc ; then
+		dodir ${GNUSTEP_SYSTEM_DOC}
+		cp -r Documentation/tmp-installation/System/Library/Documentation/* \
+			"${ED}"${GNUSTEP_SYSTEM_DOC=}
+	fi
+
+	dodoc FAQ README RELEASENOTES
+
+	exeinto /etc/profile.d
+	doexe "${T}"/gnustep-4.sh
+	doexe "${T}"/gnustep-4.csh
+}
+
+pkg_postinst() {
+	# Warn about new layout if old GNUstep directory is still here
+	if [ -e /usr/GNUstep/System ]; then
+		ewarn "Old layout directory detected (/usr/GNUstep/System)"
+		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
+		ewarn "You must first update the configuration files from this package,"
+		ewarn "then remerge all packages still installed with the old layout"
+		ewarn "You can use gnustep-base/gnustep-updater for this task"
+	fi
+}