Do not built libstand anymore and remove the now useless bootstrap useflag

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

3 files changed, 17 insertions, 13 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 2c2c21192d35..d1e51535c376 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
 # 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.181 2013/06/18 22:26:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.182 2013/06/18 23:18:11 aballier Exp $
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild:
+  Do not built libstand anymore and remove the now useless bootstrap useflag
 
   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
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 348d792768f7..ecc08e955139 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 18286 SHA256 9ad13664e5fd64a8b787d64c8bd1646fe02336e4b3ff8d5cd4ed1393d462492a SHA512 9a96f2674767586eded13bbbe11836196a5f5c53b2ce47fd91b7d5a117c0a97c335294d7f06396a8bfc440a6e084ef221954e22c9e3a5b88a124c0cb4a1138b4 WHIRLPOOL a018c434c8dd10ea025510ca2cb98b879a8445fba30af9554564bcb0f78f220a603e17166683259d3995dadf900f887bf978c16d8a1154e4b4936f6b6d1074b4
+EBUILD freebsd-lib-9.1-r8.ebuild 18313 SHA256 9fc49d455809ae1174c6424fabf22d27534e95a087f18070ada4969bd55ab5df SHA512 a5caed67e46748f44a899354e2a734f024ba859d9c2cb0824bffb19b642ffc30478720bfda2ac40ff397dcb899207b59d72278e9e5e0b66572f62f203fc85b1b WHIRLPOOL 97f412d8ca56ab0cfcf29dc6f786ee9da465a8de0fb968922ae6ce52424b5f51eb3af2d47d8027bfbdc2dc506a780a9b0922b52fa63b544d889c7c6b374cde92
 EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da
-MISC ChangeLog 37519 SHA256 62b0462d2fc1394c553b0d489fab35a797b379d9b73d9722e783c84a1d7c8b35 SHA512 9e4de162b2a19e35cc4e78eed46c3bb6ace7d1eda1c3fae624a028f6b0bb880246ce167b5baf4c0219fab9d8836ea1b9b6dd1e404ac010861f3f3eae0b36245c WHIRLPOOL 66b1b1d8c272c9e0b027fa451c76be3a3a5563deec2abd236e7834075b6f450dd2863b3e577d8138e2b21ee7ed450cb248ed56bbfe40c76392a30831b15d143e
+MISC ChangeLog 37676 SHA256 623e2618d6463bc482a2395c93fff082c90e6885c417f81d4a41e2afaac187ec SHA512 ec80ed13b9ecf93900521abe828eeaff4b430685475353cb0bf52d3ae36671ee467c2bac32dd72b1472576a451604a46abebe267d642fcfe22fa5d6a87a88959 WHIRLPOOL fdce98eaaeb9e27aafe9c962d6c5e4d7e63b5f03791d44796614c671fc2b88d4e741eee43b7d6c43201ce20142d4d62a1c96f479284668321e6fc9fa1c005609
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEUEAREIAAYFAlHA3pEACgkQvFcC4BYPU0r8UgCeKytS9LhpMkFqbKw/+FqO1Fx3
-+cEAl37aq95E4dl9Q28ltoZjCq7aoOY=
-=gla9
+iEYEAREIAAYFAlHA6rQACgkQvFcC4BYPU0qjIQCgyaTNxk0OA0KK+IxEpVfwA8Dx
+eFYAoJX38Y8i2qp1Q1zfSl1fDIQIbufg
+=7Wdb
 -----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 9eb7a6aa773c..ccd7d2e33949 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.3 2013/06/18 22:26:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.4 2013/06/18 23:18:11 aballier Exp $
 
 EAPI=5
 
@@ -37,8 +37,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 		!sys-freebsd/freebsd-headers"
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
+		=sys-freebsd/freebsd-sources-${RV}*"
 else
 	SRC_URI="${SRC_URI}
 			mirror://gentoo/${SYS}.tar.bz2"
@@ -56,7 +55,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
 fi
 
 IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build bootstrap crosscompile_opts_headers-only zfs
+	build crosscompile_opts_headers-only zfs
 	userland_GNU userland_BSD multilib"
 
 pkg_setup() {
@@ -106,6 +105,8 @@ PATCHES=(
 # - archiving libraries (have their own ebuild)
 # - sendmail libraries (they are installed by sendmail)
 # - SNMP library and dependency (have their own ebuilds)
+# - libstand: static library, 32bits on amd64 used for boot0, we build it from
+# boot0 instead.
 #
 # The rest are libraries we already have somewhere else because
 # they are contribution.
@@ -119,7 +120,8 @@ REMOVE_SUBDIRS="ncurses \
 	libbegemot libbsnmp \
 	libpam libpcap bind libwrap libmagic \
 	libcom_err libtelnet
-	libelf libedit"
+	libelf libedit
+	libstand"
 
 # For doing multilib over multibuild.eclass
 MULTIBUILD_VARIANTS=( $(get_all_abis) )
@@ -191,10 +193,9 @@ src_prepare() {
 		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
 	fi
 
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
 	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
 	# BSD's sed on BSD.
+	cd "${S}"
 	if use userland_GNU; then
 		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
 	fi