4 files changed, 137 insertions, 12 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index e0e34bdcc783..d32a73e22d2d 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.106 2012/02/20 20:05:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.107 2012/04/02 20:46:24 voyageur Exp $
+
+*gnustep-make-2.6.2-r1 (02 Apr 2012)
+
+  02 Apr 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  gnustep-make-2.6.2.ebuild, +gnustep-make-2.6.2-r1.ebuild:
+  Disable libobjc2 USE flag in stable candidate, moved in revision bump
 
   20 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
   gnustep-make-2.6.2.ebuild, +files/testlibobjc.m:
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index 662ee02c2d47..4b3ddebba3ae 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -14,13 +14,14 @@ DIST gnustep-make-2.6.2.tar.gz 562770 RMD160 683b6a034d4bb7e17b64209c7e7e289e9e9
 EBUILD gnustep-make-2.4.0.ebuild 2335 RMD160 fb557f9e3ccbbe3c9d6505b5ea0240c5bf45be4f SHA1 6f8d32ff50ebe43e7697cde8f3f2c9307858430c SHA256 3efca9d4073527e756cfbc562cef3eb4b9c0dd09032be33ff89fe9be141883a1
 EBUILD gnustep-make-2.6.0.ebuild 2488 RMD160 4269a947fe5c159525e1f9773913889d03fe7812 SHA1 4f916eb0f834a930ccede5e3fc0a0f0a29a76b01 SHA256 cb622ead93fe859763c2266979ab02f27e3c578ef639c1e08b59352f895bb208
 EBUILD gnustep-make-2.6.1-r1.ebuild 2486 RMD160 46faa0e60887bea22eb5a4b585c5818be1255e27 SHA1 cdce750b077ccbfee4512f3aa0e6047f82834107 SHA256 f1ed6fbd1c5c1443662e4d330c9db4b16fb2eea7565f87637f925904bd6041a6
-EBUILD gnustep-make-2.6.2.ebuild 3706 RMD160 ef5e44bd3101287e399bc4146ba5761214ca130f SHA1 ea9a3e56e8944503e7c1fc0926e6ea2c05b65b76 SHA256 14a7d51fad7746cd9482fba56624d7ebb38de373169e24b876f0cbf211353ad5
-MISC ChangeLog 19748 RMD160 7c0ac1bcde87124b70db3f3ac265086c118b498d SHA1 86434b48963b62bd981d6fec337585005a32c66f SHA256 1a8b77eee5c5203258e62ee7fc24a6313c32d3c0d220b98cfedca37fa37c7e54
+EBUILD gnustep-make-2.6.2-r1.ebuild 3709 RMD160 7d617571c171fedce6fbf9d00216c3b43fad5fa8 SHA1 8e734bdb972df007855a734e615110e91fc75ce6 SHA256 34b0d79ce3479b0609e9e7ab4833fc8103553a06c386ce04c7a969ab7bf92a6d
+EBUILD gnustep-make-2.6.2.ebuild 3621 RMD160 a5f073050a376f509b0cc0c9adf2982a53381a21 SHA1 9a7a3c5d6c5ada614dafdb9f3f2df1c10eb41170 SHA256 c095f5ef832f37832d343cb3ee79b9e9443e3d4807daa88663c27446110c8d1a
+MISC ChangeLog 19974 RMD160 6b2a6e9bf124aa3a4efc1c76f14d32df1c4ca459 SHA1 dfb401cd9d6d3222ade26e72ae1ca14c9396c3cf SHA256 53d45060b03d3f2862e505d8af016c02182ef0487fb00ca09c3a3b4ba54a609c
 MISC metadata.xml 898 RMD160 b9f3536bfebd8b110106c0acd25867ee18ee8913 SHA1 5c8af107c44ff235ab4817c553059aaee486af36 SHA256 00307fc5770d94f69c9c30ce99884a198bb71c5a14e85454b9bf164abc1f8b0f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9Cp54ACgkQFYEBGcdFJfLztwD/dpJ46/0+R8fhKf5xChP8kMZo
-42VvouZ1YTlm1zEEWiIA/3Xel63KgCwetf0XAUVV7dRC3a/5JKzR9IOjL5XPjhcn
-=1VoT
+iF4EAREIAAYFAk96ECsACgkQFYEBGcdFJfKXaQD/YbVt3ERD75FUck4WruIn7kiM
+UXvJ3l62OKdfrv/QvOQA/1Nd87Adzm220HuQpXFicsuQfIOjI+Sh/G4JlwzeopXT
+=W1Ym
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild
new file mode 100644
index 000000000000..dbc2fe947d70
--- /dev/null
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 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.2-r1.ebuild,v 1.1 2012/04/02 20:46:24 voyageur Exp $
+
+EAPI=4
+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] )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Determine libobjc.so to use
+	if use libobjc2; then
+		libobjc_version=libobjc.so.4
+	else
+		# Test new libobjc.so.3
+		$(tc-getCC) -Werror -Wl,-l:libobjc.so.3 "${FILESDIR}"/testlibobjc.m -o /dev/null 2> /dev/null \
+			&& libobjc_version=libobjc.so.3 \
+			|| libobjc_version=libobjc.so.2
+	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
+}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
index da59154975f0..6029916cad75 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.ebuild,v 1.4 2012/02/20 20:05:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.5 2012/04/02 20:46:24 voyageur Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -12,13 +12,11 @@ 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"
+IUSE="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] )"
+	>=sys-devel/gcc-3.3[objc]"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {