Simplify a bit get_subdirs and do not treat differently USE=build/-build for non-native ABIs since we bootstrap when needed anyway.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 20 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 18e3572e6b32..2c2c21192d35 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.180 2013/06/18 22:20:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.181 2013/06/18 22:26:23 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+  Simplify a bit get_subdirs and do not treat differently USE=build/-build for
+  non-native ABIs since we bootstrap when needed anyway.
 
   18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
   Make a full bootstrap only when needed for multilib.
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 551afe5fbfc4..348d792768f7 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -87,14 +87,14 @@ EBUILD freebsd-lib-9.1-r4.ebuild 18204 SHA256 2e9a27abe55de661e47c08996d77f00fff
 EBUILD freebsd-lib-9.1-r5.ebuild 17118 SHA256 e721a639a5fb82f213ce40bad39f02a520596463dccbb20e4abe53bd229d8445 SHA512 97caafda63a51f0c3ad35471b404ac5cea9de730ead9b8bac4042107ed0ddea3d956732435746e8f268e73ad9e24e1b8abd55a322f0c69fa7c7d62a7dc88bfa5 WHIRLPOOL d8b54d9d6d27b200ee7b3b4de3b2c2889ac9b49827ffb54fd37d3f234db10e24e4765fa9e5ebad846e87e01df79517495ce85a7cb6f86ee1e8f9b9b51f0d79a9
 EBUILD freebsd-lib-9.1-r6.ebuild 18624 SHA256 43186c9a26fe3f168eba9a526ee5a69021c40093c814431076d79ff1d25a2391 SHA512 28f56883c0fe2b20ab18108b2829a69960878867f1eca9d81f3dc6f159fb41ba2814751876a729e9ed894edabcb6922602e3c07e60502c70baf99288412d4162 WHIRLPOOL 47754469cd1b9ff711f89b881429223c2330ecd6f5320d20287e294286203a6a197c93c657ea0e8d78f2f828901f0974cff59bf251a3ba344f0730d9acc2ad0f
 EBUILD freebsd-lib-9.1-r7.ebuild 18634 SHA256 c587fa2a4ad95f8534e04188bc8fc9d7430b4a872cd1dd53a12e760be23e3ff3 SHA512 207c4d6f3c4d30c8c6d6c086cb757431de01fa11239bf3f76169fe15261cee6b4233c052013539dc02570f8a2d7c1b75052f4acf272abd909428c4c4176c4ddd WHIRLPOOL ae0af97d61dde7968cfb9c4df664a502acdbf4638b97d1c1384ad461ffea7eba82f58380eaeabc5c83a13a0148f6e9258ef9d40527fdb8662c75f0fbe2878ef9
-EBUILD freebsd-lib-9.1-r8.ebuild 18611 SHA256 233ce5079a630aa6153bb557871c91db285f9b1906e277dd114ad3574c40800c SHA512 88e861de2c830b0ed449aad794a1bb0dff4cd359efc6a726e2431c8a9701392490854f17c5e45493150389d87b44e3b660293537de7ae2d6779eeb3b04aca014 WHIRLPOOL 4ce7fe73697032579bddba393019a3984f0f1364edfe135f384e1025bbb4183fc9ab2c9c246dcf5f8436d7a470ea4b284902601a864b741ee22a9d4fc9584cdf
+EBUILD freebsd-lib-9.1-r8.ebuild 18286 SHA256 9ad13664e5fd64a8b787d64c8bd1646fe02336e4b3ff8d5cd4ed1393d462492a SHA512 9a96f2674767586eded13bbbe11836196a5f5c53b2ce47fd91b7d5a117c0a97c335294d7f06396a8bfc440a6e084ef221954e22c9e3a5b88a124c0cb4a1138b4 WHIRLPOOL a018c434c8dd10ea025510ca2cb98b879a8445fba30af9554564bcb0f78f220a603e17166683259d3995dadf900f887bf978c16d8a1154e4b4936f6b6d1074b4
 EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da
-MISC ChangeLog 37303 SHA256 3b8dcbdcee3ad146aa456a7a7438646746b0944928385878474e78e45c2ecd80 SHA512 fc1320e759e283805053e3f37585da4c3fa11734fb280173de94fcdb01b0db81871cc4546e9ceba9608533cfe71e0d93d45ba6a7ce511143ab381a5d8e917bdb WHIRLPOOL acb07d273f70d0fcd3c8ec9f8e7cb96f4b4cdbbed7dd4f3ba2d95a85a3ff71568410ac8c32f7c8b7db59253b039f6c9c3effbc92e099b8a99d3c288e2efb42ce
+MISC ChangeLog 37519 SHA256 62b0462d2fc1394c553b0d489fab35a797b379d9b73d9722e783c84a1d7c8b35 SHA512 9e4de162b2a19e35cc4e78eed46c3bb6ace7d1eda1c3fae624a028f6b0bb880246ce167b5baf4c0219fab9d8836ea1b9b6dd1e404ac010861f3f3eae0b36245c WHIRLPOOL 66b1b1d8c272c9e0b027fa451c76be3a3a5563deec2abd236e7834075b6f450dd2863b3e577d8138e2b21ee7ed450cb248ed56bbfe40c76392a30831b15d143e
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHA3UUACgkQvFcC4BYPU0qHyQCgkH/sF9dsNpppEDwYZ/OTJAsJ
-u9wAoLVmgNEIFXN8jTEeMhkPDbG2uA5C
-=gSAc
+iEUEAREIAAYFAlHA3pEACgkQvFcC4BYPU0r8UgCeKytS9LhpMkFqbKw/+FqO1Fx3
++cEAl37aq95E4dl9Q28ltoZjCq7aoOY=
+=gla9
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
index 2659d14b897a..9eb7a6aa773c 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.2 2013/06/18 22:20:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.3 2013/06/18 22:26:23 aballier Exp $
 
 EAPI=5
 
@@ -251,9 +251,12 @@ bootstrap_libgcc() {
 	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
 }
 
-# What to build for a non-native build: cross-compiler, non-native abi in
-# multilib. We also need the csu but this has to be handled separately.
-NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+# What to build for a cross-compiler.
+# We also need the csu but this has to be handled separately.
+CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# What to build for non-default ABIs.
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
 
 # Subdirs for a native build:
 NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
@@ -278,27 +281,16 @@ get_subdirs() {
 		ret="${NATIVE_SUBDIRS}"
 	elif is_crosscompile ; then
 		# With a cross-compiler we only build the very core parts.
-		ret="${NON_NATIVE_SUBDIRS}"
+		ret="${CROSS_SUBDIRS}"
 		if [ "${EBUILD_PHASE}" = "install" ]; then
 			# Add the csu dir first when installing. We treat it separately for
 			# compiling.
 			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
 		fi
-	elif use build ; then
+	else
 		# For the non-native ABIs we only build the csu parts and very core
 		# libraries for now.
-		ret="gnu/lib/libssp/libssp_nonshared gnu/lib/csu"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
-	else
-		# Finally, with a non-native ABI without USE=build, we build the most
-		# important libraries.
-		ret="${NON_NATIVE_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
-
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
-		fi
+		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
 	fi
 	echo "${ret}"
 }