Bump to EAPI=5. Use upstream tarballs.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

28 files changed, 211 insertions, 127 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index beba624611e4..bf399eb7be3e 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.53 2015/05/24 11:24:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.54 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> boot0-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -boot0-9.2.ebuild,
   -boot0-9.2_rc1.ebuild, -boot0-9.2_rc2.ebuild, -boot0-9.2_rc3.ebuild:
diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild
index daa653e586f7..08d54bcc0c80 100644
--- a/sys-freebsd/boot0/boot0-10.1.ebuild
+++ b/sys-freebsd/boot0/boot0-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.2 2015/03/15 18:18:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-10.1.ebuild,v 1.3 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
@@ -13,11 +13,14 @@ IUSE="bzip2 ieee1394 tftp zfs"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz"
 fi
 
+EXTRACTONLY="
+	sys/
+	lib/
+	contrib/bzip2/
+"
+
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 	=sys-freebsd/freebsd-lib-${RV}*
diff --git a/sys-freebsd/freebsd-bin/ChangeLog b/sys-freebsd/freebsd-bin/ChangeLog
index b837b83c2611..a90c67f91070 100644
--- a/sys-freebsd/freebsd-bin/ChangeLog
+++ b/sys-freebsd/freebsd-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.57 2015/05/24 11:24:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/ChangeLog,v 1.58 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-bin-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-bin-9.2.ebuild,
   -freebsd-bin-9.2_rc1.ebuild, -freebsd-bin-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild
index 795e37cb1164..b8d49ccdc055 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-bin/freebsd-bin-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd
 
@@ -13,12 +13,15 @@ IUSE=""
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${BIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz"
 fi
 
+EXTRACTONLY="
+	bin/
+	usr.bin/
+	sbin/
+	lib/
+"
+
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	>=dev-libs/libedit-20120311.3.0-r1
 	sys-libs/ncurses
diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index c598e70974de..11d5d206a0c4 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.42 2015/05/24 11:24:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.43 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-cddl-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org>
   -files/freebsd-cddl-9.2-underlink.patch, -freebsd-cddl-9.2.ebuild,
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild
index 5431b4208b7b..cba0648f76fa 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=4
+EAPI=5
 
 inherit bsdmk freebsd toolchain-funcs multilib
 
@@ -14,16 +14,18 @@ LICENSE="CDDL GPL-2"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${P}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
-			build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${INCLUDE}.tar.xz )"
 fi
 
 # sys is required.
+EXTRACTONLY="
+	cddl/
+	contrib/
+	usr.bin/
+	lib/
+	sbin/
+	sys/
+"
+use build && EXTRACTONLY+="include/"
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	=sys-freebsd/freebsd-libexec-${RV}*
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index af9c5a24172c..e3971115f96e 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.210 2015/05/24 11:25:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.211 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-lib-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org>
   -files/freebsd-lib-10.1-cve-2014-8611.patch, freebsd-lib-10.1.ebuild:
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
index b0fe3b6e0ff6..4e277670f963 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.2 2015/05/24 11:25:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-10.1.ebuild,v 1.3 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -17,20 +17,24 @@ UPSTREAM_PATCHES=( "SA-14:27/stdio.patch" )
 # extracting the whole tarball
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CRYPTO}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIBEXEC}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${INCLUDE}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${GNU}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SECURE}.tar.xz
-			build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz )
-			zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )
+	SRC_URI="${SRC_URI}
 			$(freebsd_upstream_patches)"
 fi
 
+EXTRACTONLY="
+	lib/
+	contrib/
+	crypto/
+	libexec/
+	etc/
+	include/
+	usr.sbin/
+	gnu/
+	secure/
+"
+use build && EXTRACTONLY+="sys/"
+use zfs && EXTRACTONLY+="cddl/"
+
 if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 	RDEPEND="ssl? ( dev-libs/openssl )
 		hesiod? ( net-dns/hesiod )
@@ -51,8 +55,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
 		=sys-freebsd/freebsd-share-${RV}*
 		>=virtual/libiconv-0-r2"
 else
-	SRC_URI="${SRC_URI}
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz"
+	EXTRACTONLY+="sys/"
 fi
 
 DEPEND="${DEPEND}
diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index f22b5833974f..b0cbdda66616 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.64 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.65 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-libexec-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-libexec-9.2.ebuild,
   -freebsd-libexec-9.2_rc1.ebuild, -freebsd-libexec-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild
index e5650bd87a50..f958519602ec 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -11,15 +11,18 @@ SLOT="0"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIBEXEC}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${BIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz"
 fi
 
+EXTRACTONLY="
+	libexec/
+	usr.bin/
+	bin/
+	contrib/hyperv/
+	lib/
+	etc/
+	usr.sbin/
+"
+
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
 	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
 	pam? ( virtual/pam )"
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index d52102764712..caf40ecece2c 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-mk-defs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.62 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.63 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-mk-defs-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org>
   -files/freebsd-mk-defs-9.2-gentoo.patch, -files/freebsd-mk-defs-9.2-gnu.patch,
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
index dc7c9a6f5e24..e92ed909acf5 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.2 2015/04/10 13:30:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.1.ebuild,v 1.3 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -13,9 +13,10 @@ IUSE="userland_GNU"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SHARE}.tar.xz"
 fi
 
+EXTRACTONLY="share/"
+
 RDEPEND=""
 DEPEND=""
 
diff --git a/sys-freebsd/freebsd-pam-modules/ChangeLog b/sys-freebsd/freebsd-pam-modules/ChangeLog
index d3537529733a..ddf8f4adadca 100644
--- a/sys-freebsd/freebsd-pam-modules/ChangeLog
+++ b/sys-freebsd/freebsd-pam-modules/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-pam-modules
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.48 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/ChangeLog,v 1.49 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-pam-modules-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-pam-modules-9.2.ebuild,
   -freebsd-pam-modules-9.2_rc1.ebuild, -freebsd-pam-modules-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild
index 4016d17267b1..56aaae4bb8b3 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild,v 1.1 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd multilib pam
 
@@ -13,9 +13,10 @@ IUSE="kerberos nis"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz"
 fi
 
+EXTRACTONLY="lib/"
+
 RDEPEND=">=sys-auth/openpam-20050201-r1
 	kerberos? ( dev-libs/openssl
 		virtual/krb5 )"
diff --git a/sys-freebsd/freebsd-pf/ChangeLog b/sys-freebsd/freebsd-pf/ChangeLog
index 09e7d418a579..eeaddd1b4d96 100644
--- a/sys-freebsd/freebsd-pf/ChangeLog
+++ b/sys-freebsd/freebsd-pf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-pf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.51 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/ChangeLog,v 1.52 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-pf-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-pf-9.2.ebuild,
   -freebsd-pf-9.2_rc1.ebuild, -freebsd-pf-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild
index 08f8ab02500f..bb3fc80227a9 100644
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild
+++ b/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-pf/freebsd-pf-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd user
 
@@ -14,12 +14,15 @@ IUSE=""
 # Crypto is needed to have an internal OpenSSL header
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz"
 fi
 
+EXTRACTONLY="
+	usr.sbin/
+	sbin/
+	contrib/pf/
+	etc/
+"
+
 RDEPEND="net-libs/libpcap"
 DEPEND="${RDEPEND}
 	dev-libs/libevent
diff --git a/sys-freebsd/freebsd-rescue/ChangeLog b/sys-freebsd/freebsd-rescue/ChangeLog
index e63b644fd6ea..51f24bef9832 100644
--- a/sys-freebsd/freebsd-rescue/ChangeLog
+++ b/sys-freebsd/freebsd-rescue/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-rescue
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.43 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/ChangeLog,v 1.44 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-rescue-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-rescue-9.2.ebuild,
   -freebsd-rescue-9.2_rc1.ebuild, -freebsd-rescue-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild
index ced5f192e4aa..4a30efece8b1 100644
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild
+++ b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild,v 1.1 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-rescue/freebsd-rescue-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -14,19 +14,22 @@ IUSE="atm netware nis zfs"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${BIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${GNU}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIBEXEC}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${RESCUE}.tar.xz
-			zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )"
 fi
 
+EXTRACTONLY="
+	usr.bin/
+	contrib/
+	lib/
+	bin/
+	sbin/
+	usr.sbin/
+	gnu/
+	sys/
+	libexec/
+	rescue/
+"
+use zfs && EXTRACTONLY+="cddl/"
+
 RDEPEND=""
 DEPEND="sys-devel/flex
 	app-arch/xz-utils[static-libs]
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index ab234318024f..066ea8fbe49f 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.84 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.85 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-sbin-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-sbin-9.2.ebuild,
   -freebsd-sbin-9.2_rc1.ebuild, -freebsd-sbin-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild
index 31d3c516ce19..b3936ba7e48e 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild,v 1.1 2015/03/08 14:01:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd multilib
 
@@ -11,15 +11,18 @@ SLOT="0"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIBEXEC}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-		build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz )"
 fi
 
+EXTRACTONLY="
+	sbin/
+	contrib/
+	lib/
+	libexec/
+	usr.sbin/
+	etc/
+"
+use build && EXTRACTONLY+="sys/"
+
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
 	=sys-freebsd/freebsd-libexec-${RV}*
 	>=dev-libs/expat-2.0.1
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index a269306d6f55..3798311a19e0 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.60 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.61 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-share-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-share-9.2.ebuild,
   -freebsd-share-9.2_rc1.ebuild, -freebsd-share-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild
index 96ee08838011..1f905aef4e87 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd
 
@@ -13,18 +13,21 @@ IUSE="doc zfs"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SHARE}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${GNU}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${USBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${BIN}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-		zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )"
 fi
 
+EXTRACTONLY="
+	share/
+	contrib/
+	gnu/
+	usr.bin/
+	usr.sbin/
+	sbin/
+	bin/
+	lib/
+	etc/
+"
+use zfs && EXTRACTONLY+="cddl/"
+
 DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
 		=sys-freebsd/freebsd-sources-${RV}*"
 RDEPEND="sys-apps/miscfiles"
diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 06737ffbfa68..51048f824036 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.112 2015/05/24 11:24:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.113 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-sources-10.1-r3.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org>
   -files/freebsd-sources-9.2-gentoo.patch, -freebsd-sources-9.2.ebuild,
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
index 961c043b092b..ad916a185040 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.1 2015/05/24 08:45:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r3.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit bsdmk freebsd flag-o-matic toolchain-funcs
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="0"
 
-IUSE="+build-kernel debug dtrace profile zfs"
+IUSE="+build-kernel debug dtrace zfs"
 
 # Security Advisory and Errata patches.
 UPSTREAM_PATCHES=( "SA-15:02/sctp.patch"
@@ -22,13 +22,17 @@ UPSTREAM_PATCHES=( "SA-15:02/sctp.patch"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-		zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )
+	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
 
+EXTRACTONLY="
+	sys/
+	contrib/bmake/
+	usr.bin/bmake/
+"
+use zfs && EXTRACTONLY+="cddl/"
+
 RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
 	=sys-freebsd/freebsd-mk-defs-${RV}*
 	!sys-freebsd/virtio-kmod
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 012b47ae2303..2aabfb510d70 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.102 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.103 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-ubin-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-ubin-9.2.ebuild,
   -freebsd-ubin-9.2_rc1.ebuild, -freebsd-ubin-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild
index f24d5315b73c..0a4ef447ea56 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild,v 1.1 2015/03/08 14:01:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
 EAPI=5
 
@@ -13,16 +13,19 @@ LICENSE="BSD zfs? ( CDDL )"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${BIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${INCLUDE}.tar.xz
-			zfs? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CDDL}.tar.xz )
-			build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz )"
 fi
 
+EXTRACTONLY="
+	usr.bin/
+	contrib/
+	lib/
+	etc/
+	bin/
+	include/
+"
+use zfs && EXTRACTONLY+="cddl/"
+use build && EXTRACTONLY+="sys/"
+
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
 	ssl? ( dev-libs/openssl )
 	kerberos? ( virtual/krb5 )
diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 10a2cf419635..713df01bf541 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.100 2015/05/24 11:24:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.101 2015/06/05 16:43:55 mgorny Exp $
+
+  05 Jun 2015; Michał Górny <mgorny@gentoo.org> freebsd-usbin-10.1.ebuild:
+  Bump to EAPI=5. Use upstream tarballs.
 
   24 May 2015; Michał Górny <mgorny@gentoo.org> -freebsd-usbin-9.2.ebuild,
   -freebsd-usbin-9.2_rc1.ebuild, -freebsd-usbin-9.2_rc2.ebuild,
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild
index 2f0cb7bf31b2..645d5cca7436 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild,v 1.1 2015/03/08 14:01:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-10.1.ebuild,v 1.2 2015/06/05 16:43:55 mgorny Exp $
 
-EAPI=3
+EAPI=5
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -11,16 +11,23 @@ SLOT="0"
 
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${P}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIB}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SBIN}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${ETC}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${GNU}.tar.xz
-			nis? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${LIBEXEC}.tar.xz )
-			build? ( http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
-			http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${INCLUDE}.tar.xz )"
+fi
+
+EXTRACTONLY="
+	usr.sbin/
+	contrib/
+	usr.bin/
+	lib/
+	sbin/
+	etc/
+	gnu/
+"
+use nis && EXTRACTONLY+="libexec/"
+if use build ; then
+	EXTRACTONLY+="
+		sys/
+		include/
+	"
 fi
 
 RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]