gentoo resync : 25.01.2018

4 files changed, 6 insertions, 107 deletions

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