gentoo resync : 25.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-26 15:48:02 +0000
commit: 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree: 6fce284d5bfddaf597a490ac66069d16c6a485db /sys-freebsd
parent: 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)
89 files changed, 566 insertions, 2531 deletions
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index acd32f776d00..a4962ab97ec6 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index b4572d84c46a..f589e18cea3e 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,13 +1,10 @@
 AUX boot0-11.0-gcc46.patch 481 BLAKE2B 32b905518fbb8c4016afe4296715369b344ab0397d4df7c3255d5b64d2600d1b1715a071ff720de74f44bb89bd623b850f0e11d7f7acd587c550b30d4dfe704c SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01
-AUX boot0-8.2-zfsboot-makefile.patch 436 BLAKE2B 20ebd3be758778b24c56e23c8dbb70dc354ef9cbb9265e2c6359162db3e5a79836dbc82b9dc1d76e4fa329190b51ca832858a5f0cc5d8b4312bca916bdcdfe49 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2
 AUX boot0-9.2-gcc46.patch 2119 BLAKE2B bbe757cddd6808b0df4769a63e78ef4e83364a7bbe9b2c738e80bff50bc7e90d5203fdadf8aa1ad96411564ce229818c286606d2cb1eed87e7dd577e626c3474 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9
 AUX boot0-add-nossp-cflags.patch 341 BLAKE2B 71eecc9af36e07b331ef842d1cd52688d5c8e152b54a44c7598253bc7078ab8f84a5b8aaa54a796ae88aae9d262546a65a86a35445f41ea1772b4434bf194e0d SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb
 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-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
-EBUILD boot0-11.1.ebuild 1940 BLAKE2B a3f1b3c8a6f2cacdc8b333ff5481653628f40ea1201bc680d0e3f61935839093dfec7888dda058f4db890a50d42442d8bfc25e4e408fe68fcd895cbf40448025 SHA512 8d8890bac720309a9ee5e56e950139ec0a3862d64643b73f92bb7783da8ac56db1d271fdd09bb7aa19f062ef6b9ffbac3b98d952d982911b3392fc59a4fd94eb
-EBUILD boot0-8.2.ebuild 1181 BLAKE2B 30c73d35331a20e505f2a912144734c8d4c0df42e41d65c1a90cc07ac1f0fbd40b971696f85d3ea7a78aee2f3deea486b76e9b563f2c0e9839117023653960ef SHA512 955c8d97b4ca370a9e8941ccec006d113c89baa25188abfb0e5e9d14ab1c9723ab3c2e32ccf58adbe2f3730c69f782abf645dd6931e1e6a689cba72b3651fb32
-EBUILD boot0-9.1.ebuild 1477 BLAKE2B 20b29953677e513427bd3a332902cdbc2d1f5c4d0c57de96a878ac1750863b7fc68ad8ad9cfe6af50bf0564ddcc0d8d6e233b2a5d9949969d40f311a09f4f51c SHA512 fe21b5d7105aecf6419be9339f989f85112b7f4ef1c061c069a60789af202d49bec44123aaf5f69d8ea732d63d87d041272540ba988b054ff51fc08c0b43bf06
+EBUILD boot0-11.1.ebuild 1928 BLAKE2B bcec8c212cbf66cb521010b5a91e6f5c3189c69821ba98139f90aba64efde512e9890803ad6ce9798a754bb39ca1b08e37154d1e520758183cdb6fc745c0ce72 SHA512 d68766eaeae64385bbc4d241704f8099b7a81bd38c56f63b2b9302666874f3876f4958d23b43d3046fedbfbb126e1aed7f09af13f05c346045c58f952ce7a135
+EBUILD boot0-9.1.ebuild 1465 BLAKE2B f1cc0b6d2207a102005e1022315d9f0254e02683a936e8f81ae1d269535589c8d08fa6d76ab235f83976852adeb896068bdcf0c740799c0c2b53fe1ecd870726 SHA512 bab0d5a99eaeeb5ed3a47903f9a28c277bd8047cdbe5d8affb4e32a22c0af3360f073a4d4f41d7a893263b724b1fe46ab4df978f210118db00523d25d73644a5
 MISC metadata.xml 385 BLAKE2B d91b401fe4cbcbe6eeb2e0621e7dc26f0c5a26e11219828fd0df652231d7ccf809b2824eb995463cac8e14056e3065a189667f2351d24510fe0980ca6b2a77f8 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808
diff --git a/sys-freebsd/boot0/boot0-11.1.ebuild b/sys-freebsd/boot0/boot0-11.1.ebuild
index 2f95e76f3e23..6b33a6891f7a 100644
--- a/sys-freebsd/boot0/boot0-11.1.ebuild
+++ b/sys-freebsd/boot0/boot0-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ IUSE="bzip2 ieee1394 tftp zfs"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/boot0/boot0-8.2.ebuild b/sys-freebsd/boot0/boot0-8.2.ebuild
deleted file mode 100644
index 1cf02f669187..000000000000
--- a/sys-freebsd/boot0/boot0-8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}"/${P}-zfsboot-makefile.patch )
-
-boot0_use_enable() {
-	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
-}
-
-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 '/-fomit-frame-pointer/d' -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
-}
-
-src_compile() {
-	strip-flags
-	append-flags "-I/usr/include/libstand/"
-	append-flags "-fno-strict-aliasing"
-	NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
-	dodir /boot/defaults
-	mkinstall FILESDIR=/boot || die "mkinstall failed"
-}
diff --git a/sys-freebsd/boot0/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild
index df9341b45fd2..54793cef68a1 100644
--- a/sys-freebsd/boot0/boot0-9.1.ebuild
+++ b/sys-freebsd/boot0/boot0-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD's bootloader"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="bzip2 ieee1394 tftp zfs"
 
diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
deleted file mode 100644
index a3a33d5d7c5b..000000000000
--- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
-index bb16ea3..7dedb49 100644
---- a/sys/boot/i386/zfsboot/Makefile
-+++ b/sys/boot/i386/zfsboot/Makefile
-@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out
- zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o
- 	${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND}
- 
-+drv.o: drv.c xreadorg.h
-+
- zfsboot.o: zfsboot.s
- 
- SRCS=	zfsboot.c xreadorg.h
diff --git a/sys-freebsd/freebsd-bin/Manifest b/sys-freebsd/freebsd-bin/Manifest
index 252bc32e0c03..bca585898143 100644
--- a/sys-freebsd/freebsd-bin/Manifest
+++ b/sys-freebsd/freebsd-bin/Manifest
@@ -1,12 +1,8 @@
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-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-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-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 DIST freebsd-ubin-9.1.tar.bz2 1910472 BLAKE2B 4bab770072543d9eb25ce7ce450084e0eb9ca603deb58886a26495a92a05373f4f8f5821c65dc76365bf325a7291e6b630b00af5ba895784093d450163637504 SHA512 74ae0aceec8597aa66c3f1ab313f0685a3c63d7273c36ae7baf8794275ad9bca241c60c3f6281cccf6d531d250d7611099977d3b1a27279cef3586401b6af05e
-EBUILD freebsd-bin-11.1.ebuild 793 BLAKE2B 6cd1a92c1428396b0e0db005783643dc60224d9337175074470fa7592cc1773babbdf1e0a3eec42bd0f706cb32daacc2f5b5641b21f9621fff8aff09923f95a2 SHA512 bd94a54161944bf37c9cbd3e45d00d01328340952e379d168f47ff0b951f77b96f47606b8fec03d31e29b6086a8d3822b065873fccb793114dbc5beaa1b697bb
-EBUILD freebsd-bin-8.2.ebuild 763 BLAKE2B 4a5ecc79225e09ddd3dc487f3ada444aef4beacdb95b42247ef33c06e70a430f47abf9599cb4360b9618a3d0fa155597ecfc8b23e12c39ee4244b1635cf1d66b SHA512 90cd9abe75073f7b8af399637cb7e0f022200b91a83dfe5623c0d9e7def4d62f5b45128bda87b47f4a28fec3fce3c0bff8ea25640106edbab0635388537afe28
-EBUILD freebsd-bin-9.1.ebuild 827 BLAKE2B 32f5ddca5528cee8438a0ccc7551526b1219d2cde5dfeda0a094adce82b164c1a47f2b48d8287e5746aa5327d71b5cc3913b07decaadcb8142ef2a01a6c75366 SHA512 fc658efd1a1c38bb07af1b47a194cc4b6a8cf78eb5f8c8119aa8a2ef07c84b16b498acf676119752928aa919f1e8e181b4908395f7b10c88b7540ae785c47fff
+EBUILD freebsd-bin-11.1.ebuild 781 BLAKE2B b64305d2287a2c6bf2068b7d593ae23689f3ecd6b0398c72ba13c216f94d4259ca61613017bb061168c35d932ba3dcc739fd507fefb5f2852f21dc3dda119e3e SHA512 66d2e50f2573749f76886ff09622cad56d2ecd6ca442ba20b587fedadbbf2a88ce0e57e2ed18f493f8288fb1b10222a90771c1c8292e762e45ac3cae2c3c1c3f
+EBUILD freebsd-bin-9.1.ebuild 815 BLAKE2B ea0c0dcd6ed2b27cc006805845d14a23637bc32abfded442123f0eac38404e35c9a09a1a2f1cfed82775304d7df2c1ad55062731b2f21d493ad7957e408e4a5e SHA512 7fbe3d65912506b9a791fcba255c4b6eb658048c0f12d717bcc0a659ce51f5425bc09bc1ae5c6f8f43cd0965d66455ef3476db4773de1a0b62c13ccf553bbf76
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild
index 37b3ce22d25e..6451fb41815c 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE=""
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild
deleted file mode 100644
index c23585e5b02b..000000000000
--- a/sys-freebsd/freebsd-bin/freebsd-bin-8.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD /bin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	dev-libs/libedit
-	sys-libs/ncurses
-	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"
-
-pkg_setup() {
-	mymakeopts="${mymakeopts} WITHOUT_TCSH= WITHOUT_SENDMAIL= WITHOUT_RCMDS= "
-}
diff --git a/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
index ff05ef637a63..fdda872991a2 100644
--- a/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
+++ b/sys-freebsd/freebsd-bin/freebsd-bin-9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd
 
 DESCRIPTION="FreeBSD /bin tools"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE=""
 
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index b7bc9acffb6a..437111bde674 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,29 +1,18 @@
 AUX freebsd-cddl-11.0-add-libs.patch 3401 BLAKE2B b0928c729f7a95d7cb7e33718917d5b021e2ae782a43b6ab68e5de61781f9f5292d48da7850f9a2188c28f271fea74344d6bfa10e7655b79435ed3db569fa9b4 SHA512 7a3da3a57bde26a79784dcb023961ed0a292da4945c49e07c4a69035fe6cd0773e09cec25eab638a64c6ccc54bb775c169b1553743f7a9b4af60ce49f1fee54c
 AUX freebsd-cddl-11.0-workaround.patch 576 BLAKE2B e1b7fa79a82812ba5543245c1051f7ef287dfd68fdd99a8808e5def821c640f258f0a9405641b853e874a4ee31ec2e1caf948bbd6de36327678ce4c28ef2629a SHA512 0a2280caeb23622454351657d61e8e465c597b82bf49cb534a924758844cd7da2df330434ba6282e159d9bc2e6ade27c2a9db41980ada6370bcab59c6a57da22
-AUX freebsd-cddl-8.0-libpaths.patch 4418 BLAKE2B 0c105003ec860565fa8f11b484db1d203eaa423c16f373eb3414a444639496a6d10407af51112cbeb8435cdd462650a4815abd9bccbeb9564a74a470bd342f7e SHA512 dac14bcac23d16ee8acc7a3adfe7de896f6595d98dd3d0c93e39205aa5bdf1a0fc35adf338e05df66b18186da4b10f578cfe2d084b446aeb84eb49d07f5736d5
-AUX freebsd-cddl-8.2-libpaths.patch 822 BLAKE2B 26d0a5d5446fe6f380f99fc1caad1d9cfe7bc3f1e2cd7779a0daa51fd1aaaec2edc2a5c2510ebbfe75d437886ed6dc3e74de23b03363e26239fb8e3350540471 SHA512 1d335eb70592436941b093c76ad2e7573cb317333f81b11be7a2ef9cc0b3e57e21d797bf43c5ac9154d9817aa136851640f2b7b67bdd66b8abde7a589fd9f567
 AUX freebsd-cddl-9.0-bsdxml.patch 1419 BLAKE2B 435e028205fbbdc0aa46763cb4de491aebab62459f485a9a5fe6d4e12319a5674453bf37fa33aef5a04194402fee9ec78e9eccd255fdd55f833309265b784853 SHA512 8ea86f6918b2629c33286c2396226bb4944e373069a423104d96f65e387162e0da94707458fd5caebcab08b9305b435ac66f4207aa6b15ce9571a5fa5878f3c5
 AUX freebsd-cddl-9.0-libpaths.patch 7621 BLAKE2B 1d743118005f6e92d960a782e633e1d8095fa1cc38c5c9dba9176b07ec188653140e2ec4e7ace83c80968e35109f77e588e2042273ea81d8ce12008f3b349911 SHA512 87e56647a41262363900ab4ecc6aabd1b4ba4f0d7d5b5011dc2eb9ec312c640bed5aa931495f208110277b2baf6c3625d20d59e62c19a70e7625a6b36b61a278
 AUX freebsd-cddl-9.0-underlink.patch 755 BLAKE2B 6d9987c6a0f491ad0afc47d169e10fe9fbe088bcb287bbc40d1707763856ae9ff936ffe54ddd5fb2f1304d3d46c4d93832b628802ead75a663b80f7cbda74225 SHA512 002c9e6a389140455f9a698dbe47197d795d36ff08e4e5fb096d38525b8cf017672de7f511b2495fdea6f536e07a426e299e0a056cbdd8dae64677299376d2f9
 AUX zfs.initd 368 BLAKE2B 932c990c341246aadc23702d107591195ebd5bbcbda9001c36fb16d7a354f33f4afbae2f54660f6fc0a621ab7c97447532009a3d9a8080639c181ec216960b4c SHA512 6b1c0342cbd4dd7e84df58240be3ef8bdc9924a32abe9258d76c87b187be5cb5776125c5989b9dc9bd1210f46216b8f478d2ecb8cc9d165a960157fadc9b5ff8
-AUX zvol.initd 838 BLAKE2B f02ce3583f3f1da7cda7db40d79dc5da4e293b4ed3e3df7fd94aa35fefa2e0e263e25527279b8219250ad6212a9131690b5d17830bc755de08b36f5f9a614437 SHA512 7a535e3f698bdde4e181ae420d88d76d11f308b0e38d8acfcae41281e05ec05166a2df9df0b3a57844991d166429229ba725561799dc26cbb2e7585094f9783e
 AUX zvol.initd-9.0 812 BLAKE2B c7aaa3d415cd59f403ed520831b10433f2ec2ddce420642b84bca33566244360b641f87760ea0276ccd281b2b946200cd7c9a592e3c67615d00a5a7fdc7c085b SHA512 dbd113cb8f072b001e5f696ddb142df063f12b29a5b16af99f3b00b8c511af87a6094bd210f384ad03a300c2afd7af249cdf278a6179a3f53edc439c3a80f566
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 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-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-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
 EBUILD freebsd-cddl-11.1.ebuild 1664 BLAKE2B a42b0759c09de7d2ef1acbd2bc40efddb1ded8c2dc5f0e42b81fb47ba9ef3cc795d06f907b165bd0df3ff42e90b5988cc2cf5ddf89b784ee9e7b1d2fc17294a3 SHA512 9540e2ab16ffc95451d3439eef6382484a80ea4a06ee1c65b77e9892159a1ddec1ef74bee79222db6e94e17953e65dec6142caae1a6054d10882ddf832dfa3d1
-EBUILD freebsd-cddl-8.2.ebuild 1176 BLAKE2B c16a5e6b5edb7f540640ace3462307573dceee029fb95c0319390fa84055ee17e74494d7bc8ca8623eaf1ca02ed644865bfec75e19a890905f6299dc1cc574b8 SHA512 d3c56ea3410338b56db20132f6f4485e60116bb9d959eca263bda5372e007a650dc23c308dc63e10ef53618531ed7d4f7924dfe2326dc2e9093941f749908a60
 EBUILD freebsd-cddl-9.1.ebuild 1477 BLAKE2B 9ef8e2fd85bc542efa623a5d222f7d33fc1b058edea4d78de0845aaa5740a6fc785089359d8b5aff79335047cfbd06a44bc25c294e5d195d9ceb1fc016feac43 SHA512 22724b107c8fe47f3148eb32982e7e46deb9c18fa9f54af2be7cf2733db83cdc1213fd873b62dd425232fa3dbc08f569fcd1edbdd89bc7b86d283327bd1e8883
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
deleted file mode 100644
index ad5c83eca3de..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.0-libpaths.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ru cddl.orig/lib/libctf/Makefile cddl/lib/libctf/Makefile
---- cddl.orig/lib/libctf/Makefile	2009-01-24 03:36:33 -0200
-+++ cddl/lib/libctf/Makefile	2009-01-24 03:55:10 -0200
-@@ -4,6 +4,7 @@
- 
- LIB=		ctf
- SHLIB_MAJOR=	2
-+LDADD+=-lz
- 
- SRCS=		ctf_create.c \
- 		ctf_decl.c \
-diff -ru cddl.orig/lib/libdtrace/Makefile cddl/lib/libdtrace/Makefile
---- cddl.orig/lib/libdtrace/Makefile	2009-01-24 00:18:47 -0200
-+++ cddl/lib/libdtrace/Makefile	2009-01-24 03:31:06 -0200
-@@ -74,7 +74,7 @@
- .endif
- 
- LFLAGS+=-l
--
-+LDADD+=-lz -lproc
- YFLAGS+=-d
- 
- CLEANFILES=	dt_errtags.c dt_names.c
-diff -ru cddl.orig/lib/libzfs/Makefile cddl/lib/libzfs/Makefile
---- cddl.orig/lib/libzfs/Makefile	2008-06-22 10:26:18 -0300
-+++ cddl/lib/libzfs/Makefile	2008-06-22 10:26:26 -0300
-@@ -7,7 +7,8 @@
-
- LIB=	zfs
- DPADD=	${LIBUTIL}
--LDADD=	-lutil
-+LDADD=	-lutil -lgeom -lm -luutil -lumem
-+LDFLAGS+=      -L${.CURDIR}/../libuutil -L${.CURDIR}/../libumem
-
- SRCS=	deviceid.c \
- 	mnttab.c \
-diff -ru cddl.orig/lib/libzpool/Makefile cddl/lib/libzpool/Makefile
---- cddl.orig/lib/libzpool/Makefile	2008-06-22 10:35:15 -0300
-+++ cddl/lib/libzpool/Makefile	2008-06-22 10:37:06 -0300
-@@ -42,7 +42,8 @@
- CFLAGS+=	-I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
- 
- DPADD=		${LIBPTHREAD} ${LIBZ}
--LDADD=		-lpthread -lz
-+LDADD=		-lpthread -lz -lavl -lumem
-+LDFLAGS+=	-L${.CURDIR}/../libavl -L${.CURDIR}/../libumem
- 
- # atomic.S doesn't like profiling.
- NO_PROFILE=
-diff -ru cddl.orig/sbin/zfs/Makefile cddl/sbin/zfs/Makefile
---- cddl.orig/sbin/zfs/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zfs/Makefile	2008-06-22 10:14:23 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libnvpair \
-+	-L${.CURDIR}/../../lib/libuutil -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/sbin/zpool/Makefile cddl/sbin/zpool/Makefile
---- cddl.orig/sbin/zpool/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/sbin/zpool/Makefile	2008-06-22 10:14:47 -0300
-@@ -23,5 +23,7 @@
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
- LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
- 	-lm -lnvpair -luutil -lutil
-+LDFLAGS+=-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libavl  -L/lib -L/usr/lib \
-+	-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libuutil
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/ztest/Makefile cddl/usr.bin/ztest/Makefile
---- cddl.orig/usr.bin/ztest/Makefile	2008-06-22 10:02:30 -0300
-+++ cddl/usr.bin/ztest/Makefile	2008-06-22 10:12:40 -0300
-@@ -18,5 +18,7 @@
- DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- 	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
- LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L/lib -L/usr/lib
- 
- .include <bsd.prog.mk>
-diff -ru cddl.orig/usr.bin/Makefile.inc cddl/usr.bin/Makefile.inc
---- cddl.orig/usr.bin/Makefile.inc   2009-01-10 07:21:10 +0000
-+++ cddl/usr.bin/Makefile.inc        2009-01-10 07:18:55 +0000
-@@ -1,5 +1,6 @@
- # $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1.6.1 2008/11/25 02:59:29 kensmith Exp $
- 
- BINDIR?=	/usr/bin
-+LDFLAGS+=	-L${.CURDIR}/../../lib/libctf
- 
- .include "../Makefile.inc"
---- cddl.orig/usr.sbin/zdb/Makefile	2010-03-11 13:19:48 +0100
-+++ cddl/usr.sbin/zdb/Makefile	2010-03-11 13:20:08 +0100
-@@ -22,6 +22,8 @@
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- 	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
-+LDFLAGS+=-L${.CURDIR}/../../lib/libnvpair -L${.CURDIR}/../../lib/libumem \
-+	-L${.CURDIR}/../../lib/libzpool -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libuutil -L${.CURDIR}/../../lib/libzfs
- 
- CSTD=	c99
- 
---- cddl.orig/usr.bin/zinject/Makefile	2010-03-11 13:30:32 +0100
-+++ cddl/usr.bin/zinject/Makefile	2010-03-11 13:33:27 +0100
-@@ -21,5 +21,8 @@
- DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- 	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
- LDADD=	-lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
-+LDFLAGS+= -L${.CURDIR}/../../lib/libavl -L${.CURDIR}/../../lib/libnvpair \
-+	-L${.CURDIR}/../../lib/libumem -L${.CURDIR}/../../lib/libuutil \
-+	-L${.CURDIR}/../../lib/libzfs -L${.CURDIR}/../../lib/libzpool
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch b/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
deleted file mode 100644
index a0e567790473..000000000000
--- a/sys-freebsd/freebsd-cddl/files/freebsd-cddl-8.2-libpaths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- cddl/usr.sbin/dtrace/Makefile.old	2011-07-06 00:09:01.000000000 +0000
-+++ cddl/usr.sbin/dtrace/Makefile	2011-07-06 00:09:48.000000000 +0000
-@@ -24,6 +24,8 @@
- #CFLAGS+=	-DNEED_ERRLOC
- #YFLAGS+=	-d
- 
-+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
- 		${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB}
- LDADD=		-lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \
---- cddl/usr.sbin/lockstat/Makefile.old	2011-07-06 00:10:33.000000000 +0000
-+++ cddl/usr.sbin/lockstat/Makefile	2011-07-06 00:10:57.000000000 +0000
-@@ -23,6 +23,8 @@
- 
- CFLAGS+=	-DNEED_ERRLOC -g
- 
-+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf
-+
- #YFLAGS+=	-d
- 
- DPADD=		${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
deleted file mode 100644
index 28eba8e8c687..000000000000
--- a/sys-freebsd/freebsd-cddl/files/zvol.initd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need hostid
-	before fsck
-}
-
-start() {
-	einfo "Starting zfs volumes..."
-	zfs volinit
-	eend $?
-	# Enable swap on ZVOLs that have org.freebsd:swap=on.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Enabling swap on zvol ${name}"
-			swapon /dev/zvol/${name} 
-			eend $?
-			;;
-		esac
-	done
-}
-
-stop() {
-	# Disable what we had enabled before.
-	zfs list -H -o org.freebsd:swap,name -t volume | \
-	while read state name; do
-		case "${state}" in
-		[oO][nN])
-			einfo "Disabling swap on zvol ${name}"
-			swapoff /dev/zvol/${name}
-			eend $?
-			;;
-		esac
-	done
-	einfo "Stopping zfs volumes..."
-	zfs volfini
-	eend $?
-}
-
-restart() {
-	:
-}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
deleted file mode 100644
index 32d09d66b25d..000000000000
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE="build"
-LICENSE="CDDL GPL-2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		build? ( mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-# sys is required.
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	=sys-freebsd/freebsd-libexec-${RV}*
-	build? ( sys-apps/baselayout )
-	dev-libs/libedit
-	dev-libs/libelf"
-
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )"
-
-S="${WORKDIR}/cddl"
-
-PATCHES=( "${FILESDIR}/${PN}-8.0-libpaths.patch" "${FILESDIR}/${PN}-8.2-libpaths.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-	# Link in include headers.
-	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-}
-
-src_install() {
-	freebsd_src_install
-	# Install zfs volinit script.
-	newinitd "${FILESDIR}"/zvol.initd zvol
-}
diff --git a/sys-freebsd/freebsd-contrib/Manifest b/sys-freebsd/freebsd-contrib/Manifest
index 7f4986d9248e..47a92c9b3a04 100644
--- a/sys-freebsd/freebsd-contrib/Manifest
+++ b/sys-freebsd/freebsd-contrib/Manifest
@@ -1,7 +1,4 @@
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-EBUILD freebsd-contrib-8.2.ebuild 1372 BLAKE2B 18990d23b562a13f67d2dae0877253110f83c166354a32e4ef00382e33b52757fbef2b1c24b74adaf134e2e1e43efdc9f04022d7ad043875b021e6cd8cb9a1f5 SHA512 68fc03d8548e7fcc7689b9a80213dcfe4ee804b42fbee1cab8e1d5cf7659f0f68b6922c5134fc09d8ba01e5b2285383cb3222503ec1fe45f0ae2dfa9f3cd265c
-EBUILD freebsd-contrib-9.1.ebuild 1398 BLAKE2B cf228727c77311daab74e338f7c72c042caba9a99573092b7e5fa574ea42afa0e01e35ca0c4ef1dcea69c4f14ce05ad404ef5789ed5cdfd4a51835e04ecff0b2 SHA512 96875155a5ce72b8b96215eb8145b20b67069dc06c0daa0d9d6ec6ceeb227e35a5db112ea4397e2cc810f208bc7e99bdcbbfddcb662365b6d782654f79aebb97
+EBUILD freebsd-contrib-9.1.ebuild 1386 BLAKE2B 10dd9af7dff56f73df7d83206a2afc9967e47ef6ec19772752bd22be3a0532cfc41ed24e06b2892e764ed46c7ce2f7a9afd38c7c58418e70a8cac8b74a241851 SHA512 871e5ec4719be7adc64d9200e9506da4dd5fda49f98ad87a95044655f92ae58b354aa6fa054f5a4d43b21480eee40e4801a618c16dca17b7eb8655e39dcc869a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
deleted file mode 100644
index dbb13edb4b59..000000000000
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="Contributed sources for FreeBSD"
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2+ libodialog"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	!dev-util/dialog"
-
-S="${WORKDIR}/gnu"
-
-src_unpack() {
-	echo ">>> Unpacking needed parts of ${GNU}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${GNU}.tar.bz2" gnu/lib/libdialog gnu/usr.bin/sort gnu/usr.bin/patch
-	echo ">>> Unpacking needed parts of ${CONTRIB}.tar.bz2 to ${WORKDIR}"
-	tar -jxpf "${DISTDIR}/${CONTRIB}.tar.bz2" contrib/gnu-sort
-
-	freebsd_do_patches
-	freebsd_rename_libraries
-}
-
-src_compile() {
-	cd "${S}/lib/libdialog"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/sort"
-	freebsd_src_compile
-
-	cd "${S}/usr.bin/patch"
-	freebsd_src_compile
-}
-
-src_install() {
-	use profile || mymakeopts="${mymakeopts} NO_PROFILE= "
-	mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-
-	cd "${S}/lib/libdialog"
-	mkinstall || die "libdialog install failed"
-
-	cd "${S}/usr.bin/sort"
-	mkinstall BINDIR="/bin/" || die "libdialog install failed"
-
-	cd "${S}/usr.bin/patch"
-	mkinstall BINDIR="/usr/bin/" || die "libdialog install failed"
-}
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
index 0a810660b414..7b6b9ee87f45 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic multilib
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${GNU}.tar.bz2
 
 LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index ba027d6da7fc..25c5bd931da8 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -5,16 +5,10 @@ AUX freebsd-lib-11.0-libproc-libcxx.patch 350 BLAKE2B 0b0a9886567b9c81c8159266eb
 AUX freebsd-lib-11.0-workaround.patch 295 BLAKE2B 3e0fa9e7c981caeb11c75e5c7ccfef597a6129c0ea098f2d6945aac4439cfc9f937463b989078f4148e995efeee28cfc81de77e8a1acd7da9a3d913c5dfe82e5 SHA512 5c7559dc1876e833f440bc85e23e601eaa5dd26484b1905a5a59e29345f83438208770671c248b4dfb5138c4dded1f08234c77070afadb5c6b54e2b6dc35e24a
 AUX freebsd-lib-11.1-liblink.patch 4233 BLAKE2B e088abc8f738475e09793cf59cb41257e2143a8daf7dbbdeb81190aec95e6d15b800862033353e556d87f757be43693e6b0895a6900fd58fff580ef8e6f1279a SHA512 23a875fa84685c7a98ddb08b1bcf831613239a6079c1711362bbbd19f27b67e61eb203bafc48c9ad06b9344258005e4d04756d4f8caba7c9545f3f86dcb52830
 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 BLAKE2B df851549b6978ab7b59585fbaec7c3bcea19f8eb6b1a2882343618c21ef2533fb8a56f9c8a362b7c188c97e5d0091b02288a457fe114b8e2e6dbe4b69bfad62d SHA512 c16a99b85e7908e77915796245741cbfcfb30ab1f4f0a8d565c28256b25d1532209ed27328d8b1571f61677251830f1fb6bbec17a8104686f56afd87f3226dec
-AUX freebsd-lib-6.0-gccfloat.patch 542 BLAKE2B f2674a83c2ce30769d3d1270ccc19d3f63a77ed8bbe1271b9009e10f085f50b0495db6d8857b574093df9e77852fd9f15bb9902e989fab495d985c2aec878489 SHA512 810745085c601757397b6d0338dba1631e4f623c3bae8a588e9f0b5c7cd9a9416d832093f97925fcef27ffcf20929bef8a5bcbeecf7a583c0a7eb6ce71f39495
 AUX freebsd-lib-6.0-pmc.patch 338 BLAKE2B 8c587f716fba0237e114af0c1860493c2aff046447f4469ba813a67e44779caa58f5b45108dc12634b7303401725006bed3b254459993972894a242737bb08bf SHA512 33187ec853ddf0c39680af60b669e60d3e213eba20a2e1ba995c991f04c053c5adcc5169b92c5d1d4cfbc7e03b72af2df4a5349361b41c56ca4a9b91e81bb327
 AUX freebsd-lib-6.1-csu.patch 655 BLAKE2B acd7ed7144a59494d656c66e823c884f4cf5c112ac1ec55add9c25745ce737ed1c6e56c82e8a0718c8c1ac3b8ab7b2e8edd51a1aedaa5f6684d6ba4e30771722 SHA512 926d8aafd6f517a0fb97af61746d53bafab7fe7003f71181c43b4f9b31e7652624d060a350cc23d83ca7da7c1be2dcc048bb00a581c3524f0f2b7b06de6100b4
-AUX freebsd-lib-6.2-bluetooth.patch 243 BLAKE2B be8f5a3df5bb0e057e1b915132adac68d45f774a9d21bc894d34ee7568bca6ae59d9aeb9b140c76159208b3a5a00c8e7bb0a9ce3ba60cb1aa8717bad6c1c4d53 SHA512 60d938a6f1162f106ec93c4122707a4dd9ca6afc73be4d90871db745ad084ca1d229e7460f4faa9885c4f6d192a41cb8be7cf671b0c8ec720eccd1c7af994bbc
 AUX freebsd-lib-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f
 AUX freebsd-lib-8.0-gcc45.patch 1264 BLAKE2B ad0884780b17fd02a6347e85654feadc0a496f4463ce2e8e796c74213f5554c0d61e595dc1e9b1bfb30a431f3fda5863ff0a2dda046bfb0f01e7bfce7ad991e8 SHA512 12b81def4e7690cf5b910f31466b06c3fdf58f38a41f63dd359582d8f480e8081b54fd4997c6595e9e1a8912f991ba1b8d04989e270f242dd547d72c9ad5ea57
-AUX freebsd-lib-8.0-log2.patch 667 BLAKE2B e86abb07093ef9d1b969fa6ebb36421ea6794b3391952e739b28f6fbaca9941d71e1f206d3d673ed3cb2f7b68c84492a043989885514a1b77dcbf3f9cf264528 SHA512 72f99ecc4632ba9b5ea8f26cbe7311a2ada1822c1c3ccf2c6690d72fb91748e7e70915f33e0f29087125c4027ef084c1d37638fc423bde533595e8d4910084c3
-AUX freebsd-lib-8.0-rpcsec_gss.patch 298 BLAKE2B 6b55c568735d7d04f2482d6cad3f3c7db0c8d05dd04ae64e021aa8ef8dda58d23c587b74a722c469809ee09b86ee5ced416c663cf4a43e616b174b28d44de438 SHA512 2dd63be1a31a1e78fff38a3061469148b673423d958223a459d157accd3a2d1b1f4e568910c49979b0a214322c4e7371f2710ef78fab7d161545fec2a78dc702
-AUX freebsd-lib-8.2-liblink.patch 510 BLAKE2B 012b5fad0ccbbbda289f33cade8246b5be62683f2cdbf2b33cfb610961bc4912dd27067d79d2f93a63d2c8b85fe731d3ebbb584ebaff3b698688ec24dc2c634c SHA512 52a050078dc71163709e6dbe6d1c3177adbc51cb9b30a6990194ddd32f5b54e107b758801f0ff5632c4fe800c6734d63d42e53378a78caa0072847060fbb0dee
-AUX freebsd-lib-8.2-nlm_syscall.patch 385 BLAKE2B 2660947da1058ade5c9c88d4960876d8a535883fe3af00083a9fa2c448c0e80e8fc2e9fbb21ee3583856f73078a768efdfe3a8dd217ec8d1c3d6f96502676065 SHA512 1c871dc00da4b6d1106720954014f60933c99508dfc34fe08ae37b2f67ca05f70ac5e1bb75d0d1d119c7750405871ee3fb6e95ebd3ec378fc84e819cc0c4c9fd
 AUX freebsd-lib-9.0-bluetooth.patch 318 BLAKE2B d86b2c48ca86bd3415073f03c311444eb3adc32f7990754396fb6383c63ccd66b3aa562d75c1817941c59497fcb709f59df1e49186f6a59a437416f8bbbcbc41 SHA512 71cba168c1530407840dde9e25ce374abb7e0d69800e85bf6f5aff28d1a777ff31f47a84ab763e1518d3492f604d1c09ca95cf8ec5b4e05e8bd5b85267ca4488
 AUX freebsd-lib-9.0-cve-2010-2632.patch 6963 BLAKE2B c8e49014e253306abac9752cc3e308da48f76ac02d96888848645d98bc2e9aa8159e56710f7e6df1d6722d25463aa8c3827151565f30e33d31a8fde1abb46f44 SHA512 bb7090a0acbf8ab431334245b1e767da60dcf8f2d23de97a4690e879ae5d528065f5462e2ad3647313662a906f139cfff04f15bce80efede2d2174f74792a07b
 AUX freebsd-lib-9.0-liblink.patch 627 BLAKE2B cbd14d69fc854e60d32882050ef5e035e51688a3f5b426488d2d3c58e45f956cbc62a4d76345d99e9857370094d969cd6f50a9a0c1ae8e04711de5d6f68bcb80 SHA512 0c570fea9cc386afe4b742985cf7de4d49370be3f34b2059dee76869d8e64bd52db0a07e61fac8924848d12d0e6d510ad6a266ce8ef76e2be885d81d909ab616
@@ -36,26 +30,16 @@ AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e17
 AUX sprayd.xinetd 216 BLAKE2B 8e154d0eb67616b6245a002d95b260c32243c8f230861b31a51f67b84d6b56627f2328b58db5cc6d6df85c8831d0c1996ea707ff0058a059b7b5b77a81b6e59d SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
 AUX walld.xinetd 215 BLAKE2B dbf0093f41762c8e493e34bd52e52f61961fcd2dfeeae981c275c983f3ce4f85283c6e81ca379f827088b1274dff9a1f9dd9dffd714a33021b34c12ca07ccfe1 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-crypto-8.2.tar.bz2 5561428 BLAKE2B e51cea35b2ae0abba7ed62051e19774075029a92c7067539f9719a6d41abc6787bf432934244d50c674b0c81cb541ce1ee1017fa047f4ac088f1bde84553d462 SHA512 3c8ed329f6ed67d6db622e2713e9a7b65f54f4d99191e00b133c0afb3dec94c5426542719002e9bd2d83a9a1856a5cb29f2117f1db250f3794e1b2234a1e8e08
 DIST freebsd-crypto-9.1.tar.bz2 5682828 BLAKE2B f6b14f5319932b8680a79abab41ff6b447045464992ad8a22ebc0a6bf89f60559881ed34a26639d5d09af7b66972d2105181186c4cb42c5d6fdbf65b342ae38a SHA512 40c7a8150fb3ddd93488502a976ce03e992e6f4fb28aa3e5e102d4915f8ff49fe9085995ccfecacefc3b665e23c85cc3a0cdeec20a32c79e04458f7cc88630d9
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 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-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-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-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-lib-11.1.ebuild 21724 BLAKE2B 3e72cbe3bba53705ce2f75e7afafb53c48f0a622c66e94f6fcf688bdceae85ce617afeceef476f1a9a463ec605c848a5d3d2cf1bbba6c6e9d8e34fa68b75c3dd SHA512 4bd0dac346bee94e24f21576a037f618fc6650f8f13e3e34c04d5f439d198e81ec087ca1030dcdc7b85d077d0de1ff9e50cfee039c2895236be17148bd7b2242
-EBUILD freebsd-lib-8.2-r1.ebuild 15621 BLAKE2B 9183ce3844d78576c1794a724e8d312b05c5cabb804d566112bf87ea663a1925337dedf50efffc90ae288885892e0ddd0ae0ec79eea2130f668d2e64864204d4 SHA512 84dd546872d08ac0aecd86a491875b04c827be7181c88f5db6fb4fa670e49d80d1825b6f51932c47c6c61b326b25f3e8bc0477baac079d77c9d93674533907dc
-EBUILD freebsd-lib-9.1-r11.ebuild 18777 BLAKE2B 7b67ffebfd1281107551ef1f7e836b0974abf33fd489addce7bbcc382ffd1c2a24618afe9d0b78efa255a1f26a9a79acc0f789b838597e5acbc30c4c5e29b430 SHA512 815b60887a33b3c5cd1cf48357ba579dfcb9f52950534ef4db9eb1d7514f31d29b7cb55069c241f22472b94f9ebcf87bbc91dbeb237d4d4caf20000a5d58637a
+EBUILD freebsd-lib-11.1.ebuild 21712 BLAKE2B e9d77514b6c9e1460dbf2f2c57a595c3d1c1b0a5617293e59b7d9a05b8b07a82b1514711915a9ffd49c6512421fc09c4b1c7516709cfb09f3cc1724cd9c4c8a2 SHA512 6906d49aa12d36ef13e713929d21d7d77b91c4c2ef0e0a1e9096514e6400566471f67e90d70a16c0e490755ff742cb449daa20052e57af767fcaf23c30fc757f
+EBUILD freebsd-lib-9.1-r11.ebuild 18765 BLAKE2B 87d24b46d75ebc562cfabbb86011dbeba01c5a0cdbf60b1b0211b8baa11b34194cb8798873faee80b790d508c02df6bec0717d11be10d53e607eb03f79f5d030 SHA512 612088ffd0f9c166fcc85fb13a04dbb92a9d08bb427417844f9f731f405660ac153c15a92888a20af466fbdcd38355362e9710089a29937eb6539ac8c4e23e62
 MISC metadata.xml 500 BLAKE2B b1e29ff9a6046d5f757c2eba85d20a8941d1f295be8dc9d3c02515193bc879020cd7760830b8a5cbaebbd9e691623dee6413f50dd321b09b28e108ca5ad99e9f SHA512 a164ccc254879d798007a4fb1db376b0dd807b3b6ef628c7f65ff05560d92d742f315226fe4935eb8b142d6937d6cfb01f515d21664f171e94f1549b40815470
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
deleted file mode 100644
index a3e7d5e1b63c..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.0-gccfloat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This patch is needed to avoid inclusion of GCC's float.h that defines
-LDBL_MANT_DIG at 53 (while the source file checks for 113 or 64.
-
-Index: freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-===================================================================
---- freebsd-6.0_beta4.orig/lib/msun/src/s_fmal.c
-+++ freebsd-6.0_beta4/lib/msun/src/s_fmal.c
-@@ -28,7 +28,7 @@
- __FBSDID("$FreeBSD: src/lib/msun/src/s_fmal.c,v 1.2 2005/03/18 02:27:59 das Exp $");
- 
- #include <fenv.h>
--#include <float.h>
-+#include <machine/float.h>
- #include <math.h>
- 
- /*
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
deleted file mode 100644
index a9b8435eff66..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-bluetooth.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libsdp/Makefile	2007-06-15 12:04:37 +0200
-+++ lib.sdp/libsdp/Makefile	2007-06-15 12:26:14 +0200
-@@ -5,7 +5,7 @@
- MAN=		sdp.3
- 
- WARNS?=		2
--CFLAGS+=	-I${.CURDIR}
-+CFLAGS+=	-I${.CURDIR}  -I${.CURDIR}/../libbluetooth
- 
- SHLIB_MAJOR=	2
- 
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
deleted file mode 100644
index a9fd18998287..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-log2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-log2 and log2f are required by C99 and are not implemented.
-Workaround the deficiency.
-
---- lib/msun/src/math.h.old	2010-03-14 17:02:25.000000000 +0100
-+++ lib/msun/src/math.h	2010-03-14 17:07:03.000000000 +0100
-@@ -203,6 +203,7 @@
- double	frexp(double, int *);	/* fundamentally !__pure2 */
- double	ldexp(double, int);
- double	log(double);
-+#define log2(x) log(x)/log(2.0)
- double	log10(double);
- double	modf(double, double *);	/* fundamentally !__pure2 */
- 
-@@ -319,6 +320,7 @@
- float	log10f(float);
- float	log1pf(float);
- float	logf(float);
-+#define log2f(x) logf(x)/logf(2.0)
- float	modff(float, float *);	/* fundamentally !__pure2 */
- 
- float	powf(float, float);
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
deleted file mode 100644
index a7de06fadf56..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.0-rpcsec_gss.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Without this linking fails during a stage3 build.
-
---- lib/librpcsec_gss/Makefile.orig
-+++ lib/librpcsec_gss/Makefile
-@@ -8,6 +8,7 @@
- 
- DPADD+=	${LIBGSSAPI}
- LDADD+=	-lgssapi
-+LDFLAGS+= 	-L${.OBJDIR}/../libgssapi
- 
- VERSION_DEF=	${.CURDIR}/../libc/Versions.def
- SYMBOL_MAPS=	${.CURDIR}/Symbol.map
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
deleted file mode 100644
index c8be7f48472e..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-liblink.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libproc/Makefile.old	2011-07-06 00:58:04.000000000 +0000
-+++ lib/libproc/Makefile	2011-07-06 00:58:58.000000000 +0000
-@@ -18,5 +18,6 @@
- WARNS?=	6
- 
- WITHOUT_MAN=	yes
-+LDADD=-lelf
- 
- .include <bsd.lib.mk>
---- lib/librtld_db/Makefile.old	2011-07-06 00:58:12.000000000 +0000
-+++ lib/librtld_db/Makefile	2011-07-06 00:59:27.000000000 +0000
-@@ -10,5 +10,7 @@
- INCS=		rtld_db.h
- 
- CFLAGS+= -I${.CURDIR}
-+LDADD=-lutil -lproc
-+LDFLAGS+=-L${.CURDIR}/../libutil -L${.CURDIR}/../libproc
- 
- .include <bsd.lib.mk>
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
deleted file mode 100644
index 556ade50b033..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-8.2-nlm_syscall.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/unistd.h	2010/12/20 20:39:49	216602
-+++ include/unistd.h	2010/12/20 21:12:18	216603
-@@ -529,6 +529,7 @@
- #define	_MKTEMP_DECLARED
- #endif
- int	 nfssvc(int, void *);
-+int	 nlm_syscall(int, int, int, char **);
- int	 profil(char *, size_t, vm_offset_t, int);
- int	 rcmd(char **, int, const char *, const char *, const char *, int *);
- int	 rcmd_af(char **, int, const char *,
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
index db383d629470..61bfeb3924f8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-11.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD GPL-2 zfs? ( CDDL )"
 # 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"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 			$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
deleted file mode 100644
index 8af19aedf5f0..000000000000
--- a/sys-freebsd/freebsd-lib/freebsd-lib-8.2-r1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-# 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
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${CRYPTO}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )"
-
-if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
-	RDEPEND="ssl? ( dev-libs/openssl )
-		hesiod? ( net-dns/hesiod )
-		kerberos? ( virtual/krb5 )
-		usb? ( !dev-libs/libusb )
-		userland_GNU? ( sys-apps/mtree )
-		>=dev-libs/expat-2.0.1
-		!sys-freebsd/freebsd-headers"
-	DEPEND="${RDEPEND}
-		>=sys-devel/flex-2.5.31-r2
-		=sys-freebsd/freebsd-sources-${RV}*
-		!bootstrap? ( app-arch/bzip2 )"
-else
-	SRC_URI="${SRC_URI}
-			mirror://gentoo/${SYS}.tar.bz2"
-fi
-
-DEPEND="${DEPEND}
-		=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 bootstrap headers-only"
-
-pkg_setup() {
-	[ -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= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
-	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
-	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL="
-
-	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.0-gccfloat.patch"
-	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	"${FILESDIR}/${PN}-6.1-csu.patch"
-	"${FILESDIR}/${PN}-6.2-bluetooth.patch"
-	"${FILESDIR}/${PN}-8.0-log2.patch"
-	"${FILESDIR}/${PN}-8.0-rpcsec_gss.patch"
-	"${FILESDIR}/${PN}-8.2-liblink.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.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)
-#
-# The rest are libraries we already have somewhere else because
-# they are contribution.
-# Note: libtelnet is an internal lib used by telnet and telnetd programs
-# as it's not used in freebsd-lib package itself, it's pointless building
-# it here.
-REMOVE_SUBDIRS="ncurses \
-	libexpat \
-	libz libbz2 libarchive liblzma \
-	libsm libsmdb libsmutil \
-	libbegemot libbsnmp \
-	libpam libpcap bind libwrap libmagic \
-	libcom_err libtelnet
-	libedit libelf"
-
-src_prepare() {
-	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
-	sed -i.bak -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
-
-	# 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}-8.2-nlm_syscall.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; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
-		die "Problem fixing \"${dir}/Makefile"
-	done
-	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}"/${PN}-7.1-types.h-fix.patch
-		# Preinstall includes so we don't use the system's ones.
-		mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-		install_includes "/include_proper"
-		return 0
-	fi
-
-	if [ "${CTARGET}" = "${CHOST}" ]; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
-	else
-		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
-			"${S}/libc/rpc/Makefile.inc" \
-			"${S}/libc/yp/Makefile.inc"
-	fi
-
-	if install --version 2> /dev/null | grep -q GNU; then
-		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
-	fi
-
-	# Preinstall includes so we don't use the system's ones.
-	mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper"
-	install_includes "/include_proper"
-
-	# Let arch-specific includes to be found
-	local machine
-	machine=$(tc-arch-kernel ${CTARGET})
-	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
-		die "Couldn't make ${machine}/include symlink."
-
-	cd "${S}"
-	use bootstrap && dummy_mk libstand
-	# 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
-}
-
-src_compile() {
-	cd "${WORKDIR}/include"
-	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
-
-	use headers-only && return 0
-
-	# Bug #270098
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	# Bug #324445
-	append-flags $(test-flags -fno-strict-overflow)
-
-	strip-flags
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		export YACC='yacc -by'
-		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
-		mymakeopts="${mymakeopts} NO_MANCOMPRESS= NO_INFOCOMPRESS= NLS="
-
-		local machine
-		machine=$(tc-arch-kernel ${CTARGET})
-
-		local csudir
-		if [ -d "${S}/csu/${machine}-elf" ]; then
-			csudir="${S}/csu/${machine}-elf"
-		else
-			csudir="${S}/csu/${machine}"
-		fi
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
-
-		append-flags "-isystem /usr/${CTARGET}/usr/include"
-		append-flags "-isystem ${WORKDIR}/lib/libutil"
-		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
-		append-flags "-B ${csudir}"
-		append-ldflags "-B ${csudir}"
-
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-
-		export RAW_LDFLAGS=$(raw-ldflags)
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${S}/msun"
-		append-ldflags "-L${WORKDIR}/lib/libc"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		LDADD="-lssp_nonshared" $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libssp failed"
-		cd "${WORKDIR}/lib/libthr/" || die "missing libthr"
-		$(freebsd_get_bmake) ${mymakeopts} || die "make libthr failed"
-	else
-		# Forces to use the local copy of headers as they might be outdated in
-		# the system
-		append-flags "-isystem '${WORKDIR}/include_proper'"
-
-		# First compile libssp_nonshared.a and add it's path to LDFLAGS.
-		einfo "Compiling libssp in \"${WORKDIR}/gnu/lib/libssp/\"."
-		cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp."
-		NOFLAGSTRIP=yes freebsd_src_compile
-		# Hack libssp_nonshared.a into libc & others since we don't have
-		# the linker script in place yet.
-		append-ldflags "-L${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
-		einfo "Compiling libc."
-		cd "${S}"
-		export RAW_LDFLAGS=$(raw-ldflags)
-		NOFLAGSTRIP=yes LDADD="-lssp_nonshared" freebsd_src_compile
-	fi
-}
-
-src_install() {
-	[ "${CTARGET}" = "${CHOST}" ] \
-		&& INCLUDEDIR="/usr/include" \
-		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
-	dodir ${INCLUDEDIR}
-	einfo "Installing for ${CTARGET} in ${CHOST}.."
-	install_includes ${INCLUDEDIR}
-
-	# Install math.h when crosscompiling, at this point
-	if [ "${CHOST}" != "${CTARGET}" ]; then
-		insinto "/usr/${CTARGET}/usr/include"
-		doins "${S}/msun/src/math.h"
-	fi
-
-	use headers-only && return 0
-	local mylibdir=$(get_libdir)
-
-	if [ "${CTARGET}" != "${CHOST}" ]; then
-		local csudir
-		if [ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]; then
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
-		else
-			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
-		fi
-		cd "${csudir}"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
-			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
-
-		cd "${S}/libc"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libc failed"
-
-		cd "${S}/msun"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install msun failed"
-
-		cd "${WORKDIR}/gnu/lib/libssp/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install ssp failed"
-
-		cd "${WORKDIR}/lib/libthr/"
-		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
-			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
-			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install libthr failed"
-
-		dosym "usr/include" "/usr/${CTARGET}/sys-include"
-	else
-		# Set SHLIBDIR and LIBDIR for multilib
-		cd "${WORKDIR}/gnu/lib/libssp"
-		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install ssp failed."
-		cd "${S}"
-		SHLIBDIR="/${mylibdir}" LIBDIR="/usr/${mylibdir}" mkinstall || die "Install failed"
-	fi
-
-	# Don't install the rest of the configuration files if crosscompiling
-	if [ "${CTARGET}" != "${CHOST}" ] ; then
-		# This is to get it stripped with the correct tools, otherwise it gets
-		# stripped with the host strip.
-		export CHOST=${CTARGET}
-		return 0
-	fi
-
-	# Symlink libbsdxml to libexpat as we use expat in favor of the renaming done
-	# on FreeBSD.
-	dosym libexpat.so /usr/${mylibdir}/libbsdxml.so
-
-	# install libstand files
-	dodir /usr/include/libstand
-	insinto /usr/include/libstand
-	doins "${S}"/libstand/*.h
-
-	cd "${WORKDIR}/etc/"
-	insinto /etc
-	doins auth.conf nls.alias mac.conf netconfig
-
-	# Install ttys file
-	local MACHINE="$(tc-arch-kernel)"
-	doins "etc.${MACHINE}"/*
-
-	# Generate ldscripts, otherwise bad thigs are supposed to happen
-	gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \
-		libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \
-		libalias_smedia.so libssp.so
-	# These show on QA warnings too, however they're pretty much bsd only,
-	# aka, no autotools for them.
-	#	libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \
-	#	libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \
-	#	libutil.so
-
-	# 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} )"
-	# Clear the symlink.
-	rm -f "${D}/usr/${mylibdir}/libc.so"
-	cat > "${D}/usr/${mylibdir}/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 ( /${mylibdir}/libc.so.7 /usr/${mylibdir}/libssp_nonshared.a )
-END_LDSCRIPT
-
-	dodir /etc/sandbox.d
-	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
-# /dev/crypto is used mostly by OpenSSL on *BSD platforms
-# leave it available as packages might use OpenSSL commands
-# during compile or install phase.
-SANDBOX_PREDICT="/dev/crypto"
-EOF
-
-	# Install a libusb.pc for better compat with Linux's libusb
-	if use usb ; then
-		dodir /usr/$(get_libdir)/pkgconfig
-		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
-	fi
-}
-
-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
-
-	# This is for ssp/ssp.h.
-	einfo "Building ssp.h"
-	cd "${WORKDIR}/gnu/lib/libssp/" || die "missing libssp"
-	$(freebsd_get_bmake) ssp.h || die "problem building ssp.h"
-
-	# 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} DESTDIR="${DESTDIR}" \
-		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "install_includes() failed"
-	einfo "includes installed ok."
-	einfo "Installing ssp includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	cd "${WORKDIR}/gnu/lib/libssp"
-	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "problem installing ssp includes."
-	einfo "ssp includes installed ok."
-	einfo "Installing librtld_db includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
-	cd "${S}/librtld_db" || die "missing librtld_db"
-	$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
-		MACHINE=${MACHINE} INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
-		BINGRP="${BINGRP}" || die "problem installing librtld_db includes."
-	einfo "librtld_db includes installed ok."
-}
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
index 92881fadfbc3..59b3798a45f0 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r11.ebuild
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild mu
 
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 # Crypto is needed to have an internal OpenSSL header
 # sys is needed for libalias, probably we can just extract that instead of
diff --git a/sys-freebsd/freebsd-libexec/Manifest b/sys-freebsd/freebsd-libexec/Manifest
index 4767583a3bb5..2b45079a62a3 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -1,27 +1,16 @@
 AUX bootpd.confd 183 BLAKE2B 76fb1b41204f2b3d07cc974ec996ff9127945dc638796b176cd8809ca46fb69fa307f3fa313d48d79a7deb532d393ab58839ed7ae53927280f0178c20c4df3c4 SHA512 3f097c1acb5547add8d12fcee0b4b55b03896cb3ba473214d1634804f3683e0dea4b3c9559b61b2366b7f264d7a3d878695e16f29acff076b8060ca1fd79757f
 AUX bootpd.initd 554 BLAKE2B 86c2128a8f17a1d8eb57ef935a6e5a2b04f5c8c6654ecf40b10559912f30effb189f55e7f34ef37b496d8f9f8eb8726ab6af2ca179cb215809d76d1293ffb338 SHA512 69bc8dc708d955e41d3e0cfb997f96b589e8a3d33b11b2728541082fc5ab0844d753ca036a6c70ddd23a2a0085c39a89340b0f7d332b1384c94671cf3fe09b66
-AUX freebsd-libexec-7.2-pic.patch 348 BLAKE2B 38c8f2be3aafa6ff92055bd61c3d1a9691fa6137322adf966971b72bc78f50e25dfdbb9598fae94974b4a2788babf250dee50916b9bcc9a8684005107d1b6214 SHA512 c77297582efccd799f6d0e67c0976f1ee5551617abf2df9ccd0e2fc0abd7fb76ecaf7f5e019356034fb47d3cc39590a5eecd9b9868d2c356467e43e845638ab5
-AUX freebsd-libexec-8.2-rtld.patch 1332 BLAKE2B c34d2e3a3f96ff619b86443b820b43d2d11c6ead43d5fa573b6541aed9dca116fbd92e94dff7504910dbbe7ee8447a8e398e56cdd3b0931abd1d41d3445e2350 SHA512 9abbac7dfb703a05b3f6f1d3dc96db7df106355e3641eeb6fb446ea5f9ba15cfb9375e00bfa02b5ae26e4c9cdb52e14e2260981908c40e2c44549a43a2865ad6
 AUX rquotad.xinetd 162 BLAKE2B 87633efa7d9732c498de807976fdc65e3ec15eaef596f7f3f52e3a065fd0b6a9d592c3823a3c84cb9d363df5870f81f00d4a140a6df6e54cbfe239157af05c6b SHA512 2cf16514f18abe2aeaa273fabc2dc94b09f31d02001ece5c82d9336c02d921e03dff6f82a613a4bffe57b5e415add2b82ef883a306907dd20ffe1bbe332b011f
 AUX rstatd.xinetd 218 BLAKE2B a998b50e4f3a49582529d0d1751a4111b0705f03e53e677395043db38b743a5d017799d4dbfa26eeb107d5d657d82af88198d6477452976b59458ce5f7912417 SHA512 febca8ab8248b1c103dd7be0806e3d678c5b5cf165a7b3bd0305bc905da228bf92392d65d44a765b7692f772befeedcbc3df205d32bb62ad5aa307f71a1c1011
 AUX rusersd.xinetd 220 BLAKE2B 60590eb0a4115ab0cdc3248beb4940f7cc6526967963e1e1791dee53a08b2ada06d2f740246bcf4e5c2a9665f612e7b613e5f437576df468ec6fd29712cb0d0f SHA512 fdf4ef4e0b0dd11c64fb38d32c9fca2d378a69e4cff87523127089d7dc0db12b26f6399c7a61fc43d62ca8083b116440f6fffff9e3329f0548bf54f0f26699cd
 AUX sprayd.xinetd 216 BLAKE2B 8e154d0eb67616b6245a002d95b260c32243c8f230861b31a51f67b84d6b56627f2328b58db5cc6d6df85c8831d0c1996ea707ff0058a059b7b5b77a81b6e59d SHA512 a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
 AUX walld.xinetd 215 BLAKE2B dbf0093f41762c8e493e34bd52e52f61961fcd2dfeeae981c275c983f3ce4f85283c6e81ca379f827088b1274dff9a1f9dd9dffd714a33021b34c12ca07ccfe1 SHA512 ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-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-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-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
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-libexec-8.2-r1.ebuild 1762 BLAKE2B bdfd5c674d09618b3337d0a5922edbc8e962e442d3f943311c3f2106179e204d5dd64aae37ad85b6057041e5e21d3e0a2b3c3c471d21dcacc9bdcce10e2f4a1f SHA512 b5ff14afff032ebe2fc43fb4045d7705d6d0cf4b2853ef788ad0cc47dab343a19a655d881dd2965e4743d4c4212dc6ef7e5b3929885851fc2041ec97fc641cb8
-EBUILD freebsd-libexec-8.2.ebuild 1726 BLAKE2B 81734a0958b6d0a44d0257a9e77534d15170404f01821fc97ff8fb2ecfe506fc6c3717b81df02f9f667231036fff70e0d81698a0e64872922627a91387ee96cf SHA512 3b825ac1c7d44a3f288483b5b7a212a60800a36c326a29dca90cbfe1898735fc4a43c13866bc95b4cbbfdf3eaaf845e9bd191933ec63f807a3bf6b43887dd8f4
-EBUILD freebsd-libexec-9.1-r2.ebuild 2296 BLAKE2B ff662e3bbee7969539bf48139f6e921bef036dc003d2b4b5b16ba94c6d6de0291a54daccb81dc0856100f452202a2eb430b0d15fdedffb479365af18f545f0ac SHA512 e099494395ac06088175df3717f7936b2b41c4b98d176cecd6f345ce31c42e02401e60642f9919418fb0ef3f4944bebb7935432c920a080b503ef9fc2fef92c7
+EBUILD freebsd-libexec-9.1-r2.ebuild 2284 BLAKE2B 239c52de3c17872b465dacaffbf4962ab25905deca80b32aec70ebee1239efd24e45ba5841a14cf1450f092bd9161c9f0477983fb084165b3c8aa217ac59d945 SHA512 ac17fd62e1d0bd470f4420c12783bb187dfe1a9ca48af5b87494d5a0de6aa4dc2537640a4e1bf386adf3433bbfcf95081bf005d4ff097a0a2fd54bd81cc582b3
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
deleted file mode 100644
index 22d5658394dd..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-7.2-pic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fails to build on sparc without using -fPIC
-
---- libexec/rtld-elf/Makefile.old	2010-01-09 17:17:21 +0100
-+++ libexec/rtld-elf/Makefile	2010-01-09 17:17:33 +0100
-@@ -19,7 +19,7 @@
- MLINKS=		rtld.1 ld-elf.so.1.1 \
- 		rtld.1 ld.so.1
- 
--CFLAGS+=	-fpic -DPIC
-+CFLAGS+=	-fPIC -DPIC
- LDFLAGS+=	-shared -Wl,-Bsymbolic
- DPADD=		${LIBC_PIC}
- LDADD=		-lc_pic
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
deleted file mode 100644
index c60b2fec102c..000000000000
--- a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-8.2-rtld.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- head/libexec/rtld-elf/rtld.c	2011/09/15 11:50:09	225582
-+++ head/libexec/rtld-elf/rtld.c	2011/10/08 12:39:47	226155
-@@ -495,8 +495,12 @@
-        exit (0);
-     }
- 
--    /* setup TLS for main thread */
--    dbg("initializing initial thread local storage");
-+    /*
-+     * Processing tls relocations requires having the tls offsets
-+     * initialized.  Prepare offsets before starting initial
-+     * relocation processing.
-+     */
-+    dbg("initializing initial thread local storage offsets");
-     STAILQ_FOREACH(entry, &list_main, link) {
- 	/*
- 	 * Allocate all the initial objects out of the static TLS
-@@ -504,7 +508,6 @@
- 	 */
- 	allocate_tls_offset(entry->obj);
-     }
--    allocate_initial_tls(obj_list);
- 
-     if (relocate_objects(obj_main,
-       ld_bind_now != NULL && *ld_bind_now != '\0', &obj_rtld, NULL) == -1)
-@@ -519,6 +522,14 @@
-        exit (0);
-     }
- 
-+    /*
-+     * Setup TLS for main thread.  This must be done after the
-+     * relocations are processed, since tls initialization section
-+     * might be the subject for relocations.
-+     */
-+    dbg("initializing initial thread local storage");
-+    allocate_initial_tls(obj_list);
-+
-     dbg("initializing key program variables");
-     set_program_var("__progname", argv[0] != NULL ? basename(argv[0]) : "");
-     set_program_var("environ", env);
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
deleted file mode 100644
index 0bf7ac9e4631..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	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"
-
-PATCHES=( "${FILESDIR}/${PN}-7.2-pic.patch"
-	"${FILESDIR}/${PN}-8.2-rtld.patch" )
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-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() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	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-8.2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild
deleted file mode 100644
index 59841db7cba0..000000000000
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd pam
-
-DESCRIPTION="FreeBSD libexec things"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
-	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"
-
-PATCHES=( "${FILESDIR}/${PN}-7.2-pic.patch" )
-# Remove sendmail, tcp_wrapper and other useless stuff
-REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
-
-IUSE="pam ssl kerberos ipv6 nis xinetd"
-
-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() {
-	ln -s /usr/include "${WORKDIR}/include"
-}
-
-src_install() {
-	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-9.1-r2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
index a1331fb143ff..ff73fbf563b9 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit bsdmk freebsd pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="mirror://gentoo/${LIBEXEC}.tar.bz2
 	mirror://gentoo/${UBIN}.tar.bz2
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 33e53a06d3d7..6edc7a555567 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,6 +3,11 @@ AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af4
 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545
 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2
 AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339
+AUX freebsd-mk-defs-9.1-gentoo.patch 11769 BLAKE2B 5a6f3ce6c84049cb876db85e69e7428a66473de2244ee299a0e6abf921fd7c4d0c4e412fd73e44581fa168ed635f49bac36bd4f73f94113b22c9bb02259a8705 SHA512 2ac2f700b168905df79b8a4c43fb7893ba752fa95b9d55bf0924602903ea5fdd6e4510b89a212dac70dd208ce24928eb202891f932a69507695d49ba59c4c6fe
+AUX freebsd-mk-defs-9.1-gnu.patch 2273 BLAKE2B c74563cbf039bbb3377bbea7e47affe540d756a0ef15ddfca60cf7f889b51b943cbad01bc0fc9ce1fb7783777a8bba1b5b1d82cfe6079bfb30dde6e9dc1e5491 SHA512 b1537d3c9dcac78de5ddc026b1281887f755990a4a164e9f05cee53acfc1d7f2674ab1dfb4345b3862bdf971d9403e677e0900fb64a4e7b200c38b8d06c64fbd
+AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 BLAKE2B 2093435dece5cfc8dbbcd1035ee4930c7b30d35b5450f7548c3fa9e34e6ac451731cd4f93c8acd3ba045150ba5674ea557ed7c1e8c79fa2fef1d3627c44afac5 SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913
+DIST freebsd-share-9.1.tar.bz2 6733003 BLAKE2B 12bff34814fc3e893a95480a3ed1a389f426b6c7c7526c572aaf3bf710258feae78f09390dc29ccf563eb700407ab2f600c251c4a3927556e9d5ca323f37b17f SHA512 9665e3d5253f49a55921012bd21a8688210a1993ba6be4ad17b5ba5619104a50f3199d49a0eb83cf29db5a06c407beb15616bfe71338c680fe34ec47564c4b43
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-EBUILD freebsd-mk-defs-11.1.ebuild 1148 BLAKE2B 5e0cfc31dbd47afb392c69125e3a29c251216436f6724dad42aabcc55f87f27fb0c687c325a284b18d3ef7ce470cf15356e05a057bad439485682ead320d7980 SHA512 d3bf63b18797b3eb4193859f3c61e5ed810f2fbd9d491b82b072655cf7f9a42d0b69c634b9877635455ef38ecc2e29fc6fdb9179a5a62cd31570d8469fd294bb
+EBUILD freebsd-mk-defs-11.1.ebuild 1136 BLAKE2B ffd94b408344303a33c949098cb8bf7084255cfe8adaf4f3bfb5d31a0907c37fb05596f955dd21ac0012c84a836c16267608b5083b343f187f16f1b622e4f4bb SHA512 645fff46a41d3c00ffb966139d58f2e46a6bedabbd163692300fa46bd7cf956d75dd5a7a41b733f7a6eb7743a2049de038a2c9484671a1a0d861dd2bab34b544
+EBUILD freebsd-mk-defs-9.1.ebuild 759 BLAKE2B 721eea8dc09489884a041dd928d3a8de46b46890c9eb2f56614389e8ffb730d4a74045f322f323048302b8fdb53a638c12c5b942715dec706f0bdbd193867532 SHA512 74bfeae62f5efdbdd15631826fa1c89f025bbebe9f3e063616948cbde28e4de9faa66cf35db265efd6da88e05a00a62cf325cbb013b23238bd5c6a7f38c7ca34
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
new file mode 100644
index 000000000000..598d0b9145b4
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch
@@ -0,0 +1,326 @@
+diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
+--- share.orig/mk/bsd.doc.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.doc.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -135,10 +135,12 @@
+ realinstall:
+ .for _dev in ${PRINTERDEVICE:Mhtml}
+ 	cd ${SRCDIR}; \
++	    ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
+ .endfor
+ .for _dev in ${PRINTERDEVICE:Nhtml}
++	${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}; \
+ 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
+ .endfor
+diff -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
+--- share.orig/mk/bsd.files.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.files.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -39,6 +39,7 @@
+ .endif
+ installfiles: _${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} \
+@@ -51,10 +52,12 @@
+ installfiles: _${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 -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
+--- share.orig/mk/bsd.incs.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.incs.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -41,6 +41,9 @@
+ .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 @@
+ 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 -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
+--- share.orig/mk/bsd.info.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.info.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -83,6 +83,7 @@
+ TEX?=		tex
+ DVIPS?=		dvips
+ DVIPS2ASCII?=	dvips2ascii
++INSTALL?=	install
+ 
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
+ 
+@@ -144,15 +145,17 @@
+ 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 -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
+--- share.orig/mk/bsd.lib.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.lib.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -46,10 +46,6 @@
+ .endif
+ .endif
+ 
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
+-.endif
+-
+ .include <bsd.libnames.mk>
+ 
+ # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries
+@@ -284,14 +280,17 @@
+ .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}
+@@ -329,10 +328,12 @@
+ .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 -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk
+--- share.orig/mk/bsd.libnames.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.libnames.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -48,7 +48,7 @@
+ LIBEDIT?=	${DESTDIR}${LIBDIR}/libedit.a
+ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
+ LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
+-LIBFL?=		"don't use LIBFL, use LIBL"
++LIBFL?=		${DESTDIR}${LIBDIR}/libfl.a
+ LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
+ LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
+ LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
+@@ -79,7 +79,7 @@
+ 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"
+ .if ${MK_BIND} != "no"
+ LIBLWRES?=	${DESTDIR}${LIBDIR}/liblwres.a
+diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk
+--- share.orig/mk/bsd.links.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.links.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -15,6 +15,8 @@
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		ln -f $$l $$t; \
+ 	done; true
+ .endif
+@@ -26,6 +28,8 @@
+ 		t=${DESTDIR}$$1; \
+ 		shift; \
+ 		${ECHO} $$t -\> $$l; \
++		d=`dirname $$t`; \
++		test -d $$d || mkdir $$d; \
+ 		ln -fs $$l $$t; \
+ 	done; true
+ .endif
+diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
+--- share.orig/mk/bsd.man.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.man.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -165,9 +165,11 @@
+ .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 @@
+ 		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 @@
+ .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 -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk
+--- share.orig/mk/bsd.nls.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.nls.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -62,7 +62,8 @@
+ # 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 -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk
+--- share.orig/mk/bsd.own.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.own.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -182,9 +182,6 @@
+ INCLUDEDIR?=	/usr/include
+ 
+ # Common variables
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=		-s
+-.endif
+ 
+ COMPRESS_CMD?=	gzip -cn
+ COMPRESS_EXT?=	.gz
+diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
+--- share.orig/mk/bsd.prog.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.prog.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -33,10 +33,6 @@
+ CFLAGS+=${CRUNCH_CFLAGS}
+ .endif
+ 
+-.if !defined(DEBUG_FLAGS)
+-STRIP?=	-s
+-.endif
+-
+ .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
+ LDFLAGS+= -static
+ .endif
+@@ -155,6 +151,7 @@
+ .ORDER: beforeinstall _proginstall
+ _proginstall:
+ .if defined(PROG)
++	${INSTALL} -d ${DESTDIR}${BINDIR}
+ .if defined(PROGNAME)
+ 	${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
+@@ -186,6 +183,7 @@
+ 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 -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk
+--- share.orig/mk/bsd.sys.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/bsd.sys.mk	2012-07-16 00:04:14.000000000 +0900
+@@ -28,10 +28,6 @@
+ .if defined(WARNS)
+ .if ${WARNS} >= 1
+ CWARNFLAGS+=	-Wsystem-headers
+-.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+-    ${CC:T:Mclang} != "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
+@@ -95,10 +91,6 @@
+ CWARNFLAGS+=	-Wno-format-nonliteral
+ .endif # WARNS <= 3
+ .endif # CLANG
+-.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
+-    ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+-CWARNFLAGS+=	-Werror
+-.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang)
+ .endif # WFORMAT > 0
+ .endif # WFORMAT
+ .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \
+diff -Nur share.orig/mk/sys.mk share/mk/sys.mk
+--- share.orig/mk/sys.mk	2012-07-12 13:25:44.000000000 +0900
++++ share/mk/sys.mk	2012-07-16 00:01:55.000000000 +0900
+@@ -349,12 +349,6 @@
+ 		(${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
+ 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
+ 
+-# 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-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
new file mode 100644
index 000000000000..f986ed9c3e11
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch
@@ -0,0 +1,77 @@
+diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
+--- share.orig/mk/bsd.lib.mk	2012-07-16 02:40:07.000000000 +0900
++++ share/mk/bsd.lib.mk	2012-07-16 02:41:40.000000000 +0900
+@@ -155,11 +155,7 @@
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
+ 	@${ECHO} building static ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -172,11 +168,7 @@
+ lib${LIB}_p.a: ${POBJS}
+ 	@${ECHO} building profiled ${LIB} library
+ 	@rm -f ${.TARGET}
+-.if !defined(NM)
+-	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+-.else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+-.endif
++	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
+ 	${RANLIB} ${.TARGET}
+ .endif
+ 
+@@ -203,15 +195,9 @@
+ .if defined(SHLIB_LINK)
+ 	@ln -fs ${.TARGET} ${SHLIB_LINK}
+ .endif
+-.if !defined(NM)
+ 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `lorder ${SOBJS} | tsort -q` ${LDADD}
+-.else
+-	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+-	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+-.endif
++	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
+ 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+ 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
+ 		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
+@@ -259,13 +245,6 @@
+ 
+ .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 -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
+--- share.orig/mk/bsd.prog.mk	2012-07-16 02:40:07.000000000 +0900
++++ share/mk/bsd.prog.mk	2012-07-16 02:40:24.000000000 +0900
+@@ -134,13 +134,6 @@
+ 
+ .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-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
new file mode 100644
index 000000000000..8eb80c38cc7a
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/show_bug.cgi?id=511698
+
+diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
+index e438633..de4a05b 100644
+--- a/share/mk/bsd.sys.mk
++++ b/share/mk/bsd.sys.mk
+@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
+ CFLAGS+=	 -Qunused-arguments
+ .endif # CLANG
+ 
+-.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+-    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
++.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
++    && ${MACHINE_CPUARCH} != "mips"
++.if ${MK_SSP} != "no"
+ # Don't use -Wstack-protector as it breaks world with -Werror.
+ SSP_CFLAGS?=	-fstack-protector
++.else
++# 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
++.endif #SSP
+ CFLAGS+=	${SSP_CFLAGS}
+-.endif # SSP && !IA64 && !ARM && !MIPS
++.endif # !IA64 && !ARM && !MIPS
+ 
+ # Allow user-specified additional warning flags
+ CFLAGS+=	${CWARNFLAGS}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
index 1d5d46f51932..46502242b6f5 100644
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="userland_GNU"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="share/"
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
new file mode 100644
index 000000000000..b98cde16cb2e
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit bsdmk freebsd
+
+DESCRIPTION="Makefile definitions used for building and installing libraries and system files"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="userland_GNU"
+
+SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
+
+RDEPEND=""
+DEPEND=""
+
+RESTRICT="strip"
+
+S="${WORKDIR}/share/mk"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-9.1-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-add-nossp-cflags.patch"
+	use userland_GNU && epatch "${FILESDIR}/${PN}-9.1-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-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 20ec95d71ac5..eef5f851d1a8 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,10 +1,7 @@
 AUX README.pamd 2840 BLAKE2B 06d8f86b6db63a0b401627a8e2cff0dcb7daa2b567b2d7f97f196db263956b95516495b3acc806cfaca448509638235a874845c088b898033e858e835c46fcba SHA512 7188bbb741bacbd2c826976f7f3b3150036f0855514ead679f56f0a4ab70fd6657fd38a33215cd883264ca2e801b7b2f3d7b73c40e04adc685e5fa6385c49357
-AUX freebsd-pam-modules-6.0-gentoo.patch 701 BLAKE2B dc275160427933eb9d84faef0665f56b6f3f934aa7fa7a31e4a7b94a985f88a92b85d025eb9cb7aa8f044fb373f39bbcb2c05357eeb70481e0a1dea26e865bd6 SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 BLAKE2B 10d9b14b96d777d8b9e6294b74a42f579a894053047391db79beab6aa9e413059c5f6ad217cc8c80573ac6bc836329aefd17bdd0a8f22b06422b78d0d3e815f4 SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0
-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-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-EBUILD freebsd-pam-modules-11.1.ebuild 1035 BLAKE2B 6dfe4a5fc5b8dd5e982db7fd5e5da872e2d4df83e1eb0c0b454d2e80b5d216d77dd094d1472eca7cf9244db9d50a93dad30a8c1d6eb9da86093473218a0526a1 SHA512 150ba570785b63e2fea121de424a7a8a5c0e6a74c4d498f743d4b7377d55f3eef7db10cfb5b0ded06f39913d32eb68565f17043863d16097ec9ce9f4cc5a04e2
-EBUILD freebsd-pam-modules-8.2.ebuild 1123 BLAKE2B cf201d16028e3ee682279b33fbb22a92bdf567b28ad907478d6c533322116f7d32bb9bf58c144c2cf7f39e9201fd93e8dc0237ac558a926bcbe4898e4e2f1b62 SHA512 134d96116953ec37a82d8ca96673c9a83191c8cb6d5564800292f311fdd3d2f7c5b827bb7727855e6cad764850573345d88764a0b985704c2987cb58caa680f1
-EBUILD freebsd-pam-modules-9.1-r1.ebuild 1072 BLAKE2B e050425fd980a9ae6aeb1f6513a66e4ad2bf96e05c728a490ab5e00cf2ba89c8716726ff676b4e8f2c93e4b795a841fd828dc8763923177e85ee1d43afcd73d0 SHA512 d5a4f80a980481f368e99c319b81a548fbfa20ea72b3044755a1065b09dbf63519f412328e4eaac8752de593a9e01b07eca0f0187e98e588cf5f38c04d528273
+EBUILD freebsd-pam-modules-11.1.ebuild 1023 BLAKE2B 0f3e81814eff77c96b6ffb6d6469fb3bb63ca97b5d31125ca14cbca595809bd4015213bde430be10b41d7995f91f3ff35f1218be7bc43ff87b5669444abb4d6c SHA512 f2fdb23d324125a06535dab07d753878ebbeb561e3e6a0f9d5ea0cc94664199675a7c1b2410d21adad627440920813cff68fd4c09f043fcf6b09a4798f0b3710
+EBUILD freebsd-pam-modules-9.1-r1.ebuild 1060 BLAKE2B 63dd7114a3d63459d8760d496bc58c396989cbb2c3e8ddb6d1cad972ac931861ae9edc873fc5e5800cec2e4d3aa1a805950276d4f9abd13326c3d8c87c2fe2cf SHA512 a8dadd3c595ce8303592dfa81c7cbfe524a1b75183d66229b7c0948e5d7b49e5f7b82bad004e6478c94a67c2bcb998ad273b9ab7cf183276f6eb016cf45feb5a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
deleted file mode 100644
index ce1a7fbff8c6..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fbsd-6.0/lib/libpam/modules/Makefile.inc
-===================================================================
---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc
-+++ fbsd-6.0/lib/libpam/modules/Makefile.inc
-@@ -5,18 +5,10 @@ PAMDIR=		${.CURDIR}/../../../../contrib/
- NO_INSTALLLIB=
- NO_PROFILE=
- 
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-+CFLAGS+= -I${.CURDIR}/../../libpam
- WARNS?=	4
- 
--# This is nasty.
--# For the static case, libpam.a depends on the modules.
--# For the dynamic case, the modules depend on libpam.so.N
--.if defined(_NO_LIBPAM_SO_YET)
--NO_PIC=
--.else
- SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
--DPADD+=		${LIBPAM}
- LDADD+=		-lpam
--.endif
- 
- .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
index 4c29c927a781..058bd4a6a812 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="kerberos nis"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="lib/"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
deleted file mode 100644
index a04f7b0eb72d..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd ~sparc-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		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} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch "${FILESDIR}"/${PN}-6.0-gentoo.patch
-}
-
-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-9.1-r1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
index 0d4662e54e14..ec99d87c211d 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd multilib pam
 
 DESCRIPTION="FreeBSD's PAM authentication modules"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="kerberos nis"
 
diff --git a/sys-freebsd/freebsd-pf/Manifest b/sys-freebsd/freebsd-pf/Manifest
index f28f901eeedc..6b89b12e0eea 100644
--- a/sys-freebsd/freebsd-pf/Manifest
+++ b/sys-freebsd/freebsd-pf/Manifest
@@ -1,7 +1,5 @@
 AUX freebsd-pf-11.1-libevent.patch 305 BLAKE2B cce2abce33431885196c5bc44c7e38582b2c7db273ddd3b7d4c8b58dbd9902cbc6e2a5031f5cddd28db9361eafd75c98fc0ca8d14e822305ead12aa035990c5f SHA512 a75ff98e8d87ec5182bb1a7226b34d6223500c0a5659727392d97d69d1a66af6d439d4c23a6817740c25306654468e82e52ddfa591d4509001e407e099c83b44
 AUX freebsd-pf-11.1-pflogd.patch 363 BLAKE2B fac873813332149adc13e5b1a77cd8532c12bae7ee1c93644af31e517e7697cdd8e7c59412e7dbb616c97baabb6308049bd7c995b5e803627f6cc3049056380e SHA512 bceaf0f234948acf30aab4391d73c7545bd860dc5b2bba8eb8da1a9791de905654450592674c75419a8dc0646215ba5bcdd885d61cac336d34c017a7c57039fd
-AUX freebsd-pf-7.0-libevent.patch 331 BLAKE2B 3bf0b950ad0669ac399a220e9411d7137243810f4b203a55a803421783ef200d2b0c435bbda499f8fa48d2011fb51db3c29769eae9adfcc991dfbfe50884481a SHA512 fe2db637c8b1f6f8853fd4f6a88dbc0de8d58cc8f3875f0a94dbda74ef4bab4f1402409ff4732f8deae5d9da6bf5eb32d2a8e985f210b84926f94942dffe9c61
-AUX freebsd-pf-7.0-pcap_pollution.patch 437 BLAKE2B a3449aa3bdbce190c823d1a3386c1b44f759cb7fd0e0274584587a6e1d2834333f34ea6a1b3cc58c39dae35901d196384d9628fe1c324a2acb8d62389318885f SHA512 e08df63ac57747cbd42e32b6e61e08e92b0f7af333508e32717194e9c0d0a1b0f23bf4ed9f0b745f804c164b2c950bf92d2abc22ece58113b7ccaee5e86ea3d9
 AUX freebsd-pf-9.0-bpf.patch 309 BLAKE2B 38d4382e437301da49388333b18541699299f033df83e88decd9ba41a62a2b349facd00af806f2c414cfc5e2d356ff6025dadce40abe5767257391b741d1e62f SHA512 e3364e372b5c2d2c4a1960ee1f6d5fa411810ba3597356ec17b275afd8bb6813cce62d781fc683663037b008d81804d28a2617f308c942a741657cf8dcf0e039
 AUX freebsd-pf-9.0-getline.patch 1159 BLAKE2B a9920741120762771581510c8d97e2ddf33c6c9757891cb697a7452bd56ea410dca573cb0b312994f675c89430c882f0a51f1070b4086133e8101f5227377f82 SHA512 2b7ab780e8a66a63e17302f9de19a9a72c7246b349f16745fbe7a2a69d8c83c9d8c5c7e18311bf0273620ce18cd9add6dcf051364013f941d477dbbf165b3ddb
 AUX freebsd-pf-9.0-libevent.patch 384 BLAKE2B 381a15deccbe2ecaf7baa9310866b784f4a734707e5460c8cbdf4b473d65d59de22013e3da540c506a7a483a7ff56517b25791bd28bde5b7bae6d079b17b85c6 SHA512 763c352e5a1e789e5d634066cfa7de84199db14a1f0d61b699f84f04ef1a2acb82dd63d59cffa339ff673bf92a3a9aab25f4b60fb5928e040e47b8c43b6a93f8
@@ -9,16 +7,11 @@ AUX freebsd-pf-9.0-pcap_pollution.patch 450 BLAKE2B daf9a836b6c8243e8b452c0e68bc
 AUX freebsd-pf-9.0-pflogd.patch 332 BLAKE2B 99686ab51741c4b7fd0d72b56743c0306319402cc01b038f9dce8165853fce80b0e7d9c9c34e9e25656b17974a63c8a039b8aa1c98ec7cd429b2e5991e0a0f7a SHA512 7bc7ea7695504a236b7f0aef2598ce577314843e0937258a68b21a7a246db733b9952e6822c938aac9f31409ddaef6753abe7f5143a514d4875abab4aec3f073
 AUX pf.confd 274 BLAKE2B ed3466c836e7c4958d371d7858cf15e532140c1d3afe7e3b2155275f24ec245628d2936d8ac26eba13bbb88b9d86ad13e5f662f0f37ae813a98e92428e160fae SHA512 bf476bf7dc796307f2bf916e73780a6c70a2defd75f4dcbce664a99fdbb5aa69ce7004483073036a0c52fadcf9e7e7c8bcc902e9eacb7ac1963714740bdfc5e5
 AUX pf.initd 803 BLAKE2B 8f3d10adae448a429b2e08954b5a3d3025d9cdde90073fed0b50f900de47c8e4611fd406409047fe8ad1f25c69465fe7954e8b3c937ad507b45fdd8096a9a4de SHA512 b447683fb3abd11a6c5158b452ac9a72858c0a57bb424a1ec3a4cc8dce09336228d6e43ce0c58a63d63ee3917211227a6c5f1d4ac4bde42ce7fc5aa6d188f28d
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 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-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
 EBUILD freebsd-pf-11.1.ebuild 1491 BLAKE2B 01e49509dc7f3528e0f14a01eebb2a8b5f0c9fa927844b98f8a9f4c89bbc1b103f01b972efa4a370b9765dd1cb6620d51de0c012a1b58b108434d7e247562f57 SHA512 2ace1ad0f89365b9b707a2b9b29f04dff926ad3a3340abd156862aa0c50396ce078d4f997d1298b498df1c52745b5216f2c112424254ae12abbb554783c276a8
-EBUILD freebsd-pf-8.2.ebuild 1493 BLAKE2B 86a9eea616866fb9ed315fdf68ac314358599eb39ecb5257d684ceab0195bda67e6bc63b86e6689ba95c0f13de546339367c2f30a175c67e514705af681ac239 SHA512 cc1d221ffa6a763641c64802ae6d8a1f1a5598c48ce07e3bc7f1b1a70454c1ba7730a30c6881de7dc493bccf49dcfb7a64998162dda4d47165b088dc0a63bdff
 EBUILD freebsd-pf-9.1.ebuild 1614 BLAKE2B a22189ed6a16455b6f95dae6f7cfa064efa355c89d97a2b1e0e5947589979da059cc6fc3df609d702b188b6c85ebec031df4c35f6850e79b09fe6eb045d532be SHA512 db5c7a663f784b6fb73515312a91e7971da959b1b67fd40fd479b6f2b272f5fbf2eebee1a29c4dfd63bbdfddaedb51ffca9b2297004ffc03851e1127fa3e890c
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
deleted file mode 100644
index 1425db24d975..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-libevent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- usr.sbin/ftp-proxy/ftp-proxy/Makefile.orig	2008-06-14 00:01:52 -0300
-+++ usr.sbin/ftp-proxy/ftp-proxy/Makefile	2008-06-14 00:03:19 -0300
-@@ -10,8 +10,7 @@
- CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
- CFLAGS+= -I${.CURDIR}/../../../sys/contrib/pf
- 
--DPADD=	${LIBEVENT}
--LDADD=	${LIBEVENT}
-+LDADD=	-levent
- 
- WARNS?=	2
- 
diff --git a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch b/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
deleted file mode 100644
index 4a7c2e9a0e46..000000000000
--- a/sys-freebsd/freebsd-pf/files/freebsd-pf-7.0-pcap_pollution.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- contrib/pf/pflogd/privsep.c.orig	2007-07-03 09:30:02 -0300
-+++ contrib/pf/pflogd/privsep.c	2008-06-13 23:55:39 -0300
-@@ -31,13 +31,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#include <stdio.h>
-+#define HAVE_SNPRINTF
- #ifndef __FreeBSD__
- #include <pcap.h>
- #include <pcap-int.h>
- #endif
- #include <pwd.h>
- #include <signal.h>
--#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef __FreeBSD__
diff --git a/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild b/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild
deleted file mode 100644
index b21039807877..000000000000
--- a/sys-freebsd/freebsd-pf/freebsd-pf-8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd user
-
-DESCRIPTION="FreeBSD's base system libraries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-
-IUSE=""
-
-# Crypto is needed to have an internal OpenSSL header
-SRC_URI="mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}
-	dev-libs/libevent
-	sys-freebsd/freebsd-mk-defs
-	=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_unpack() {
-	freebsd_src_unpack
-	# pcap-int.h redefines snprintf as pcap_snprintf
-	epatch "${FILESDIR}/${PN}-7.0-pcap_pollution.patch"
-	# Use system's libevent
-	epatch "${FILESDIR}/${PN}-7.0-libevent.patch"
-	# Link in kernel sources
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_compile() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting make in ${dir}"
-		cd "${S}/${dir}"
-		mkmake || die "Make ${dir} failed"
-	done
-}
-
-src_install() {
-	for dir in ${SUBDIRS}; do
-		einfo "Starting install in ${dir}"
-		cd "${S}/${dir}"
-		mkinstall || die "Install ${dir} failed"
-	done
-
-	cd "${WORKDIR}"/etc
-	insinto /etc
-	doins pf.os
-	newdoc pf.conf pf.conf.example
-	# 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 edb3c7a5a04d..292af8c8dff9 100644
--- a/sys-freebsd/freebsd-rescue/Manifest
+++ b/sys-freebsd/freebsd-rescue/Manifest
@@ -2,35 +2,22 @@ AUX freebsd-rescue-10.0-zlib.patch 861 BLAKE2B 6eb6f4dad43fbb66c6947b0c5aead4207
 AUX freebsd-rescue-11.0-rename-libs.patch 874 BLAKE2B 104c74d323a40c228df812c31f9fa6799ee26f0069f54c087b9c6b6ec1e1bac440a98cdabb4b090ab9e5267121d1c8a22abbd4d7a53a785dc11c452dd75754d7 SHA512 8ac692342e0ce3cd39286c08523bc89d56f15964242c08ec2065e70fbf3cec24c00608d50ab5b94ab4a7781a4175acc40c2bcc0e4a2cfaf3afcd89fa06dd77c9
 AUX freebsd-rescue-7.1-zlib.patch 800 BLAKE2B 6bfdd272ec9ff98b78eb2ecf827ef5b714af3b2c8003145e0d59de9087eae407eadd6dbe1ca5ccf392405c739b13df25e654e8ba29ff58b8fb2a5e66b3ad66fa SHA512 54db6c1ad6030002fb1b5848e75470136a2b0b3d0c5398e1e0b3439c0bb736eb1ffa4799da7a3775a29761196a2c09a9cf70f75244de7d4e99bfe07357ed759c
 AUX freebsd-rescue-8.0-pkgconfig_static_libarchive.patch 330 BLAKE2B d07e1485606eddfd5046e1121fd8aed4185321c37c2596ea955a4ae34d572ea7dc51b7e59dab925a5175aea157a4276ed4c3cdd442155c7fb083ee8b499293f2 SHA512 529294fbff01e573f714e7f0474ccb85755453da057d224ffc1eab91ea6945af2efc8cafcc48db4d75f5204fa5ab514da35af66d75f90df4bde3f0b8e8aa7dc5
-AUX freebsd-rescue-8.2-libzcleverlink.patch 789 BLAKE2B 806f9497ec031267695e49da5012002f5a18f961a44bb020c88af97f9857ed6a9c3020f8d6a541d0417e2cfa0b431ca4b498e6eb1e51500f4600547289037f2e SHA512 5c24aed5b05b1de4aad67961edbc168c31f80a2d0d034839af8b2fb73497b34d525e1af2c0979b1e23bbcbb53d6079030aa68a1b218cef470c8daa2f439d3a7f
 AUX freebsd-rescue-9.1-bsdtar.patch 404 BLAKE2B fde2d3b1d4bf5ab3a60201b862eb3653c3c440e073423bb5c2119269165461371f8a8be26ea614eb22dec3ae11a4bbb4901935c8f268a188531e95d12b358f6d SHA512 320d2a69c2f0de5e6cb733238fcc46133e571d8536f2ac573597f008d4261fae4d27619c244a90a70392688004df438b80e89f6be810841f6a40a22c2c361bb4
 AUX freebsd-rescue-9.1-libcleverlink.patch 801 BLAKE2B d9e1d2afacbde9d4ce6eebeb9225e4aead2fddd042c83c3aff80228af65959f97ac6b1af4f93792e1f1b51a90e7e432c8819013a81cd603e091a9a551508241f SHA512 556bb68f3307dc7fb10096080db2d336ba4096ba6bebc6a1fe9449ab5298ce2c66fb53f11f0702ee75c2208b45a6e2cb366a3d774bedb65bcdb2a49f51c08fa3
 AUX freebsd-sbin-bsdxml2expat.patch 424 BLAKE2B 4ea522446bf755f07184f0779454a6d2a4aea715a0bac4f7b85dc362ad3f9fb4fa783fc7145e3acfb85782039eb5f575d4340e47775dba678f49bdb51376055f SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522
 AUX freebsd-ubin-10.2-bsdxml.patch 367 BLAKE2B 0a2dfc1b2646aa2c42bfa8b9a6cbd3d22d8b83b8bd252bb7faa3753390a376e8898d5155b16bba52378df304848f99a0cf3fcd141b013670f5dff8355ac0a062 SHA512 234fe495fcefaa9c36d97460da05365ff081661411451ae3d8dca83b3f8b1746450e111ac43baccd15a6c86c03c7cdd37d54d70fed551d694800dc6bca7c5e8d
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-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-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 DIST freebsd-libexec-9.1.tar.bz2 304592 BLAKE2B 994543ac910e4703d36682f6c0550596e340605754b9386770660f0ed0e70f8d437185f2010e6be795a8cc508aa7d69c90cc0a0df968c5dd8de4c5c4bb38e8c2 SHA512 7baa4160dda2610250dd52f445e24478e0f1ea10bce21fcd0e5d1b856f399b896adc334114de0c7f61a5637e4349bb1688fdbe5c72798d8568ae791114710b92
-DIST freebsd-rescue-8.2.tar.bz2 5041 BLAKE2B bb75f3e71db9e81397d230f1bb604f20704ac2bdc757b11e6ee01a1f30a9f03523b26a2caec09d78ded50ab4503f5e1421cc543d9013354aa9e32288fb7cc9e2 SHA512 3311e1ee1d2fc1de0ecc9c5351bfbe007a4651e89a3f3f86ce6cf0fea83a65692fc7a709ccf3a4e9a3179ce51a87b36256481d91819a7621db4045394aa51c29
 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-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-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
 EBUILD freebsd-rescue-11.1.ebuild 1863 BLAKE2B 192ee47076a02df932500c4441ce38fc6f8a03c05d177d6964b8ec8df9dcc13117d408ed5a890533ea14f04eb4d3345f8a64669565b791ba0398508279740aee SHA512 38821a85f4e5f2efb6746b096b64c02b6534ce98ad743c44e45f65d8a6cafc3fba6cc452d3d465df1021fa2bf02063d3a5fa5be89ce7c667a9912626a7317591
-EBUILD freebsd-rescue-8.2.ebuild 1488 BLAKE2B d0816a163bb298f10ed4826019312122f04ee2af04bf8fc52c316c4016e830d395e2b22a66807af5e3bce83f85b4130f6f8c133bb29b0ee82b25ce0061aba49e SHA512 6cf49d8ef4f62affa527d0339c56087d49576da2c27bce2ed25d72755ce8852ff43448e51382553d5605f8d8cdd5e124cd2ca00228b542ee9b85790152f6dba2
 EBUILD freebsd-rescue-9.1.ebuild 1780 BLAKE2B 0a50df4fa297fbe54c7b68843a607f4eebc49af2bd60782f05b30cd6fffd88f9c32802d0dd81852ea61b7302a4f901acdb19396eddfe315a1277d6ddf6654f9f SHA512 0d463b226f9520d5d752a5de402e2d01bc6a7f778fb0747725f976053746685549c70ee59c78f2a53768ff1e0850f0c4fc479f8ecb611008af2b1e881e8c84a3
 MISC metadata.xml 402 BLAKE2B f24c7363fc3c6749311732e4b1722f301ad6a680e6d25450657645b3295611202f65ceb7386a6827cfd4448584584584c67b3f3d03089b8948709282b5cae0fa SHA512 247e4e4c80cd64a81f698fc7fbeab529a02f8b2c6b0040628936ab7d83a09c7242df0b10d7cb4e4e8d7d78806c303cd82903adc4a38b649e911337a832c35834
diff --git a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch b/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
deleted file mode 100644
index 3d444575515f..000000000000
--- a/sys-freebsd/freebsd-rescue/files/freebsd-rescue-8.2-libzcleverlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- rescue/rescue/Makefile.old	2011-07-06 01:35:13.000000000 +0000
-+++ rescue/rescue/Makefile	2011-07-06 01:35:54.000000000 +0000
-@@ -143,7 +143,7 @@
- .if ${MK_ZFS} != "no"
- CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl
- .endif
--CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs -lz
-+CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lreadline -lsbuf -lufs
- 
- .if ${MACHINE_ARCH} == "i386"
- CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
-@@ -234,7 +234,7 @@
- CRUNCH_PROGS_usr.sbin+= chown
- CRUNCH_ALIAS_chown= chgrp
- ##################################################################
--CRUNCH_LIBS+= -lm
-+CRUNCH_LIBS+= -lz -lm
- 
- ##################################################################
- #  The following is pretty nearly a generic crunchgen-handling makefile
diff --git a/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild b/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild
deleted file mode 100644
index a63b59c79f4b..000000000000
--- a/sys-freebsd/freebsd-rescue/freebsd-rescue-8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD's rescue binaries"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-LICENSE="BSD zfs? ( CDDL )"
-
-IUSE="atm netware nis zfs"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${USBIN}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
-		mirror://gentoo/${LIBEXEC}.tar.bz2
-		mirror://gentoo/${RESCUE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )"
-
-RDEPEND=""
-DEPEND="sys-devel/flex
-	>=app-arch/libarchive-2.7.1[static-libs]
-	dev-libs/libedit[static-libs]
-	app-arch/xz-utils[static-libs]
-	sys-libs/ncurses[static-libs]
-	virtual/pkgconfig
-	=sys-freebsd/freebsd-lib-${RV}*[atm?,netware?]
-	=sys-freebsd/freebsd-sources-${RV}*
-	=sys-freebsd/freebsd-mk-defs-${RV}*"
-
-S="${WORKDIR}/rescue"
-
-pkg_setup() {
-	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
-	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= "
-	use nis || mymakeopts="${mymakeopts} WITHOUT_NIS= "
-	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
-}
-
-src_prepare() {
-	# As they are patches from ${WORKDIR} apply them by hand
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}"-8.0-pkgconfig_static_libarchive.patch
-	epatch "${FILESDIR}/${PN}"-7.1-zlib.patch
-	epatch "${FILESDIR}/${PN}"-8.2-libzcleverlink.patch
-}
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index b6c281a2f8a0..f8ff63f7da53 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -6,22 +6,14 @@ AUX freebsd-sbin-7.1-zlib.patch 800 BLAKE2B 6bfdd272ec9ff98b78eb2ecf827ef5b714af
 AUX freebsd-sbin-bsdxml2expat.patch 424 BLAKE2B 4ea522446bf755f07184f0779454a6d2a4aea715a0bac4f7b85dc362ad3f9fb4fa783fc7145e3acfb85782039eb5f575d4340e47775dba678f49bdb51376055f SHA512 f455db40e528c9bf19a68a639d2c0b304371d66741ee852c279246647f43620fd33911787aa9721547e086cbaa7dafa85b1ee6571094593c74de15e2ccc2f522
 AUX freebsd-sbin-setXid.patch 541 BLAKE2B 0e1e7ede0385d8f6ecbf905e4366712b7707aaf918780a93712afcbefa2741585e14be7536d2f6a823808f97756bebc6e0374882a04cc2743b9649ae777875db SHA512 e6f1aefab22eca6941a5b62f6f9d9c82e0efc2b308ec636ecab40d9a678e87f2f6ccfefac99f5367ad8a16d18ddadf9a877a2f93697248b3f38a09edac75ec6e
 AUX idmapd.initd 441 BLAKE2B 6b16dec71b9d0fdacbb2b46811a70677069c9d1c8ae67607aa50c8152a0c0031f758b0056ead97d3ce8f86fa87724125b388663e93878892ee78bbb0c25427be SHA512 69e548dd863c12dd9d525d9dd77ed06fd0418b6744c97899766d73aca26b60d12f27c791720b195c46b244fd2f3effd47d43b4fa277f795f402494f991837714
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-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-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 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-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-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-sbin-11.1.ebuild 2658 BLAKE2B 574dc52cdf48536c62a2928baed35d427385d2606264cd86d5317598fcec2b814c63169debec63aab4e9b500bc902866ef685405e191b0941c3019601ecb0890 SHA512 9f04e9c38c4040fc95075368e6a6133f8c98e48647249634fce0962372f032c48e82f76d7fe164efc4ff96ff73038875ee8d75445d33564b63df4229f7dfe0a4
-EBUILD freebsd-sbin-8.2-r1.ebuild 2554 BLAKE2B 8fc7a5a50b8fc67b1d592697ba261ce7aa368f93e9481e512188249487ad4e4c4e6fd2da06324930bd256e9608e99e460cd9aa1b7dac85c403db8ea4ec3892ea SHA512 f8e7eb0416726aa824ab309b298f8d16a43694deecd8740fe9abe071f6bac40d5b2827bf74e0e89701684718a686a05a8586b093fe10d2a1b3b3138b9c3341d5
-EBUILD freebsd-sbin-9.1.ebuild 2668 BLAKE2B df80b380b340455f88e0bc474aee32402ab26fe793e7df4c689b8b1b493d97c5396efadd69536c67432f859a8a06ac63cafbf0006ae8b8a1fbb03ca574db3627 SHA512 e6d9ac18f8ee6118228cdad1fc2b2a8ebe7237fa491873cdf37f894420d26b0244c25c7d9d24bfa25b417ed81523890ffc2bfd1b77260a622e5192379ef72b4e
+EBUILD freebsd-sbin-11.1.ebuild 2646 BLAKE2B 79418a3a6ef338c4a3b5cf8032d42606d42102e0bfd11bad8ebab3af03c84e785ddcfb7517e89945f4f34b690903bff5596b6b97d341f14d4dd9cfb77899504f SHA512 5ddec2a2ff87e62670d88fa71f4ed7166ff20de188d81adad3c6dd7b8988505a7f5a766d23fc7b93e50ddb5e44ea8cd75964bfb4202b70ff0b22dccca5d3fc73
+EBUILD freebsd-sbin-9.1.ebuild 2656 BLAKE2B afe136ee0e3a0404aec3207f499dbc2d158c40686772a1c8a0d1025034917d0b1f730f0483e395117653be762f34261fca4e37f7ef441870e378f0cdecf374fd SHA512 fad12585ea56a2e87d5326b25b752d5aea6c0d635b2a1bc3c583032a9728757307d71a5dc55d8e080efcd5d1df568f6a161eeb2dfd0a5a75cb09b100a5591bad
 MISC metadata.xml 611 BLAKE2B 74992d5b0b76a115a51cb01273ca718f057f832fee09d1ee4959cb0cd058eceed28d1e71e77e41a386f1c056cbb7c08ca7a4dec1853b5b21209710b9eb96ef1f SHA512 f5564d34b62dfd20fda9ce5e17de3fc45b9d281de062e8858aa090049218ee5a05670967111032bce63363ae64a98ba39753964c013e12aaf5e15e90719a720e
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
index 09b3cbb45f8e..50a513208cb8 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SLOT="0"
 LICENSE="BSD zfs? ( CDDL )"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild
deleted file mode 100644
index 430a320ac379..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-8.2-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-
-SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${LIBEXEC}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2
-	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[ipv6?,atm?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	>=dev-libs/expat-2.0.1
-	ssl? ( dev-libs/openssl )
-	dev-libs/libedit
-	sys-libs/readline
-	|| (
-		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() {
-	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"
-
-PATCHES=( "${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-7.1-zlib.patch"
-	"${FILESDIR}/${PN}-6.2-ldconfig.patch"
-	"${FILESDIR}/${PN}-6.1-pr102701.patch"
-	"${FILESDIR}/${PN}-bsdxml2expat.patch" )
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-}
-
-src_install() {
-	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/"
-	insinto /etc
-	doins minfree sysctl.conf regdomain.xml || die
-
-	# initd script for idmapd
-	newinitd "${FILESDIR}/idmapd.initd" idmapd
-
-	# 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"
-
-	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-9.1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild
index 31c9d7794de8..85dc8c8e5a78 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -6,7 +6,7 @@ EAPI=2
 inherit bsdmk freebsd multilib
 
 DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 
 SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
diff --git a/sys-freebsd/freebsd-share/Manifest b/sys-freebsd/freebsd-share/Manifest
index 145704eb607f..61d0e44703c3 100644
--- a/sys-freebsd/freebsd-share/Manifest
+++ b/sys-freebsd/freebsd-share/Manifest
@@ -4,26 +4,16 @@ AUX freebsd-share-10.3-gentoo-skel.patch 600 BLAKE2B b04b8653aef9add52fe180b5876
 AUX freebsd-share-5.3-doc-locations.patch 608 BLAKE2B b79fd173a1051dd6af748f45d0476ba21d8f2f72baea6965b2db22bbfc9ecd428c3e9b6e296ad8d8df6276cc61ff9f54da932d81c7ba3af5f68b0ce5cc96eb4a SHA512 2156f679683b8a02fd01fa71268f13f342d282b1885095e48611d9a94bdf99f03bad71f5c22253425c09ad5ae1ea544d1db3d0d40361f3b814f7e10f0061f2a6
 AUX freebsd-share-5.4-gentoo-skel.patch 621 BLAKE2B 96a8d7759ed001a1c04e254255c7e7cb927898391346b2dff14839fbcfb0f8d2c19e3d6ce6b3b847cbaa2322089317f64efe854ad878a51d1f9fc6496f12f7ab SHA512 608e108bcfdc1eaa1f45f4115f460e26fa89211aaefea9602d1943dfa51e34f721526ef5e71d7e44f019d31b43efbd8f9f937e71d71074b0c3b48a33329281af
 AUX freebsd-share-8.0-gnu-miscfiles.patch 858 BLAKE2B 56d6b8585cc49f5547240f28343f6114b75cd49b97bf532e11e17220f55224f8a2c1f365c858643d7879ce133ec16bf33d361e7783a65539763e7769a6297932 SHA512 0b10a29d7840b7839c819afba1beb0ba4c22af02a63400d90735ea4330413ab672bf247e375194e75746a858c5a2727d07cdf958a8618f9cf059b71105ea9853
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-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-sbin-8.2.tar.bz2 1211665 BLAKE2B 82bb2477f10d6eed389bd723766dce1d99f73caf55c2142dcdff5cea0ec36a6774ac2e2fb2bd8816632ce6da29710fad2c199ed5ba6a796d9a7c8a080e9ba585 SHA512 c6643c29ab62344c98d8991708798730ee1c17e6478071718beeaa79788300a1f4ed2e6aeb8e39e3c216877d4ed2ac85b2a9531d534f1ac5125a508927898959
 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-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
-DIST freebsd-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-share-11.1.ebuild 3336 BLAKE2B ccc17da18a5275cc592ce2adce80f2b024c7fad65bafd3e4b1341c1c1a001000f4862d89504c5030ec95c2c4ec3c5cb10c255cc9703ef2c48330968302b3ef11 SHA512 ab1b7653ec6db7deaf19d731adf27d40ff0eab88d7aa056714f63232ca40d0560e63b5850ee3341c47d150d5d64ad3e6031178d1923533f3c0a8ff2b7dc15ede
-EBUILD freebsd-share-8.2.ebuild 2445 BLAKE2B 10db1e63675fba4d35e6b1a582a7998e66ff802e51f990605ecbe243cda59887bd68c811da140de4848f152d9fe6219f3508477e13c0054ba453aa4eea7616d7 SHA512 9c5141a258faad0bd1bb3903f359ef0dad2ea88f73d5ae4e24ec7d2b86d2f0642bf7cd960f18785cca7b729b7082040641366b3207c21b69cc3da5a812b23b41
-EBUILD freebsd-share-9.1.ebuild 2574 BLAKE2B 14a140c600040f967c871a916bf736e08bb5ae0d68754ae02bfe719b30e9c025a8102ca1edcd8dab91c331c6d4874379cd525cf7bb4f8032c19f5b3a7de3b80f SHA512 e0061942e6004beaf43e1f5fdcabfd9033b69e10ed29508c51a4fd8f917e68130d7a24ca6a4a0d92429245576847292989cf6f38290f840c06de8b7a7b87004d
-MISC metadata.xml 350 BLAKE2B d28338ba6e48a466bb19a5a3f619aa4c33b578451922f9e42422b59cd08e7dae4f497584cd9856f429f90852d7c9415e28a4c79b7f86dca219e6e1ddb089f115 SHA512 50f19565decf09ffcadd28e20a882e75659eb301788f9760e37398acf41929968cd64078b716f4528521d3fa77403b3305ecd4ffd932fb6be2a7e2d02ae0a829
+EBUILD freebsd-share-11.1.ebuild 3324 BLAKE2B a4a35392bc6e32b2e7c8922e887260717b30df97d4c18b9d6b068338ed536e5cc4dafdbca59391345d1c2af93798b28417d660aa2cb86778b53d5097a904f3ce SHA512 6e91be861b588dc5e91ac6b6e71fd242c5b7d86f9aabc8077bc2084326b65d71c1da6a6c4bb1b61e71e991c501eb7ebd13bd2bb46352bdcd8b37815bd5ae1ea9
+EBUILD freebsd-share-9.1.ebuild 2562 BLAKE2B 0c3d22cb9db9e08f5c06dd49d3474e72de2ef7914e8143c4e40f39df0e43b57c39a0b4f12dc74b612331ec7a63cd8efe6a7942aa6a387d96810508c4892b992d SHA512 ee60aadb6756a7e922eafc4b75cabaff847d15e4513c4ea296d343f8468070fee2514aa169836806eb074b4954e12d7c3a66c431200333f60eb11fa217e8f525
+MISC metadata.xml 303 BLAKE2B 32a957edfc2dcb1fd1076d208b253fbe2408a65f44585ebd3863a9f6d95f4e25d8e3fc5ada378074e0d7e1ebd47793c4e8241656087da905100f68375c70df9e SHA512 4483a50bd02a3644bd12148d0a54ff78686d974337b5c22a267bdae228eefec85bf1a8b74a1c04a7759645e451e59c75734318d07376692d26c97261eaf2fbf3
diff --git a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
index a579de545050..27899c51835f 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ LICENSE="BSD zfs? ( CDDL )"
 IUSE="doc usb zfs"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="
diff --git a/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild
deleted file mode 100644
index df7170c8f1b4..000000000000
--- a/sys-freebsd/freebsd-share/freebsd-share-8.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD shared tools/files"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="doc isdn"
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2
-	mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${UBIN}.tar.bz2
-	mirror://gentoo/${USBIN}.tar.bz2
-	mirror://gentoo/${SBIN}.tar.bz2
-	mirror://gentoo/${BIN}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${ETC}.tar.bz2"
-
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-		=sys-freebsd/freebsd-sources-${RV}*"
-RDEPEND="sys-apps/miscfiles"
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share"
-
-pkg_setup() {
-	use isdn || mymakeopts="${mymakeopts} NO_I4B= "
-	use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= "
-
-	mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= "
-}
-
-REMOVE_SUBDIRS="mk termcap zoneinfo tabset"
-
-PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch"
-	"${FILESDIR}/${PN}-5.4-gentoo-skel.patch"
-	"${FILESDIR}/${PN}-8.0-gnu-miscfiles.patch" )
-
-src_unpack() {
-	freebsd_src_unpack
-
-	# Remove make.conf manpage as it describes bsdmk's make.conf.
-	sed -i -e 's:make.conf.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"
-
-	# 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
-	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink"
-}
-
-src_compile() {
-	export ESED="/usr/bin/sed"
-
-	# This is a groff problem and not a -shared problem.
-	export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/"
-	mkmake || 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-9.1.ebuild b/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
index f3a6f4c52e40..6d06af01a442 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-9.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd
 
 DESCRIPTION="FreeBSD shared tools/files"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="doc"
 
diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
index 30006739b84a..a470eb89458a 100644
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ b/sys-freebsd/freebsd-share/metadata.xml
@@ -6,7 +6,6 @@
 		<name>BSD Project</name>
 	</maintainer>
 	<use>
-		<flag name="isdn">Enable ISDN support</flag>
 		<flag name="zfs">Enable ZFS support.</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 873cb24befd4..d85a4f69ce36 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -5,13 +5,9 @@ AUX freebsd-sources-11.0-gentoo.patch 852 BLAKE2B 81306d42748674cf550d5399a1ab02
 AUX freebsd-sources-6.0-flex-2.5.31.patch 826 BLAKE2B 7644dccfb8ad6242c903fb0d5d81601c9ab395628a1cfdc299a31575db4ea6656ac1d3e6c15c751e96a7ce384909e95a90928b3cd1caa9de7d926a3ad9682092 SHA512 7183b1923019df12849e7d3984c4227d65275077cf95c3b0719b99dc852234eb3813db0e69e9c34bdfca45a59f7340209211d0b7a2a5074c2d1ad8ea0a3a3f64
 AUX freebsd-sources-6.1-ntfs.patch 1043 BLAKE2B cf7777656f4d49975c7ad4cb5786c0534c80db87cdc3ecc46619d4f757ad087527fbbd96a436a309255e8968341c9dda71cc485277ee485ab5b8127482120e03 SHA512 5401b50ed93bd9155b8adc3f0d6ec81b6e48431bb950cdf468be2e918553e19cd88a1988cdad49be2a34a1db44419cb9eb7067ff0fb1feb8b3f6373aa3c262ad
 AUX freebsd-sources-7.0-tmpfs_whiteout_stub.patch 1015 BLAKE2B 86ef2add961195d4429db30e7d43ba3f6d43c1c2316e269e952e8e0c84da82fc6ec77fc84e7c3be2d5a5f76bec9e093b7d748ffbb57fa168f31c007066ae64d2 SHA512 9dc96b967869efd7480785977764e879bf50978b5e609867e678574f9ed1476695690832bdb725eaebc8d93e83b4a0b3fe9f23b94e2de072a6540a168b13c4a7
-AUX freebsd-sources-7.1-binutils_link.patch 1297 BLAKE2B 31f31c0a5b8999bf774e498d2b0734aaa7521b6af9e1b6ecbff17d0300ae74fce8daf62b451ebbea18d484c8f62cfd71643a703fca110c254a1185ad3daf13b8 SHA512 0e3aa342646d18429ed76e484d7e15d353d858f00bda906dae74b01b4e73f1b4ccfb6404590d79cb206da3a732528a4437813540a26292d697ccc3b964dabfb0
 AUX freebsd-sources-7.1-includes.patch 318 BLAKE2B e95da1360824b9a5037bf55deda2d92a72a08e0e42f8ecd4080863bed69f10137b2c2637bafbe1088fe6bf2bfed7f83a748cab42a14b41b7243efd524ae15589 SHA512 f73db3fd72bdd2972ae25c3f661e7677bd5877aa623981303a4b0c5e9522fd458e294799a0ebad17ac3c639d588394b10ad5fcab4d88743a6dfcc8a8d60eecd7
 AUX freebsd-sources-7.1-types.h-fix.patch 371 BLAKE2B 358a52999cd48561beb41e051829e0d47aba07d73b8852c0e164debfeeaa22e8dd04249897f807192239be3be673f1a51df98f8ee63529ceca5d469fd6cfc5e5 SHA512 133ab13e98c3f2dc5f96cd5e45cd11c4da9757f4ea64831a6e17b309bc4692e4213b48c7ab6dd634f1feb069ca2dfc3a8afe1585d0d1425b5304fd7494cd342f
-AUX freebsd-sources-7.2-debug-O2.patch 771 BLAKE2B 97217822a435da048d6c628e5a3fd9ad104dc8e8a98cf992561f9e3750aaca7088eaded205fd53b0b28c6ba9d42160b7cd8be58849c9832387e4abb47838bde3 SHA512 a74dacbd24c6130ec4c762a9c2df58a37d5fee2ee6fa4a970245b53837afa5ee3f72318b6e723e0591ddce00a5aa0fd66746a06783174d4edb9814e3a3724201
-AUX freebsd-sources-8.0-gentoo.patch 1138 BLAKE2B 806bed2b9fad754bef54fa37795063d1f66314885726e22e0b46a9f3249eed72956b0a45a0d8af7bc9d699962b4311b86e582440e209d8e16f14f5a904a3bc7c SHA512 677adbbbba367bda65f01b604a0a6235ac12d7b307857fa35c7722eb05e0a74d3cd35c03a9dfa56023b7869a865959c9edcfa601d841add92ff21a941d395ddc
 AUX freebsd-sources-8.0-subnet-route-pr40133.patch 548 BLAKE2B 2c783822d71de3633c5b914a38d1a80b9afd4a5e4335ac9a01da605306c8d0f5605970f808d9b7c93e9853a7b741eaec8f0b1701602160761404558eaf93f680 SHA512 9ae65e2775302b664dd4e5f5cbc58fe1ca7db61b6182db10971660207c72ec74e542181f1c2aefcacd2fd4b54e10d371efc619c3c03a977c35d3cf67b99b7de5
-AUX freebsd-sources-8.2-unix2.patch 1642 BLAKE2B 96b784136100ca1094c847496f9755ff0e4b3bc033266c9f7cbe2be3fc89e963214e2bf479efab0c5e7005880cfcf6d767242cc8671965bb43cc5853b66e1c0b SHA512 a7f8166abc9883cab92a4b1ce038cefc3c00a6567fd79ebab96ccebbed7e230459dd8efc0b96ba2029a89b4b5d41305be87d0c40ad85fcfe4c819a4604b4490b
 AUX freebsd-sources-9.0-disable-optimization.patch 927 BLAKE2B 42fff42c4d1bc57aed5c4b4dc30328f8ac3317f36cb3b4df60690e5ce9e3ef19d2a1b6a8e35082aad6c43283b47af8df6c94912710d55fc925e2eae08d275459 SHA512 0b74874d42eab95994309b922f37ebbf3706d01db6c447c9f062b03e64b77c7f793bc297150b539acdf39530a8afd91f4bf824a87c674dd625a59056656c614b
 AUX freebsd-sources-9.0-ipv6refcount.patch 3259 BLAKE2B 48607d9851f9a37994fc507decf3fc6710406e2fc12cc24cc5a08f5a0717ebc4409ada146b795689036561481078a3cfbc74c697cb3559cc04d2f7b238ee1426 SHA512 04d89da7ab4c50d3405ff18eea49f94ffff34375c6333a6bb84bc81a63046ba12f384d256e010dc1b64a186650c7ad4702403ed933e6a678d2c5ee4238b56658
 AUX freebsd-sources-9.0-sysctluint.patch 403 BLAKE2B 3860821b308a75dcad8fa5910cb6c287ca2013269d21b588d0abbb1a79197366eac7eb733c87136f77ba2556913f36784842ac5f089d5c9bdb59bdb836748049 SHA512 f3a87cb187858bc6fd1bafda3c3bd7bbda52b07239a50a7c1aa201df2c52a58d4809e196b8799b1949c8ca1a556519d454ad1789358540e3a96cd480fc0a504c
@@ -30,17 +26,14 @@ AUX freebsd-sources-9.1-mmap.patch 676 BLAKE2B 17fb129a34eb0280b1edfdb2a5b138443
 AUX freebsd-sources-9.1-nfsserver.patch 650 BLAKE2B d719735cfe035de970f42cc40dded1785c038ce03c568dd7ccaf5a3715f658131cb02e1291b2a327b54fdff1f58f76c5deb41332ba4a125cded18344e21a0a17 SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe
 AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770a8541d3a3c0ede353a535f7e93f33ff62c800e9cf775e1bb56b5ba00917d1cd81294404dd660c6e954c01e352a5f413f9 SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99
 AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e
-AUX freebsd-sources-cve-2012-0217.patch 856 BLAKE2B 7dcbe58d7e58165fbdf734d59554c6e05f1248bdbafd0b5fa8b820de2aae50c9dd15938dc66603a683ba225e5e4e1271a7acea10fd1d43c6595226cea85f63b3 SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9
 DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc
 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-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e
 DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4
 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
-EBUILD freebsd-sources-11.1_p2.ebuild 4596 BLAKE2B 66b50e7b707962a367151246456e215af2456f579fe93fecea423f919555d74c6c11f80d9c72d02e334072b8632cee9275ba345bedeed2d9ab1d5fe413b0d1ef SHA512 b9cb8af695e5ef100cfd72dc852a0e5b90c2ffdeb6e7866d105286d18cc343645b7985e6c47fe80a5aa56bb05011a589293e8a754baa914285bad43807a260a4
-EBUILD freebsd-sources-8.2-r2.ebuild 3671 BLAKE2B ffe430c6ad815d2135130de624acad622d9dfbee4ebc356d2e4d52fbcf67c979745067ebfbb331363f5b5859cb9e2cd11ecbbed018154bd3fabcd40e5d804d54 SHA512 4e2c7ff852639c0cc5124beb0a3b5f998780553892eae1d1c6bbc2b253a82e56838897062f6e55e4fb47be2f99060f1e9b7392e794b25a49a38d925774a1423a
-EBUILD freebsd-sources-9.1-r3.ebuild 2514 BLAKE2B 8365ccfc2287740cdbb4f1b59cdc105065edef4f44ec59b3051b506072210491f4468ecd52fcb7d071967b665590f467ef5c788985d9bd10c3c396cbff456683 SHA512 e21a899b3329ac8abfb1a167a56a71a6e37b0b3ec50af9f6274f2353c2a422805a62543105eeda21a1f7d7a4325de6bb749b08851ffe7f5e8b113d8e8571023d
-EBUILD freebsd-sources-9.1-r9.ebuild 3059 BLAKE2B 99e91d727964772bf769cecfadb152e917cec34858b20cfa9ad6401d0466b90c07f4cecb457b4740c4ed532f3ec933a7dd95fa868524aa4c060f27554b6e53c7 SHA512 5e241adb02fe3b5fedbd4dac59c1f38d815c2b1041bf6efdd0ed406ff9b380ff7b8ba72210539fc94a11dbb3d7b7422a162e03ee0fb393f8fa7a77df3b327d55
+EBUILD freebsd-sources-11.1_p2.ebuild 4594 BLAKE2B b4861bdab72dcfbaaadccacd98efabada77878264140e35428acbe427e17a9d56edda10c5275bb7abcc9107badfe010fa642bcc1bf760e02241b4da6c9644887 SHA512 a700daa8edbfc20f6aa9e82288529f613bc2134ed5dab624d0aba56b4189b78a680ec3a13110d7e4aa15471c4133651ce4472096ae242c772a73faa953df10ab
+EBUILD freebsd-sources-9.1-r3.ebuild 2508 BLAKE2B 2aee9a694feb07368341dc8817f441d7c1f842b2b2ba2e4398b2ee23633b2f5648519ce4d85180fb6a66fb220bd9992427d8709b614afc0caa5687ed7d167b4b SHA512 481a7816515b4b08f9b7185837b90a35aab02912135f6eab5bc12a0d1223e3b7cddcd6c1d23e9ebdf440fe9d2e3035af091238b6bd004dbeff389f50be558df5
+EBUILD freebsd-sources-9.1-r9.ebuild 3053 BLAKE2B 92fe95d5496c84a86cc5eca23902e326c1645a6d34b8a5031d7a3f43fbceba0f6ee4f69e039d92996e99e8923b39b08e00fc972b5f56534399d2e55ba9aa1cf8 SHA512 99535792a4e17d9ad108174f8e09f32582b0f6a0a3d6edcb026668479e90a319252b628f7348add35740952467b84875b47eb125bc61d43d712fcda461071295
 MISC metadata.xml 444 BLAKE2B 26160b0d71ed4eb333357e7d3d5fd131038abfeb50db42107cabab63fe2123cc9d495d53a33bc8fea3622dee7994076c57163ab9904c452c1d3bbdad569481b9 SHA512 9e2abef67d9a4092a62f92a0b32e5d8547a046d26551ef15c577dedf3b56231ba055702a7476104993a8ed15717b5610d1cdbd6c167b0571a84392f41f177cdc
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
deleted file mode 100644
index 43d01baef347..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-binutils_link.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN sys.orig/conf/kern.post.mk sys/conf/kern.post.mk
---- sys.orig/conf/kern.post.mk	2007-03-23 18:55:59 -0300
-+++ sys/conf/kern.post.mk	2008-06-18 19:51:13 -0300
-@@ -85,7 +85,9 @@
- ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
- 	@rm -f ${.TARGET}
- 	@echo linking ${.TARGET}
--	${SYSTEM_LD}
-+	${SYSTEM_LD} -o ${.TARGET}.tmp
-+	@sh $S/tools/gen-ld-u-options ${.TARGET}.tmp > ${.TARGET}.lopt
-+	${SYSTEM_LD} "@${.TARGET}.lopt"
- .if defined(CTFMERGE)
- 	${SYSTEM_CTFMERGE}
- .endif
-diff -ruN sys.orig/conf/kmod.mk sys/conf/kmod.mk
---- sys.orig/conf/kmod.mk	2008-06-18 09:11:53 -0300
-+++ sys/conf/kmod.mk	2008-06-18 19:50:01 -0300
-@@ -176,7 +176,8 @@
- 
- .if ${MACHINE_ARCH} != amd64
- ${FULLPROG}: ${KMOD}.kld
--	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
-+	sh ./@/tools/gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
-+	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld "@${KMOD}.lopt"
- .if !defined(DEBUG_FLAGS)
- 	${OBJCOPY} --strip-debug ${.TARGET}
- .endif
-diff -ruN sys.orig/tools/gen-ld-u-options sys/tools/gen-ld-u-options
---- sys.orig/tools/gen-ld-u-options	1969-12-31 21:00:00 -0300
-+++ sys/tools/gen-ld-u-options	2008-06-18 19:47:56 -0300
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+
-+for i in `objdump -h -w $1 | grep set_ | cut -c5- | cut -f1 -d " "`
-+do
-+    echo -n " -u __start_$i -u __stop_$i "
-+done
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
deleted file mode 100644
index 4fa3565207ec..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.2-debug-O2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-My UltraSPARC U5 panics on boot about a memory alignment error when compiled
-with gcc4 and -O. Compiling with -O2 fixes this, and it should not adversly
-affect debugging.
-
-NOTE: This does not fix the memory alignment panic when loading kernel modules.
-
-Roy Marples (uberlord@gentoo.org)
-
---- sys/conf/kern.pre.mk.old	2009-05-22 10:09:46 +0000
-+++ sys/conf/kern.pre.mk	2009-05-22 10:10:27 +0000
-@@ -22,15 +22,13 @@
- COPTFLAGS?=	-O
- .else
- . if defined(DEBUG)
--_MINUS_O=	-O
- CTFFLAGS+=	-g
- . else
--_MINUS_O=	-O2
- . endif
- . if ${MACHINE_ARCH} == "amd64"
- COPTFLAGS?=-O2 -frename-registers -pipe
- . else
--COPTFLAGS?=${_MINUS_O} -pipe
-+COPTFLAGS?=-O2 -pipe
- . endif
- . if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
- COPTFLAGS+= -fno-strict-aliasing
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
deleted file mode 100644
index 0f8d070e9a31..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- sys/conf/kern.mk.old	2007-05-24 23:53:42.000000000 +0200
-+++ sys/conf/kern.mk	        2008-03-14 14:37:47.216420518 +0100
-@@ -12,7 +12,7 @@
- .else
- CWARNFLAGS?=	-Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
- 		-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
--		${_wundef} ${_Wno_pointer_sign} -fformat-extensions
-+		${_wundef} ${_Wno_pointer_sign}
- .if !defined(WITH_GCC3)
- _Wno_pointer_sign=-Wno-pointer-sign
- .endif
-@@ -36,7 +36,7 @@
- # reserved for user applications.
- #
- .if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2 \
-+CFLAGS+=	-mpreferred-stack-boundary=2 \
- 		-mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
- INLINE_LIMIT?=	8000
- .endif
-Only in ./sys/conf: kern.mk.rej
-Only in ./sys/conf: kern.mk~
---- sys/dev/aic7xxx/aicasm/Makefile.old	2010-03-10 14:01:50 +0100
-+++ sys/dev/aic7xxx/aicasm/Makefile	2010-03-10 14:01:56 +0100
-@@ -14,7 +14,7 @@
- SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
- CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
- DPADD=	${LIBL}
--LDADD=	-ll
-+LDADD=	-lfl
- WARNS?=	6
- 
- # Correct path for kernel builds
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
deleted file mode 100644
index 50dacd0e5a49..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.2-unix2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: sys/kern/uipc_usrreq.c
-===================================================================
---- sys/kern/uipc_usrreq.c	(revision 225745)
-+++ sys/kern/uipc_usrreq.c	(working copy)
-@@ -462,6 +462,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
- 
-+	if (soun->sun_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
- 	if (namelen <= 0)
- 		return (EINVAL);
-@@ -1252,6 +1254,8 @@
- 	unp = sotounpcb(so);
- 	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
- 
-+	if (nam->sa_len > sizeof(struct sockaddr_un))
-+		return (EINVAL);
- 	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
- 	if (len <= 0)
- 		return (EINVAL);
-Index: sys/compat/linux/linux_socket.c
-===================================================================
---- sys/compat/linux/linux_socket.c	(revision 225919)
-+++ sys/compat/linux/linux_socket.c	(working copy)
-@@ -104,6 +104,7 @@
- 	int oldv6size;
- 	struct sockaddr_in6 *sin6;
- #endif
-+	int namelen;
- 
- 	if (*osalen < 2 || *osalen > UCHAR_MAX || !osa)
- 		return (EINVAL);
-@@ -166,6 +167,20 @@
- 		}
- 	}
- 
-+	if ((bdom == AF_LOCAL) && (*osalen > sizeof(struct sockaddr_un))) {
-+		for (namelen = 0;
-+		    namelen < *osalen - offsetof(struct sockaddr_un, sun_path);
-+		    namelen++)
-+			if (!((struct sockaddr_un *)kosa)->sun_path[namelen])
-+				break;
-+		if (namelen + offsetof(struct sockaddr_un, sun_path) >
-+		    sizeof(struct sockaddr_un)) {
-+			error = EINVAL;
-+			goto out;
-+		}
-+		alloclen = sizeof(struct sockaddr_un);
-+	}
-+
- 	sa = (struct sockaddr *) kosa;
- 	sa->sa_family = bdom;
- 	sa->sa_len = alloclen;
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
deleted file mode 100644
index 0bf1b611a091..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-cve-2012-0217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: sys/amd64/amd64/trap.c
-===================================================================
---- sys/amd64/amd64/trap.c.orig
-+++ sys/amd64/amd64/trap.c	(working copy)
-@@ -972,4 +972,21 @@
- 	     syscallname(td->td_proc, sa.code)));
- 
- 	syscallret(td, error, &sa);
-+
-+	/*
-+	 * If the user-supplied value of %rip is not a canonical
-+	 * address, then some CPUs will trigger a ring 0 #GP during
-+	 * the sysret instruction.  However, the fault handler would
-+	 * execute with the user's %gs and %rsp in ring 0 which would
-+	 * not be safe.  Instead, preemptively kill the thread with a
-+	 * SIGBUS.
-+	 */
-+	if (td->td_frame->tf_rip >= VM_MAXUSER_ADDRESS) {
-+		ksiginfo_init_trap(&ksi);
-+		ksi.ksi_signo = SIGBUS;
-+		ksi.ksi_code = BUS_OBJERR;
-+		ksi.ksi_trapno = T_PROTFLT;
-+		ksi.ksi_addr = (void *)td->td_frame->tf_rip;
-+		trapsignal(td, &ksi);
-+	}
- }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
index b4d22b6fc70e..32b3d46dc935 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild
@@ -18,7 +18,7 @@ UPSTREAM_PATCHES=( "SA-17:08/ptrace.patch"
 	"EN-17:08/pf.patch" )
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
@@ -137,18 +137,18 @@ pkg_preinst() {
 		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
+#	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 to manually compile (not recommended), please don't forget the following steps."
-	if ! use sparc-fbsd ; then
-		ewarn "export CC=clang"
-		ewarn "export CXX=clang++"
-	fi
+#	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 under the CDDL."
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
deleted file mode 100644
index ccb0c43f6faf..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-8.2-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-8.0"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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 8.2-RELEASE it's 800001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=800001: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
-
-	epatch "${FILESDIR}/${PN}-8.0-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	sed -e 's/elf64-sparc/elf64-sparc-freebsd/g' -i	"${S}/conf/ldscript.sparc64" || die
-	epatch "${FILESDIR}/${PN}-6.1-ntfs.patch"
-	epatch "${FILESDIR}/${PN}-7.2-debug-O2.patch"
-	epatch "${FILESDIR}/${PN}-7.1-types.h-fix.patch"
-	epatch "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
-	epatch "${FILESDIR}/${PN}-7.1-includes.patch"
-	# http://security.FreeBSD.org/patches/SA-11:05/unix2.patch
-	epatch "${FILESDIR}"/${P}-unix2.patch
-
-	# By adding -DGENTOO_LIVECD to CFLAGS activate this stub
-	# vop_whiteout to tmpfs, so it can be used as an overlay
-	# unionfs filesystem over the cd9660 readonly filesystem.
-	epatch "${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch"
-
-	# See https://sourceware.org/bugzilla/show_bug.cgi?id=5391
-	# ld doesn't provide symbols constructed as the __start_set_(s) ones
-	# are on FreeBSD modules.
-	# This patch adds code to generate a list of these and adds them
-	# as undefined references to ld's commandline to get them.
-	# Without this kernel modules will not load.
-	epatch "${FILESDIR}/${PN}-7.1-binutils_link.patch"
-
-	epatch "${FILESDIR}/${PN}-cve-2012-0217.patch"
-	epatch "${FILESDIR}/${PN}-9.0-ipv6refcount.patch"
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L "${ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating symlink to sys-${MY_PVR}..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		# just in case...
-		[[ -L ""${ROOT}/usr/src/sys-${RV}"" ]] && rm "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink to sys-${MY_PVR}..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't remove previous symlinks, please fix manually."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	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
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
index a36f195b6947..fc852df1d6ff 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="symlink"
 
@@ -74,10 +74,10 @@ pkg_postinst() {
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
 	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
+#	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
 }
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
index 798f1f370f0b..de5badfc6b22 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.1-r9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="FreeBSD kernel sources"
 SLOT="${RV}"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="symlink"
 
@@ -87,10 +87,10 @@ pkg_postinst() {
 			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
 	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
+#	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
 }
diff --git a/sys-freebsd/freebsd-ubin/Manifest b/sys-freebsd/freebsd-ubin/Manifest
index b5ee24b2c359..198434f168e1 100644
--- a/sys-freebsd/freebsd-ubin/Manifest
+++ b/sys-freebsd/freebsd-ubin/Manifest
@@ -3,11 +3,7 @@ AUX freebsd-ubin-10.2-talk-workaround.patch 349 BLAKE2B c5697082af994d7f019254c1
 AUX freebsd-ubin-11.0-setXid.patch 3527 BLAKE2B feccd24c34869e35dad18391687be0bec1c86b5573c40ba9c97a3faef0578031226aee817552d19d4416892896ed9e69867287744637def99c2915ff31f96f36 SHA512 204ce8a36eae6435d9549de7c45e361715fd50f721ea44aba630fdfad482bf434e8ac34c1bab588b7af2e2c941931e2aeb4690d65904d617b65ecfa7c76c4211
 AUX freebsd-ubin-11.1-fixmakefiles.patch 453 BLAKE2B 626500cab079cb0a28a375cb3415fc1ecdd3f8ae5c92f564a63420d1e1d6a7f91184d45f81b6a6ac73a2b217b6345db3789ad59c8aa15571f9d259b603f52a03 SHA512 ec3cd800596998c2bc3499a0cde45a173daf87db2af709bef1ae47e70f88a16a7af7649492e4ab96abba4d9b10b58f82e7d8cb3c2882a738ae7963677fd60f0f
 AUX freebsd-ubin-6.0-bsdcmp.patch 413 BLAKE2B 3c9b81f373d1438ca97edf0b0c0339faadf04a3b73f63a9fda51618803b191bbf697a038809ead6d276c3664c309acc68186f5fc571de26334605a693442536a SHA512 1516d984e7e17e8a3474ce519c9e5d6fefaee244ad27f1ed21af73335a6a25275e842007e71a60d6b18aa049f84c87b349f3350664cea03885cd55a846a73d50
-AUX freebsd-ubin-6.0-fixmakefiles.patch 1457 BLAKE2B 83a23e099842f1d89ee3cfa14e7ea0c340bf0e5874e5b5650bc0fa8af67339430501b83bc8c31fa09cc2c14ec94888ea0faf43533ada590a8798476094c4e65a SHA512 65009d59ba9739627afb04f7abf5a55395d7585d2c9c201faf8f7b849ea462b61fee407accfe4460aa33a231d151c9d2aa29be7a0ccd71e969f5235a2635442d
-AUX freebsd-ubin-6.0-kdump-ioctl.patch 1111 BLAKE2B aec894276aeee03484c2a4e7751a8b78301747d23794ef046aabb13f59f60d6ff66282e26399f140d74aa9acfc4361ebd8415ba75eb230f43c39fce0ab58767e SHA512 53f2decb5a695b8daa4db10ac4f72b5a1d4fa58bd151314211f0ce230de5247a64e360855cef10b9e0c195146a704acb7f4cec623501516dfb9dcce09946262e
-AUX freebsd-ubin-8.0-bsdar.patch 556 BLAKE2B dac1259bad031300b1e24e970c37e681213fc590d86e0df286bb2dcd17925727d900540baa2b0d2ac768058db9a13ee0e7dd91bb9dc833f4910b420686cc2c2a SHA512 46ac4dc366571be48fb6bd131dba49253a3f6e54f68c33bb5b4fede5143c3b96dc107fbd1c3159e15f3816d3b716238c0dc162c958798fbafb5074603c7da430
 AUX freebsd-ubin-8.0-xinstall.patch 1014 BLAKE2B 9d51cab56860e63bc79057ec910b1f5d39dc1c100e43a0f15ce4c3696da4da3366dbb13bea280fdaae2dff91e2a5d0aad2f5b7448a46d76fdfce317393db7f46 SHA512 a39843600497876287c13a10ca783041123631ef7a82501df323c6a118eb20d871fa6683b812eeebea220c4cfa1eba81450dc7de7ea08888229f326375ff285d
-AUX freebsd-ubin-8.2-compress.patch 1658 BLAKE2B fda8b86c361c7c171a36d4a788ddaefc4b0d1b8f6a0e2687aeec379e64b3b9df623ac7aa322041a7dc5d0c1de116b71cbc0310308ec541bc91bad1afbe1b80c3 SHA512 9b94b608e4dffb27cec0e6994a06de710ff2d73125d18fad2c5bbe9cab3e1f626ba2ade0333cac9d72350e30b2746f1ccf096bb67b472d1b9b0b79da68bf43bc
 AUX freebsd-ubin-9.0-fixmakefiles.patch 445 BLAKE2B 6d284099f5c52d94fe682e190cb584f3a78e475005ddc349fbf1fb690a17f87e9753fc93a27715e3815450fadb51d7ae9158308cea1aeec9e58310709474a620 SHA512 588b0e7f58504ae338b714fb324b1525ed340b56e2e99a1ebaac2606799c9ff15b8c1a05e2ddaa5dfbdc7328684917de8753d99b0c8929c056d6eb6446aa9955
 AUX freebsd-ubin-9.1-ar-libarchive3.patch 593 BLAKE2B 7ff532f2bfa1b6f70894757fd249543e479f6bc31aa2328aa9c9edcd4ea7c67666ee6cea06af616f3de9e6e86dd50b8b76d6f860aa95705abe686227423b2ffc SHA512 ece840657b425a666af495332a00a57a4c9c353187ee98747651da4ba69227bd0a58dbbdc7af860d49e0d662c9eaca046ec2f087a86c5bf282530bb9cdcf7aaa
 AUX freebsd-ubin-9.1-bsdar.patch 656 BLAKE2B 3e224819d75dbba4b11fc3cb9a493ae2467f7396ee17d9e4511414f60c53578bff8442eda82497b33b37184e1814bbd54a48197577526c335e7447f1ed09817b SHA512 88fc86fdb0ee6f757cee9b6bd55226517e6b79946f0518904bedd8176230124b40b868dee30049daa7053ea0ebe7d242dc58778e3addae2612ffd53996303bac
@@ -20,25 +16,16 @@ AUX locate-updatedb-cron 122 BLAKE2B 47f9847f8d1ca474a882cdbb24ecdda4d15f8bf24a5
 AUX login.1.pamd 145 BLAKE2B 74b7fc80ccfbe63fcdedc533bff27e9f857c0c71a8429cd7f7c748ac86924e38bdeaef19ab36fa9583eeb247b49a554618622311b28bee6c71f32ac838fb0df1 SHA512 2308d818de388be2973b59fad5a21ffe5a9c9d302b47ccf1a148182ccaf082421c5a277acf0c85649874fd607a8da20222e7a05c15606ee36f6e74d0968a1397
 AUX passwd.1.pamd 145 BLAKE2B b2d0f308d79db41bf38523ff309686da8a2feac0a9173100941b54d6a04f959ccb149f9a91fb747f73cd6b39eee74e075b37061a6e01a2a5360a49a33f38b882 SHA512 89f8a8a7058c2105c71a98099ba79f7169b660633cacc7be5352622481fd0a6c82f6b5403f34bfb059f8cf524671e86d7f0031dd7c89fc98fe5d5f33986a557a
 AUX su.1.pamd 312 BLAKE2B 2142e9f4cc37bd9b2f23b11f5c221ddd1bc73b18859e90931202900ffbbc4d896fb716b3d219d583facca4602e6836a10c4f53bac09b75dedc590c56323f3da5 SHA512 f7ceb3659313197138d057a67b325fab7a304426ad7b6e8e3fbda2cae47f42a3348eaa1e5153b20626cef63da5096c60cb7f2e1904c3031d9fd13df765fc70b4
-DIST freebsd-bin-8.2.tar.bz2 415900 BLAKE2B 3d6d681a3676fe5f6227cfc23b1520786802a1173b0b28e2609e843506d555dce207b65eda994d55460176531167ec738c891c811775bbf098db473fc1b9e6e1 SHA512 c39b26f75f7d812f46e907acabd8dfaf45c97adf4488bcafa35fd46c805d821e177609d403cf5e677f3674020290199ac97059a0609f7705bce58a7aab3ee8e3
 DIST freebsd-bin-9.1.tar.bz2 385664 BLAKE2B f890e37393186ae2cddf8868d47ca8a7a5767240f02aa0d353561fd746da3c0ca57461871906481b75c8c52c9f6d45f7ea5b3c9b30f27fe81a3a64fba3085e8b SHA512 fa0571a705befe1cb9c07285d3df55c9b5f4f295760511d668d80fec8cd4d59b70c676f07164f2aa44911decef0fb54fa6d78405ac2ceec822b6b8920abc5ca8
-DIST freebsd-cddl-8.2.tar.bz2 823706 BLAKE2B a9cf10f4681babfb303976056b9f0d78f3f6335fc77522d53de3c650737e85040c3c6bd3b455ffd838268b19f84e61437c786be30928f72bbdb985f678711e15 SHA512 9f9728d9bf0f9fb320a0378186b29133e5e9276494f57ac3cffa9917ec94d3b886708406990107f2fbf742c255f9ac716f35ea14f6a6a835712eb55581421721
 DIST freebsd-cddl-9.1.tar.bz2 899348 BLAKE2B 419e475b4c3debacd0d0fbbad4d1b13685c1c5ac741cc8cfb53dadce9d30cf9ddd7132ef8ab897787be538028d34bb9603eb76caf7650f4f50bb3295f19bf035 SHA512 ae0a969e710785bbcf36a2ec22cc5b1dcdb25398be951e047a1237d0c977e38fc9e05504db51f8bf9ed83bc1f68b04fc88ce18fc48a93f785b8a3f8ef481bacd
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 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-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
-EBUILD freebsd-ubin-11.1.ebuild 6203 BLAKE2B 4f0627a072962c3f70fc44efa493c0947677ad8f08302b53c9e64fcbee7267df7ec5b88b1a1a2fa3b55c90412f426e9f4847bc157511baba9ab9f6d5335c62b3 SHA512 aad001318ee376d64c06a3b3c8eed3477b27e27a50120c4135e6eea0966aed7b80a176a6fcd5095e55526340c5eb8a01d42fe57765b42d78453d6208a4e76ac6
-EBUILD freebsd-ubin-8.2-r1.ebuild 4520 BLAKE2B 86709e29a161d33d53be9db41106f3dffcf5a043431e269eeab614cec6e14eb97df838bb18584424456c16aca0a4c2e32cbcfb8ca538546189f051e8c4a6adb9 SHA512 92a14a5812aafea6a7c772e4da874651babc2fd8e0c03172ed5dfea7ab50c51cde3ace435a7e8ccfcbfdb45e725c9cfdf6b307efd2e2f77f5a00295b5d7c148e
-EBUILD freebsd-ubin-9.1-r2.ebuild 5447 BLAKE2B 6afa74903b56300050b8a8987cd050479d87ad1894c8b859dc8f6770aae361066d8133f0c81feeb65d4ba4226635ae2f604387be67dc08e1b7410298aea22d81 SHA512 fc4dc85aa3a37cd734e6ff59811e55e4679a178a9feb6f7e99410835cac73fe95730067267e7c808bba718ce9ca1d5f9d532c96080b7b61238e657869ec5027d
-EBUILD freebsd-ubin-9.1-r3.ebuild 5454 BLAKE2B faea05dfb1ab5b98c98f7d7975ec4433352ca7fface10aa6746397c5cb3aba00768f9250028886549e85e104287d59e1944eea733288eb0fe7a3ac210545f353 SHA512 b70bb34cf6536e080f2fc40f3018dce2e1c4061932e6f9137709bea5d0878e6f4625d4d7d7f34b3bd51e48a46ff9f3d352ac112b66579de6d0249bb7a0a3eb57
+EBUILD freebsd-ubin-11.1.ebuild 6191 BLAKE2B f39322b75a7d4a208e00c4a254fa785ed97f47c02fe74982cb724d83d8d9990dad52d3147b79ac228ffa01fe97e39e4863a8335ed7c8986e955dc7f422ffc2e5 SHA512 a900e3f060f44f9b15f0894725cfb0c247e3cfd7785184a2847714d1089a2dd61c3c7882d9dd0922e88e1d83bb0572ff874106bc0466dae883538cfd23009ea1
+EBUILD freebsd-ubin-9.1-r2.ebuild 5435 BLAKE2B 593ac216d25f29ea13839a4713115d7b502d9c706b5c44d258c6fd95d96a1782dd5065ec4a439ce01208cefa056f75d7ca629160d9c43b88d4dab6d172d04e6f SHA512 10cbe0ef273e83d0828ba54178fc03f736f0eba0e77d194ccd497bc1fc9123cb88705dca4bc3918fcc1a6fb8adca71edc215a4056c7a2f59e0a60c8e091fc395
+EBUILD freebsd-ubin-9.1-r3.ebuild 5442 BLAKE2B a19be7516757aafad2141d462023cd0dcc078393be1f8b54219c1ba8d214c737f2a956d1a30931be9f07fc95633e90d18f3f56cb4b1c1bd955767a521c602abd SHA512 53e627e4f98a2b7636992cd7d33366128b4d1f39bfea2ab1af49ccfc896db8ba98d9dc391d67d09a0ba609b6ee05fcde285cce6cf5cf4b0739c65adacf5930a5
 MISC metadata.xml 738 BLAKE2B 610b94f0d41c0b374855c3e340e18061db019949712332be10179ece5ad4ed84512c519279695d1c294bb1b8482d7980135c1b53b254e7078a4ba7c9575da471 SHA512 1761e6535f251fb4e9e8495ab0682677c633109b410984d142a3e3de144bd79e2a472044c064dc3c2f8aea7eded011e2848770257d100b4837701d2c71f3b824
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
deleted file mode 100644
index b135a82a5238..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-fixmakefiles.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: usr.bin/calendar/Makefile
-===================================================================
---- usr.bin/calendar/Makefile.orig
-+++ usr.bin/calendar/Makefile
-@@ -10,6 +10,7 @@ FR_LINKS=       fr_FR.ISO8859-15
- TEXTMODE?=	444
- 
- beforeinstall:
-+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
- 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
- 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
- .for lang in ${INTER}
-Index: usr.bin/ee/Makefile
-===================================================================
---- usr.bin/ee/Makefile.orig
-+++ usr.bin/ee/Makefile
-@@ -12,12 +12,12 @@ LDADD=	-lncurses
- NLS=	en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
- 	uk_UA.KOI8-U ru_RU.KOI8-R
- 
--NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
--NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
--        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
--	fr_FR.ISO8859-15
--NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
--        de_CH.ISO8859-15 de_DE.ISO8859-15
-+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
-+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-+#        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
-+#	fr_FR.ISO8859-15
-+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-+#        de_CH.ISO8859-15 de_DE.ISO8859-15
- 
- NLSSRCFILES=ee.msg
- .for lang in ${NLS}
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
deleted file mode 100644
index a89cf52dfc4c..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-By default the mkioctl program that generates code for kdump does look for
-ioctls in the whole /usr/include tree, but this does break when xorg is merged.
-This patch allows to look for include files only in the source tree.
-
-Index: fbsd-6/usr.bin/kdump/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/kdump/Makefile
-+++ fbsd-6/usr.bin/kdump/Makefile
-@@ -10,6 +10,6 @@ CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CUR
- CLEANFILES=	ioctl.c
- 
- ioctl.c: mkioctls
--	sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>
-Index: fbsd-6/usr.bin/truss/Makefile
-===================================================================
---- fbsd-6.orig/usr.bin/truss/Makefile
-+++ fbsd-6/usr.bin/truss/Makefile
-@@ -29,6 +29,6 @@ syscalls.h:	syscalls.master
- 		${.CURDIR}/i386.conf
- 
- ioctl.c: ${.CURDIR}/../kdump/mkioctls
--	sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET}
-+	sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET}
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
deleted file mode 100644
index c966b9b88ad7..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.0-bsdar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- usr.bin/ar/Makefile.old	2010-03-12 14:50:30 +0100
-+++ usr.bin/ar/Makefile	2010-03-12 14:50:53 +0100
-@@ -1,6 +1,6 @@
- # $FreeBSD: src/usr.bin/ar/Makefile,v 1.22.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
- 
--PROG=	ar
-+PROG=	freebsd-ar
- SRCS=	ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
- 
- WARNS?=	5
-@@ -10,8 +10,7 @@
- 
- CFLAGS+=-I. -I${.CURDIR}
- 
--NO_SHARED?=	yes
--LINKS=	${BINDIR}/ar ${BINDIR}/ranlib
--MLINKS= ar.1 ranlib.1
-+LINKS=	${BINDIR}/freebsd-ar ${BINDIR}/freebsd-ranlib
-+MLINKS= freebsd-ar.1 freebsd-ranlib.1
- 
- .include <bsd.prog.mk>
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
deleted file mode 100644
index 5bd1d5524c31..000000000000
--- a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-8.2-compress.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: usr.bin/compress/zopen.c
-===================================================================
---- usr.bin/compress/zopen.c	(revision 225020)
-+++ usr.bin/compress/zopen.c	(working copy)
-@@ -486,7 +486,7 @@ zread(void *cookie, char *rbp, int num)
- 	block_compress = maxbits & BLOCK_MASK;
- 	maxbits &= BIT_MASK;
- 	maxmaxcode = 1L << maxbits;
--	if (maxbits > BITS) {
-+	if (maxbits > BITS || maxbits < 12) {
- 		errno = EFTYPE;
- 		return (-1);
- 	}
-@@ -513,17 +513,28 @@ zread(void *cookie, char *rbp, int num)
- 			for (code = 255; code >= 0; code--)
- 				tab_prefixof(code) = 0;
- 			clear_flg = 1;
--			free_ent = FIRST - 1;
--			if ((code = getcode(zs)) == -1)	/* O, untimely death! */
--				break;
-+			free_ent = FIRST;
-+			oldcode = -1;
-+			continue;
- 		}
- 		incode = code;
- 
--		/* Special case for KwKwK string. */
-+		/* Special case for kWkWk string. */
- 		if (code >= free_ent) {
-+			if (code > free_ent || oldcode == -1) {
-+				/* Bad stream. */
-+				errno = EINVAL;
-+				return (-1);
-+			}
- 			*stackp++ = finchar;
- 			code = oldcode;
- 		}
-+		/*
-+		 * The above condition ensures that code < free_ent.
-+		 * The construction of tab_prefixof in turn guarantees that
-+		 * each iteration decreases code and therefore stack usage is
-+		 * bound by 1 << BITS - 256.
-+		 */
- 
- 		/* Generate output characters in reverse order. */
- 		while (code >= 256) {
-@@ -540,7 +551,7 @@ middle:		do {
- 		} while (stackp > de_stack);
- 
- 		/* Generate the new entry. */
--		if ((code = free_ent) < maxmaxcode) {
-+		if ((code = free_ent) < maxmaxcode && oldcode != -1) {
- 			tab_prefixof(code) = (u_short) oldcode;
- 			tab_suffixof(code) = finchar;
- 			free_ent = code + 1;
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
index 0aa366c68d63..4a52e0bedec6 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ LICENSE="BSD zfs? ( CDDL )"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
deleted file mode 100644
index cafa7605cf93..000000000000
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-8.2-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic pam
-
-DESCRIPTION="FreeBSD's base system source for /usr/bin"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
-LICENSE="BSD zfs? ( CDDL )"
-
-SRC_URI="mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${BIN}.tar.bz2
-		mirror://gentoo/${INCLUDE}.tar.bz2
-		zfs? ( mirror://gentoo/${CDDL}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?]
-	ssl? ( dev-libs/openssl )
-	kerberos? ( virtual/krb5 )
-	ar? ( app-arch/libarchive )
-	virtual/pam
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.9
-	!dev-util/csup"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	!build? ( =sys-freebsd/freebsd-sources-${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}-6.0-fixmakefiles.patch"
-	"${FILESDIR}/${PN}-setXid.patch"
-	"${FILESDIR}/${PN}-lint-stdarg.patch"
-	"${FILESDIR}/${PN}-6.0-kdump-ioctl.patch"
-	"${FILESDIR}/${PN}-8.0-xinstall.patch"
-	"${FILESDIR}/${PN}-8.0-bsdar.patch"
-	"${FILESDIR}/${P}-compress.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
-# and the rest are misc utils we already provide somewhere else.
-REMOVE_SUBDIRS="bzip2 bzip2recover tar cpio
-	gzip gprof
-	lzmainfo xz xzdec
-	tput tset tabs
-	less lessecho lesskey
-	dig hesinfo nslookup nsupdate host
-	rsh rlogin rusers rwho ruptime
-	compile_et lex vi smbutil file vacation nc ftp telnet
-	c99 c89
-	whois tftp"
-
-pkg_setup() {
-	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= "
-}
-
-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
-	fi
-}
-
-src_prepare() {
-	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-
-	# 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"
-
-	# 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
-}
-
-src_install() {
-	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"
-	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
-}
-
-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
-		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
-	fi
-}
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
index 2b7bb22a77f1..51d1442d20f2 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
index f292b7e8ba5a..5c516589984e 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-9.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic pam multilib multibuild multilib-build
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="ar atm audit bluetooth ipv6 kerberos netware nis ssl usb build zfs"
 LICENSE="BSD zfs? ( CDDL )"
 
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index bbf4a673cb8a..c95480e33781 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,14 +1,11 @@
 AUX freebsd-usbin-10.3-bsdxml2expat.patch 406 BLAKE2B bddbdf3869a084f4a3eed616398bbcad3759570ce25ff4467747f2ac1795a50cc082e5e2858f61faa3d70acecbf91c0f793d6a559622e3c8f8a07485138bfa79 SHA512 91a2323b5007e2381fb58d608dd19dcc010afb398a4b2285b53cae4157268fb6aa232323280cec72cccdb2010610f73e048b06bae76418b7db8cd1f34b7ad8dd
 AUX freebsd-usbin-11.0-workaround.patch 374 BLAKE2B 7e4b18ccddd1da87fc2d6bb8d8c98be45cc1b2d1d8b383316746a793b6eb3aa9d722e11ea600d0c49111b00c5ddb237eaa019b2babeed86da7d0beef6ff0189d SHA512 c9e8b493d99581dd7beac48def291843e31649a2962f720ed06ef095a128b039e8308662cfbbfcbecfbd0265132bb7a4df9d895ffe69aac09c129389ba5be518
 AUX freebsd-usbin-11.1-bsdxml2expat.patch 841 BLAKE2B 89b5b0ed64dcf5c95eb727110651bb77079a4ccfc346fbd9ac1b26e3a4d53c452d657379ca876e6eb8b50dd90be59737b84405de873613dadf3bebeae7c788de SHA512 69f9055dc536132f1ec46389b53e25261632d726bc74857210ecb5511114f07d4b550e5e4a7a6e066a4a68c4a4bb4e44309d01f569b154fc773247dbd7f3fb23
-AUX freebsd-usbin-7.0-nowrap.patch 1185 BLAKE2B abf703cc6a6a7294b2be9da26f71add505b0394d465211a1154690f8e6705d39e6b71f5a63c9a298eb5d9df544037b03577bae16c259d84d78ca03f048e2b438 SHA512 4374954aecddaf51acc8121b58ea28a4b411652c1deaea05cb600dac3d27a7e42bae1b2ad6f90ffc503d40f296ce627106545c8ad0f2dd23231d454e71f83fee
-AUX freebsd-usbin-8.2-newsyslog.patch 400 BLAKE2B 12be44c218cc355a2eaaace2061ac9d1f62b2c44cdde6816a9e35fe525692d1971af8d78bc78740642d970a0d8d6e18f04879114851811052600b16c9b02bde6 SHA512 f013a8911aaf1da759fae307276c482480d3938183f583d1c78c2711bf81e8cb9ebefa004112d4eb1fe7d9620527a49326e49186f0dfd9a9af9e0ff29d4aad56
 AUX freebsd-usbin-9.0-newsyslog.patch 507 BLAKE2B 7c95ebd60ca6cc1bac56b84359a389dada9e71de9f275cf99d72f329fb408bd16845fb46d60037c514deb4ea21cd894da57ae28193e56970e383c5a8e1c689b7 SHA512 5423fc577035c2a272d4cb4305c5ee5e1e910a68af44595524665f7b867bd0a48bab0349b2fa13eabc385b2ec29c8f578d018cd8196f3ad20a13a68d36a335ae
 AUX freebsd-usbin-9.1-bsdxml2expat.patch 431 BLAKE2B c521420d05d41a4f65d20786c0057e4e684860f1ba28d2976fa44c6fa94379ab1423b8e332cf30c99fdf6b06b54525c491e2fc17a5f820e7cbc2d1a10d868b2c SHA512 ef1e9be49796b50e8dd818ac1a6f363eaa54d767ac9477e3df09354df78dff887a31a3c793288f321b7976bd98de79821742550ee8e7f9fcf3b1a42cccbc68b0
 AUX freebsd-usbin-9.1-kldxref.patch 756 BLAKE2B 9ddf3efe8b5c0ed13158bda03c2a89e70d0692520d31590448a3b24440b24228edc37600a3052fc91c82ac6f9ab8a5ef163954b911122659ce26d95d1fe5836f SHA512 8d1e0c80a6698729bdf40e60ac0373ed76e4c394f7fc93e9ae78e9e8bb06d63c99d04dbb942e90cc9240fc429be7048c4fee22c3ce593b49be90c9df3fc549ec
 AUX freebsd-usbin-adduser.patch 428 BLAKE2B 3008953aa7ea14405b0e914f518fa05a5de744283110959900ab1ee9887b8b48d8d15131f26280773ff0173f1c60c077c66fedfad1b0310d0e6c5abb5a2b1370 SHA512 51720e3db9bf3728afc0dc370a469746cb1bf61623c44a20c58e27d647e5a5d0360145b1d174382176d803f2558afa2f2a29eca6c85c638529d0e11e2859c0c3
 AUX iscsid.initd 429 BLAKE2B 366c216bf7f4584d1aa115302547b7066105b5107a976504c68725a1f7ca80adb7bd19b4acdaa2ea41b45c42bfed2b028a17ab28201163222788432768f2e5a6 SHA512 49a90719aa0279e19899a2107113cad0784a2cf3b57a0c24ad08549fa4b44dcb1aceecd71027e363b8d2cbbe1b590480ef7806cb05d8b00c1830c2d77b8a8540
-AUX mountd.patch 542 BLAKE2B 3da93977dc98ae0c95a4df71bf990c9cd42c79c782ad83b9c6473f603a97a481fd800729530c5820b23c46dc14485af22efb705cfbc75db88f348fce0a3d04fc SHA512 c7a77ea1df0bd9c0a75b899a306aeb7fbee5ed4fb67a230d6348edbd238dc176267f19cd345f51b26ceef11b4657821ab752b333da5b03fc973bce3253e036e5
 AUX nfs.confd 303 BLAKE2B 69f72512c7e518f9078ea3873c5a2c9f0e1fef02ba3d769a18d1c8f347a8f8d5981cbe7ce34946431b373ae2b580505d74714f7bdbc0a7298745f02f96d35404 SHA512 4224c7f525e39b105b8d80caa7db0f3e0b07d6c521970b2aacfd707ef524262cbdb9ed8aa5151022d571a759151dd25a280fc765a38e67864b0c446ee9fd6b5a
 AUX nfs.initd 1424 BLAKE2B d3988adba20f8c8d4114342ca90752ea6dfce1993bce29991655639b995784bb25f8ebd7d0dee687d5e5e2970862f688dcc74239fac4b7de4beb8cddc6c1cdad SHA512 1d85de665dfea1845189f2ad2e7205ab6185ce228f7140ccaafa22c84f8b9f0b4b4c5a26bd53895f1f2c4639bbeb8d5b76106d2e64851eb62f229028dc61cb5c
 AUX nfsuserd.confd 153 BLAKE2B 931bde9b889bae7a58a9dd2b37583e1b9caa610a4eda9f4b70ed15d8a8752edc669b9b7f45d5613db57f05648c9f20f0efe2808f25b000627dd7c36778efce58 SHA512 47bf885dc80a61c9f8aab5890a360063fc2e846ce8abefb84e9d504f62c455cd759af753c7a5ab8cdd624842200f6b0ec7d177ddfdc1e7564460764eb4d4d073
@@ -16,28 +13,17 @@ AUX nfsuserd.initd 447 BLAKE2B 0367d6849fc1392ae308023c5c5ddf4df0db0b38e86c486d8
 AUX pw.conf 179 BLAKE2B d93e3d2df7bc636b21b2bfa30b5b76b671f98631c360f7977c9368b0f1fa96cfa922c6820836addd24804b50c3a9978ca901dd7068f5d721b8ac8c6b8ff151f7 SHA512 042b7c7805d891f453da58f607edb3174fddc8443d6995ebe833185ab313328c131bae87dbbc9db95bf69a9ee71548d350191b34a8b2bf41a56416aff03c3891
 AUX rpc.lockd.initd 530 BLAKE2B 03926d9b01e3d191030a18785ef53824836d1826895d064a303d83f5eff8e3a3630273d5547d1d0d95bd85db7f421b790671cf9e882af58621dd8756fde86fe6 SHA512 930c42b63a230f6f64ecdaec95f61e43b463abe109f926c298507fa3c6b090edba1f8dcc95046a0a5b8c0378d336fbf728f9db77b8b0822d0e2b36713fefc9e5
 AUX rpc.statd.initd 520 BLAKE2B 701d58e57520dd9237a7e2261071304a1f820816c0902e06122a4729872432e6c29dc62a686f53d674a75f2c3050b6adf04b2d3c665f2f3639362fecf0ca929c SHA512 62c3bef69ca0619e3492050379a4c8b490305ab0ee7620143c31be7af414b1f1cbd79feaee345bd5e6bfdfa6c93bcce3cc9ff61a2f63e235a3807920e260cb7a
-DIST freebsd-contrib-8.2.tar.bz2 40931651 BLAKE2B c6beafd99e27731297454208059e08a9d0889611781955a23695bd27457a592b87d2da0d93eb6eea5fa870bab5c719f705722cf89f4a9a43f1a71996f3e0f951 SHA512 4f7bf825b579fbb88f2aac531d07e531474179c63fa0b66c4e80821290a8c94bf611bb4dcaef51b762aacd25b11dfae798a4ec3bad3b9e3f6b3490ebfaa72476
 DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-etc-8.2.tar.bz2 188629 BLAKE2B 112f3a97525c98bc0ac17378549d943a3e4138ea7924a189f411776ec203720a93bcdbc9e7270c90116c76351bababc007b42b7443e47fd37290ee7fc519de38 SHA512 3e5c106754a6a1ac806bd46b711fba7ee9cb31a4eab5262c995a5d59dbeb02f756dd8b495640dda94189d204a5d2c5218de2bd23467172d6a4ebe1048986e89c
 DIST freebsd-etc-9.1.tar.bz2 207776 BLAKE2B 61fbfa11dfcd24c007c20940a4b7cc802dfb9a991e41433840c57f113eaaa9e2b833a15f48d60c706e55d941b0a999baabd0c33197cffd522b67c57eaa9460f1 SHA512 4fbe56fde519cf2f44e39a8869efa26c34f703cf540f4a83389da8d170873d7c6fb18e4010e643b8d793cfc5c55d15eeb198057a5b2a8da9d9e8f791801bf314
-DIST freebsd-gnu-8.2.tar.bz2 815379 BLAKE2B aef186c8b65b185d471ea240beed3a4ccb28a127f6b2b6621f836fb7e1e6e438f61b1c072f68e4c8fcdb7c58390a3fd8d0bbb261d78bb0c1863b02f84807d0ff SHA512 8b278e386b22b22658eef18341073c1c757b86ecdef5c5b543fb781cfee295d71cef599544eda5f8cf273fc22d28a1ab14d912086ff8398c36ee2b71281617d4
 DIST freebsd-gnu-9.1.tar.bz2 795778 BLAKE2B a922a8bd2c8a7ddbac757e7db900109918bf214a34988adb45bdb11e5c829445cac9b13b0ed27ec62603aeae1e3230af362682182494db0ec95ff47cbfd7d927 SHA512 b05f2a5a10bdaeef19dfd0e962bc09f1571288a831e9345f404b920037f47db5c0ca3d620d1cbdd138b18bca1c3feab5b211b57e3041727341e5238cb9feb4fd
-DIST freebsd-include-8.2.tar.bz2 138992 BLAKE2B f9d5a4c43a4c79ba5d9fbfe53037139c31cd5a7011851305a155a648f50b5b7769fafd4ff59e105dcac54079947b8f98c05527b517e955a3e60423c68a849a10 SHA512 6bc820dde866589ef75f9f0d1c469d815439bdd4c79f0e1a2482ec58f938b638cb9106969b321aa72492f933c95c76895ce489727a5e265798c93adc75dd64e3
 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-libexec-8.2.tar.bz2 289147 BLAKE2B a81a5cd6a0b302be8eacd478fbe1f6f4d8cdbf4ea7dfbeea698c59e62c8d0c3a3bf77d460ad4b218bf1877338608abde7ebd94a93e2ef4476c243571cfd3b88d SHA512 abe6cf5a268675d7dcb1c214c46fef47a3fb09b31947f5d8a0b938d352295efe0249beb5007649c52187bf4c221b6ebf074d18dfe9bafd168cae09ee02ab608d
 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-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-usbin-8.2.tar.bz2 2443024 BLAKE2B c5c8d708a1277d59e5287fd4d524c81da63521327f29b7a46bc97b4e9414cd0fd294d0890368064bd91833613fbab9467e676fa5dae3729cd4b667609dff9d8f SHA512 bcb8ff3df54848b9107bbb52e5ced7a91e24bb181f06769b6997221729b8064ec17652eaf7500de3268cbcb63ff5760beb54d15fc78c27b02687b5b1067c74a6
 DIST freebsd-usbin-9.1.tar.bz2 2670916 BLAKE2B 353c7e641c0cccf25b99cb454368bd3001cd6b85a15956b1ee2de1ab240c420602e04bf6d0389aca0bdd4f7d1206a6848516e58a17eda4881d849f078b71a139 SHA512 21c234312f70eb35cd2926519efc1f61592892f5d0940786dbeb959c3c5ec7819a51ae95c6e8a1a06aa01f669350fe0fd3dd7c4ec8a84dd6b90f24cb192356ca
-EBUILD freebsd-usbin-11.1.ebuild 5454 BLAKE2B 388e4183cf15d1ec29dfb0e7c38e5bc4e8531c4b3aa192cd0368adad1f4450f89b1b44336fc7a6bafeb4368cd3022fe9fd12628d20d3d4641eccdc1e611b072e SHA512 6b37709519942d7dbe85f12c347838cd07de93d5f5bb2b3867e16b1b1da8af1a78745585b1d016989dac7692143433d96d6dbc68cb492ff9d315314f667ad43f
-EBUILD freebsd-usbin-8.2-r2.ebuild 5093 BLAKE2B b383f35bd8cc32c1a130240ed680591670b0274097934bab481d0e97d2226b5dcbbac33906f432306bea321ba7b421f2d41b4db8c1925c95722f1a9b83c11e5e SHA512 77a75c88f844eb51896b1021fbb9690771e80cdba214c6f3d7ae8dbfac9bfd9f5db2af587839612d485818243451b50a61596aa457bfa92b2f5008a5ae203ed2
-EBUILD freebsd-usbin-9.1-r1.ebuild 5359 BLAKE2B 17673327f8f6498fec2bd9453a34830ebb1729c859a06243da4a00d130773b32688adfd74012607f2568a41d07249fb939e58cc81350838e0389dd2a377bbff6 SHA512 e59ef89170cde0cfa4802ee20c94c4bed6d71f695f0f961cdd7ff6667af719561f156f1f0f6ba5be5395a00020c4f419c354e8cb48fcaec307dd5247b3750dec
+EBUILD freebsd-usbin-11.1.ebuild 5442 BLAKE2B 68a9b16ec4eceded11cbfda41eaf8e5d5108e43ba16d351c8e7e82480ab747f9088592bf6dc9aeb35507cfe0d53936108dee467ed0ddac1b728141116925f42b SHA512 ec043c20093c49637c5ee352259015addcf23c610c893a21b3a9f512b097b3d659ed788316540435b3edfedbe3b949325f2a935a8d46acd61593cb27dd6756ac
+EBUILD freebsd-usbin-9.1-r1.ebuild 5347 BLAKE2B f2588f153a30c134cebc1bf46092840fd1638ee963c296aa7872871e482b186463783bb14ec3dadc987d2c121f883f2ac82586e819fddad73ffdcd48c2421556 SHA512 578b2754262864fee5f76b0a3b4e30b5d3069d47a20fb9aa6a97ab70da1dfe0a1cb42121debca776c3e94fd9de1d1501b0cdc9c2b7ba0cc34bacc6157cc4e291
 MISC metadata.xml 599 BLAKE2B 70b00a85a1d670dc842bf5234aa6a82cc31564ec25c2f1789440b5beae5e4e0ab76b7b16122b92205d616e86225d892eb183f21c3e0c8aa63cb32f60a0647265 SHA512 afe1f9e8ccacac89bcd308b6476bba009035542f86d71f70f27df029ff20dda7ff7ff8c9510e6939d502a31750c6bf69de608440fb61b1d590d018446aa14f99
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
deleted file mode 100644
index 9b11104e8337..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
---- usr.sbin.orig/rpcbind/Makefile	2007-04-21 12:02:30 +0000
-+++ usr.sbin/rpcbind/Makefile	2007-04-21 12:05:32 +0000
-@@ -8,13 +8,20 @@
- SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
- 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
- 
--CFLAGS+= -DPORTMAP -DLIBWRAP
-+CFLAGS+= -DPORTMAP
- 
- .if ${MK_INET6_SUPPORT} != "no"
- CFLAGS+= -DINET6
- .endif
- 
--DPADD=	${LIBWRAP} ${LIBUTIL}
--LDADD=	-lwrap -lutil
-+DPADD=	${LIBUTIL}
-+LDADD=	-lutil
-+
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DLIBWRAP
-+DPADD+=         ${LIBWRAP}
-+LDADD+=         -lwrap
-+.endif
-+
- 
- .include <bsd.prog.mk>
-diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
---- usr.sbin.orig/ypserv/Makefile	2007-04-21 12:02:31 +0000
-+++ usr.sbin/ypserv/Makefile	2007-04-21 12:06:53 +0000
-@@ -8,10 +8,13 @@
- SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
- 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
- 
--CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
-+CFLAGS+= -DDB_CACHE -I.
- 
-+.if !defined(NO_WRAP)
-+CFLAGS+= -DTCP_WRAPPER
- DPADD=	${LIBWRAP}
- LDADD=	-lwrap
-+.endif
- 
- CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h
- 
diff --git a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch b/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
deleted file mode 100644
index a0983912178f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/freebsd-usbin-8.2-newsyslog.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- usr.sbin/newsyslog/pathnames.h.orig	2001-07-30 18:17:17.000000000 +0300
-+++ usr.sbin/newsyslog/pathnames.h	2009-09-11 08:32:57.508226240 +0300
-@@ -24,5 +24,5 @@
- 
- #define _PATH_CONF	"/etc/newsyslog.conf"
- #define _PATH_SYSLOGPID	_PATH_VARRUN "syslog.pid"
--#define _PATH_BZIP2	"/usr/bin/bzip2"
--#define _PATH_GZIP	"/usr/bin/gzip"
-+#define _PATH_BZIP2	"/bin/bzip2"
-+#define _PATH_GZIP	"/bin/gzip"
diff --git a/sys-freebsd/freebsd-usbin/files/mountd.patch b/sys-freebsd/freebsd-usbin/files/mountd.patch
deleted file mode 100644
index 3cb9f03e9d8f..000000000000
--- a/sys-freebsd/freebsd-usbin/files/mountd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://security.freebsd.org/advisories/FreeBSD-SA-11:01.mountd.asc
-
-Index: usr.sbin/mountd/mountd.c
-===================================================================
---- usr.sbin/mountd/mountd.c	20 Dec 2010 09:28:28 -0000	1.107
-+++ usr.sbin/mountd/mountd.c	1 Mar 2011 11:47:16 -0000	1.108
-@@ -2875,7 +2875,7 @@ makemask(struct sockaddr_storage *ssp, i
- 
- 	for (i = 0; i < len; i++) {
- 		bits = (bitlen > CHAR_BIT) ? CHAR_BIT : bitlen;
--		*p++ = (1 << bits) - 1;
-+		*p++ = (u_char)~0 << (CHAR_BIT - bits);
- 		bitlen -= bits;
- 	}
- 	return 0;
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
index 36367a5e496d..5e4b26e2c2fd 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="BSD zfs? ( CDDL )"
 # UPSTREAM_PATCHES=()
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 	SRC_URI="${SRC_URI}
 		$(freebsd_upstream_patches)"
 fi
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
deleted file mode 100644
index 2bf4b1f35f0a..000000000000
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-8.2-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic eutils
-
-DESCRIPTION="FreeBSD /usr/sbin tools"
-SLOT="0"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		mirror://gentoo/${CONTRIB}.tar.bz2
-		mirror://gentoo/${UBIN}.tar.bz2
-		mirror://gentoo/${LIB}.tar.bz2
-		mirror://gentoo/${SBIN}.tar.bz2
-		mirror://gentoo/${ETC}.tar.bz2
-		mirror://gentoo/${GNU}.tar.bz2
-		nis? ( mirror://gentoo/${LIBEXEC}.tar.bz2 )
-		build? ( mirror://gentoo/${SYS}.tar.bz2
-			mirror://gentoo/${INCLUDE}.tar.bz2 )"
-
-RDEPEND="=sys-freebsd/freebsd-lib-${RV}*[usb?,bluetooth?,netware?]
-	=sys-freebsd/freebsd-libexec-${RV}*
-	acpi? ( sys-power/iasl )
-	build? ( sys-apps/baselayout )
-	ssl? ( dev-libs/openssl )
-	dev-libs/libelf
-	dev-libs/libedit
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-ubin-${RV}*
-	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
-	sys-apps/texinfo
-	sys-devel/flex"
-
-S="${WORKDIR}/usr.sbin"
-
-IUSE="acpi atm audit bluetooth floppy ipv6 minimal netware nis pam ssl usb build"
-
-pkg_setup() {
-	# 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= "
-
-	mymakeopts="${mymakeopts} WITHOUT_BIND_NAMED= WITHOUT_BIND_DNSSEC= WITHOUT_PF= WITHOUT_LPR= WITHOUT_SENDMAIL= WITHOUT_AUTHPF= WITHOUT_MAILWRAPPER= "
-
-	append-flags $(test-flags -fno-strict-aliasing)
-}
-
-PATCHES=( "${FILESDIR}/${PN}-7.0-nowrap.patch"
-	"${FILESDIR}/${PN}-adduser.patch"
-	"${FILESDIR}/mountd.patch"
-	"${FILESDIR}/${PN}-8.2-newsyslog.patch" )
-
-REMOVE_SUBDIRS="
-	named named-checkzone named-checkconf rndc rndc-confgen
-	dnssec-keygen dnssec-signzone
-	tcpdchk tcpdmatch
-	sendmail praliases editmap mailstats makemap
-	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_install freebsd-update"
-
-src_prepare() {
-	if ! use build; then
-		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
-		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_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 nfs rpc.statd rpc.lockd; do
-		newinitd "${FILESDIR}/"${util}.initd ${util} || die
-		if [[ -e "${FILESDIR}"/${util}.confd ]]; then \
-			newconfd "${FILESDIR}"/${util}.confd ${util} || die
-		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" || die
-
-	cd "${WORKDIR}/etc"
-	doins apmd.conf syslog.conf newsyslog.conf nscd.conf || die
-
-	insinto /etc/ppp
-	doins ppp/ppp.conf || die
-
-	if use bluetooth; then
-		insinto /etc/bluetooth
-		doins bluetooth/* || die
-		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"
-
-	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-9.1-r1.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
index 11c304685cfb..2627caf77333 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -7,7 +7,7 @@ inherit bsdmk freebsd flag-o-matic eutils
 
 DESCRIPTION="FreeBSD /usr/sbin tools"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 		mirror://gentoo/${CONTRIB}.tar.bz2
diff --git a/sys-freebsd/ubin-wrappers/Manifest b/sys-freebsd/ubin-wrappers/Manifest
index 2286e286be6a..1310daa943ff 100644
--- a/sys-freebsd/ubin-wrappers/Manifest
+++ b/sys-freebsd/ubin-wrappers/Manifest
@@ -1,2 +1,2 @@
-EBUILD ubin-wrappers-0.ebuild 781 BLAKE2B 3ac0cda528c298894c546cc6c50a58b4cf1ef9af84190efc72d644a750477b9060b3bed4beff5bb594c84f6198d31b7f86aac05f55f11f2217fb01382621ae10 SHA512 a438b6e683273b7f832e2e2cf41ad644cf4a5006ea493886e46b3008a3e158372c179d8836b54f1d258a5562157b774098e5a4758f107f48af1c97b597d7411f
+EBUILD ubin-wrappers-0.ebuild 769 BLAKE2B b18bca98024fc32a287283f5ad80cf6d7070fe0c57368e356c5e43e3f2958d677151adc3c87e06d7f0ac580e5497ade2c5001a093384f416824a0592524017d6 SHA512 6b11cf09d20ce8a585c3191ff69b19ef918c87b7a1e35d2dc6f71b3662e879147059f05588e821f908d13f17e274148bec4711020137098888f7355c3eb17959
 MISC metadata.xml 242 BLAKE2B 96580d939bee0b28e643476ad839223e9992a8bbcc59c5902a2b7d71945dfecf01bf924f11884f3f684184181deaa13849ce318c2aa0683d33113e87d191bc26 SHA512 b854e91958adbf3787c2f322ff793e9a7e1881eed7018e83935a99a6a68db80996eb87786d5162c8d66460801f601bc477071baa4010152abff68668e36047d3
diff --git a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
index ad8aabbca3e8..e183e180cc94 100644
--- a/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
+++ b/sys-freebsd/ubin-wrappers/ubin-wrappers-0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 IUSE="userland_BSD userland_GNU"
 
 DEPEND=""
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-26 15:48:02 +0000
commit	38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch)
tree	6fce284d5bfddaf597a490ac66069d16c6a485db /sys-freebsd
parent	0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff)