[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-sbin/, sys-freebsd/freebsd-cddl/, ...

[Michał Górny]

commit:     73a205d7991182e5d2e1f8135b8c1a4b7482ba4e
Author:     Yuta Satoh <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Mon Nov 23 11:56:34 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 11:56:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a205d7

sys-freebsd: Move use call from global scope to pkg_setup.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566522

 sys-freebsd/freebsd-cddl/freebsd-cddl-10.2.ebuild          |  6 +++++-
 sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild         |  8 +++++---
 sys-freebsd/freebsd-rescue/freebsd-rescue-10.2.ebuild      |  4 +++-
 sys-freebsd/freebsd-sbin/freebsd-sbin-10.2.ebuild          |  4 +++-
 sys-freebsd/freebsd-share/freebsd-share-10.2.ebuild        |  4 +++-
 sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild |  4 +++-
 sys-freebsd/freebsd-ubin/freebsd-ubin-10.2-r1.ebuild       |  6 ++++--
 sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild     | 11 ++++-------
 8 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2.ebuild
index 9dcfe3c..7da5b2f 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.2.ebuild
@@ -25,7 +25,6 @@ EXTRACTONLY="
 	sbin/
 	sys/
 "
-use build && EXTRACTONLY+="include/"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
@@ -42,6 +41,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-10.2-underlink.patch"
 	)
 
+pkg_setup() {
+	# Add the required source files.
+	use build && EXTRACTONLY+="include/ "
+}
+
 src_prepare() {
 	if [[ ! -e "${WORKDIR}/include" ]]; then
 		# Link in include headers.

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
index 1bd3bd1..7168bea 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.2-r1.ebuild
@@ -32,8 +32,6 @@ EXTRACTONLY="
 	gnu/
 	secure/
 "
-use build && EXTRACTONLY+="sys/"
-use zfs && EXTRACTONLY+="cddl/"
 
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
@@ -56,7 +54,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 		=sys-freebsd/freebsd-share-${RV}*
 		>=virtual/libiconv-0-r2"
 else
-	EXTRACTONLY+="sys/"
+	EXTRACTONLY+="sys/ "
 fi
 
 DEPEND="${DEPEND}
@@ -77,6 +75,10 @@ IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
 QA_DT_NEEDED="lib/libc.so.7 usr/lib32/libc.so.7"
 
 pkg_setup() {
+	# Add the required source files.
+	use build && EXTRACTONLY+="sys/ "
+	use zfs && EXTRACTONLY+="cddl/ "
+
 	[ -c /dev/zero ] || \
 		die "You forgot to mount /dev; the compiled libc would break."
 

diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.2.ebuild
index 0fb1283..54182da 100644
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.2.ebuild
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.2.ebuild
@@ -28,7 +28,6 @@ EXTRACTONLY="
 	libexec/
 	rescue/
 "
-use zfs && EXTRACTONLY+="cddl/"
 
 RDEPEND=""
 DEPEND="sys-devel/flex
@@ -49,6 +48,9 @@ DEPEND="sys-devel/flex
 S="${WORKDIR}/rescue"
 
 pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
 	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
 	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
 	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "

diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.2.ebuild
index 7836556..5f5589a 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.2.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.2.ebuild
@@ -21,7 +21,6 @@ EXTRACTONLY="
 	usr.sbin/
 	etc/
 "
-use build && EXTRACTONLY+="sys/"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
 	=sys-freebsd/freebsd-libexec-${RV}*
@@ -43,6 +42,9 @@ S="${WORKDIR}/sbin"
 IUSE="atm ipfilter +pf ipv6 build ssl +cxx netware"
 
 pkg_setup() {
+	# Add the required source files.
+	use build && EXTRACTONLY+="sys/ "
+
 	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
 	use cxx || mymakeopts="${mymakeopts} WITHOUT_CXX="
 	use ipfilter || mymakeopts="${mymakeopts} WITHOUT_IPFILTER= "

diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.2.ebuild
index 1cf2e7e..0d25fb6 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-10.2.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-10.2.ebuild
@@ -26,7 +26,6 @@ EXTRACTONLY="
 	lib/
 	etc/
 "
-use zfs && EXTRACTONLY+="cddl/"
 
 DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 		=sys-freebsd/freebsd-sources-${RV}*"
@@ -37,6 +36,9 @@ RESTRICT="strip"
 S="${WORKDIR}/share"
 
 pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
 	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
 	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
index 0d0e26c..b1f9daa 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
@@ -26,7 +26,6 @@ EXTRACTONLY="
 	contrib/bmake/
 	usr.bin/bmake/
 "
-use zfs && EXTRACTONLY+="cddl/"
 
 RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	=sys-freebsd/freebsd-mk-defs-${RV}*
@@ -56,6 +55,9 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
 
 pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+
 	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
 	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP="
 	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL="

diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.2-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.2-r1.ebuild
index e3408e6..ebaf8a0 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.2-r1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.2-r1.ebuild
@@ -28,8 +28,6 @@ EXTRACTONLY="
 	bin/
 	include/
 "
-use zfs && EXTRACTONLY+="cddl/"
-use build && EXTRACTONLY+="sys/"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
 	ssl? ( dev-libs/openssl )
@@ -94,6 +92,10 @@ REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
 	whois tftp man"
 
 pkg_setup() {
+	# Add the required source files.
+	use zfs && EXTRACTONLY+="cddl/ "
+	use build && EXTRACTONLY+="sys/ "
+
 	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
 	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
 	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
index 00a5cb5..ddbe6c2 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.2-r4.ebuild
@@ -30,13 +30,6 @@ EXTRACTONLY="
 	etc/
 	gnu/
 "
-use nis && EXTRACTONLY+="libexec/"
-if use build ; then
-	EXTRACTONLY+="
-		sys/
-		include/
-	"
-fi
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
 	=sys-freebsd/freebsd-libexec-${RV}*
@@ -60,6 +53,10 @@ S="${WORKDIR}/usr.sbin"
 IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build"
 
 pkg_setup() {
+	# Add the required source files.
+	use nis && EXTRACTONLY+="libexec/ "
+	use build && EXTRACTONLY+="sys/ include/ "
+
 	# Release crunch is something like minimal. It seems to remove everything
 	# which is not needed to work.
 	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "