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

Package-Manager: portage-2.1.2_pre2-r3

6 files changed, 47 insertions, 32 deletions

diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 270aa9606c92..94c606e104d5 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.26 2006/10/05 09:16:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.27 2006/10/05 21:06:46 flameeyes Exp $
+
+  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-ubin-6.1.ebuild, freebsd-ubin-6.2_beta2.ebuild:
+  Add a build useflag that uses a downloaded tarball of sys rather than
+  symlinking it.
 
 *freebsd-ubin-6.2_beta2 (05 Oct 2006)
 
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 021eeeba51a2..c932ebf55175 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -68,42 +68,44 @@ DIST freebsd-include-6.2_beta2.tar.bz2 131579 RMD160 1c09dd973a875dbebb8e5b460a7
 DIST freebsd-lib-6.1.tar.bz2 2613584 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 SHA1 c7fed3b4a996fdd25f97eef428dd40023dc53a7e SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37
 DIST freebsd-lib-6.2_beta1.tar.bz2 2661080 RMD160 904eae7bf7fb7ac8575eee10dea3de44944dcecc SHA1 a3efa5d3c3c062e4399ee851b50f5674cb7f39d4 SHA256 5f6235820f8dcbeeeae90ff05917ab61b203730b07015b920732a49204df356e
 DIST freebsd-lib-6.2_beta2.tar.bz2 2669048 RMD160 dfb33df2c853bf226034843fdc319a5e0781fcf7 SHA1 c1062981050f4666e146affc4b152a5ad427904a SHA256 ee3f7c41c0991b0196cbb550ed6a97093f220efd9caac52705ef4f49050c4f14
+DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f
+DIST freebsd-sys-6.2_beta2.tar.bz2 18317253 RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 SHA1 5f5e3d61f7580eecafb87cbd08050ac8a2c8a1c4 SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3
 DIST freebsd-ubin-6.1.tar.bz2 1763218 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e SHA1 7d1b0568d02f192dcd3bd7f972613376d3d0f16d SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6
 DIST freebsd-ubin-6.2_beta1.tar.bz2 1771844 RMD160 0bedcb1038ac157a2c3eee59db38f75d310bbfa1 SHA1 4a3ef8eb543635b2f88ce9f3fe49ec02e5e62e6a SHA256 b82e2b310001ccb335f26c19bf74431691ace27320fe4d1a49d0b4c86ba419cd
 DIST freebsd-ubin-6.2_beta2.tar.bz2 1773001 RMD160 3eab2de326885151e6b76e996c687cfd6772581f SHA1 821e69be1305b04d6009055863614cfc7c9ea011 SHA256 4037b96452eca9d12a201f81d5f545671cb2f28c869ce0497268d179ac2b2869
-EBUILD freebsd-ubin-6.1.ebuild 2860 RMD160 30b43a2f85aefac66a768612617d06ad091f8787 SHA1 039228961f17c8e07467273aecef79fc28f4d1d2 SHA256 994f46949a7ab2669181054f256e7672894a6a824a639fad03200d0666f4b806
-MD5 531201c3dc82a2c631a33981585335ba freebsd-ubin-6.1.ebuild 2860
-RMD160 30b43a2f85aefac66a768612617d06ad091f8787 freebsd-ubin-6.1.ebuild 2860
-SHA256 994f46949a7ab2669181054f256e7672894a6a824a639fad03200d0666f4b806 freebsd-ubin-6.1.ebuild 2860
+EBUILD freebsd-ubin-6.1.ebuild 2936 RMD160 886bf3b51e715fba69c8b1329ca5f94561937382 SHA1 034ed1a6003d50d75dc705840fbd4e2965228bed SHA256 5305fafac7eb44a8f5c295421bceb08b65d8d96bc0a851c7442f3563f1e921a3
+MD5 3a8be5b9b223d22fc06c5715133d3b6f freebsd-ubin-6.1.ebuild 2936
+RMD160 886bf3b51e715fba69c8b1329ca5f94561937382 freebsd-ubin-6.1.ebuild 2936
+SHA256 5305fafac7eb44a8f5c295421bceb08b65d8d96bc0a851c7442f3563f1e921a3 freebsd-ubin-6.1.ebuild 2936
 EBUILD freebsd-ubin-6.2_beta1.ebuild 2893 RMD160 132f85d75f3cac18ce67a99acbd4913b04c80ea4 SHA1 f552687f4cb6dd026caec1ae5f9dec345dec35cf SHA256 56066ad03269ab16ebd8d7130b9666da53c416b2195543578091207e3745aa1d
 MD5 da750bf4f690fbdec875239c56f408d7 freebsd-ubin-6.2_beta1.ebuild 2893
 RMD160 132f85d75f3cac18ce67a99acbd4913b04c80ea4 freebsd-ubin-6.2_beta1.ebuild 2893
 SHA256 56066ad03269ab16ebd8d7130b9666da53c416b2195543578091207e3745aa1d freebsd-ubin-6.2_beta1.ebuild 2893
-EBUILD freebsd-ubin-6.2_beta2.ebuild 2893 RMD160 7b3a0b280037eb62b45059576bb9f5913a2296d3 SHA1 56ba55ec341e8f763cb1956e5a3b0ced954e5f1d SHA256 784b1ea8e6390a26977fbe946ed501ebced4cc748b3ae0c58f66c9369e9fe66f
-MD5 f07efb8d3d49530b20d137ffe8431c76 freebsd-ubin-6.2_beta2.ebuild 2893
-RMD160 7b3a0b280037eb62b45059576bb9f5913a2296d3 freebsd-ubin-6.2_beta2.ebuild 2893
-SHA256 784b1ea8e6390a26977fbe946ed501ebced4cc748b3ae0c58f66c9369e9fe66f freebsd-ubin-6.2_beta2.ebuild 2893
-MISC ChangeLog 8272 RMD160 084543de765438fed01461a1ba72830f5c542f43 SHA1 9a841367ec6285ec5f6ba91328fd188e8220bbf9 SHA256 54791673f608027abafe4a770401c4a3bf6c07c1bcb720d534e1c83f74832987
-MD5 2846a3065a2b876e69573903dd852fdd ChangeLog 8272
-RMD160 084543de765438fed01461a1ba72830f5c542f43 ChangeLog 8272
-SHA256 54791673f608027abafe4a770401c4a3bf6c07c1bcb720d534e1c83f74832987 ChangeLog 8272
+EBUILD freebsd-ubin-6.2_beta2.ebuild 2968 RMD160 651d187de7bbd56d1e6d4c6b4bcfcab44e3bb7b7 SHA1 e04084a07fff51507a40d6ca10b1b97abcb7dd14 SHA256 8eceaafc4fc2ad8c9ec4806ce83cf91c1146878a61c6885a46ef3d37624165bd
+MD5 8b25f6058cb28a6679c83e22cb975db9 freebsd-ubin-6.2_beta2.ebuild 2968
+RMD160 651d187de7bbd56d1e6d4c6b4bcfcab44e3bb7b7 freebsd-ubin-6.2_beta2.ebuild 2968
+SHA256 8eceaafc4fc2ad8c9ec4806ce83cf91c1146878a61c6885a46ef3d37624165bd freebsd-ubin-6.2_beta2.ebuild 2968
+MISC ChangeLog 8473 RMD160 c710f9a8417f9687434b5cc9b74a458f53c4af1e SHA1 ababda540fa9934e05fa6900e5a8b43aad97c090 SHA256 eb5b295952ef741b1324e89ee9d82c0ed8f05a43de233974980819c87fa6cdec
+MD5 d6e324bb0f2aa25df68b31d3946a61f3 ChangeLog 8473
+RMD160 c710f9a8417f9687434b5cc9b74a458f53c4af1e ChangeLog 8473
+SHA256 eb5b295952ef741b1324e89ee9d82c0ed8f05a43de233974980819c87fa6cdec ChangeLog 8473
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
-MD5 26098214f8781d00f13bde0da2257059 files/digest-freebsd-ubin-6.1 1539
-RMD160 9f6c67a78d44686397958e49759418e4cf8e04d6 files/digest-freebsd-ubin-6.1 1539
-SHA256 cfdac09bb63d09d942690cf6956d5d9f805de04a60457dc1a672903ecc217bbd files/digest-freebsd-ubin-6.1 1539
+MD5 400c35bcf63ac6ea151a5a0f52b82393 files/digest-freebsd-ubin-6.1 1795
+RMD160 8d2c9a0cf9d6be3cebf366d295ae4b098f48b3ef files/digest-freebsd-ubin-6.1 1795
+SHA256 b185465d2d3030a516bbb26199657b865cf9ed25cfdebb7bc6d5a6963948a240 files/digest-freebsd-ubin-6.1 1795
 MD5 d2623fc990e626dd5f64bd9bb299b0ed files/digest-freebsd-ubin-6.2_beta1 1647
 RMD160 fab3f17887909c6c7a1b852bb53738718389cea4 files/digest-freebsd-ubin-6.2_beta1 1647
 SHA256 5c806a71075f0191a3590b752fae6e4fd7967535ab8087f578091efbb5ecc0b6 files/digest-freebsd-ubin-6.2_beta1 1647
-MD5 4fa4863a6faec2b8059db39aacf326a4 files/digest-freebsd-ubin-6.2_beta2 1647
-RMD160 8d50352d293571fe3605c181edffa44d1c2e8998 files/digest-freebsd-ubin-6.2_beta2 1647
-SHA256 09cab4a8b593a52b399f5eef460cb202d47484bb699bddc741d44df803f675cf files/digest-freebsd-ubin-6.2_beta2 1647
+MD5 1dcb3ad14550329b03469315ea531669 files/digest-freebsd-ubin-6.2_beta2 1921
+RMD160 159dc3ba117d543f0a6a45d82d1a3f90c8ed39cb files/digest-freebsd-ubin-6.2_beta2 1921
+SHA256 8bb651675188698f5f01b46601a132f449cd2c7e1be7dbda7f1d9d79a2b8917a files/digest-freebsd-ubin-6.2_beta2 1921
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJM2IAiZjviIA2XgRAsiZAKCbfWN3/KkFNxHLg1R/vq5PAj+QbQCfRHAl
-Lx0MidKc/Na6D652UxJ0xvU=
-=KCNr
+iD8DBQFFJXP3AiZjviIA2XgRAsv8AJ0agFW8juaFuRz//xKg2p1B5rNqlQCg5UD6
+m4KfYXgLKPMbINX3HsbWfRo=
+=2QSI
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1
index c3e53df368f7..fcc057a57fd9 100644
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.1
@@ -13,6 +13,9 @@ SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-
 MD5 f33af43501169d9167c71c3a48a033c2 freebsd-lib-6.1.tar.bz2 2613584
 RMD160 f71aad95ef2bac094bdab9e317a99fb866fba042 freebsd-lib-6.1.tar.bz2 2613584
 SHA256 6ecb49695dc135e64cea949cb7e9b9998b15cb962797cdafc735a7e244744c37 freebsd-lib-6.1.tar.bz2 2613584
+MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
+RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
+SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
 MD5 f9c5fe01da2eba4696619c63eb4cad8c freebsd-ubin-6.1.tar.bz2 1763218
 RMD160 5da58c546cebf30a6b661841dbcb5b53626a4a1e freebsd-ubin-6.1.tar.bz2 1763218
 SHA256 13429ed3cc8a14a4efda69b7d82004bf993b5a14591a6129a857d627221aeef6 freebsd-ubin-6.1.tar.bz2 1763218
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
index 6747ccde17da..869c29aedea4 100644
--- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
+++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.2_beta2
@@ -13,6 +13,9 @@ SHA256 d2ab03d2db180d4a444b99b7f164eb1ef5e04ac8ad69e1ffcb621ea8c594fa3f freebsd-
 MD5 280ec9cccb1e34dabc8344d682dcfa23 freebsd-lib-6.2_beta2.tar.bz2 2669048
 RMD160 dfb33df2c853bf226034843fdc319a5e0781fcf7 freebsd-lib-6.2_beta2.tar.bz2 2669048
 SHA256 ee3f7c41c0991b0196cbb550ed6a97093f220efd9caac52705ef4f49050c4f14 freebsd-lib-6.2_beta2.tar.bz2 2669048
+MD5 7457f7ec6d84a5cc00a8689fca2082ea freebsd-sys-6.2_beta2.tar.bz2 18317253
+RMD160 c53fdcb1289d56f5184b3912fdb0ce2cc4edcc49 freebsd-sys-6.2_beta2.tar.bz2 18317253
+SHA256 a5e503e13340bd1ac674aeae3737d4b65f3b00650a43ef11bfb9771fcf0f62d3 freebsd-sys-6.2_beta2.tar.bz2 18317253
 MD5 caa3dd80d07aad286292fb4928ae1276 freebsd-ubin-6.2_beta2.tar.bz2 1773001
 RMD160 3eab2de326885151e6b76e996c687cfd6772581f freebsd-ubin-6.2_beta2.tar.bz2 1773001
 SHA256 4037b96452eca9d12a201f81d5f545671cb2f28c869ce0497268d179ac2b2869 freebsd-ubin-6.2_beta2.tar.bz2 1773001
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
index 397017e3966c..12119294f784 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-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-ubin/freebsd-ubin-6.1.ebuild,v 1.10 2006/09/19 14:58:30 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.1.ebuild,v 1.11 2006/10/05 21:06:47 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -8,14 +8,15 @@ DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
 
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis"
+IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build"
 
 SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${ETC}.tar.bz2
 		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2"
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
 
 RDEPEND="sys-freebsd/freebsd-lib
 	ssl? ( dev-libs/openssl )
@@ -25,7 +26,7 @@ RDEPEND="sys-freebsd/freebsd-lib
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
 
 RDEPEND="${RDEPEND}
@@ -74,7 +75,7 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar
 src_unpack() {
 	freebsd_src_unpack
 
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
 
 	# Rename manpage for renamed cmp
 	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
index 81213ab2072b..3ee714a034d4 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-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-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.1 2006/10/05 09:16:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.2 2006/10/05 21:06:47 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
@@ -8,14 +8,15 @@ DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
 KEYWORDS="~x86-fbsd"
 
-IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis"
+IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build"
 
 SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${ETC}.tar.bz2
 		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2"
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
 
 RDEPEND="sys-freebsd/freebsd-lib
 	ssl? ( dev-libs/openssl )
@@ -26,7 +27,7 @@ RDEPEND="sys-freebsd/freebsd-lib
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
-	=sys-freebsd/freebsd-sources-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
 
 RDEPEND="${RDEPEND}
@@ -75,7 +76,7 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar
 src_unpack() {
 	freebsd_src_unpack
 
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
 
 	# Rename manpage for renamed cmp
 	mv ${S}/cmp/cmp.1 ${S}/cmp/bsdcmp.1