Add a build useflag that uses a downloaded tarball of sys rather than symlinking it.

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 37 insertions, 24 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index bcd2c0711bb6..62f5c531f14a 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.29 2006/10/05 09:09:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.30 2006/10/05 20:57:29 flameeyes Exp $
+
+  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> freebsd-lib-6.1.ebuild,
+  freebsd-lib-6.2_beta2.ebuild:
+  Add a build useflag that uses a downloaded tarball of sys rather than
+  symlinking it.
 
 *freebsd-lib-6.2_beta2 (05 Oct 2006)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index f7215008aec5..d9377e3e2f61 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,22 +61,22 @@ DIST freebsd-sys-6.2_beta2.tar.bz2 18317253 RMD160 c53fdcb1289d56f5184b3912fdb0c
 DIST freebsd-usbin-6.1.tar.bz2 2664570 RMD160 98a87538790a814d0afd35bb0f848bcff574c72d SHA1 c7e6856e7f6bd2d45790737f411348b301944b91 SHA256 70b4a494a72d130d641500bfa857bdf98c9a4a040da2699475902523ba5c374e
 DIST freebsd-usbin-6.2_beta1.tar.bz2 2694381 RMD160 360aa0fb7010a337e655ca003599f18b37232f76 SHA1 4ee2bcfb04ad1ed80186b33ed85d6086b34959e9 SHA256 315e58a3d65dc4078845747e97f5e31b3245e3a8795d74a715d81afbadaf08fc
 DIST freebsd-usbin-6.2_beta2.tar.bz2 2694290 RMD160 a260f821dc50adbf1b1bef270bc41477e938e336 SHA1 bf532378a01c4b17499c402953d8d8eac1d276fc SHA256 fd54dc28e41028d39cdef1d37f054c3db5c798854db1519119e09e034a8f48ef
-EBUILD freebsd-lib-6.1.ebuild 6997 RMD160 cb7720a2a39562fe10a9a92f48f2613b0030c064 SHA1 c1aaff856e998428b1815f314a45f63d56217bca SHA256 3ee39d5903ed9460ab5bfe79725fcd0f9762fcf4dd9e74f113425e2c1d339381
-MD5 30ec1b636f5e47d846a99bfc135361a9 freebsd-lib-6.1.ebuild 6997
-RMD160 cb7720a2a39562fe10a9a92f48f2613b0030c064 freebsd-lib-6.1.ebuild 6997
-SHA256 3ee39d5903ed9460ab5bfe79725fcd0f9762fcf4dd9e74f113425e2c1d339381 freebsd-lib-6.1.ebuild 6997
+EBUILD freebsd-lib-6.1.ebuild 7074 RMD160 7b81fdeb6d919c94fd71bb6045ded4e5d1623e8f SHA1 094ac9d1cd988b22822b78aa9ea357d39e90be50 SHA256 4cb30596b6f3c81d9af3d523d2d3882e3ef3f97c7dfc273a097b5e62a77649b4
+MD5 645d032f06a9bb21a2ac48568202e8c7 freebsd-lib-6.1.ebuild 7074
+RMD160 7b81fdeb6d919c94fd71bb6045ded4e5d1623e8f freebsd-lib-6.1.ebuild 7074
+SHA256 4cb30596b6f3c81d9af3d523d2d3882e3ef3f97c7dfc273a097b5e62a77649b4 freebsd-lib-6.1.ebuild 7074
 EBUILD freebsd-lib-6.2_beta1.ebuild 7210 RMD160 4c03f2a67b328d3cede3f3257d216441eb2a843a SHA1 f820e4dcde4bb7bebcf6df990f172450ee326e02 SHA256 3bcddb77d58848bed2bd3f34bd14abf9d0732211a2d526391c3d0ac5d78b7860
 MD5 8ae5b5be2cec8d3759e6cf2fac646734 freebsd-lib-6.2_beta1.ebuild 7210
 RMD160 4c03f2a67b328d3cede3f3257d216441eb2a843a freebsd-lib-6.2_beta1.ebuild 7210
 SHA256 3bcddb77d58848bed2bd3f34bd14abf9d0732211a2d526391c3d0ac5d78b7860 freebsd-lib-6.2_beta1.ebuild 7210
-EBUILD freebsd-lib-6.2_beta2.ebuild 7210 RMD160 c167d7613768ab4fba8f61a5a3588faf83c95981 SHA1 4c35d5514b69456be0f9fdd5405cd3ca07bc574b SHA256 c13ec1ba4c69ae39f1c681875da10b522aaa22612b7c2764110af050be95734d
-MD5 dc584a774c0dd55f0ac055c4e681d8b5 freebsd-lib-6.2_beta2.ebuild 7210
-RMD160 c167d7613768ab4fba8f61a5a3588faf83c95981 freebsd-lib-6.2_beta2.ebuild 7210
-SHA256 c13ec1ba4c69ae39f1c681875da10b522aaa22612b7c2764110af050be95734d freebsd-lib-6.2_beta2.ebuild 7210
-MISC ChangeLog 10106 RMD160 c5eb269fa35f7867da090a2449c992a3b9058374 SHA1 e252c500c4beda9090ec556b0cdcaa5859d11aa4 SHA256 802c1e068528917007491b20e19e9d7a8358433511252903ef7b1d52ac944c16
-MD5 b44d85973b60b09a1386ffaa565bb61e ChangeLog 10106
-RMD160 c5eb269fa35f7867da090a2449c992a3b9058374 ChangeLog 10106
-SHA256 802c1e068528917007491b20e19e9d7a8358433511252903ef7b1d52ac944c16 ChangeLog 10106
+EBUILD freebsd-lib-6.2_beta2.ebuild 7287 RMD160 b652449ea816093e9da5dd3c9eda6d8805d08871 SHA1 81890ba9bcf83b6868426483adad18628b3fc648 SHA256 09889dd522b05e9c849f7d19f8a3eb9afd84aadf1e3e3671d336de01859155ab
+MD5 a63b5c705f15b9a36820c1e0b6946c5e freebsd-lib-6.2_beta2.ebuild 7287
+RMD160 b652449ea816093e9da5dd3c9eda6d8805d08871 freebsd-lib-6.2_beta2.ebuild 7287
+SHA256 09889dd522b05e9c849f7d19f8a3eb9afd84aadf1e3e3671d336de01859155ab freebsd-lib-6.2_beta2.ebuild 7287
+MISC ChangeLog 10305 RMD160 c594b2b1d191142751b6e8316014ef9c0dc43c19 SHA1 cdaa5df0dcfca03e3ae00b540b4f71d39d2e717d SHA256 464f8ca871333db258e1117acc41997eb360841e05a80d1834b6f9d4a02c5cd9
+MD5 54ba0989c0b70f502587196250a438ea ChangeLog 10305
+RMD160 c594b2b1d191142751b6e8316014ef9c0dc43c19 ChangeLog 10305
+SHA256 464f8ca871333db258e1117acc41997eb360841e05a80d1834b6f9d4a02c5cd9 ChangeLog 10305
 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)
 
-iD8DBQFFJMvEAiZjviIA2XgRAgGyAKCZFjgoQEY5mmOTVe65Iz68+fBHAACeKOpk
-HsvhUdBJJz60knS8LS+lCEc=
-=QLnj
+iD8DBQFFJXHjAiZjviIA2XgRAsjkAKCqASeNMtUtsAshwLF+1hssvhk1bgCfVtyl
+7Xrh6EZb2oCMGfnAVO7r+nc=
+=mFAA
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
index ca24f17f3226..5d11a3215366 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.1.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.1.ebuild,v 1.10 2006/09/03 11:25:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.1.ebuild,v 1.11 2006/10/05 20:57:29 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"
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
@@ -21,6 +21,8 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${INCLUDE}.tar.bz2
 		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
 		!kernel_FreeBSD? (
+			mirror://gentoo/${SYS}.tar.bz2 )
+		build? (
 			mirror://gentoo/${SYS}.tar.bz2 )"
 
 if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then
@@ -102,6 +104,10 @@ REMOVE_SUBDIRS="libncurses libform libmenu libpanel \
 src_unpack() {
 	freebsd_src_unpack
 
+	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
+
+	use build && return 0
+
 	if [[ ${CTARGET} == ${CHOST} ]]; then
 		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
 	else
@@ -111,8 +117,6 @@ src_unpack() {
 
 	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
 		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-
-	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
 }
 
 src_compile() {
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 8bb882e9855d..5a9bbf100081 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.1 2006/10/05 09:09:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.2 2006/10/05 20:57:29 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"
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
@@ -21,6 +21,8 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${INCLUDE}.tar.bz2
 		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
 		!kernel_FreeBSD? (
+			mirror://gentoo/${SYS}.tar.bz2 )
+		build? (
 			mirror://gentoo/${SYS}.tar.bz2 )"
 
 if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then
@@ -103,6 +105,10 @@ REMOVE_SUBDIRS="libncurses libform libmenu libpanel \
 src_unpack() {
 	freebsd_src_unpack
 
+	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
+
+	use build && return 0
+
 	if [[ ${CTARGET} == ${CHOST} ]]; then
 		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
 	else
@@ -113,8 +119,6 @@ src_unpack() {
 	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
 		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
 
-	sed -i -e 's:-o/dev/stdout:-t:' ${S}/libc/net/Makefile.inc
-
 	# Let arch-specific includes to be found
 	local machine
 	machine=$(tc-arch-kernel ${CTARGET})