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, 38 insertions, 13 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 6c74311cecef..1905922d795f 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.22 2006/10/05 11:15:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.23 2006/10/05 22:14:27 flameeyes Exp $
+
+  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  freebsd-usbin-6.1-r1.ebuild, freebsd-usbin-6.2_beta2.ebuild:
+  Add a build useflag that uses a downloaded tarball of sys rather than
+  symlinking it.
 
   05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-usbin-6.2_beta2.ebuild:
diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1
index 07808559207c..2cc68094886e 100644
--- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.1-r1
@@ -4,6 +4,9 @@ SHA256 41283b7f78597cf81f98477aef04eb9cce2b130b1a2f8b5c7d647549c973c054 freebsd-
 MD5 ac8defbdaaab754fee70ac27c02f2c0e freebsd-etc-6.1.tar.bz2 184045
 RMD160 b9a8bea64694c040c02b74f7633dc3cd77afa400 freebsd-etc-6.1.tar.bz2 184045
 SHA256 62b06b61e526c4a939503202aaca31cbce7a3de9daec03e67dc57119527eeff7 freebsd-etc-6.1.tar.bz2 184045
+MD5 d832298dc9565d138f86fd53e1d9ad3f freebsd-include-6.1.tar.bz2 127179
+RMD160 f873b13bb16408a390932d14974b39336bd90a7c freebsd-include-6.1.tar.bz2 127179
+SHA256 9cd9d47c5cc8ea4fc7afe185c9b391317fe013adb3f0a960e9fe498f166177b5 freebsd-include-6.1.tar.bz2 127179
 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
@@ -13,6 +16,9 @@ SHA256 38eaddc9edc36597e42ca3c63ee8a2fd6f07f96c7294aea75a9988ac5b07b357 freebsd-
 MD5 33a8f60e595bc82c6abb7e47de1b9fa8 freebsd-sbin-6.1.tar.bz2 1156163
 RMD160 167a4545da086f52b9a8fd52e48f9ec6cfdd3150 freebsd-sbin-6.1.tar.bz2 1156163
 SHA256 fb15602238f98f6dd2b9d56bc9ece09c922b0c49599aea87620ba70c853f95d6 freebsd-sbin-6.1.tar.bz2 1156163
+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-usbin/files/digest-freebsd-usbin-6.2_beta2 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta2
index 6c00fda191c9..3836e89d81a6 100644
--- a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta2
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2_beta2
@@ -4,6 +4,9 @@ SHA256 c3a600edf8d61377e5bffbd91f06b9ff3442d76ee667f757e9a71fba854f4f96 freebsd-
 MD5 5c67b6e8d6c69b5151a9828679b920ad freebsd-etc-6.2_beta2.tar.bz2 188103
 RMD160 d6556dd5c89806e4968d7b76df5790602be25390 freebsd-etc-6.2_beta2.tar.bz2 188103
 SHA256 9395e53d0b581235cb48f3b8d788a8c4be8e75e7c11edcd11dd56569b40b1656 freebsd-etc-6.2_beta2.tar.bz2 188103
+MD5 e6733cd028b0dd26545a63c70ed44d0d freebsd-include-6.2_beta2.tar.bz2 131579
+RMD160 1c09dd973a875dbebb8e5b460a72ac5ab99f0644 freebsd-include-6.2_beta2.tar.bz2 131579
+SHA256 d2ab03d2db180d4a444b99b7f164eb1ef5e04ac8ad69e1ffcb621ea8c594fa3f freebsd-include-6.2_beta2.tar.bz2 131579
 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
@@ -13,6 +16,9 @@ SHA256 6a9d0525336914d1607412fe7785aa4809f78abb0961933521bf912195e614aa freebsd-
 MD5 049aaca0e7b93c2bab4d2a197218d893 freebsd-sbin-6.2_beta2.tar.bz2 1159380
 RMD160 439e0702da402f723bf9ceb593ffd0aa1ed6d66a freebsd-sbin-6.2_beta2.tar.bz2 1159380
 SHA256 56f77795dd9586b8dd0920f6041ad0d49d83607c89771541ada8f6b7d8312d3f freebsd-sbin-6.2_beta2.tar.bz2 1159380
+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-usbin/freebsd-usbin-6.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
index 929122454d28..f84b83ae95a5 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.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-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.4 2006/10/04 19:55:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.1-r1.ebuild,v 1.5 2006/10/05 22:14:26 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -9,7 +9,7 @@ SLOT="0"
 KEYWORDS="~x86-fbsd"
 
 IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
-	 minimal ipsec nis pam suid nat radius"
+	 minimal ipsec nis pam suid nat radius build"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
@@ -17,7 +17,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${SBIN}.tar.bz2
 		mirror://gentoo/${ETC}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )"
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
@@ -26,7 +28,7 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	net-libs/libpcap"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
 	sys-apps/texinfo
 	sys-devel/flex"
 
@@ -83,8 +85,10 @@ REMOVE_SUBDIRS="
 src_unpack() {
 	freebsd_src_unpack
 
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	ln -s "/usr/include" "${WORKDIR}/include"
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	fi
 }
 
 src_install() {
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
index 82f2647e048d..512f93515bdf 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-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-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.2 2006/10/05 11:15:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.3 2006/10/05 22:14:27 flameeyes Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -9,7 +9,7 @@ SLOT="0"
 KEYWORDS="~x86-fbsd"
 
 IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
-	 minimal ipsec nis pam suid nat radius"
+	 minimal ipsec nis pam suid nat radius build"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
@@ -17,7 +17,9 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${SBIN}.tar.bz2
 		mirror://gentoo/${ETC}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )"
+		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
+		build? ( mirror://gentoo/${SYS}.tar.bz2
+			mirror://gentoo/${INCLUDE}.tar.bz2 )"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
@@ -26,7 +28,7 @@ RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	net-libs/libpcap"
 DEPEND="${RDEPEND}
 	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
 	sys-apps/texinfo
 	sys-devel/flex"
 
@@ -82,8 +84,10 @@ REMOVE_SUBDIRS="
 src_unpack() {
 	freebsd_src_unpack
 
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-	ln -s "/usr/include" "${WORKDIR}/include"
+	if ! use build; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+		ln -s "/usr/include" "${WORKDIR}/include"
+	fi
 }
 
 src_compile() {