Version bump, force install path thanks Nick Bowler <nbowler@draconx.ca> in bug #532196. Drop some versions

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

7 files changed, 44 insertions, 420 deletions

diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog
index 9502829df966..bed0dbc6aea8 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.120 2014/06/06 12:44:31 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.121 2015/05/18 14:45:37 voyageur Exp $
+
+*gnustep-make-2.6.7 (18 May 2015)
+
+  18 May 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  -gnustep-make-2.6.2-r2.ebuild, -gnustep-make-2.6.3.ebuild,
+  -gnustep-make-2.6.4.ebuild, -gnustep-make-2.6.5.ebuild,
+  gnustep-make-2.6.6.ebuild, +gnustep-make-2.6.7.ebuild:
+  Version bump, force install path thanks Nick Bowler <nbowler@draconx.ca> in
+  bug #532196. Drop some versions
 
 *gnustep-make-2.6.6 (29 Jan 2014)
 
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
index a8f11449d28f..3c84035b486f 100644
--- a/gnustep-base/gnustep-make/Manifest
+++ b/gnustep-base/gnustep-make/Manifest
@@ -8,22 +8,29 @@ AUX gnustep-5.sh 480 SHA256 ab76e717419e639b7349295e2990ec17df9893c92dba805dab49
 AUX gnustep-make-2.0.1-destdir.patch 975 SHA256 68e386ad5dfeb90138723081ce0d45fd6c426dbcf9660784eb85707dee7be474 SHA512 e77ff00576deeeefc8f9c3d04645f091ba607d2296e75083ce9ecf21e3e408fdc4a1cd10dda5f0128fc1eff0a433ce73395e462a49f48e4fc40767b2f090453a WHIRLPOOL 6494c7dbaebb7cba39b43bf5a492b7e5f72b77c83b5431119c85d7151a662fafc5301f3402c187d13ed5d4c8b0778c3dbac5fde9edf7972a1b76512b9ccc0940
 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
-DIST gnustep-make-2.6.5.tar.gz 572273 SHA256 a1b4b7fbe80d1195a8367d5e92201be35990585b60253966b509250d810f2118 SHA512 4cb02b420990d1a352d5749156d1dec162c4f6def9a3cc019ccd5fe6e1680c8bcd2502c1af4da18a2bbaa01cbdce3b65219279b9f9a217386b4834361fb387e6 WHIRLPOOL ed955559bb3e31be64770932583dc65ed71560ae29a9ea2c50b204a8118857e3924c76752c86fb0b7c3119e2fa83e174d40caa861641a054341bab9098fb4e34
 DIST gnustep-make-2.6.6.tar.gz 576589 SHA256 bcef14d875ff70b26dfc9e892f33bd3665e3d5d9b12eca0c4f2aae133aca981d SHA512 bfabcca446e37a167a5ee2da5230023387ed6edec3ca9f7067131f0f1296eb32754f35db13e7fb4670ac9bb9fa2ccfeb728adb63b692ed7f3f8f30ba39276224 WHIRLPOOL 0872046506300e23c40d23a01f29641d299bdc87d4c35d9c189064ed9110fbb7c6aaaf67626282eaa0a1a4a7bc3920617654a412222c19b98571a115020fa033
-EBUILD gnustep-make-2.6.2-r2.ebuild 3892 SHA256 9bf7474be3dbbc09753aadf4c99a53eb0e67242f4051155f71370c06e47d6681 SHA512 0e5bd786965c95529f95851e999793d915c18ed953b06d3bf5f59923a197e78ebf7bc23fedaeeb01732a3315dc7b490e5daa3d1918db9cd528c04123cf2f2282 WHIRLPOOL e2cc5d707a9f78fe9aa921cc9808a5bd30cc58fe8509790e4eb4dfcf9882ae4cd32abd5cfc31ce9c25c6e18817a4ab1e85e96b3258d9447ccecad83fe4b0280d
+DIST gnustep-make-2.6.7.tar.gz 583730 SHA256 112b57737c3dcc66c78a5c88925ae1d672673d256d9935598e98bcd687d051e4 SHA512 4470844ec50d51ce4609b0ec8031e5dcb8422e46fbcfb6b3d6d2fee11f3b8140f6b07edcc3b8462177acb65d81cd4bc29a4fd86793ae52d6106e698170b0dad0 WHIRLPOOL da525cc4502e082ab1cce5f75c05472a1029041cf327104e714a2641f79961c4ecb9deb2afb707ae83af2fea1e50b0c064b27dd20e84d17d137a75226936d64f
 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
-EBUILD gnustep-make-2.6.4.ebuild 3889 SHA256 a1147c8ae52fb08ababafee41ff74bcdfc8c3b6ee7d902938750aa04a0f1cb56 SHA512 ecbc45b20f9eaed9738114de4c9cc009a90aa3c14e02762e238366b5d5d28b1020889dfd1f55ef8779412ce77802a05bdbaa42b35c16be61952c3b26613027c6 WHIRLPOOL 628ed9d739d6b68a17758ad2314e0d23059965bcde06d24a68c3012b5abfa1b0d7f974459e07f21496ecb46fcaba1a654a41a271e0b6df6303d71973de1851e7
-EBUILD gnustep-make-2.6.5.ebuild 3889 SHA256 0e21a10bd971a0b0e4488f8a53fd41576b4c5889e63bd902622d4b37dc63d4bf SHA512 4326107a6713188f5eefeacbbc66a45d44121fe8ab2947d52c754a7d312db1241f8c072d74c5417dd2acd96af08f3e75b0780f9a3412375e8f2ee18ba724b0dd WHIRLPOOL ef7138a15ab696bfc0c02ca35ade3f5a46df171747958c25d3045db4509437f6f1fa385ab4e71d07718aa85915d9884efc2d873357f0040301e2f4d9ee08ce78
-EBUILD gnustep-make-2.6.6.ebuild 3845 SHA256 26a6eed8fe29b37f720bb2d7c0b818d617618cf2213c71cf45bc2224a4804303 SHA512 0f2d585fa9a38d48771c2255f52e407d944fa4eb07d67a6238588a665d801c2130ff39d65a59939c5e33b4219a1197ee7c54c7b15fe3b9a5d8953afca604a753 WHIRLPOOL 8e748e7a017bbe1805a46ef49cc734dab92db3b6b9699c6fb1ffa21fb6a492357d1b113dd0981771a16bdf39ce3c60a3bdce2bced3702253bc48760d7d9c7658
-MISC ChangeLog 21954 SHA256 3d8ce00fec95c6e475a307430b11e7c9ace97e673754ed688c4e1300687b77f2 SHA512 8f96f9fbe41dd555db1d9364fae53beaf14a6c0c0f79a03d02f12e205dcaa51b63639ec1bc416d74d59396210568ae670721e7e744e91a6bc98c4c583481191a WHIRLPOOL 6edc33b37b71386e0566318721fbb870e5c1a41c30632373a20538dc93251e6a2f51a32551a2b5f2682e27661d6310ec8b9118187b67e3cb3c8d59ede7b2f415
+EBUILD gnustep-make-2.6.6.ebuild 3888 SHA256 160586d4715c4f70d94bda45e99fb78d21fdac4194fee43d65c6f4a5f8706221 SHA512 f8fe39ca43847af9808a45caafdfa6a5d39ed770fd3bd73b9484314d41b9a7d1e546aa0ee3aa3f081a3e8f19fd1d32ded7be9c49fee25347c6221c649f1400fe WHIRLPOOL 0c51c88a0a7654fdea6f51be38b2b4451c53ed3c2a518717029c9b0c8516a2258798dbed39f75f010a0aba47aa3601560ad59b3f4d3a1335fdec3a127df5e24b
+EBUILD gnustep-make-2.6.7.ebuild 3888 SHA256 54d49d83b0cbf23eead750a0c7e00879ca66ea9175118528da18a8440d7f253a SHA512 6ddab968a7984e5e1b22fc34be70cfa25c757c41a423b58823b60d93777de76e30a81316db1feb37b71c3016c7d43abf61a53f210700e6e6582ee1176fd6fab0 WHIRLPOOL b9828cf9fd51d73f0c806882703bbc3492a6c53548251f406428323edb9e9bcc71caed496ce883c491a3629b5c8e3482761439f6e0f243627959a4861adc19b3
+MISC ChangeLog 22338 SHA256 d39f490ed546da7dd79a95a765e01f69f8adca44dc158863df334cecad41d500 SHA512 1d85ecfc66dc9a943236ff290ae0886bb372344f19f80a226d46d5fe84c679c54f957df2785a5a9fc3fcaedbcdf126d14a877136f779990435bea96cf574cdf8 WHIRLPOOL 5e26ddcb9254a5fc9c8581d1c6f3b6043afe834b80d59ae53699598f3a2143ca9138e5b7ad86d80ab1d4d3a1f7047cc0988bbed36e6b45898a9b9fa26ac62e89
 MISC metadata.xml 929 SHA256 9def40fd32c963254dca8c34cd47b3cec9505de5280d4581486268c554ccaa8e SHA512 ab8867e76c04c2b8f2d48b91c4f1da6bb53bb4755a617bbe17bb6d5e28c44ccb5b8947ad6661d19a2e358d6e1a35a737702d197f7e9edfd8a9681f8917172116 WHIRLPOOL 95d468383b12988b80e45c614f55ecf1f12e1a0f0b7b492ae10862c6d822706c42a2b7d3603eab9464d3b5319ae54f9f02732005e90bb138bd63015496027ac3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlORt7AACgkQVWmRsqeSphNLJACbBhMESgn6RStPgDrRYTUtUo53
-sxYAn20wY5rwB7EpO1l9c3/Kik0BAdN3
-=4xy/
+iQJ8BAEBCABmBQJVWfsSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/JSsQANROGZ6AthJn0RSfGccZQS44
+mjSvBIADa+fxCBJLNr8qf8lvJGJvIRd7L9ZZonE19/2IMZksCFUOyMwycippcHvn
+8lGUTOHpi6yxfkTBMZ19e22MbTgBipL8JY+6kDxhSzU9MfNrmzcS05RpPTuKeJ9c
+XzaKWXufW1zKqTYesklIUvhpScjnJT2o4WkUv3zDLTzwdy6Q9o2NV5PffONxqmWt
++aD4lCsb3et6lCNOA/QBZcwxSTYqkggJwQeAcXHx3fKxlhQKkW4uRNx+Qz9x1nMp
+qxXBGUbSSzLsO13TEdkEAPBa11ey9xaF8wlEF0q2+mJXJXo3GQbz4pqoP5EJztlX
+aOBC/MJQo8iLMB9ZSEqlHbG/9Ov8QrEmghB9grptdlRbqI8lciaKBP1/v+1m+Nc0
+7LNyMQ2OTT1Ygzb14TF+9i9pGqxqPC6d0kvZyChERnxkRtGQZL0K0sfwvRXxaUe0
+pUeOMsaRSiY0KjO2TLs6XRWtcILazwAS6gJe5ZQ3st7rWEdwey/JFIHGyv97XNel
+HbBz1viJK6HQ3X0psnIQu2egNF02T+AnjP0ChZ3gCqh6brHx1JrsEzo7SgO4Kidz
++JuOQ5M/yciDOgWB1JGx8+Iv4PyYc1z4igj/Zv2SGNCht3SukcKWldsgMDLBp+yH
+DC32LBtPJ/eeM3xOG4Wm
+=xA72
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
deleted file mode 100644
index 9f0f2177c05b..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.2-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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-r2.ebuild,v 1.1 2012/07/03 18:23:12 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]
-		!!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
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.3.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.3.ebuild
deleted file mode 100644
index d4686a10dcd0..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.3.ebuild,v 1.1 2013/03/08 15:05:46 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]
-		!!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
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.5.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.5.ebuild
deleted file mode 100644
index 30a5a7a1406f..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.5.ebuild,v 1.1 2013/09/26 11:57:23 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
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild
index fe27c519f6e3..c5ebda5c517e 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.6.ebuild,v 1.1 2014/01/29 14:48:32 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.6.ebuild,v 1.2 2015/05/18 14:45:37 voyageur Exp $
 
 EAPI=5
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -18,7 +18,7 @@ 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}"
 
@@ -75,6 +75,7 @@ src_prepare() {
 src_configure() {
 	#--enable-objc-nonfragile-abi: only working in clang for now
 	econf \
+		INSTALL="${EPREFIX}"/usr/bin/install \
 		--with-layout=fhs-system \
 		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
 		--with-objc-lib-flag=-l:${libobjc_version} \
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild
index cd27790d8919..71559a40db63 100644
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.4.ebuild
+++ b/gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.7.ebuild,v 1.1 2015/05/18 14:45:37 voyageur Exp $
 
 EAPI=5
 inherit gnustep-base eutils prefix toolchain-funcs
@@ -18,7 +18,7 @@ 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}"
 
@@ -68,14 +68,14 @@ pkg_setup() {
 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}
+	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
+	eprefixify "${T}"/gnustep-5.{csh,sh}
 }
 
 src_configure() {
 	#--enable-objc-nonfragile-abi: only working in clang for now
 	econf \
+		INSTALL="${EPREFIX}"/usr/bin/install \
 		--with-layout=fhs-system \
 		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
 		--with-objc-lib-flag=-l:${libobjc_version} \
@@ -90,7 +90,7 @@ src_compile() {
 		# If a gnustep-1 environment is set
 		unset GNUSTEP_MAKEFILES
 		pushd Documentation &> /dev/null
-		emake all install
+		emake -j1 all install
 		popd &> /dev/null
 	fi
 }
@@ -115,8 +115,8 @@ src_install() {
 	dodoc FAQ README RELEASENOTES
 
 	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-4.sh
-	doexe "${T}"/gnustep-4.csh
+	doexe "${T}"/gnustep-?.sh
+	doexe "${T}"/gnustep-?.csh
 }
 
 pkg_postinst() {