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

(Portage version: 2.1.2_pre2-r3)

5 files changed, 24 insertions, 11 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/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