Add a bootstrap useflag to disable libstand, as in stage1 we don't have libbz2 available.

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 22 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index a1f0999793ed..4458f44b1600 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.32 2006/10/06 16:47:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.33 2006/10/06 17:14:03 flameeyes Exp $
+
+  06 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-lib-6.2_beta2.ebuild:
+  Add a bootstrap useflag to disable libstand, as in stage1 we don't have
+  libbz2 available.
 
   06 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild,
   freebsd-lib-6.2_beta2.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 8286836df27f..379e08c51f57 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -69,14 +69,14 @@ EBUILD freebsd-lib-6.2_beta1.ebuild 7203 RMD160 5cb99f761d63e0b300dac281bc92decd
 MD5 87aa8d691dc33986ef686c8fefb4ac42 freebsd-lib-6.2_beta1.ebuild 7203
 RMD160 5cb99f761d63e0b300dac281bc92decd200b42d1 freebsd-lib-6.2_beta1.ebuild 7203
 SHA256 40f4575d8675129030a6d5d95bc7a25a750a768eff4c52679b7f411bcc9969fc freebsd-lib-6.2_beta1.ebuild 7203
-EBUILD freebsd-lib-6.2_beta2.ebuild 7298 RMD160 7b18d3f7294a2f39258f97e305f77cc93fc00d3b SHA1 2657a9a2bd466f65f72ebed12407f87943e9d38b SHA256 98326607c3f64c52d7fbca1a3b310e486d0efbb90400cc033d67cefe5ba27bed
-MD5 0c593a674773f9bbd08780e32a148776 freebsd-lib-6.2_beta2.ebuild 7298
-RMD160 7b18d3f7294a2f39258f97e305f77cc93fc00d3b freebsd-lib-6.2_beta2.ebuild 7298
-SHA256 98326607c3f64c52d7fbca1a3b310e486d0efbb90400cc033d67cefe5ba27bed freebsd-lib-6.2_beta2.ebuild 7298
-MISC ChangeLog 10789 RMD160 de1162de5785f81fbd64a7b46bc8a0327b20c9c0 SHA1 849dd98ab3021c6399ffbe33e0e34f7f74d95db0 SHA256 e51d75565eaf796ecd27a2e5d5d9cb1879676c219d60181a8308393dd2ae211c
-MD5 77d19a7e7388e53332049ea816a228b1 ChangeLog 10789
-RMD160 de1162de5785f81fbd64a7b46bc8a0327b20c9c0 ChangeLog 10789
-SHA256 e51d75565eaf796ecd27a2e5d5d9cb1879676c219d60181a8308393dd2ae211c ChangeLog 10789
+EBUILD freebsd-lib-6.2_beta2.ebuild 7361 RMD160 ce127039222bf1f115f82de8ed97f5186b45cc32 SHA1 7a2263409e7d9f17be3adf968fab4ca3f7bfbb5b SHA256 40036ab8a0be94a9facea3671c244621a10a711b0b4615a0466c5638cbdc3e1e
+MD5 e85077edf6bec7dee052b124cffc1ac3 freebsd-lib-6.2_beta2.ebuild 7361
+RMD160 ce127039222bf1f115f82de8ed97f5186b45cc32 freebsd-lib-6.2_beta2.ebuild 7361
+SHA256 40036ab8a0be94a9facea3671c244621a10a711b0b4615a0466c5638cbdc3e1e freebsd-lib-6.2_beta2.ebuild 7361
+MISC ChangeLog 10969 RMD160 eb5b298c76a4b25cf9917678399b88ec9df71715 SHA1 c91260ee01525067c18cd8333681194ccea880fe SHA256 316071889f177d6a3afc0300e08ca69716a41895e5b4ba739a2599a53cf81204
+MD5 348f3780b3f41c09f0f3b210be85be63 ChangeLog 10969
+RMD160 eb5b298c76a4b25cf9917678399b88ec9df71715 ChangeLog 10969
+SHA256 316071889f177d6a3afc0300e08ca69716a41895e5b4ba739a2599a53cf81204 ChangeLog 10969
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -93,7 +93,7 @@ SHA256 6ec0493bba230f79c405f25cbb3918fdb3e38a1627c4fe87a5d635cb269b1e4d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJoinAiZjviIA2XgRAgi9AKDGikd3jAW/gJCbycWgw1+/6qBK5QCgxr8u
-VWrKvylnHMmQOPuz1RSRw/o=
-=eIyh
+iD8DBQFFJo70AiZjviIA2XgRAl/4AJwI4fL7evSqHISR459UePvTqEL4pgCfczft
+yg5Fk4eiCZNYmU10ihAburk=
+=wcny
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
index 7d1590f17bcd..8f9b45913a45 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.4 2006/10/06 16:47:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.5 2006/10/06 17:14:03 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="FreeBSD's base system libraries"
 SLOT="6.0"
 KEYWORDS="~x86-fbsd"
 
-IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build"
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
@@ -32,7 +32,7 @@ if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then
 	DEPEND="${RDEPEND}
 		>=sys-devel/flex-2.5.31-r2
 		=sys-freebsd/freebsd-sources-${RV}*
-		app-arch/bzip2"
+		!bootstrap? ( app-arch/bzip2 )"
 
 	PROVIDE="virtual/libc
 		virtual/os-headers"
@@ -124,6 +124,8 @@ src_unpack() {
 	local machine
 	machine=$(tc-arch-kernel ${CTARGET})
 	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine"
+
+	use bootstrap && dummy_mk libstand
 }
 
 src_compile() {