gentoo resync : 25.01.2018

7 files changed, 6 insertions, 252 deletions

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