Support GCC 4.7 (checking more libobjc.so versions, blocking libobjc2 when disabled). Bump for ~arch version. Should fix bug #421779

(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)

5 files changed, 44 insertions, 183 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index d6f40529d0c7..92989d4e7089 100644
--- a/gnustep-base/gnustep-make/ChangeLog
+++ b/gnustep-base/gnustep-make/ChangeLog
@@ -1,6 +1,15 @@
 # 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.111 2012/06/16 09:31:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.112 2012/07/03 18:23:12 voyageur Exp $
+
+*gnustep-make-2.6.2-r2 (03 Jul 2012)
+
+  03 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -gnustep-make-2.6.0.ebuild, -gnustep-make-2.6.1-r1.ebuild,
+  gnustep-make-2.6.2.ebuild, -gnustep-make-2.6.2-r1.ebuild,
+  +gnustep-make-2.6.2-r2.ebuild:
+  Support GCC 4.7 (checking more libobjc.so versions, blocking libobjc2 when
+  disabled). Bump for ~arch version. Should fix bug #421779
 
   16 Jun 2012; Kacper Kowalik <xarthisius@gentoo.org> gnustep-make-2.6.2.ebuild:
   ppc64 stable wrt #410601
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
deleted file mode 100644
index d8bf555d1151..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 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.0.ebuild,v 1.4 2011/06/07 13:48:56 voyageur Exp $
-
-EAPI="3"
-
-inherit gnustep-base eutils prefix
-
-DESCRIPTION="GNUstep Makefile Package"
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="native-exceptions"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/gcc-3.3[objc]
-	>=sys-devel/make-3.75
-	!gnustep-base/libobjc2"
-RDEPEND="${DEPEND}"
-
-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() {
-	econf \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		$(use_enable native-exceptions native-objc-exceptions) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "compilation failed"
-	# 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 || die "doc make has failed"
-		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 || die "install has failed"
-
-	# Copy the documentation
-	if use doc ; then
-		dodir ${GNUSTEP_SYSTEM_LIBRARY}
-		cp -r Documentation/tmp-installation/System/Library/Documentation \
-			"${ED}"${GNUSTEP_SYSTEM_LIBRARY}
-	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.1-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild
deleted file mode 100644
index 22219a45e4e8..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 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.1-r1.ebuild,v 1.1 2011/06/09 09:47:21 voyageur Exp $
-
-EAPI="3"
-
-inherit gnustep-base eutils prefix
-
-DESCRIPTION="GNUstep Makefile Package"
-
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="native-exceptions"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/gcc-3.3[objc]
-	>=sys-devel/make-3.75
-	!gnustep-base/libobjc2"
-RDEPEND="${DEPEND}"
-
-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() {
-	econf \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		$(use_enable native-exceptions native-objc-exceptions) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake || die "compilation failed"
-	# 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 || die "doc make has failed"
-		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 || die "install has failed"
-
-	# 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-r1.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
index dbc2fe947d70..9f0f2177c05b 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r1.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.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-r1.ebuild,v 1.1 2012/04/02 20:46:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild,v 1.1 2012/07/03 18:23:12 voyageur Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -18,7 +18,8 @@ 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] )"
+	!libobjc2? ( >=sys-devel/gcc-3.3[objc]
+		!!gnustep-base/libobjc2 )"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -26,10 +27,20 @@ pkg_setup() {
 	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
+		# 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
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 2ca94df3a2d6..cdf32211e75a 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.9 2012/06/16 09:31:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.10 2012/07/03 18:23:12 voyageur Exp $
 
 EAPI=4
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -16,7 +16,8 @@ IUSE="native-exceptions"
 
 DEPEND="${GNUSTEP_CORE_DEPEND}
 	>=sys-devel/make-3.75
-	>=sys-devel/gcc-3.3[objc]"
+	>=sys-devel/gcc-3.3[objc]
+	!!gnustep-base/libobjc2"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -24,10 +25,20 @@ pkg_setup() {
 	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
+		# 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