gentoo resync : 25.01.2018

9 files changed, 9 insertions, 312 deletions

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 )"