sys-freebsd: remove 10.3 and 11.0.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

72 files changed, 0 insertions, 5704 deletions

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 51688a4ced89..a7da7dded3a7 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,8 +1,5 @@
-DIST boot0-EN-1618-loader.patch 1092 BLAKE2B f96401394ca0b8a9ab364b5e4dbffeef49f75d86c0936067f4bcdf0e74598dad043d99b2dbf09dc5dd00e2f06cc338b7259d454aa56e1a501b66b176763fb74d SHA512 c2d28dc48289683c009a783db59ce62008a8d9231d4ea5b1ebe6dac2d6d0d86a285524195be9a806c23fbc2ceb6e159fcd7a7e8d01fe973b6ea6d154bfca298c
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/boot0/boot0-10.3.ebuild b/sys-freebsd/boot0/boot0-10.3.ebuild
deleted file mode 100644
index d33328cf5f42..000000000000
--- a/sys-freebsd/boot0/boot0-10.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	sys/
-	lib/
-	contrib/bzip2/
-"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch"
-	"${FILESDIR}/${PN}-10.3-clang.patch"
-	"${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch"
-	"${FILESDIR}/${PN}-10.3-uefi-support.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-	use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	sed -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-
-	export MAKEOBJDIRPREFIX="${WORKDIR}/build"
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-fno-strict-aliasing"
-
-	cd "${WORKDIR}/lib/libstand" || die
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
-	LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
-	export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
-
-	cd "${S}" || die
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-
-	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
-	insinto /boot
-	newins GENERIC.hints device.hints
-
-	echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
-	doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/boot0/boot0-11.0-r1.ebuild b/sys-freebsd/boot0/boot0-11.0-r1.ebuild
deleted file mode 100644
index 1b56c9159994..000000000000
--- a/sys-freebsd/boot0/boot0-11.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-16:18/loader.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	lib/
-	contrib/bzip2/
-"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch"
-	"${FILESDIR}/${PN}-11.0-uefi-support.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch" )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-	use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
-}
-
-pkg_setup() {
-	boot0_use_enable ieee1394 FIREWIRE
-	boot0_use_enable zfs ZFS
-	boot0_use_enable tftp TFTP
-	boot0_use_enable bzip2 BZIP2
-}
-
-src_prepare() {
-	sed -e '/-mno-align-long-strings/d' \
-		-i "${S}"/i386/boot2/Makefile \
-		-i "${S}"/i386/gptboot/Makefile \
-		-i "${S}"/i386/gptzfsboot/Makefile \
-		-i "${S}"/i386/zfsboot/Makefile || die
-
-	mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes"
-	export MAKEOBJDIRPREFIX="${WORKDIR}/build"
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-fno-strict-aliasing"
-
-	cd "${WORKDIR}/lib/libstand" || die
-	freebsd_src_compile
-
-	CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
-	LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand"
-	export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
-
-	cd "${S}" || die
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	freebsd_src_install FILESDIR=/boot
-
-	cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
-	insinto /boot
-	newins GENERIC.hints device.hints
-
-	echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
-	doenvd "${T}"/50boot0
-}
diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
deleted file mode 100644
index 9b31e7c0d1ba..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
-index 472b275..0c9409d 100644
---- a/sys/boot/i386/Makefile.inc
-+++ b/sys/boot/i386/Makefile.inc
-@@ -13,8 +13,6 @@ LDFLAGS+=	-nostdlib
- .if ${MACHINE_CPUARCH} == "amd64"
- CFLAGS+=	-m32
- ACFLAGS+=	-m32
--# LD_FLAGS is passed directly to ${LD}, not via ${CC}:
--LD_FLAGS+=	-m elf_i386_fbsd
- AFLAGS+=	--32
- .endif
- 
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
-index 428950e..6a15450 100644
---- a/sys/boot/i386/boot2/Makefile
-+++ b/sys/boot/i386/boot2/Makefile
-@@ -113,3 +113,10 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.boot1.S=		${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
-+CFLAGS+=		-fno-asynchronous-unwind-tables
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
-index a90e712..d60ae00 100644
---- a/sys/boot/i386/gptboot/Makefile
-+++ b/sys/boot/i386/gptboot/Makefile
-@@ -81,3 +81,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
-index 5eb2383..c10a917 100644
---- a/sys/boot/i386/gptzfsboot/Makefile
-+++ b/sys/boot/i386/gptzfsboot/Makefile
-@@ -78,3 +78,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.gptldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index 149f43a..be1e46a 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -91,3 +91,8 @@ machine:
- # XXX: clang integrated-as doesn't grok .codeNN directives yet
- CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
- CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-+
-+.if ${MACHINE_CPUARCH} == "amd64"
-+LD_FLAGS+=		-m elf_i386_fbsd
-+.endif
-+
diff --git a/sys-freebsd/boot0/files/boot0-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch
deleted file mode 100644
index 4245e21a96e1..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676
-
-https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479
-
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
-index 8a6e771..c030853 100644
---- a/sys/boot/i386/boot2/Makefile
-+++ b/sys/boot/i386/boot2/Makefile
-@@ -22,8 +22,7 @@ BOOT2_UFS?=	UFS1_AND_UFS2
- #BOOT2_UFS?=	UFS2_ONLY
- #BOOT2_UFS?=	UFS1_ONLY
- 
--CFLAGS=	-Os \
--	-fomit-frame-pointer \
-+CFLAGS= -fomit-frame-pointer \
- 	-mrtd \
- 	-mregparm=3 \
- 	-DUSE_XREAD \
-@@ -40,7 +39,10 @@ CFLAGS=	-Os \
- 	-Winline \
- 	${CLANG_OPT_SMALL}
- 
--CFLAGS.gcc+=	-fno-guess-branch-probability \
-+CFLAGS.clang+=	-Oz
-+
-+CFLAGS.gcc+=	-Os \
-+		-fno-guess-branch-probability \
- 		-fno-unit-at-a-time \
- 		--param max-inline-insns-single=100
- .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
deleted file mode 100644
index af1d3512e7da..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
-index fc66e01..470453d 100644
---- a/sys/boot/efi/libefi/Makefile
-+++ b/sys/boot/efi/libefi/Makefile
-@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common
- 
-- 
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
- CFLAGS+= -DTERM_EMU
- 
- .include <bsd.lib.mk>
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
-index 24cc4c1..e5d2bae 100644
---- a/sys/boot/i386/libi386/Makefile
-+++ b/sys/boot/i386/libi386/Makefile
-@@ -55,9 +55,6 @@ CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../common \
- # the location of libstand
- CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
- 
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
--
- .if ${MACHINE_CPUARCH} == "amd64"
- CLEANFILES+=	machine
- machine:
diff --git a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
deleted file mode 100644
index fdafe74252bc..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/efi/Makefile b/efi/Makefile
-index 30024e3..a33efb2 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -2,15 +2,10 @@
- 
- .include <bsd.own.mk>
- 
--# In-tree GCC does not support __attribute__((ms_abi)).
--.if ${COMPILER_TYPE} != "gcc"
--
- .if ${MACHINE_CPUARCH} == "amd64"
- SUBDIR+=	libefi loader boot1
- .endif
- 
--.endif # ${COMPILER_TYPE} != "gcc"
--
- .if ${MACHINE_CPUARCH} == "ia64"
- SUBDIR+=	libefi
- .endif
-diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile
-index 4ffdfda..8ec0e00 100644
---- a/efi/boot1/Makefile
-+++ b/efi/boot1/Makefile
-@@ -64,7 +64,7 @@ LDFLAGS+=	-Wl,-znocombreloc
- # Add libstand for required string and memory functions for all platforms.
- #
- DPADD+=		${LIBSTAND}
--LDADD+=		-lstand
-+LDADD+=		${LIBSTAND}
- 
- DPADD+=		${LDSCRIPT}
- 
diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch
deleted file mode 100644
index c7a69d62aa8b..000000000000
--- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
-index 79ee9a9..f7789f1 100644
---- a/sys/boot/efi/Makefile
-+++ b/sys/boot/efi/Makefile
-@@ -4,7 +4,7 @@
- 
- # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
- # than 4.5 supports it.
--.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
-+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
- 
- .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
- .if ${MK_FDT} != "no"
-@@ -18,6 +18,6 @@ SUBDIR+=	fdt
- SUBDIR+=	libefi loader boot1
- .endif
- 
--.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
-+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
- 
- .include <bsd.subdir.mk>
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 2ce406a11fb3..d72727158ab3 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -4,7 +4,5 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild
deleted file mode 100644
index 964c4d64f9e4..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	bin/
-	usr.bin/
-	sbin/
-	lib/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/ncurses:0=
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed freebsd-version"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild
deleted file mode 100644
index 964c4d64f9e4..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-
-IUSE=""
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	bin/
-	usr.bin/
-	sbin/
-	lib/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/ncurses:0=
-	sys-apps/ed
-	!app-misc/realpath
-	!<sys-freebsd/freebsd-ubin-8"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	>=sys-devel/flex-2.5.31-r2"
-
-S=${WORKDIR}/bin
-
-# csh and tcsh are provided by tcsh package, rmail is sendmail stuff.
-REMOVE_SUBDIRS="csh rmail ed freebsd-version"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index b8cc1045daa6..e179eb2396a8 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -8,8 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch
deleted file mode 100644
index 9af7cfbb8c31..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.2-libpaths.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
-index d8bcccb..2cebbcb 100644
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -59,6 +59,11 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- 
-diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
-index 262d3e9..9643210 100644
---- a/cddl/lib/libzfs_core/Makefile
-+++ b/cddl/lib/libzfs_core/Makefile
-@@ -34,4 +34,6 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+
- .include <bsd.lib.mk>
-diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
-index 83cefca..55c56d5 100644
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -56,6 +56,10 @@ CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/thread
- CFLAGS+=	-I${.CURDIR}/../../../lib/libpthread/sys
- CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
- 
-+LDFLAGS+=      -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+=      -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+=      -L${.CURDIR}/../../lib/libumem
-+
- DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
- 		${LIBAVL} ${LIBUMEM}
- LDADD=		-lmd -lpthread -lz -lnvpair -lavl -lumem
-diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
-index 1f909aa..2590302 100644
---- a/cddl/sbin/zfs/Makefile
-+++ b/cddl/sbin/zfs/Makefile
-@@ -22,6 +22,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
- 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=	-lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
-index 4b5b898..f89d010 100644
---- a/cddl/sbin/zpool/Makefile
-+++ b/cddl/sbin/zpool/Makefile
-@@ -27,6 +27,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
- 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
- LDADD=	-lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
-diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
-index 6cb9529..e76fbc4 100644
---- a/cddl/usr.bin/ctfconvert/Makefile
-+++ b/cddl/usr.bin/ctfconvert/Makefile
-@@ -36,6 +36,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
-index 673c7e3..5fff940 100644
---- a/cddl/usr.bin/ctfmerge/Makefile
-+++ b/cddl/usr.bin/ctfmerge/Makefile
-@@ -33,6 +33,8 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
- 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
- LDADD=		-lctf -ldwarf -lelf -lz -lpthread
- 
-diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
-index b6605cb..7028630 100644
---- a/cddl/usr.bin/zinject/Makefile
-+++ b/cddl/usr.bin/zinject/Makefile
-@@ -21,6 +21,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
-diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
-index 888b9af..523ba44 100644
---- a/cddl/usr.bin/zstreamdump/Makefile
-+++ b/cddl/usr.bin/zstreamdump/Makefile
-@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
-index f6f7e03..6fed691 100644
---- a/cddl/usr.bin/ztest/Makefile
-+++ b/cddl/usr.bin/ztest/Makefile
-@@ -18,6 +18,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
- CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
- LDADD=	-lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
-diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
-index fb5729f..ea9a752 100644
---- a/cddl/usr.sbin/dtrace/Makefile
-+++ b/cddl/usr.sbin/dtrace/Makefile
-@@ -25,4 +25,7 @@ DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
- LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
- 		-lrtld_db
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- .include <bsd.prog.mk>
-diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
-index ccd8189..827a197 100644
---- a/cddl/usr.sbin/lockstat/Makefile
-+++ b/cddl/usr.sbin/lockstat/Makefile
-@@ -20,6 +20,9 @@ CFLAGS+=	-I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
- 
- CFLAGS+=	-DNEED_ERRLOC -g
- 
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libdtrace
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+=	-d
- 
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBFL} ${LIBPROC} \
-diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
-index c2a6b1d..f411fc0 100644
---- a/cddl/usr.sbin/zdb/Makefile
-+++ b/cddl/usr.sbin/zdb/Makefile
-@@ -24,6 +24,14 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
-diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
-index 1957aad..9a5570a 100644
---- a/cddl/usr.sbin/zhack/Makefile
-+++ b/cddl/usr.sbin/zhack/Makefile
-@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
- CFLAGS+= -I${.CURDIR}/../../lib/libumem
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair
-+LDFLAGS+= -L${.CURDIR}/../../lib/libumem
-+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs_core
-+
- DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
deleted file mode 100644
index c8ce8e1a2943..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-10.3-underlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
-index 2a66337..04988d7 100644
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -12,6 +12,7 @@ DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- 
- LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
- 	-lbsdxml -lgeom -lnvpair -lz -lzfs_core
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl
- 
- SRCS=	deviceid.c \
- 	fsshare.c \
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild
deleted file mode 100644
index 44c9ae6d6386..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-10.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-# sys is required.
-EXTRACTONLY="
-	cddl/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	sys/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-10.2-libpaths.patch"
-	"${FILESDIR}/${PN}-10.3-underlink.patch"
-	)
-
-pkg_setup() {
-	# Add the required source files.
-	use build && EXTRACTONLY+="include/ "
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		# Link in include headers.
-		ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-}
-
-src_compile() {
-	# Disable parallel make.
-	freebsd_src_compile -j1
-}
-
-src_install() {
-	# Install libraries proper place
-	local mylibdir=$(get_libdir)
-	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
-
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
-	# Install zfs script
-	newinitd "${FILESDIR}"/zfs.initd zfs
-
-	keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
deleted file mode 100644
index cebbb02e7f49..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-11.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs multilib
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-# sys is required.
-EXTRACTONLY="
-	cddl/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	sys/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-11.0-workaround.patch"
-	"${FILESDIR}/${PN}-11.0-add-libs.patch" )
-
-pkg_setup() {
-	# Add the required source files.
-	use build && EXTRACTONLY+="include/ "
-	[[ $(tc-getCXX) != *clang++* ]] && REMOVE_SUBDIRS="usr.sbin/zfsd"
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		# Link in include headers.
-		ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	for d in libavl libctf libdtrace libnvpair libumem libuutil libzfs libzfs_core libzpool; do
-		LDFLAGS="${LDFLAGS} -L${S}/lib/${d}"
-	done
-}
-
-src_compile() {
-	cd "${S}"/lib || die
-	freebsd_src_compile
-	cd "${S}" || die
-	freebsd_src_compile
-}
-
-src_install() {
-	# Install libraries proper place
-	local mylibdir=$(get_libdir)
-	freebsd_src_install SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}"
-
-	gen_usr_ldscript -a avl nvpair umem uutil zfs zpool zfs_core
-
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
-
-	# Install zfs script
-	newinitd "${FILESDIR}"/zfs.initd zfs
-
-	keepdir /etc/zfs
-}
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 090e7a388e0e..b4bcd4aa6e70 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -11,13 +11,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
 DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-lib-EN-1606-libc.patch 249 BLAKE2B 79670a18a490e16a96d10c9d2230af3b076883a46bf56542ac6902e63112b1b6d00f6a9967cc9b99f56ee97aef5ba4931eaa0505b6da6b9cf0118801f46c7d57 SHA512 6dcfd00e646da0d3d8ad231786a8e422d319d8a1755e9f1d55f555999c5ccc0fdb7dca62fc1ced8686f6c3206044e75cd197d75843b1e9e6e83bef276c01d3d9
-DIST freebsd-lib-SA-1637-libc.patch 1567 BLAKE2B 84aff6ae2868c6cf7ac6b4a7e461115b9416bd0a30d86236d07048391bd1614d1be7ae2fbe632afa1e9fea50b1ecdf0863c378ee967744a1363d24bc93b001ae SHA512 8eaea9e01a7b224138da2cec559d8e925af3ecda4bf7d29340394f57204cd2460c7418a33dcca3db445436ac2985dba42478ad5595c25b9d83305552a04965f7
-DIST freebsd-lib-SA-1638-bhyve.patch 637 BLAKE2B 686c5b0f1ccfd6fa4f43b3e45139ffa64a1493110a32b5848671f14e75b076533fda5851a34da70599842842ab64d61b865181587135407014fb987831df1bb3 SHA512 4d8c45f4e2d729998a874023bf5bc8ca2904d3fd71e681180c3b4b2eabe2a34c086b806b86debcbc9ab24c6b5ab637f6ddae00fb577994359ed14edc3cac5aa4
 DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
deleted file mode 100644
index 42b64b572322..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
-index 937187a..d5277f3 100644
---- a/lib/atf/Makefile.inc
-+++ b/lib/atf/Makefile.inc
-@@ -49,6 +49,24 @@ CFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
- CFLAGS+=	-DATF_SHELL='"/bin/sh"'
- CFLAGS+=	-DATF_WORKDIR='"/tmp"'
- 
-+CXXFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DATF_ARCH='"${MACHINE}"'
-+CXXFLAGS+=	-DATF_BUILD_CC='"${CC}"'
-+CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
-+CXXFLAGS+=	-DATF_BUILD_CPP='"${CPP}"'
-+CXXFLAGS+=	-DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
-+CXXFLAGS+=	-DATF_BUILD_CXX='"${CXX}"'
-+CXXFLAGS+=	-DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
-+CXXFLAGS+=	-DATF_CONFDIR='"${CONFDIR}/atf"'
-+CXXFLAGS+=	-DATF_INCLUDEDIR='"${INCLUDEDIR}"'
-+CXXFLAGS+=	-DATF_LIBDIR='"${LIBDIR}"'
-+CXXFLAGS+=	-DATF_LIBEXECDIR='"${LIBEXECDIR}"'
-+CXXFLAGS+=	-DATF_MACHINE='"${MACHINE_ARCH}"'
-+CXXFLAGS+=	-DATF_M4='"/usr/bin/m4"'
-+CXXFLAGS+=	-DATF_PKGDATADIR='"${SHAREDIR}/atf"'
-+CXXFLAGS+=	-DATF_SHELL='"/bin/sh"'
-+CXXFLAGS+=	-DATF_WORKDIR='"/tmp"'
-+
- WARNS?=		3
- 
- # vim: syntax=make
-diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
-index 37d6073..90a2687 100644
---- a/lib/atf/libatf-c++/Makefile
-+++ b/lib/atf/libatf-c++/Makefile
-@@ -40,11 +40,11 @@ LDFLAGS+=	-L${.OBJDIR}/../libatf-c
- .PATH:		${ATF}/atf-c++
- .PATH:		${ATF}/atf-c++/detail
- 
--CFLAGS+=	-I${ATF}
--CFLAGS+=	-I${.CURDIR}/../libatf-c
--CFLAGS+=	-I.
-+CXXFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-I${.CURDIR}/../libatf-c
-+CXXFLAGS+=	-I.
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- SRCS=		application.cpp \
- 		build.cpp \
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
deleted file mode 100644
index 6ef3f07de0fd..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
-index 9a21dde..0815f0a 100644
---- a/lib/libcam/Makefile
-+++ b/lib/libcam/Makefile
-@@ -8,6 +8,7 @@ INCS=		camlib.h
- 
- DPADD=		${LIBSBUF}
- LDADD=		-lsbuf
-+LDFLAGS+=	-L${.OBJDIR}/../libsbuf
- 
- MAN=		cam.3 cam_cdbparse.3
- 
-diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
-index dbd7895..607b1f6 100644
---- a/lib/libdwarf/Makefile
-+++ b/lib/libdwarf/Makefile
-@@ -21,6 +21,7 @@ SRCS=	\
- INCS=	dwarf.h libdwarf.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- SHLIB_MAJOR=	3
- 
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index 4449c06..f024cf0 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -14,6 +14,7 @@ SRCS=	proc_bkpt.c		\
- INCS=	libproc.h
- 
- CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}/../libelf
- 
- .if ${MK_LIBCPLUSPLUS} != "no"
- LDADD+=		-lcxxrt
-@@ -27,4 +28,7 @@ SHLIB_MAJOR=	2
- 
- WITHOUT_MAN=
- 
-+LDADD+=		-lelf
-+LDFLAGS+=	-L${.OBJDIR}/../libelf
-+
- .include <bsd.lib.mk>
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
-index af5a775..c01aa05 100644
---- a/lib/libprocstat/Makefile
-+++ b/lib/libprocstat/Makefile
-@@ -16,6 +16,8 @@ VERSION_DEF=	${.CURDIR}/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map
- 
- INCS=		libprocstat.h
-+CFLAGS+=	-I${.CURDIR}/../libelf
-+LDFLAGS+=       -L${.OBJDIR}/../libelf
- CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
- SHLIB_MAJOR=	1
- 
-diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
-index 2815a07..e992662 100644
---- a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -10,5 +10,8 @@ SRCS=		rtld_db.c
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-+LDADD+= -lutil -lproc
-+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
- 
- .include <bsd.lib.mk>
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
-index 1cf52a0..3d25fae 100644
---- a/lib/libtelnet/Makefile
-+++ b/lib/libtelnet/Makefile
-@@ -13,6 +13,8 @@ INTERNALLIB=
- SRCS=		genget.c getent.c misc.c
- CFLAGS+=	-I${TELNETDIR}
- 
-+CFLAGS+=	-I${.CURDIR}/../libmp
-+
- WARNS?=		2
- 
- .if !defined(RELEASE_CRUNCH)
-diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
-index 30a1dfb..9f8a99c 100644
---- a/lib/libexecinfo/Makefile
-+++ b/lib/libexecinfo/Makefile
-@@ -10,8 +10,10 @@ SHLIB_MAJOR=	1
- INCS=		execinfo.h
- SRCS=		backtrace.c symtab.c unwind.c
- 
-+CFLAGS+=	-I${.CURDIR}/../libelf
- DPADD=		${LIBELF}
- LDADD=		-lelf
-+LDFLAGS+=	-L${.OBJDIR}/../libelf
- 
- MAN=		backtrace.3
- 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
deleted file mode 100644
index 55987aa44fa1..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index f9e01ab..15b27d8 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -15,7 +15,10 @@ INCS=	libproc.h
- 
- CFLAGS+=	-I${.CURDIR}
- 
--.if ${MK_LIBCPLUSPLUS} != "no"
-+.if ${CXX:T:M*-stdlib=libc++*}
-+LDADD+=		-lcxxrt
-+DPADD+=		${LIBCXXRT}
-+.elif ${CXXFLAGS:T:M*-stdlib=libc++*}
- LDADD+=		-lcxxrt
- DPADD+=		${LIBCXXRT}
- .else
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch
deleted file mode 100644
index 303f422651f3..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-bsdxml2expat.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile
-index bbfb57b..a7c17e3 100644
---- a/lib/libgeom/Makefile
-+++ b/lib/libgeom/Makefile
-@@ -13,7 +13,7 @@ CFLAGS += -I${.CURDIR}
- 
- WARNS?=	3
- 
--DPADD=	${LIBBSDXML} ${LIBSBUF}
-+DPADD=	${LIBSBUF}
- LDADD=	-lbsdxml -lsbuf
- 
- MAN=	libgeom.3
-diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c
-index 9dedb8e..d96420c 100644
---- a/lib/libgeom/geom_xml2tree.c
-+++ b/lib/libgeom/geom_xml2tree.c
-@@ -43,7 +43,7 @@
- #include <sys/sbuf.h>
- #include <sys/sysctl.h>
- #include <err.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <libgeom.h>
- 
- struct mystate {
-diff --git a/lib/libmt/mtlib.c b/lib/libmt/mtlib.c
-index d1fc0b1..89ac55e 100644
---- a/lib/libmt/mtlib.c
-+++ b/lib/libmt/mtlib.c
-@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD: stable/10/lib/libmt/mtlib.c 280438 2015-03-24 14:36:10Z ken
- #include <unistd.h>
- #include <stdint.h>
- #include <errno.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <mtlib.h>
- 
- /*
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch
deleted file mode 100644
index b08d95f714f3..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.2-liblink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile
-index cb1da71..43de5a5 100644
---- a/lib/libmt/Makefile
-+++ b/lib/libmt/Makefile
-@@ -5,6 +5,7 @@ SHLIBDIR?=	/lib
- SRCS=		mtlib.c
- INCS=		mtlib.h
- 
-+CFLAGS+=	-I${.CURDIR}
- DPADD=		${LIBSBUF}
- LDADD=		-lsbuf
- 
-diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile
-index e9384b7..085ef62 100644
---- a/lib/libdpv/Makefile
-+++ b/lib/libdpv/Makefile
-@@ -11,7 +11,8 @@ LDADD=		-ldialog -lfigpar -lncursesw -lutil
- 
- SRCS=		dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c
- 
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../libfigpar
-+LDFLAGS+=	-L${.OBJDIR}/../libfigpar
- 
- WARNS?=		6
- 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch
deleted file mode 100644
index 813a42b50171..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.3-libusb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
-index 88ec3fe..076b8d4 100644
---- a/lib/libusb/Makefile
-+++ b/lib/libusb/Makefile
-@@ -38,7 +38,7 @@ SRCS+=		libusb10_io.c
- CFLAGS+=	-DCOMPAT_32BIT
- .else
- FILES=		libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
--FILESDIR=	${LIBDATADIR}/pkgconfig
-+FILESDIR=	${LIBDIR}/pkgconfig
- .endif
- 
- #
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch
deleted file mode 100644
index d90aa3163dae..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-libsysdecode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile
-index e3bfe00..51fc5f0 100644
---- a/lib/libsysdecode/Makefile
-+++ b/lib/libsysdecode/Makefile
-@@ -8,7 +8,7 @@ LIB=	sysdecode
- SRCS=	errno.c ioctl.c syscallnames.c utrace.c
- INCS=	sysdecode.h
- 
--CFLAGS+= -I${.CURDIR}/../../sys
-+CFLAGS+= -I${.CURDIR}/../../sys -I${.CURDIR}
- 
- MAN+=	sysdecode.3 \
- 	sysdecode_abi_to_freebsd_errno.3 \
-@@ -37,7 +37,7 @@ CFLAGS.gcc+=	${CFLAGS.gcc.${.IMPSRC}}
- 
- ioctl.c: mkioctls
- 	env MACHINE=${MACHINE} CPP="${CPP}" \
--		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
-+		/bin/sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- beforedepend: ioctl.c
- 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild
deleted file mode 100644
index 96b625022684..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-10.3-r3.ebuild
+++ /dev/null
@@ -1,648 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-16:06/libc.patch"
-	"SA-16:37/libc.patch"
-	"SA-16:38/bhyve.patch" )
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-			$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	lib/
-	contrib/
-	crypto/
-	libexec/
-	etc/
-	include/
-	usr.sbin/
-	gnu/
-	secure/
-"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl:0= )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( app-crypt/heimdal )
-		usb? ( !dev-libs/libusb )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		>=dev-util/dialog-1.2.20150225
-		=sys-freebsd/freebsd-libexec-${RV}*
-		!sys-libs/libutempter
-		!dev-libs/libelf
-		!dev-libs/libexecinfo
-		!dev-libs/libiconv
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		>=sys-freebsd/freebsd-sources-10.3-r5"
-	RDEPEND="${RDEPEND}
-		=sys-freebsd/freebsd-share-${RV}*
-		>=virtual/libiconv-0-r2"
-else
-	EXTRACTONLY+="sys/ "
-fi
-
-DEPEND="${DEPEND}
-		userland_GNU? ( sys-apps/mtree )
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD"
-
-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."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-10.0-liblink.patch"
-	"${FILESDIR}/${PN}-10.2-liblink.patch"
-	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
-	"${FILESDIR}/${PN}-10.3-libusb.patch"
-	"${FILESDIR}/${PN}-10.0-libproc-libcxx.patch"
-	"${FILESDIR}/${PN}-10.2-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
-	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	)
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap libwrap libmagic \
-	libcom_err
-	libedit
-	libstand
-	libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
-	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386-elf/Makefile" \
-		-i "${S}/csu/ia64/Makefile" || die
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
-	fi
-
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		if [[ ! -e "${WORKDIR}/sys" ]]; then
-			ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-		fi
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-}
-
-bootstrap_lib() {
-	for i ; do
-		cd "${WORKDIR}/${i}" || die "missing ${i}"
-		freebsd_src_compile
-		append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
-	done
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	bootstrap_lib "${csudir}"
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
-	bootstrap_lib "gnu/lib/csu"
-
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	for i in *.So ; do
-		ln -s $i ${i%.So}S.o
-	done
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
-	export LDADD="-lssp_nonshared"
-}
-
-bootstrap_libgcc() {
-	bootstrap_lib "lib/libcompiler_rt"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
-	ln -s libcompiler_rt.a libgcc.a || die
-
-	bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
-	bootstrap_lib "lib/libthr"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
-	ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${CROSS_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	else
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_lib "lib/libc"
-	is_crosscompile || is_native_abi || bootstrap_libgcc
-	is_native_abi   || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	# Bootstrap if needed, otherwise assume the system headers are in
-	# /usr/include.
-	if need_bootstrap ; then
-		do_bootstrap
-	else
-		CFLAGS="${CFLAGS} -isystem /usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
-	fi
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${DESTDIR}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	# iconv symbol provided by libc_nonshared.a.
-	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
-	cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ ! -d "${dirname}/${ABI}" ] ; then
-		mkdir "${dirname}/${ABI}" || die
-	fi
-
-	mv "${1}" "${dirname}/${ABI}/" || die
-
-	export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
-	cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
-  @ABI_amd64_fbsd@
-#elif defined(__i386__)
-  @ABI_x86_fbsd@
-#else
-  @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ -n "${dirname#.}" ] ; then
-		dirname="${dirname}/${2}"
-	else
-		dirname="${2}"
-	fi
-
-	if [ -f "${dirname}/${filename}" ] ; then
-		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
-	else
-		cat ${1}
-	fi
-}
-
-wrap_header_end() {
-	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
-	if is_crosscompile ; then
-		INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	else
-		INCLUDEDIR="/usr/include"
-	fi
-
-	dodir ${INCLUDEDIR}
-	CTARGET="${CHOST}" \
-		install_includes ${INCLUDEDIR}
-
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc
-	fi
-
-	for i in $(get_subdirs) ; do
-		if [[ ${i} != *libiconv_modules* ]] ; then
-			einfo "Installing in ${i}..."
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			freebsd_src_install || die "Install ${i} failed"
-		fi
-	done
-
-	if ! is_crosscompile; then
-		local mymakeopts_save="${mymakeopts}"
-		mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
-
-		einfo "Installing in lib/libiconv_modules..."
-		cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules."
-		freebsd_src_install || die "Install lib/libiconv_modules failed"
-
-		mymakeopts="${mymakeopts_save}"
-	fi
-
-	if ! is_crosscompile ; then
-		if ! multilib_is_native_abi ; then
-			DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		else
-			dodir "$(get_libdir)"
-			DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		fi
-	else
-		CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib"
-		# We're done for the cross libc here.
-		return 0
-	fi
-
-	# Generate ldscripts for core libraries that will go in /
-	multilib_is_native_abi && \
-		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-			kvm m md procstat sbuf thr ufs util elf
-
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
-		cd "${D}/usr/include"
-		for i in machine/*.h fenv.h ; do
-			move_header ${i}
-		done
-		if multilib_is_native_abi ; then
-			# Supposedly the last one!
-			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
-			for j in ${uniq_headers} ; do
-				make_header_template > ${j}
-				for i in $(get_all_abis) ; do
-					wrap_header ${j} ${i} > ${j}.new
-					cp ${j}.new ${j}
-					rm -f ${j}.new
-				done
-				wrap_header_end ${j} > ${j}.new
-				cp ${j}.new ${j}
-				rm -f ${j}.new
-			done
-		fi
-	fi
-}
-
-src_install() {
-	if is_crosscompile ; then
-		einfo "Installing for ${CTARGET} in ${CHOST}.."
-		# From this point we need to force: get stripped with the correct tools,
-		# get tc-arch-kernel to return the right value, etc.
-		export CHOST=${CTARGET}
-
-		mymakeopts="${mymakeopts} NO_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-
-		return 0
-	else
-		export STRIP_MASK="*/usr/lib*/*crt*.o"
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" \
-		WITHOUT_GSSAPI= || die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild
deleted file mode 100644
index 24c62627e2a2..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.0-r1.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:37/libc.patch"
-	"SA-16:38/bhyve.patch" )
-
-# Crypto is needed to have an internal OpenSSL header
-# sys is needed for libalias, probably we can just extract that instead of
-# extracting the whole tarball
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-			$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	lib/
-	contrib/
-	crypto/
-	libexec/
-	etc/
-	include/
-	usr.sbin/
-	gnu/
-	secure/
-"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl:0= )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( app-crypt/heimdal )
-		usb? ( !dev-libs/libusb )
-		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-		>=dev-libs/expat-2.0.1
-		>=dev-util/dialog-1.2.20150225
-		=sys-freebsd/freebsd-libexec-${RV}*
-		!sys-libs/libutempter
-		!dev-libs/libelf
-		!dev-libs/libexecinfo
-		!dev-libs/libiconv
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*"
-	RDEPEND="${RDEPEND}
-		=sys-freebsd/freebsd-share-${RV}*
-		>=virtual/libiconv-0-r2"
-else
-	EXTRACTONLY+="sys/ "
-fi
-
-DEPEND="${DEPEND}
-		userland_GNU? ( sys-apps/mtree )
-		=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/lib"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
-	export CTARGET=${CATEGORY/cross-}
-fi
-
-IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
-	build crosscompile_opts_headers-only zfs
-	userland_GNU userland_BSD"
-
-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."
-
-	if ! use ssl && use kerberos; then
-		eerror "If you want kerberos support you need to enable ssl support, too."
-	fi
-
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= WITHOUT_LIBCPLUSPLUS= WITHOUT_LDNS= WITHOUT_UNBOUND= "
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
-		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-pmc.patch"
-	"${FILESDIR}/${PN}-10.0-atfcxx.patch"
-	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
-	"${FILESDIR}/${PN}-11.0-workaround.patch"
-	"${FILESDIR}/${PN}-11.0-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-11.0-libsysdecode.patch"
-	"${FILESDIR}/${PN}-11.0-libproc-libcxx.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	)
-# Here we disable and remove source which we don't need or want
-# In order:
-# - ncurses stuff
-# - libexpat creates a bsdxml library which is the same as expat
-# - archiving libraries (have their own ebuild)
-# - sendmail libraries (they are installed by sendmail)
-# - SNMP library and dependency (have their own ebuilds)
-# - libstand: static library, 32bits on amd64 used for boot0, we build it from
-# boot0 instead.
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap libwrap libmagic \
-	libcom_err
-	libedit
-	libstand
-	libgssapi"
-
-# Are we building a cross-compiler?
-is_crosscompile() {
-	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	use x86-fbsd && [[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-
-	# Upstream Display Managers default to using VT7
-	# We should make FreeBSD allow this by default
-	local x=
-	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
-		sed -i.bak \
-			-e '/ttyv5[[:space:]]/ a\
-# Display Managers default to VT7.\
-# If you use the xdm init script, keep ttyv6 commented out\
-# unless you force a different VT for the DM being used.' \
-			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
-			|| die "Failed to sed ${x}"
-		rm "${x}".bak
-	done
-
-	# This one is here because it also
-	# patches "${WORKDIR}/include"
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-includes.patch"
-
-	# Don't install the hesiod man page or header
-	rm "${WORKDIR}"/include/hesiod.h || die
-	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
-	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
-	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
-
-	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
-	cd "${S}"
-	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
-		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
-	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
-		-i "${S}/csu/i386/Makefile" || die
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
-	# BSD's sed on BSD.
-	cd "${S}"
-	if [[ ${CBUILD:-${CHOST}} != *bsd* ]]; then
-		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
-		sed -i -e 's/-i ""/-i""/' "${S}/csu/Makefile.inc" || die
-	fi
-
-	if use build; then
-		cd "${WORKDIR}"
-		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
-		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
-		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
-		return 0
-	fi
-
-	if ! is_crosscompile ; then
-		if [[ ! -e "${WORKDIR}/sys" ]]; then
-			ln -s "${SYSROOT}/usr/src/sys" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-		fi
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-}
-
-bootstrap_lib() {
-	for i ; do
-		cd "${WORKDIR}/${i}" || die "missing ${i}"
-		freebsd_src_compile
-		append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/${i}"
-	done
-}
-
-get_csudir() {
-	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
-		echo "lib/csu/$1-elf"
-	else
-		echo "lib/csu/$1"
-	fi
-}
-
-bootstrap_csu() {
-	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
-	export RAW_LDFLAGS=$(raw-ldflags)
-	bootstrap_lib "${csudir}"
-
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
-
-	bootstrap_lib "gnu/lib/csu"
-
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	for i in *.So ; do
-		ln -s $i ${i%.So}S.o
-	done
-	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
-}
-
-# Compile libssp_nonshared.a and add it's path to LDFLAGS.
-bootstrap_libssp_nonshared() {
-	bootstrap_lib "gnu/lib/libssp/libssp_nonshared"
-}
-
-bootstrap_libgcc() {
-	bootstrap_lib "lib/libcompiler_rt"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
-	ln -s libcompiler_rt.a libgcc.a || die
-
-	bootstrap_lib "lib/libc" "gnu/lib/libgcc"
-}
-
-bootstrap_libthr() {
-	bootstrap_lib "lib/libthr"
-	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
-	ln -s libthr.so libpthread.so
-}
-
-# What to build for a cross-compiler.
-# We also need the csu but this has to be handled separately.
-CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt lib/libc_nonshared"
-
-# What to build for non-default ABIs.
-NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt lib/libsbuf lib/libcam lib/libelf lib/libiconv_modules"
-
-# Subdirs for a native build:
-NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc lib/libiconv_modules"
-
-# Is my $ABI native ?
-is_native_abi() {
-	is_crosscompile && return 1
-	multilib_is_native_abi
-}
-
-# Do we need to bootstrap the csu and libssp_nonshared?
-need_bootstrap() {
-	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' && ! has_version ">=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]" ; } || has_version "<${CATEGORY}/${P}"
-}
-
-# Get the subdirs we are building.
-get_subdirs() {
-	local ret=""
-	if is_native_abi ; then
-		# If we are building for the native ABI, build everything
-		ret="${NATIVE_SUBDIRS}"
-	elif is_crosscompile ; then
-		# With a cross-compiler we only build the very core parts.
-		ret="${CROSS_SUBDIRS}"
-		if [ "${EBUILD_PHASE}" = "install" ]; then
-			# Add the csu dir first when installing. We treat it separately for
-			# compiling.
-			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
-		fi
-	else
-		# For the non-native ABIs we only build the csu parts and very core
-		# libraries for now.
-		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
-	fi
-	echo "${ret}"
-}
-
-# Bootstrap the core libraries and setup the flags so that the other parts can
-# build against it.
-do_bootstrap() {
-	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
-	if ! is_crosscompile ; then
-		# Pre-install headers, but not when building a cross-compiler since we
-		# assume they have been installed in the previous pass.
-		einfo "Pre-installing includes in include_proper_${ABI}"
-		mkdir "${WORKDIR}/include_proper_${ABI}" || die
-		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
-		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		[[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1"
-		CXXFLAGS="${CXXFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
-		mymakeopts="${mymakeopts} RPCDIR=${WORKDIR}/include_proper_${ABI}/rpcsvc"
-	fi
-	bootstrap_csu
-	bootstrap_libssp_nonshared
-	is_crosscompile && bootstrap_lib "lib/libc"
-	is_crosscompile || is_native_abi || bootstrap_libgcc
-	is_native_abi   || bootstrap_libthr
-}
-
-# Compile it. Assume we have the toolchain setup correctly.
-do_compile() {
-	# Bootstrap if needed, otherwise assume the system headers are in
-	# /usr/include.
-	if need_bootstrap ; then
-		do_bootstrap
-	else
-		CFLAGS="${CFLAGS} -isystem /usr/include"
-		[[ $(tc-getCXX) = *clang++* ]] && CXXFLAGS="${CXXFLAGS} -isystem /usr/include/c++/v1"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/include"
-	fi
-
-	export RAW_LDFLAGS=$(raw-ldflags)
-
-	# Everything is now setup, build it!
-	for i in $(get_subdirs) ; do
-		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
-		cd "${WORKDIR}/${i}/" || die "missing ${i}."
-		freebsd_src_compile || die "make ${i} failed"
-	done
-}
-
-src_compile() {
-	# Does not work with GNU sed
-	# Force BSD's sed on BSD.
-	if [[ ${CBUILD:-${CHOST}} == *bsd* ]]; then
-		export ESED=/usr/bin/sed
-		unalias sed
-	fi
-
-	use usb && export NON_NATIVE_SUBDIRS="${NON_NATIVE_SUBDIRS} lib/libusb lib/libusbhid"
-
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" SRCTOP="${WORKDIR}" || die "make include failed"
-
-	use crosscompile_opts_headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	# strip flags and do not do it later, we only add safe, and in fact
-	# needed flags after all
-	strip-flags
-	export NOFLAGSTRIP=yes
-	if is_crosscompile ; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NLS="
-		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		CXXFLAGS="${CXXFLAGS} -isystem /usr/${CTARGET}/usr/include"
-		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
-	fi
-
-	if is_crosscompile ; then
-		do_compile
-	else
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
-	fi
-}
-
-gen_libc_ldscript() {
-	# Parameters:
-	#   $1 = target libdir
-	#   $2 = source libc dir
-	#   $3 = source libssp_nonshared dir
-
-	# Clear the symlink.
-	rm -f "${DESTDIR}/$2/libc.so" || die
-
-	# Move the library if needed
-	if [ "$1" != "$2" ] ; then
-		mv "${DESTDIR}/$2/libc.so.7" "${DESTDIR}/$1/" || die
-	fi
-
-	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
-	# this is done to avoid having to touch gcc spec file as it is currently
-	# done on FreeBSD upstream, mostly because their binutils aren't able to
-	# cope with linker scripts yet.
-	# Taken from toolchain-funcs.eclass:
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	# iconv symbol provided by libc_nonshared.a.
-	# http://svnweb.freebsd.org/base?view=revision&amp;revision=258283
-	cat > "${DESTDIR}/$2/libc.so" <<-END_LDSCRIPT
-/* GNU ld script
-   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
-   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
-   this symbol was provided by a shared libc. So we link in
-   libssp_nonshared.a from here.
- */
-${output_format}
-GROUP ( /$1/libc.so.7 /$3/libc_nonshared.a /$3/libssp_nonshared.a )
-END_LDSCRIPT
-}
-
-header_list=""
-
-move_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ ! -d "${dirname}/${ABI}" ] ; then
-		mkdir "${dirname}/${ABI}" || die
-	fi
-
-	mv "${1}" "${dirname}/${ABI}/" || die
-
-	export header_list="${header_list} ${1}"
-}
-
-make_header_template() {
-	cat <<-END_HEADER
-/*
- * Wrapped header for multilib support.
- * See the real headers included below.
- */
-
-#if defined(__x86_64__)
-  @ABI_amd64_fbsd@
-#elif defined(__i386__)
-  @ABI_x86_fbsd@
-#else
-  @ABI_${DEFAULT_ABI}@
-#endif
-END_HEADER
-}
-
-wrap_header() {
-	local dirname=$(dirname ${1})
-	local filename=$(basename ${1})
-
-	if [ -n "${dirname#.}" ] ; then
-		dirname="${dirname}/${2}"
-	else
-		dirname="${2}"
-	fi
-
-	if [ -f "${dirname}/${filename}" ] ; then
-		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
-	else
-		cat ${1}
-	fi
-}
-
-wrap_header_end() {
-	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
-}
-
-do_install() {
-	if is_crosscompile ; then
-		INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	else
-		INCLUDEDIR="/usr/include"
-	fi
-
-	dodir ${INCLUDEDIR}
-	CTARGET="${CHOST}" \
-		install_includes ${INCLUDEDIR}
-
-	is_crosscompile && use crosscompile_opts_headers-only && return 0
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -i.bkp "s:^libdir=.*:libdir=/usr/$(get_libdir):g" "${S}"/libusb/libusb-*.pc
-	fi
-
-	for i in $(get_subdirs) ; do
-		if [[ ${i} != *libiconv_modules* ]] ; then
-			einfo "Installing in ${i}..."
-			cd "${WORKDIR}/${i}/" || die "missing ${i}."
-			freebsd_src_install || die "Install ${i} failed"
-		fi
-	done
-
-	if ! is_crosscompile; then
-		local mymakeopts_save="${mymakeopts}"
-		mymakeopts="${mymakeopts} SHLIBDIR=/usr/$(get_libdir)/i18n LIBDIR=/usr/$(get_libdir)/i18n"
-
-		einfo "Installing in lib/libiconv_modules..."
-		cd "${WORKDIR}/lib/libiconv_modules/" || die "missing libiconv_modules."
-		freebsd_src_install || die "Install lib/libiconv_modules failed"
-
-		mymakeopts="${mymakeopts_save}"
-	fi
-
-	if ! is_crosscompile ; then
-		if ! multilib_is_native_abi ; then
-			DESTDIR="${D}" gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		else
-			dodir "$(get_libdir)"
-			DESTDIR="${D}" gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
-		fi
-	else
-		CHOST=${CTARGET} DESTDIR="${D}/usr/${CTARGET}/" gen_libc_ldscript "usr/lib" "usr/lib" "usr/lib"
-		# We're done for the cross libc here.
-		return 0
-	fi
-
-	# Generate ldscripts for core libraries that will go in /
-	multilib_is_native_abi && \
-		gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
-			kvm m md procstat sbuf thr ufs util elf
-
-	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]] ; then
-		cd "${D}/usr/include"
-		for i in machine/*.h fenv.h ; do
-			move_header ${i}
-		done
-		if multilib_is_native_abi ; then
-			# Supposedly the last one!
-			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
-			for j in ${uniq_headers} ; do
-				make_header_template > ${j}
-				for i in $(get_all_abis) ; do
-					wrap_header ${j} ${i} > ${j}.new
-					cp ${j}.new ${j}
-					rm -f ${j}.new
-				done
-				wrap_header_end ${j} > ${j}.new
-				cp ${j}.new ${j}
-				rm -f ${j}.new
-			done
-		fi
-	fi
-}
-
-src_install() {
-	if is_crosscompile ; then
-		einfo "Installing for ${CTARGET} in ${CHOST}.."
-		# From this point we need to force: get stripped with the correct tools,
-		# get tc-arch-kernel to return the right value, etc.
-		export CHOST=${CTARGET}
-
-		mymakeopts="${mymakeopts} WITHOUT_MAN= \
-			INCLUDEDIR=/usr/${CTARGET}/usr/include \
-			SHLIBDIR=/usr/${CTARGET}/usr/lib \
-			LIBDIR=/usr/${CTARGET}/usr/lib"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-		do_install
-
-		return 0
-	else
-		export STRIP_MASK="*/usr/lib*/*crt*.o"
-		local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
-	fi
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-}
-
-install_includes()
-{
-	local INCLUDEDIR="$1"
-
-	# The idea is to be called from either install or unpack.
-	# During unpack it's required to install them as portage's user.
-	if [[ "${EBUILD_PHASE}" == "install" ]]; then
-		local DESTDIR="${D}"
-		BINOWN="root"
-		BINGRP="wheel"
-	else
-		local DESTDIR="${WORKDIR}"
-		[[ -z "${USER}" ]] && USER="portage"
-		BINOWN="${USER}"
-		[[ -z "${GROUPS}" ]] && GROUPS="portage"
-		BINGRP="${GROUPS}"
-	fi
-
-	# Must exist before we use it.
-	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
-	cd "${WORKDIR}/include"
-
-	local MACHINE="$(tc-arch-kernel)"
-
-	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	$(freebsd_get_bmake) installincludes \
-		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-		DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" \
-		WITHOUT_GSSAPI= \
-		SRCTOP="${WORKDIR}"|| die "install_includes() failed"
-	einfo "includes installed ok."
-	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex lib/libcasper lib/libmp"
-	for i in $EXTRA_INCLUDES; do
-		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-		cd "${WORKDIR}/$i" || die
-		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
-			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-			BINGRP="${BINGRP}" \
-			SRCTOP="${WORKDIR}" || die "problem installing $i includes."
-		einfo "$i includes installed ok."
-	done
-}
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index f9f34ba46984..348874a0634d 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -8,8 +8,6 @@ DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e6
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
 DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch
deleted file mode 100644
index e9c092566303..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-10.2-atf-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
-index b50e14e..e59a413 100644
---- a/libexec/atf/Makefile.inc
-+++ b/libexec/atf/Makefile.inc
-@@ -25,7 +25,7 @@
- #
- # $FreeBSD: stable/10/libexec/atf/Makefile.inc 271298 2014-09-09 04:00:30Z ngie $
- 
--CFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-DHAVE_CONFIG_H
- 
- WARNS?=		3
- 
-diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
-index 77c11db..7449ddb 100644
---- a/libexec/atf/atf-check/Makefile
-+++ b/libexec/atf/atf-check/Makefile
-@@ -34,8 +34,8 @@ PROG_CXX=	atf-check
- SRCS=		atf-check.cpp
- MAN=		atf-check.1
- 
--CFLAGS+=	-I${ATF}
--CFLAGS+=	-DATF_SHELL='"/bin/sh"'
-+CXXFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-DATF_SHELL='"/bin/sh"'
- 
- LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
- LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
deleted file mode 100644
index d33000927424..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-9.2-no_ld32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use LD_* variables for 32bits too instead of the FreeBSD invention LD_32_*.
-We use LD_* everywhere on Gentoo and things like libtool wrappers have no clue
-about LD_32_* and thus fail to run from the build directory.
-
-diff -uNr libexec.old/rtld-elf/rtld.h libexec/rtld-elf/rtld.h
---- libexec.old/rtld-elf/rtld.h	2013-08-24 12:30:26.000000000 -0400
-+++ libexec/rtld-elf/rtld.h	2013-08-26 17:10:19.000000000 -0400
-@@ -47,7 +47,6 @@
- #define	_PATH_ELF_HINTS		"/var/run/ld-elf32.so.hints"
- /* For running 32 bit binaries  */
- #define	STANDARD_LIBRARY_PATH	"/lib32:/usr/lib32"
--#define LD_ "LD_32_"
- #endif
- 
- #ifndef STANDARD_LIBRARY_PATH
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
deleted file mode 100644
index e915c5115503..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-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 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-no_ld32.patch"
-	"${FILESDIR}/${PN}-10.2-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.2.
-	if has_version "<sys-freebsd/freebsd-lib-${RV}"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/mman.h
-		echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild
deleted file mode 100644
index 59376c1713b0..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-11.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd pam multilib multibuild multilib-build toolchain-funcs
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	libexec/
-	usr.bin/
-	bin/
-	contrib/blacklist/
-	contrib/dma/
-	contrib/hyperv/
-	contrib/telnet/
-	lib/
-	etc/
-	usr.sbin/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	>=sys-freebsd/freebsd-lib-9.1-r11[${MULTILIB_USEDEP}]
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="${RDEPEND}
-	xinetd? ( sys-apps/xinetd )"
-
-S="${WORKDIR}/libexec"
-
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-PATCHES=( "${FILESDIR}/${PN}-10.2-atf-check.patch" )
-
-pkg_setup() {
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_PF= WITHOUT_RCMDS= "
-
-	if has_version "<sys-freebsd/freebsd-libexec-11.0"; then
-		REMOVE_SUBDIRS="${REMOVE_SUBDIRS} rpc.rstatd ulog-helper"
-	fi
-
-	if has_version "<sys-freebsd/freebsd-ubin-11.0"; then
-		mymakeopts="${mymakeopts} WITHOUT_MAN_UTILS= "
-	fi
-
-	if has_version "<sys-freebsd/freebsd-share-${RV}"; then
-		die ">=sys-freebsd/freebsd-share-${RV} is required."
-	fi
-}
-
-src_prepare() {
-	# gcc-5.0 or later, Workaround for critical issue. bug 573358.
-	[[ "$(gcc-major-version)" -ge 5 ]] && replace-flags -O? -O1
-
-	if [[ ! -e "${WORKDIR}/include" ]]; then
-		ln -s /usr/include "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	fi
-	# allow upgrade directly from 9.x to 10.2.
-	if has_version "<sys-freebsd/freebsd-lib-${RV}"; then
-		# taken from sys/sys/elf_common.h
-		echo "#define DF_1_INTERPOSE 0x00000400" >> "${S}"/rtld-elf/rtld.h
-		echo "#define STT_GNU_IFUNC 10" >> "${S}"/rtld-elf/rtld.h
-		echo "#define R_386_IRELATIVE 42" >> "${S}"/rtld-elf/rtld.h
-		echo "#define PT_GNU_RELRO 0x6474e552" >> "${S}"/rtld-elf/rtld.h
-		echo "#define DF_1_NODEFLIB 0x00000800" >> "${S}"/rtld-elf/rtld.h
-		echo "#define NT_FREEBSD_ABI_TAG 1" >> "${S}"/rtld-elf/rtld.h
-		echo "#define NT_FREEBSD_NOINIT_TAG 2" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/fcntl.h
-		echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
-		echo "#define O_VERIFY 0x00200000" >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/cdefs.h
-		echo '#define __compiler_membar()  __asm __volatile(" " : : : "memory")' >> "${S}"/rtld-elf/rtld.h
-		# taken from sys/sys/mman.h
-		echo '#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_SHIFT 24' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNMENT_MASK MAP_ALIGNED(0xff)' >> "${S}"/rtld-elf/rtld.h
-		echo '#define MAP_ALIGNED_SUPER MAP_ALIGNED(1)' >> "${S}"/rtld-elf/rtld.h
-
-		export mymakeopts="${mymakeopts} WITHOUT_SYMVER= WITHOUT_BLACKLIST_SUPPORT= "
-	fi
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/libexec/rtld-elf" || die
-		export mymakeopts="${mymakeopts} PROG=ld-elf32.so.1"
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	insinto /etc
-	doins "${WORKDIR}/etc/gettytab"
-	newinitd "${FILESDIR}/bootpd.initd" bootpd
-	newconfd "${FILESDIR}/bootpd.confd" bootpd
-
-	if use xinetd; then
-		for rpcd in rstatd rusersd walld rquotad sprayd; do
-			insinto /etc/xinetd.d
-			newins "${FILESDIR}/${rpcd}.xinetd" ${rpcd}
-		done
-	fi
-}
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 0f580c255088..f3dcd89d595d 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -1,3 +1 @@
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch
deleted file mode 100644
index b88fde255007..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.2-gnu.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index 80549d8..fd2aac5 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -173,7 +173,7 @@ _LIBS=		lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- 	@${ECHO} building static ${LIB} library
- 	@rm -f ${.TARGET}
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+	@${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -186,7 +186,7 @@ POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
- lib${LIB}_p.a: ${POBJS}
- 	@${ECHO} building profiled ${LIB} library
- 	@rm -f ${.TARGET}
--	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-+	@${AR} ${ARFLAGS} ${.TARGET} {POBJS} ${ARADD}
- 	${RANLIB} ${RANLIBFLAGS} ${.TARGET}
- .endif
- 
-@@ -215,7 +215,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
- .endif
- 	${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
--	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
-+	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .if ${MK_CTF} != "no"
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
- .endif
-@@ -273,13 +273,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index 19ad99f..46c4b09 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -179,13 +179,6 @@ _EXTRADEPEND:
- 
- .if !target(install)
- 
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:=	${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch
deleted file mode 100644
index cdc244d6e059..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-10.3-gentoo.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index a8aa595..476b33b 100644
---- a/share/mk/bsd.doc.mk
-+++ b/share/mk/bsd.doc.mk
-@@ -135,10 +135,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
- realinstall:
- .if ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
- .endif
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
- .endfor
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index 183cb1c..5b57594 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -40,6 +40,7 @@ ${group}NAME_${file:T}?=	${file:T}
- .endif
- installfiles-${group}: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -52,10 +53,12 @@ _${group}FILES+= ${file}
- installfiles-${group}: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index b938221..6b98e72 100644
---- a/share/mk/bsd.incs.mk
-+++ b/share/mk/bsd.incs.mk
-@@ -41,6 +41,9 @@ ${group}NAME_${header:T}?=	${header:T}
- .endif
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		 -g ${${group}GRP_${.ALLSRC:T}} \
-+		 ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -53,9 +56,13 @@ _${group}INCS+= ${header}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index 6275ce3..8d32289 100644
---- a/share/mk/bsd.info.mk
-+++ b/share/mk/bsd.info.mk
-@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -144,15 +145,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index c753afe..14f74aa 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -46,8 +46,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?=	-s
- .endif
- 
- .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
-@@ -296,14 +294,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
- 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
-@@ -357,10 +358,12 @@ _libinstall:
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
- .endif
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index c097c77..c2994d8 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -51,7 +51,7 @@ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
- LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
- LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
-@@ -81,7 +81,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
- .if ${MK_LDNS} != "no"
- LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
- .endif
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 574f0f5..b63b117 100644
---- a/share/mk/bsd.links.mk
-+++ b/share/mk/bsd.links.mk
-@@ -15,6 +15,8 @@ _installlinks:
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		${INSTALL_LINK} $$l $$t; \
- 	done; true
- .endif
-@@ -26,6 +28,8 @@ _installlinks:
- 		t=${DESTDIR}$$1; \
- 		shift; \
- 		${ECHO} $$t -\> $$l; \
-+		d=`dirname $$t`; \
-+		test -d $$d || mkdir $$d; \
- 		${INSTALL_SYMLINK} $$l $$t; \
- 	done; true
- .endif
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
-index 0212d3a..6435936 100644
---- a/share/mk/bsd.man.mk
-+++ b/share/mk/bsd.man.mk
-@@ -165,9 +165,11 @@ _maninstall: ${MAN}
- .if defined(NO_MANCOMPRESS)
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -181,11 +183,14 @@ _maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -193,9 +198,11 @@ _maninstall: ${MAN}
- .endif
- .else
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
- 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
-index 28255ea..2bc6546 100644
---- a/share/mk/bsd.nls.mk
-+++ b/share/mk/bsd.nls.mk
-@@ -62,7 +62,8 @@ NLSDIR?=	${SHAREDIR}/nls
- # installation rules
- #
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- NLSLINKS+=	${file:R}
- .endif
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index 73de02d..c6c30ca 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -206,9 +206,6 @@ INSTALL_LINK?=		${INSTALL} ${HRDLINK}
- INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index d6d0fa5..93a9046 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -42,10 +42,6 @@ CTFFLAGS+= -g
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
- LDFLAGS+= -static
- .endif
-@@ -200,6 +196,7 @@ realinstall: _proginstall
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .if ${MK_DEBUG_FILES} != "no"
-@@ -233,6 +230,7 @@ SCRIPTSGRP_${script:T}?=	${SCRIPTSGRP}
- SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index fee6ccc..c2fe39a 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -30,10 +30,6 @@ CFLAGS+=	-std=${CSTD}
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
--    || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -102,10 +98,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
- CWARNFLAGS+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
- .endif # CLANG
--.if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
--    || !defined(NO_WERROR.clang))
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || (${COMPILER_TYPE} == "clang" && defined(NO_WFORMAT.clang))
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk
-index c270260..68491ce 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -327,12 +327,6 @@ YFLAGS		?=	-d
- 	rm -f ${.PREFIX}.tmp.c
- 	${CTFCONVERT_CMD}
- 
--# FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
- SHELL=	${__MAKE_SHELL}
- .SHELL: path=${__MAKE_SHELL}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch
deleted file mode 100644
index e87bdbacd58b..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-11.0-gentoo.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
-index 9f4ea2c..0f666bf 100644
---- a/share/mk/bsd.doc.mk
-+++ b/share/mk/bsd.doc.mk
-@@ -144,10 +144,12 @@ CLEANFILES+=	${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \
- realinstall:
- .if ${PRINTERDEVICE:Mhtml}
- 	cd ${SRCDIR}; \
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}/
- .endif
- .for _dev in ${PRINTERDEVICE:Nhtml}
-+	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}/
- .endfor
-diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
-index bc123e1..4707b84 100644
---- a/share/mk/bsd.files.mk
-+++ b/share/mk/bsd.files.mk
-@@ -63,6 +63,7 @@ stage_as.${file:T}: ${file}
- 
- installfiles-${group}: _${group}INS_${file:T}
- _${group}INS_${file:T}: ${file}
-+	${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -77,10 +78,12 @@ stage_files.${group}: ${_${group}FILES}
- installfiles-${group}: _${group}INS
- _${group}INS: ${_${group}FILES}
- .if defined(${group}NAME)
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} \
- 	    ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d ${DESTDIR}${${group}DIR}
- 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- 	    -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}/
- .endif
-diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk
-index 9636e8c..fc2751a 100644
---- a/share/mk/bsd.incs.mk
-+++ b/share/mk/bsd.incs.mk
-@@ -62,6 +62,9 @@ stage_includes: stage_as.${header:T}
- 
- installincludes: _${group}INS_${header:T}
- _${group}INS_${header:T}: ${header}
-+	${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
-+		-g ${${group}GRP_${.ALLSRC:T}} \
-+		${DESTDIR}${${group}DIR_${.ALLSRC:T}}
- 	${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
- 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-@@ -77,9 +80,13 @@ stage_includes: stage_files.${group}
- installincludes: _${group}INS
- _${group}INS: ${_${group}INCS}
- .if defined(${group}NAME)
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
- .else
-+	${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \
-+		${DESTDIR}${${group}DIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- 	    ${.ALLSRC} ${DESTDIR}${${group}DIR}/
- .endif
-diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
-index 0544662..1a7aad7 100644
---- a/share/mk/bsd.info.mk
-+++ b/share/mk/bsd.info.mk
-@@ -83,6 +83,7 @@ INFO2HTML?=	info2html
- TEX?=		tex
- DVIPS?=		dvips
- DVIPS2ASCII?=	dvips2ascii
-+INSTALL?=	install
- 
- .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
- 
-@@ -141,15 +142,17 @@ ${x:S/$/${ICOMPRESS_EXT}/}:	${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+	${INSTALL} -d ${DESTDIR}${INFODIR}
- 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
--	    --defsection=${INFOSECTION} \
--	    --defentry=${INFOENTRY_${x}} \
-+	    --section=${INFOSECTION} \
-+	    --entry=${INFOENTRY_${x}} \
- 	    ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .endif
- .endfor
-diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
-index bd93e57..92df111 100644
---- a/share/mk/bsd.lib.mk
-+++ b/share/mk/bsd.lib.mk
-@@ -52,8 +52,6 @@ CFLAGS+= ${DEBUG_FLAGS}
- .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
- CTFFLAGS+= -g
- .endif
--.else
--STRIP?=	-s
- .endif
- 
- .if ${SHLIBDIR:M*lib32*}
-@@ -335,14 +333,17 @@ realinstall: _libinstall
- .ORDER: beforeinstall _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}_p.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if defined(SHLIB_NAME)
-+	${INSTALL} -d ${DESTDIR}${_SHLIBDIR}
- 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
- 	    ${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}/
-@@ -387,10 +388,12 @@ _libinstall:
- .endif # SHLIB_LINK
- .endif # SHIB_NAME
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
-+	${INSTALL} -d ${DESTDIR}${_LIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}/
- .endif
- .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
-+	${INSTALL} -d ${DESTDIR}${LINTLIBDIR}
- 	${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 	    ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}/
- .endif
-diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
-index 0844ae2..caec715 100644
---- a/share/mk/bsd.libnames.mk
-+++ b/share/mk/bsd.libnames.mk
-@@ -63,7 +63,7 @@ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
- LIBEXECINFO?=	${DESTDIR}${LIBDIR}/libexecinfo.a
- LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
- LIBFIGPAR?=	${DESTDIR}${LIBDIR}/libfigpar.a
--LIBFL?=		"don't use LIBFL, use LIBL"
-+LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
- LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
- LIBGEOM?=	${DESTDIR}${LIBDIR}/libgeom.a
-@@ -92,7 +92,7 @@ LIBKEYCAP?=	${DESTDIR}${LIBDIR}/libkeycap.a
- LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
- LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
- LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
--LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-+LIBL?=		${DESTDIR}${LIBDIR}/libfl.a
- LIBLN?=		"don't use LIBLN, use LIBL"
- LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
- LIBM?=		${DESTDIR}${LIBDIR}/libm.a
-diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk
-index 0c7d063..f5d1779 100644
---- a/share/mk/bsd.links.mk
-+++ b/share/mk/bsd.links.mk
-@@ -16,9 +16,11 @@ afterinstall: _installlinks
- _installlinks:
- .for s t in ${LINKS}
- 	@${ECHO} "${t} -> ${s}" ;\
-+	test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
- 	${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t}
- .endfor
- .for s t in ${SYMLINKS}
- 	@${ECHO} "${t} -> ${s}" ;\
-+	test -d ${DESTDIR}/`dirname ${t}` || mkdir ${DESTDIR}/`dirname ${t}`;\
- 	${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}/${t}
- .endfor
-diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
-index 6f78501..bc9a1a6 100644
---- a/share/mk/bsd.man.mk
-+++ b/share/mk/bsd.man.mk
-@@ -188,9 +188,11 @@ maninstall: ${MAN}
- .if ${MK_MANCOMPRESS} == "no"
- .if defined(MANFILTER)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- 	${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/${__page}
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page}
- .endif
-@@ -204,11 +206,14 @@ maninstall: ${MAN}
- 		esac; \
- 		page=$$1; shift; sect=$$1; shift; \
- 		d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \
-+		${ECHO} ${INSTALL} -d $${d}; \
-+		${INSTALL} -d $${d}; \
- 		${ECHO} ${MINSTALL} $${page} $${d}; \
- 		${MINSTALL} $${page} $${d}; \
- 	done
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}/} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T}
- .endfor
-@@ -216,9 +221,11 @@ maninstall: ${MAN}
- .endif	# defined(MANFILTER)
- .else	# ${MK_MANCOMPRESS} == "yes"
- .for __page in ${MAN}
-+	${INSTALL} -d ${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}
- 	${MINSTALL} ${__page:T:S/$/${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${MANDIR}${__page:E}${MANSUBDIR}/
- .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
-+	${INSTALL} -d ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}
- 	${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
- 		${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/}
- .endif
-diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
-index 87a7347..c860c97 100644
---- a/share/mk/bsd.nls.mk
-+++ b/share/mk/bsd.nls.mk
-@@ -71,7 +71,8 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
- SYMLINKS+= ${NLSSYMLINKS}
- .endif
- .for file in ${NLS}
--NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
-+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/
-+NLSNAME_${file:T}= ${NLSNAME}.cat
- .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
- .if !empty(NLSLINKS_${file:R}:M${file:R})
- .error NLSLINKS_${file:R} contains itself: ${file:R}
-diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
-index c10e492..5984215 100644
---- a/share/mk/bsd.own.mk
-+++ b/share/mk/bsd.own.mk
-@@ -233,9 +233,6 @@ INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
- INSTALL_RSYMLINK?=	${INSTALL} ${RSYMLINK}
- 
- # Common variables
--.if !defined(DEBUG_FLAGS)
--STRIP?=		-s
--.endif
- 
- COMPRESS_CMD?=	gzip -cn
- COMPRESS_EXT?=	.gz
-diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
-index f1a5c65..3b1ecf8 100644
---- a/share/mk/bsd.prog.mk
-+++ b/share/mk/bsd.prog.mk
-@@ -44,10 +44,6 @@ CTFFLAGS+= -g
- .endif
- .endif
- 
--.if !defined(DEBUG_FLAGS)
--STRIP?=	-s
--.endif
--
- .if defined(NO_ROOT)
- .if !defined(TAGS) || ! ${TAGS:Mpackage=*}
- TAGS+=		package=${PACKAGE:Uruntime}
-@@ -217,6 +213,7 @@ realinstall: _proginstall
- .ORDER: beforeinstall _proginstall
- _proginstall:
- .if defined(PROG)
-+	${INSTALL} -d ${DESTDIR}${BINDIR}
- 	${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
- .if ${MK_DEBUG_FILES} != "no"
-@@ -255,6 +252,7 @@ SCRIPTSMODE_${script:T}?=	${SCRIPTSMODE}
- STAGE_AS_${script:T}=		${SCRIPTSDIR_${script:T}}/${SCRIPTSNAME_${script:T}}
- _scriptsinstall: _SCRIPTSINS_${script:T}
- _SCRIPTSINS_${script:T}: ${script}
-+	${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
- 	${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
- 	    -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
- 	    ${.ALLSRC} \
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index 0ae45c5..37c4d01 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -29,9 +29,6 @@ CFLAGS+=	-std=${CSTD}
- .if defined(WARNS)
- .if ${WARNS} >= 1
- CWARNFLAGS+=	-Wsystem-headers
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
- .endif # WARNS >= 1
- .if ${WARNS} >= 2
- CWARNFLAGS+=	-Wall -Wno-format-y2k
-@@ -100,9 +97,6 @@ CWARNFLAGS+=	-Wformat=2 -Wno-format-extra-args
- .if ${WARNS} <= 3
- CWARNFLAGS.clang+=	-Wno-format-nonliteral
- .endif # WARNS <= 3
--.if !defined(NO_WERROR) && !defined(NO_WERROR.${COMPILER_TYPE})
--CWARNFLAGS+=	-Werror
--.endif # !NO_WERROR && !NO_WERROR.${COMPILER_TYPE}
- .endif # WFORMAT > 0
- .endif # WFORMAT
- .if defined(NO_WFORMAT) || defined(NO_WFORMAT.${COMPILER_TYPE})
-@@ -151,6 +145,13 @@ CFLAGS.clang+=	 -fno-dwarf2-cfi-asm
- # but not yet.
- CXXFLAGS.clang+=	 -Wno-c++11-extensions
- 
-+.if ${MK_SSP} == "no"
-+# gcc-4.9, -fstack-protector-strong is enabled by default.
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
-+SSP_CFLAGS?=    -fno-stack-protector
-+CFLAGS+=	${SSP_CFLAGS}
-+.endif
-+
- .if ${MK_SSP} != "no" && \
-     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
- .if (${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30500) || \
-diff --git a/share/mk/sys.mk b/share/mk/sys.mk
-index 5cfd0bb..25abf8e 100644
---- a/share/mk/sys.mk
-+++ b/share/mk/sys.mk
-@@ -418,12 +418,6 @@ YFLAGS		?=	-d
- 	rm -f ${.PREFIX}.tmp.c
- 	${CTFCONVERT_CMD}
- 
--# Pull in global settings.
--__MAKE_CONF?=/etc/make.conf
--.if exists(${__MAKE_CONF})
--.include "${__MAKE_CONF}"
--.endif
--
- # late include for customization
- .sinclude <local.sys.mk>
- 
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild
deleted file mode 100644
index fdbdef6957b8..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-10.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="share/"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-10.3-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-10.2-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd
-	else
-		insinto /usr/share/mk
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
deleted file mode 100644
index 85da1616d6ca..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
-SLOT="0"
-
-IUSE="userland_GNU"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="share/"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_prepare() {
-	local installdir
-
-	epatch "${FILESDIR}/${PN}-11.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch"
-	epatch "${FILESDIR}/${PN}-11.0-libproc-libcxx.patch"
-	epatch "${FILESDIR}/${PN}-11.0-drop-unsupport-cflags.patch"
-	use userland_GNU && epatch "${FILESDIR}/${PN}-11.0-gnu.patch"
-
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		installdir="/usr/share/mk/freebsd"
-	else
-		installdir="/usr/share/mk"
-	fi
-
-	sed -i -e "s:FILESDIR=.*:FILESDIR= ${installdir}:" "${S}"/Makefile || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	freebsd_src_install
-	if [[ ${CHOST} != *-freebsd* ]]; then
-		insinto /usr/share/mk/freebsd/system
-	else
-		insinto /usr/share/mk/system
-	fi
-	doins *.mk *.awk
-}
diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 61d7fcc57782..1de619484017 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,5 +1,3 @@
 DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild
deleted file mode 100644
index 3289409bc5c6..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-10.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="lib/"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl:0=
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-PATCHES=( "${FILESDIR}"/${PN}-9.0-gentoo.patch )
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} WITHOUT_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-}
-
-src_prepare() {
-	for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc || die
-	done
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild
deleted file mode 100644
index 3d4ceae6b8db..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-
-IUSE="kerberos nis"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="lib/"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl:0=
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} WITHOUT_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-}
-
-src_prepare() {
-	for module in pam_deny pam_passwdqc pam_permit pam_krb5; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc || die
-	done
-}
-
-src_install() {
-	freebsd_src_install "LIBDIR=/$(get_libdir)/security"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index d0fc2d5d8a98..bb73276d6d7b 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -4,8 +4,6 @@ DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e41
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch
deleted file mode 100644
index 57474ea31dfb..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-libevent.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-index de49888..2ab32fb 100644
---- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-+++ b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
-@@ -7,10 +7,7 @@ MAN=	ftp-proxy.8
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
--
--LDADD+= ${LIBEVENT}
--DPADD+= ${LIBEVENT}
-+LDADD+= -levent
- 
- WARNS?=	3
- 
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch
deleted file mode 100644
index 1316d3be832a..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-10.0-pflogd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
-index fcff8eb..0da383d 100644
---- a/sbin/pflogd/Makefile
-+++ b/sbin/pflogd/Makefile
-@@ -6,10 +6,7 @@ PROG=	pflogd
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
--
- LDADD=	-lpcap
--DPADD=	${LIBPCAP}
- 
- WARNS?=	2
- 
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch
deleted file mode 100644
index 0f3ecb1fc615..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-libevent.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
-index 941505f..df5ccb2 100644
---- a/usr.sbin/ftp-proxy/Makefile
-+++ b/usr.sbin/ftp-proxy/Makefile
-@@ -7,8 +7,6 @@ MAN=	ftp-proxy.8
- 
- SRCS=	ftp-proxy.c filter.c
- 
--CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent
--
- LIBADD=	event
- 
- WARNS?=	3
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch
deleted file mode 100644
index 6435280b7e96..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-11.0-pflogd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile
-index b3822dd..5912ad2 100644
---- a/sbin/pflogd/Makefile
-+++ b/sbin/pflogd/Makefile
-@@ -7,8 +7,6 @@ PROG=	pflogd
- SRCS= 	pflogd.c pidfile.c privsep.c privsep_fdpass.c
- MAN=	pflogd.8
- 
--CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
--
- LIBADD=	pcap
- 
- WARNS?=	2
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild
deleted file mode 100644
index e0a26d65e2f1..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-10.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	sbin/
-	contrib/pf/
-	etc/
-"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-src_prepare() {
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-10.0-libevent.patch"
-	epatch "${FILESDIR}/${PN}-10.0-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	epatch "${FILESDIR}/${PN}-9.0-getline.patch"
-	# Link in kernel sources
-	[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}" || die
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}" || die
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild
deleted file mode 100644
index 49e2f293e51f..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-11.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	sbin/
-	contrib/pf/
-	etc/
-"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S="${WORKDIR}"
-
-SUBDIRS="usr.sbin/authpf sbin/pfctl sbin/pflogd usr.sbin/ftp-proxy"
-
-pkg_setup() {
-	enewgroup authpf 63
-}
-
-src_prepare() {
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-9.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-11.0-libevent.patch"
-	epatch "${FILESDIR}/${PN}-11.0-pflogd.patch"
-	epatch "${FILESDIR}/${PN}-9.0-bpf.patch"
-	# Link in kernel sources
-	[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}" || die
-		freebsd_src_compile || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}" || die
-		freebsd_src_install || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	# pf.initd provided by openrc, but no pf.confd
-	newconfd "${FILESDIR}/pf.confd" pf
-}
diff --git a/sys-freebsd/freebsd-rescue/Manifest b/sys-freebsd/freebsd-rescue/Manifest
index b9e8a5035d07..0b7477a90e2d 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -14,8 +14,6 @@ DIST freebsd-rescue-8.2.tar.bz2 5041 BLAKE2B bb75f3e71db9e81397d230f1bb604f20704
 DIST freebsd-rescue-9.1.tar.bz2 3939 BLAKE2B f2756276c6018ded0e9b0f73bff25a606193c9da3e5348aefda3866308c3fb2ce046e35de6020dd0b28e0457b61a4864600ae40fa51042a64d93c712f9d85858 SHA512 93015a725cea428fd6f4813370eab460979bbae3aac2e6688319a06012b4e0fe1f7b847f9e0d4da423835e59ba5a3842057b61d110d24f79109a50133e5e23bb
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild
deleted file mode 100644
index a7e52e525efc..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-10.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	bin/
-	sbin/
-	usr.sbin/
-	gnu/
-	sys/
-	libexec/
-	rescue/
-"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	dev-libs/expat[static-libs]
-	app-arch/bzip2[static-libs]
-	dev-libs/libedit[static-libs]
-	dev-libs/libxml2:2[static-libs]
-	dev-libs/openssl:0=[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-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= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}/${PN}"-10.0-zlib.patch
-	epatch "${FILESDIR}/freebsd-sbin-bsdxml2expat.patch"
-	epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch"
-}
-
-src_compile() {
-	tc-export CC
-	# crunchgen is now checks env MAKE.
-	# Use to force BSD's make
-	export MAKE=/usr/bin/make
-
-	cd "${WORKDIR}/lib/libarchive" || die
-	echo "#include <expat.h>" > bsdxml.h
-	freebsd_src_compile
-	export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild
deleted file mode 100644
index 4f35e4425b18..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-11.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd toolchain-funcs
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	bin/
-	sbin/
-	usr.sbin/
-	gnu/
-	sys/
-	libexec/
-	rescue/
-"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	dev-libs/expat[static-libs]
-	app-arch/bzip2[static-libs]
-	dev-libs/libedit[static-libs]
-	dev-libs/libxml2:2[static-libs]
-	dev-libs/openssl:0=[static-libs]
-	sys-libs/zlib[static-libs]
-	sys-libs/readline[static-libs]
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )"
-
-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= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} NO_PIC= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}/${PN}-10.0-zlib.patch"
-	epatch "${FILESDIR}/${PN}-11.0-rename-libs.patch"
-	epatch "${FILESDIR}/freebsd-ubin-10.2-bsdxml.patch"
-}
-
-src_compile() {
-	export ESED=/usr/bin/sed
-	unalias sed
-
-	tc-export CC
-	# crunchgen is now checks env MAKE.
-	# Use to force BSD's make
-	export MAKE=/usr/bin/make
-
-	cd "${WORKDIR}/lib/libarchive" || die
-	echo "#include <expat.h>" > bsdxml.h
-	freebsd_src_compile
-	export CC="${CC} -L${WORKDIR}/lib/libarchive"
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 96121308fd49..d9b2f36fba7e 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -8,8 +8,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild
deleted file mode 100644
index 99c4a3b6aed2..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-10.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	sbin/
-	contrib/
-	lib/
-	libexec/
-	usr.sbin/
-	etc/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl:0= )
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/readline:0=
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-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= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-10.0-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/" || die
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild
deleted file mode 100644
index 5188b97c05b5..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd multilib
-
-DESCRIPTION="FreeBSD sbin utils"
-SLOT="0"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	sbin/
-	contrib/
-	lib/
-	libexec/
-	usr.sbin/
-	etc/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl:0= )
-	>=dev-libs/libedit-20120311.3.0-r1
-	sys-libs/readline:0=
-	|| (
-		sys-process/cronie
-		sys-process/vixie-cron
-	)
-	atm? ( net-analyzer/bsnmp )"
-DEPEND="${RDEPEND}
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-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= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT="
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use pf || mymakeopts="${mymakeopts} WITHOUT_PF= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL="
-}
-
-REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder resolvconf"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-10.0-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch" )
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-}
-
-src_install() {
-	mymakeopts="${mymakeopts} GEOM_CLASS_DIR=/$(get_libdir)/geom "
-	freebsd_src_install
-	keepdir /var/log
-	# Needed by ldconfig:
-	keepdir /var/run
-
-	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
-	# New wireless config method requires regdomain.xml in /etc
-	cd "${WORKDIR}/etc/" || die
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# Install a crontab for adjkerntz
-	insinto /etc/cron.d
-	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic security \
-		security/*.ipfwlimit \
-		security/*.ipfwdenied || die
-
-	use ipfilter && { doperiodic security \
-		security/*.ipfdenied || die ; }
-
-	use pf && { doperiodic security \
-		security/*.pfdenied || die ; }
-}
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index ee4635205efc..a439205984e0 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -12,8 +12,6 @@ DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
 DIST freebsd-share-8.2.tar.bz2 3797560 BLAKE2B 411eae0c8da465cbfb61be450bc72218b97499aa8ce36abbafc8408aa85a10a144b48a0b3941d8049326f1afe9c0306c66ce176e8fb456981185c39671100cbb SHA512 b3f964253f80e58cde12f26e48a23aa75c17b9ab2810f91a4bd2d7efbe902af7c73c219f8373a4fc97ee0a35d25627b8815c79c136ef18620acc8bd0ee5bd6c4
 DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
diff --git a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild b/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild
deleted file mode 100644
index 071efda03a82..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-10.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="doc usb zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	share/
-	contrib/
-	gnu/
-	usr.bin/
-	usr.sbin/
-	sbin/
-	bin/
-	lib/
-	etc/
-"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-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= "
-	[[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= WITHOUT_CLANG= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
-	"${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" )
-
-src_prepare() {
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-	# Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
-	sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef mklocale monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
-	fi
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# libiconv support.
-	# i18n/csmapper/APPLE requires mkcsmapper_static
-	# i18n/esdb/APPLE requires mkesdb_static
-	for pkg in mkcsmapper_static mkesdb_static
-	do
-		cd "${WORKDIR}"/usr.bin/${pkg} || die
-		freebsd_src_compile
-	done
-
-	# This is a groff problem and not a -shared problem.
-	cd "${S}" || die
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
-	freebsd_src_compile -j1 || die "emake failed"
-}
-
-src_install() {
-	mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed"
-}
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild
deleted file mode 100644
index 3e5bae2b14c2..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-11.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="doc usb zfs"
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-EXTRACTONLY="
-	share/
-	contrib/
-	gnu/
-	usr.bin/
-	usr.sbin/
-	sbin/
-	bin/
-	lib/
-	etc/
-	tools/tools/locale/
-"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	# Add the required source files.
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	use doc || mymakeopts="${mymakeopts} WITHOUT_SHAREDOCS= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	[[ ! -e /usr/bin/vtfontcvt ]] && mymakeopts="${mymakeopts} WITHOUT_VT= "
-	[[ ! -e /usr/bin/localedef ]] && mymakeopts="${mymakeopts} WITHOUT_LOCALES= "
-	mymakeopts="${mymakeopts} WITHOUT_SENDMAIL= WITHOUT_CLANG= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-10.3-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo-eapi3.patch"
-	"${FILESDIR}/${PN}-10.2-gnu-miscfiles.patch" )
-
-src_prepare() {
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile"
-	# Remove rc.conf manpage as it describes bsd's rc.conf.
-	sed -i -e 's:\brc.conf.5::' "${S}/man/man5/Makefile"
-	sed -i -e 's:\brc.conf.local.5::' "${S}/man/man5/Makefile"
-	# Remove mailer.conf manpage
-	sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile"
-	# Remove pbm and moduli(ssh) manpages
-	sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile"
-	# Remove builtins manpage
-	sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile"
-	# Remove rc manpages
-	sed -i -e '/rc.8/d' "${S}/man/man8/Makefile"
-	# Remove hv_kvp_daemon.8 manpage. It's provided by freebsd-usbin.
-	sed -i -e '/hv_kvp_daemon.8/d' "${S}/man/man8/Makefile"
-
-	# Don't install the arch-specific directories in subdirectories
-	sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile
-
-	# Remove them so that they can't be included by error
-	rm -rf "${S}"/mk/*.mk
-
-	# Make proper symlinks by defining the full target.
-	local sdir
-	for sdir in colldef monetdef msgdef numericdef timedef
-	do
-		sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \
-			"${S}/${sdir}/Makefile" || \
-			die "Error fixing ${sdir}/Makefile"
-	done
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		ln -s "/usr/src/sys" "${WORKDIR}/sys" || die "failed to set sys symlink"
-	fi
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# libiconv support.
-	# i18n/csmapper/APPLE requires mkcsmapper_static
-	# i18n/esdb/APPLE requires mkesdb_static
-	for pkg in mkcsmapper_static mkesdb_static
-	do
-		cd "${WORKDIR}"/usr.bin/${pkg} || die
-		freebsd_src_compile
-	done
-
-	# This is a groff problem and not a -shared problem.
-	cd "${S}" || die
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.22.2/tmac/"
-	freebsd_src_compile -j1 || die "emake failed"
-}
-
-src_install() {
-	freebsd_src_install -j1 DOCDIR=/usr/share/doc/${PF}
-}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 251e4d6fb4c3..cb987fb75a3b 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,24 +1,8 @@
 DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc
-DIST freebsd-sources-EN-1607-ipi.patch 2557 BLAKE2B 2387a6da039b5c52676cf8a1a963bda63bc7553b752495e9f5818deec14b12c04df51b526a199baa59ffe4f388d715e24ecbb164f381d5e6f04d909ef3b54a98 SHA512 41bee92ac36685ea81437befc07e1d1f7ba9d93b3d733981fce512e68a77eb3e9563a88e23fd9ae27a331e63c42966a55041cd5ae05d61895b8e20b1edae86dd
-DIST freebsd-sources-EN-1608-zfs.patch 280 BLAKE2B 80b833c57b4d19c8844371032f66a24d9b1ab390ea6c94f9e26be2a60298a8a506fe1fd213d04e5e53438ebf0c27534582b25bd9ab1ccbb84083543c88418b73 SHA512 df2e133cfa565332da3c2b173c98e866bc1d9ddcfa06156da1f9a2f382186cafb130b7f0e19617482af71b730d95b9d8a7d81195a57760a93736bc2f49ed1c03
-DIST freebsd-sources-EN-1611-vmbus.patch 6755 BLAKE2B 2e5b972b686d8a9b9284ce645e1927da16c1d44ab5567487443363b9505a6296c1d430c082b817c63b1b9b3e063855647eef892a6b1cc33bcf14213553edfe85 SHA512 8a2296612f688692691765dbbd695f7aa75bf45fab8a569b3d6671aa5cf2d022e498f6f0266d89c999a1799a862f9cdeda8179a0e8eef85f5613bdaa792dcd41
-DIST freebsd-sources-EN-1612-hv_storvsc.patch 6459 BLAKE2B c86625831b8d7c4622f844c179e1c79a38d596bf869352fd31041c07e73de5bab0d75528d28188d50dddc15623b63d4832295949b49200c3c31eb6b449a66329 SHA512 90cc301222cb31d2c5cbb289666bea0291880a2c1236fe056c5c29b571fe656a39047e131eacf41af0b783e0c22f07681665e33046980f98f233a28baef18ade
-DIST freebsd-sources-EN-1613-vmbus.patch 3886 BLAKE2B d58a5e0c9ada9f6e875f0103913bcc9f32e489e22ccf18fa9feae73ae9e2b1276aa2f6e2ac4a9e14f0aec233cde1da74ad9a2c659348f862fbfd01fdfb2a9df7 SHA512 14d7d6e1acf3e78b0b5653aa83dda8cb6fdbd8e2824624e093d73e217bad2600de157479e66f94248e38afa21ddc1292c30ba8381f76cac95b5d11caca1fee50
-DIST freebsd-sources-EN-1614-hv_storvsc.patch 1134 BLAKE2B 9c70536934791f6ba7fce367278cb22c7aae2cdc3cdfa5d13b9dd6d1cd1b008174d5d45ae01d317b456d86450617cb44dbf8cb56083ebff0a0548b66b0926cc1 SHA512 bcb687290b2a9572345e5e4c8d2408dadf2fe2f206d457ba8147bbc62fd6dff064b132b66b4e2ac6fa98c73c37eda7bf22538d51a29cbb773fb90c4af44f5986
-DIST freebsd-sources-EN-1615-vmbus.patch 2114 BLAKE2B b81217bc62c922f3706a21aa948e08da6a5f11fcfab9234feb6150bcb98b4e47a4697afac00733e681077c12dd2a26553abb3313f5fa311f991df87c79e247f2 SHA512 81477e9f5e4980d3e0c0487fbc7b760e7500ef37be42444782cd1fb5202d33e622109519e4bf4ba419a4d13c250e27e01f34d77c57b504584a2fab77b4f122c6
-DIST freebsd-sources-EN-1616-hv_storvsc.patch 5358 BLAKE2B 1641a1f44329490ad3002244a77e3ef5287212b8d2b5eb284a16717b02d2ff98141f25a3bf3d647e1f89b0d77cdb9423d6630f96fa56091bec0f707998628e1c SHA512 7364108737334ef7a12a8babf47b5139b973e68810b0cad335a6d8a7b7696fcfda047b1b7e85d28427f75001184a3c07418901ba0b9b152592d238bd392bf002
-DIST freebsd-sources-EN-1617-vm.patch 6332 BLAKE2B 526686e6ef410c5cd8acd0ea1cea2e0be1398db55da669eefd28f52cd2d81d4e08c4d52576b82596feb7e2d13fa3df61e2503f7bc6f04055a0ee7ac4a9b1069f SHA512 8d8112d1df50ef45311736cb24dc8be38bc93e6246ef1cb0535928a6a4cd4cecd58e755e0ef7992197a3995f3a92893141e01f3dd7d095b4e645528dc9e060ff
 DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7
 DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15
-DIST freebsd-sources-SA-1615-sysarch-01.patch 655 BLAKE2B 5f0293dad23adf3b6113450e7de6bc971624df4c12ff49da2dbc0e6f3a318d73ee32e2d710322315bda2a0da2dd8ede228902b8a3b5e6fee645829655b61c2a1 SHA512 3ddc42f0e713a8f1753526b877141563b93d845e57cd111ef2219e969424efa88f3e726288bbd81fef7d4f06f2d68faa3f0c63c996a9579289236518e316739d
-DIST freebsd-sources-SA-1618-atkbd.patch 352 BLAKE2B 30d4d0ceaba3ecf3a34d9bc0dcdc78e3f018f8aeaf8493f0fe8123d64fdf2d023d359cea73183bc1fca0a207cb5fbfd34bfce23b61136f056a3ddca1d262ffdf SHA512 aed4ee6b51905d04680181f571f0f89d60b66a2201c397f88931d9ce92b58148e2d638d93328a78ed53b4bf7a5040f1f646ba50566994252e73c13a09659ba3f
-DIST freebsd-sources-SA-1619-sendmsg.patch 247 BLAKE2B 1d644bdb65855e7b3e09e0803bf04bc6806bd19e293b659e91163ed85be2210b7453e7f9d80c9a153f4bdb71ef847b6861f9037114abdd0d6e232a363f407277 SHA512 878e2b283358c050603cc32241077b25987696232bce3b9d41373c1186f5dbeb41881adc69e8754804054a57fffa71cad930b82ad8d5abd458779d5a3bd61978
-DIST freebsd-sources-SA-1620-linux.patch 492 BLAKE2B a1ac48d6a18ac6ae7f3a378ca175417abd1a80406ea832795809950a5764e9ba05cadbd67ee99de418eecc51e75770b3454a3eaaa2a13ce01113fb75ce34320e SHA512 1fb28b25ac5f89e2f7fa9a1f74ba83b4c949f2175217b669b5fcd2062c54307dcb50ad072acbe18162272b9bc29ba40ac4e19db1564a2959e885ac826a332ae5
-DIST freebsd-sources-SA-1621-stat.patch 223 BLAKE2B 9d18b3ac701b213e71e97965b1baa74ee9a89600267f1bcb4713170a96c9511c37f4a809818c4d1cf70d04d188906522c59b23a8393f3e1bd5d2e2e4885178a3 SHA512 501244c0831d2aeb37c8a8aaa762cc6c8c39929355e6695df23dc83c78d6bb499dcb903f50c17e3f7774306d53836a0633d65e284167590c015aa1f8e10e5e4a
 DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
 DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch
deleted file mode 100644
index c7e12bdf8a4e..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.0-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
-index 2939a59..124ef6f 100644
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -5,7 +5,7 @@
- #
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		-Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \
-+		-Wundef -Wno-pointer-sign \
- 		-Wmissing-include-dirs -fdiagnostics-show-option \
- 		${CWARNEXTRA}
- #
-@@ -61,7 +61,7 @@ FORMAT_EXTENSIONS=	-fformat-extensions
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	-mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild
deleted file mode 100644
index a5c5083ebc43..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.3-r6.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch"
-	"SA-16:18/atkbd.patch"
-	"SA-16:19/sendmsg.patch"
-	"SA-16:20/linux.patch"
-	"SA-16:21/stat.patch"
-	"EN-16:07/ipi.patch"
-	"EN-16:08/zfs.patch"
-	"EN-16:11/vmbus.patch"
-	"EN-16:12/hv_storvsc.patch"
-	"EN-16:13/vmbus.patch"
-	"EN-16:14/hv_storvsc.patch"
-	"EN-16:15/vmbus.patch"
-	"EN-16:16/hv_storvsc.patch"
-	"EN-16:17/vm.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-10.0-gentoo.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-gentoo-gcc.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="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch"
-	cd "${S}" || die
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 10.0-RELEASE it's 1000001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use zfs ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild
deleted file mode 100644
index 773c3f974a36..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="0"
-LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )"
-
-IUSE="+build-kernel debug dtrace zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:15/sysarch-01.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	sys/
-	contrib/bmake/
-	usr.bin/bmake/
-"
-
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!sys-freebsd/virtio-kmod
-	!sys-fs/fuse4bsd
-	!<sys-freebsd/freebsd-sources-9.2_beta1"
-DEPEND="build-kernel? (
-		dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 )
-		>=sys-freebsd/freebsd-usbin-9.1
-		=sys-freebsd/freebsd-mk-defs-${RV}*
-	)"
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-KERN_BUILD=GENTOO
-
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	"${FILESDIR}/${PN}-7.1-includes.patch"
-	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-11.0-gentoo.patch"
-	"${FILESDIR}/${PN}-11.0-gentoo-gcc.patch"
-	"${FILESDIR}/${PN}-10.1-gcc48.patch" )
-
-pkg_setup() {
-	# Add the required source files.
-	use dtrace && EXTRACTONLY+="cddl/ "
-
-	# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914
-	[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS="
-	use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL="
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS="
-}
-
-src_prepare() {
-	local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}"
-
-	cd "${WORKDIR}" || die
-	epatch "${FILESDIR}/freebsd-ubin-10.3-bmake-workaround.patch"
-	cd "${S}" || die
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 11.0-RELEASE it's 1100001.
-	# FYI, can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
-
-	# Remove -Werror
-	sed -e "s:-Werror:-Wno-error:g" \
-		-i "${S}/conf/kern.pre.mk" \
-		-i "${S}/conf/kmod.mk" || die
-
-	# Set the kernel configuration using USE flags.
-	cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die
-	use debug || echo 'nomakeoptions DEBUG' >> "${conf}"
-	use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}"
-
-	# hyperv fails to compile on x86-fbsd.
-	if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then
-		echo 'nodevice hyperv' >> "${conf}"
-		dummy_mk modules/hyperv
-	fi
-
-	# Only used with USE=build-kernel, let the kernel build with its own flags, its safer.
-	unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL
-}
-
-src_configure() {
-	if use build-kernel ; then
-		tc-export CC
-		cd "${S}/$(tc-arch-kernel)/conf" || die
-		config ${KERN_BUILD} || die
-	fi
-}
-
-src_compile() {
-	if use build-kernel ; then
-		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
-			cd "${WORKDIR}"/usr.bin/bmake || die
-			CC=${CHOST}-gcc freebsd_src_compile
-			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
-		fi
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_compile depend
-		freebsd_src_compile
-	else
-		einfo "Nothing to compile.."
-	fi
-}
-
-src_install() {
-	if use build-kernel ; then
-		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die
-		freebsd_src_install
-		rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}"
-		cd "${S}"
-	fi
-
-	insinto "/usr/src/sys"
-	doins -r "${S}/".
-	if use dtrace ; then
-		insinto "/usr/src/cddl"
-		doins -r "${WORKDIR}/cddl/".
-	fi
-}
-
-pkg_preinst() {
-	if [[ -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys is a symlink, removing it..."
-		rm -f "${ROOT}/usr/src/sys"
-	fi
-
-	if use sparc-fbsd ; then
-		ewarn "WARNING: kldload currently causes kernel panics"
-		ewarn "on sparc64. This is probably a gcc-4.1 issue, but"
-		ewarn "we need gcc-4.1 to compile the kernel correctly :/"
-		ewarn "Please compile all modules you need into the kernel"
-	fi
-
-	ewarn "If you want manual compile (not recommended), please don't forget the following step."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
-	if ! use zfs ; then
-		ewarn "export WITHOUT_CDDL="
-		ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license."
-	fi
-	if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then
-		ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it."
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index 4e0f48102afa..1047b2d6f990 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -10,13 +10,8 @@ DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c
 DIST freebsd-include-9.1.tar.bz2 146881 BLAKE2B 3db8570a8c841ec1c9ceff479bd0ef9b146b2a343d6596892c9d8a9f9193404f6c62712cb96d7416c6e5cc4c46e7fb942421c47e1bc2c707dde534e2050be442 SHA512 779c8315ce2b10b343bb62e331525d510b0d68ce5d665a1672bd6f4d1eff6445bc6b7a0f178b319828aa203c4e4c04c561ce793052703f4f936ce9711280a0c9
 DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3f4d4a3202fcf6197c7e1a933ead72699022dc06ba085ea5c25a864a0f02a88718d0866c59518b218e9a601be00af9f SHA512 48d0103323e820c431aa4f62d3be40cb3b200fb62e3de01f36c88760395bf2ba3367c51f3fa72da4dbccc2812176a051a12ca5cb7e84125c3e0fc78d4cab2c29
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-DIST freebsd-ubin-EN-1621-localedef.patch 1958 BLAKE2B 6a42a1736759e99b892f788f2ca2255963f1e429b07e481b8fe19b5be4e6b625ca0d91b755af3395688313e017610334f6f47f3480b07a14639e82c899cd9de8 SHA512 191661a189dbb33979de04f68cac1701ee0f3af52921be1e0566590b462e475e5883cd0495b001c42b7bfdaf60e0360ea53ddc2ea729cc1bc13cbf228aaa284a
-DIST freebsd-ubin-SA-1625-bspatch.patch 286 BLAKE2B f06e15e3804185057a1aa3fbba42e65c8825ec32667e92b41b4f8217579086881924e6f65681e2685895c24ba8be9b8d1530417e8f5d85e4a4dcbfa4dc9812f6 SHA512 f2a0210e582076bac93faa3a226cd9301b6d0245938d6c5a17e1aa275401934d7848bcb908f63a689f5e36f961dfbf1d0a0b5717ff54f67a76b5d1908ae39703
-DIST freebsd-ubin-SA-1629-bspatch.patch 9323 BLAKE2B 73609a85ba21940cd68cd02c17429896978b303d43184f59c68417c1e99461f93ecec6353e302c72d93e8e06c8fcc476612a18fba941ff60a84976df4cac1137 SHA512 ae061869db3a01e0002b2159306ff72c5629147b8e594f0fda5f6d3aa956f4a73a4a3fbc299ef2c69231cf619049e8eb5bed34067be6d5d419f108958c97f59f
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch
deleted file mode 100644
index d758c48846ed..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-atf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
-index 4ebdc33..37ff8fa 100644
---- a/usr.bin/atf/atf-sh/Makefile
-+++ b/usr.bin/atf/atf-sh/Makefile
-@@ -33,8 +33,8 @@ PROG_CXX=	atf-sh
- SRCS=		atf-sh.cpp
- MAN=            atf-sh.1 atf-sh-api.3
- 
--CFLAGS+=	-DHAVE_CONFIG_H
--CFLAGS+=	-I${ATF}
-+CXXFLAGS+=	-DHAVE_CONFIG_H
-+CXXFLAGS+=	-I${ATF}
- 
- DPADD+=		${LIBATF_C} ${LIBATF_CXX}
- LDADD+=		-latf-c++ -latf-c
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch
deleted file mode 100644
index 112523851f90..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-dtc-gcc46.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/usr.bin/dtc/string.hh b/usr.bin/dtc/string.hh
-index 45bc4fd..6eaf8e4 100644
---- a/usr.bin/dtc/string.hh
-+++ b/usr.bin/dtc/string.hh
-@@ -32,6 +32,8 @@
- 
- #ifndef _STRING_HH_
- #define _STRING_HH_
-+#include <cstdio>
-+#include <cstring>
- #include "input_buffer.hh"
- 
- namespace dtc
-diff --git a/usr.bin/dtc/util.hh b/usr.bin/dtc/util.hh
-index 7f2ec67..8e13b1c 100644
---- a/usr.bin/dtc/util.hh
-+++ b/usr.bin/dtc/util.hh
-@@ -33,6 +33,7 @@
- #ifndef _UTIL_HH_
- #define _UTIL_HH_
- 
-+#include <stdint.h>
- #include <vector>
- 
- // If we aren't using C++11, then just ignore static asserts.
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch
deleted file mode 100644
index e10685284cbb..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-kdump-ioctl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
-index 38e9df6..5e831c6 100644
---- a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
-@@ -22,7 +22,7 @@ CLEANFILES=	ioctl.c kdump_subr.c kdump_subr.h linux_syscalls.c
- 
- ioctl.c: mkioctls
- 	env MACHINE=${MACHINE} CPP="${CPP}" \
--	    sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
-+	    sh ${.CURDIR}/mkioctls print ${.CURDIR}/../../include > ${.TARGET}
- 
- kdump_subr.h: mksubr
- 	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
-diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
-index 7a49497..bc8b61f 100644
---- a/usr.bin/truss/Makefile
-+++ b/usr.bin/truss/Makefile
-@@ -24,7 +24,7 @@ syscalls.h:	syscalls.master
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
- 	env MACHINE=${MACHINE} CPP="${CPP}" \
--		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET}
-+		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${.CURDIR}/../../include > ${.TARGET}
- 
- .if ${MACHINE_CPUARCH} == "i386"
- SRCS+=	i386-linux.c linux_syscalls.h
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch
deleted file mode 100644
index c5f7706024c4..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.0-mandoc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
-index 0995534..1bcb3e0 100644
---- a/usr.bin/mandoc/Makefile
-+++ b/usr.bin/mandoc/Makefile
-@@ -1,7 +1,7 @@
- # $FreeBSD$
- 
- MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
--LIBMANDOC=	${.OBJDIR}/../../lib/libmandoc/libmandoc.a
-+LIBMANDOC=	${.CURDIR}/../../lib/libmandoc/libmandoc.a
- .PATH: ${MDOCMLDIR}
- 
- PROG=	mandoc
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch
deleted file mode 100644
index c0ca444b042d..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-10.3-bmake-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
-index 6c6d8c2..22fec7a 100644
---- a/usr.bin/bmake/Makefile
-+++ b/usr.bin/bmake/Makefile
-@@ -5,7 +5,7 @@
- 
- .sinclude "Makefile.inc"
- 
--SRCTOP?= ${.CURDIR:H:H}
-+SRCTOP= ${.CURDIR:H:H}
- 
- # look here first for config.h
- CFLAGS+= -I${.CURDIR}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild
deleted file mode 100644
index 8ecf7ec4fb98..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-10.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=(
-	"SA-16:25/bspatch.patch"
-	"SA-16:29/bspatch.patch"
-)
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	etc/
-	bin/
-	include/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0= )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9:0=
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-sbin-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-10.0-atf.patch"
-	"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
-	"${FILESDIR}/${PN}-10.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-10.0-mandoc.patch"
-	"${FILESDIR}/${PN}-10.2-bsdxml.patch"
-	"${FILESDIR}/${PN}-10.2-talk-workaround.patch"
-	"${FILESDIR}/${PN}-10.3-bmake-workaround.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	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= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]]; then
-		rm -f "${ROOT}"/usr/bin/yacc || die
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/make/Makefile || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	# Preparing to build mandoc
-	cd "${WORKDIR}/lib/libmandoc" || die
-	freebsd_src_compile -j1
-
-	cd "${S}" || die
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1
-}
-
-src_install() {
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf ; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc" || die
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild
deleted file mode 100644
index bf7da86b52e6..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.0-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-16:21/localedef.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.bin/
-	contrib/
-	lib/
-	etc/
-	bin/
-	include/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,${MULTILIB_USEDEP}]
-	ssl? ( dev-libs/openssl:0= )
-	kerberos? ( virtual/krb5 )
-	ar? ( >=app-arch/libarchive-3 )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9:0=
-	!sys-process/fuser-bsd
-	!dev-util/csup
-	!dev-libs/libiconv
-	!sys-freebsd/freebsd-contrib"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	=sys-freebsd/freebsd-sbin-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-RDEPEND="${RDEPEND}
-	>=sys-auth/pambase-20080219.1
-	sys-process/cronbase"
-
-S="${WORKDIR}/usr.bin"
-
-PATCHES=( "${FILESDIR}/${PN}-6.0-bsdcmp.patch"
-	"${FILESDIR}/${PN}-9.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-11.0-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-9.1-bsdar.patch"
-	"${FILESDIR}/${PN}-9.1-minigzip.patch"
-	"${FILESDIR}/${PN}-10.0-dtc-gcc46.patch"
-	"${FILESDIR}/${PN}-10.2-talk-workaround.patch"
-	"${FILESDIR}/${PN}-10.2-bsdxml.patch" )
-
-# Here we remove some sources we don't need because they are already
-# provided by portage's packages or similar. In order:
-# - Archiving tools, provided by their own ebuilds
-# - ncurses stuff
-# - less stuff
-# - bind utils
-# - rsh stuff
-# - binutils gprof
-# - dc stuff
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	unzip
-	tput tset tabs
-	less lessecho lesskey
-	hesinfo host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	bc dc
-	whois tftp man
-	addr2line bsdcat cxxfilt cxxfilt elfcopy nm readelf sdiff size soelim strings"
-
-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= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-	mymakeopts="${mymakeopts} WITHOUT_CLANG= WITHOUT_LZMA_SUPPORT= WITHOUT_SVN= WITHOUT_SVNLITE= WITHOUT_OPENSSH= WITHOUT_LDNS_UTILS= WITHOUT_MANDOCDB= "
-}
-
-pkg_preinst() {
-	# bison installs a /usr/bin/yacc symlink ...
-	# we need to remove it to avoid triggering
-	# collision-protect errors
-	if [[ -L ${ROOT}/usr/bin/yacc ]]; then
-		rm -f "${ROOT}"/usr/bin/yacc || die
-	fi
-}
-
-src_prepare() {
-	if [[ ! -e "${WORKDIR}/sys" ]]; then
-		use build || ln -s "/usr/src/sys" "${WORKDIR}/sys"
-	fi
-
-	# Rename manpage for renamed cmp
-	mv "${S}"/cmp/cmp.1 "${S}"/cmp/bsdcmp.1 || die
-	# Rename manpage for renamed ar
-	mv "${S}"/ar/ar.1 "${S}"/ar/freebsd-ar.1 || die
-	# Fix whereis(1) manpath search.
-	sed -i -e 's:"manpath -q":"manpath":' "${S}/whereis/pathnames.h" || die
-
-	# Build a dynamic make
-	sed -i -e '/^NO_SHARED/ s/^/#/' "${S}"/bmake/Makefile.inc || die
-
-	# Disable it here otherwise our patch wont apply
-	use ar || dummy_mk ar
-
-	# Preparing to build xlint
-	export LINT=xlint
-}
-
-setup_multilib_vars() {
-	if ! multilib_is_native_abi ; then
-		cd "${WORKDIR}/usr.bin/ldd" || die
-		export mymakeopts="${mymakeopts} PROG=ldd32 WITHOUT_MAN="
-	else
-		cd "${S}" || die
-	fi
-	"$@"
-}
-
-src_compile() {
-	local MULTIBUILD_VARIANTS="${DEFAULT_ABI}"
-	# Preparing to build addr2line, elfcopy, m4
-	for dir in libelftc libpe libopenbsd; do
-		cd "${WORKDIR}/lib/${dir}" || die
-		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper freebsd_src_compile -j1
-	done
-
-	MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_compile -j1
-}
-
-src_install() {
-	cd "${S}"/calendar/calendars || die
-	for dir in $(find . -type d ! -name "." ) ; do
-		dodir /usr/share/calendar/"$(basename ${dir})"
-	done
-
-	local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
-	multibuild_foreach_variant freebsd_multilib_multibuild_wrapper setup_multilib_vars freebsd_src_install
-
-	# baselayout requires these in /bin
-	dodir /bin
-	for bin in sed printf; do
-		mv "${D}/usr/bin/${bin}" "${D}/bin/" || die "mv ${bin} failed"
-		dosym /bin/${bin} /usr/bin/${bin} || die "dosym ${bin} failed"
-	done
-
-	for pamdfile in login passwd su; do
-		newpamd "${FILESDIR}/${pamdfile}.1.pamd" ${pamdfile} || die
-	done
-
-	cd "${WORKDIR}/etc" || die
-	insinto /etc
-	doins remote phones opieaccess fbtab || die
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/locate-updatedb-cron" locate.updatedb || die
-
-	# tip requires /var/spool/lock/, bug #200700
-	keepdir /var/spool/lock
-
-	# create locate database #472468
-	local f=/var/db/locate.database
-	mkdir "${ED}${f%/*}" || die
-	touch "${ED}${f}" || die
-	fowners nobody:nobody ${f}
-}
-
-pkg_postinst() {
-	# We need to ensure that login.conf.db is up-to-date.
-	if [[ -e "${ROOT}"etc/login.conf ]] ; then
-		einfo "Updating ${ROOT}etc/login.conf.db"
-		"${ROOT}"usr/bin/cap_mkdb -f "${ROOT}"etc/login.conf "${ROOT}"etc/login.conf || die
-		elog "Remember to run cap_mkdb /etc/login.conf after making changes to it"
-	fi
-}
-
-pkg_postrm() {
-	# and if we uninstall yacc but keep bison,
-	# lets restore the /usr/bin/yacc symlink
-	if [[ ! -e ${ROOT}/usr/bin/yacc ]] && [[ -e ${ROOT}/usr/bin/yacc.bison ]] ; then
-		ln -s yacc.bison "${ROOT}"/usr/bin/yacc || die
-	fi
-}
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 260ecdf88eb5..917172245e91 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -12,8 +12,6 @@ DIST freebsd-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
 DIST freebsd-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
@@ -21,5 +19,3 @@ DIST freebsd-ubin-8.2.tar.bz2 1808012 BLAKE2B ad467c26b8df8e32ffca2ec606cdf287e3
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
 DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-DIST freebsd-usbin-SA-1630-portsnap-10.patch 1660 BLAKE2B 39f16a422c20038c76ff2739d23a231a2e263321ea2a6a16166b1c2fa72424e9c2e3048fad653700c5b2ec6d22e543e753ed4ec718cadd6e80ab9f248ca394d0 SHA512 43814a98a29b8ef0176de949ad513f16f4ac2cbea23eb260a6c5484b16d0dcc525569e44cfd00bce1f7aa3ecf6c537220098f6514790457372849da941d38d4a
-DIST freebsd-usbin-SA-1632-bhyve.patch 402 BLAKE2B d1d346e93400071bfa13391c418fc9bb67d17b75f11c88751e3e50e6f2df75c1b98502da130cbfdcd386d42d939fb6da13609c4ecf31fb1ed0cbe25d61086d64 SHA512 8261f070c282a4ff0123e90150bb5605615d86e74adc557b8d187dfc5acf74900751ac4f24e2b86bb1dbfeda34a86c694e31ec3a21788ce7994f1dacb21a9362
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch
deleted file mode 100644
index a84f96d405b2..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-10.0-bsdxml2expat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur work.orig/usr.sbin/ctladm/ctladm.c work/usr.sbin/ctladm/ctladm.c
---- work.orig/usr.sbin/ctladm/ctladm.c	2012-07-12 13:25:58.000000000 +0900
-+++ work/usr.sbin/ctladm/ctladm.c	2012-07-16 05:37:14.000000000 +0900
-@@ -60,7 +60,7 @@
- #include <errno.h>
- #include <err.h>
- #include <ctype.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <cam/scsi/scsi_all.h>
- #include <cam/scsi/scsi_message.h>
- #include <cam/ctl/ctl.h>
-diff -Nur work.orig/usr.sbin/ctld/kernel.c work/usr.sbin/ctld/kernel.c
---- work.orig/usr.sbin/ctld/kernel.c	2013-09-20 21:55:45.000000000 +0900
-+++ work/usr.sbin/ctld/kernel.c	2013-09-20 22:01:17.000000000 +0900
-@@ -45,7 +45,7 @@
- #include <sys/sbuf.h>
- #include <sys/capability.h>
- #include <assert.h>
--#include <bsdxml.h>
-+#include <expat.h>
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild
deleted file mode 100644
index 54be148462f5..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-10.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:30/portsnap-10.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl:0 )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
-
-pkg_setup() {
-	# Add the required source files.
-	use nis && EXTRACTONLY+="libexec/ "
-	use build && EXTRACTONLY+="sys/ include/ "
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg pkg_install freebsd-update service sysrc bsdinstall"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-	# Don't install mtree format manpage
-	# it's installed by libarchive.
-	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
-}
-
-src_compile() {
-	# Preparing to build nmtree
-	cd "${WORKDIR}/lib/libnetbsd" || die
-	freebsd_src_compile
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	mkinstall DOCDIR=/usr/share/doc/${PF} || die "Install failed"
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util}
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util}
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf"
-
-	cd "${WORKDIR}/etc" || die
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild
deleted file mode 100644
index a43897c528f5..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.0-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-LICENSE="BSD zfs? ( CDDL )"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "SA-16:32/bhyve.patch" )
-
-if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-	SRC_URI="${SRC_URI}
-		$(freebsd_upstream_patches)"
-fi
-
-EXTRACTONLY="
-	usr.sbin/
-	contrib/
-	usr.bin/
-	lib/
-	sbin/
-	etc/
-	gnu/
-"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl:0 )
-	>=app-arch/libarchive-3
-	sys-apps/tcp-wrappers
-	dev-util/dialog
-	>=dev-libs/libedit-20120311.3.0-r1
-	net-libs/libpcap
-	kerberos? ( app-crypt/heimdal )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 kerberos minimal netware nis pam ssl usb build zfs"
-
-pkg_setup() {
-	# Add the required source files.
-	use nis && EXTRACTONLY+="libexec/ "
-	use build && EXTRACTONLY+="sys/ include/ "
-	use zfs && EXTRACTONLY+="cddl/ "
-
-	# Release crunch is something like minimal. It seems to remove everything
-	# which is not needed to work.
-	use minimal && mymakeopts="${mymakeopts} RELEASE_CRUNCH= "
-
-	use acpi || mymakeopts="${mymakeopts} WITHOUT_ACPI= "
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use audit || mymakeopts="${mymakeopts} WITHOUT_AUDIT= "
-	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
-	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6= WITHOUT_INET6_SUPPORT= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use pam || mymakeopts="${mymakeopts} WITHOUT_PAM_SUPPORT= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-	use floppy || mymakeopts="${mymakeopts} WITHOUT_FLOPPY= "
-	use kerberos || mymakeopts="${mymakeopts} WITHOUT_GSSAPI= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-
-	mymakeopts="${mymakeopts} WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= WITHOUT_UNBOUND= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/${PN}-9.0-newsyslog.patch"
-	"${FILESDIR}/${PN}-10.0-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-10.3-bsdxml2expat.patch"
-	"${FILESDIR}/${PN}-11.0-workaround.patch"
-	)
-
-REMOVE_SUBDIRS="
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	pc-sysinstall cron mailwrapper ntp bsnmpd
-	tcpdump ndp inetd
-	wpa/wpa_supplicant wpa/hostapd wpa/hostapd_cli wpa/wpa_cli wpa/wpa_passphrase
-	zic amd
-	pkg freebsd-update service sysrc bsdinstall"
-
-src_prepare() {
-	if ! use build; then
-		[[ ! -e "${WORKDIR}/sys" ]] && ln -s "/usr/src/sys" "${WORKDIR}/sys"
-		[[ ! -e "${WORKDIR}/include" ]] && ln -s "/usr/include" "${WORKDIR}/include"
-	else
-		dummy_mk mount_smbfs
-	fi
-}
-
-src_compile() {
-	# Preparing to build nmtree
-	cd "${WORKDIR}/lib/libnetbsd" || die
-	freebsd_src_compile
-
-	cd "${S}" || die
-	freebsd_src_compile
-}
-
-src_install() {
-	# By creating these directories we avoid having to do a
-	# more complex hack
-	dodir /usr/share/doc
-	dodir /sbin
-	dodir /usr/libexec
-	dodir /usr/bin
-
-	# FILESDIR is used by some makefiles which will install files
-	# in the wrong place, just put it in the doc directory.
-	freebsd_src_install DOCDIR=/usr/share/doc/${PF}
-
-	# Most of these now come from openrc.
-	for util in iscsid nfs nfsuserd rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util}
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util}
-		fi
-	done
-
-	for class in daily monthly weekly; do
-		cat - > "${T}/periodic.${class}" <<EOS
-#!/bin/sh
-/usr/sbin/periodic ${class}
-EOS
-		exeinto /etc/cron.${class}
-		newexe "${T}/periodic.${class}" periodic
-	done
-
-	# Install the pw.conf file to let pw use Gentoo's skel location
-	insinto /etc
-	doins "${FILESDIR}/pw.conf"
-
-	cd "${WORKDIR}/etc" || die
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/*
-		rm -f "${D}"/etc/bluetooth/Makefile
-	fi
-
-	cd "${S}"/ppp || die
-	insinto /etc/ppp
-	doins ppp.conf
-
-	# Install the periodic stuff (needs probably to be ported in a more
-	# gentooish way)
-	cd "${WORKDIR}/etc/periodic" || die
-
-	doperiodic daily daily/*.accounting
-	doperiodic monthly monthly/*.accounting
-}
-
-pkg_postinst() {
-	# We need to run pwd_mkdb if key files are not present
-	# If they are, then there is no need to run pwd_mkdb
-	if [[ ! -e "${ROOT}etc/passwd" || ! -e "${ROOT}etc/pwd.db" || ! -e "${ROOT}etc/spwd.db" ]] ; then
-		if [[ -e "${ROOT}etc/master.passwd" ]] ; then
-			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
-			"${ROOT}"usr/sbin/pwd_mkdb -p -d "${ROOT}etc" "${ROOT}etc/master.passwd"
-		else
-			eerror "${ROOT}etc/master.passwd does not exist!"
-			eerror "You will no be able to log into your system!"
-		fi
-	fi
-
-	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
-		debug.log slip.log ppp.log; do
-		[[ -f "${ROOT}/var/log/${logfile}" ]] || touch "${ROOT}/var/log/${logfile}"
-	done
-}