gentoo resync : 10.11.2017

14 files changed, 375 insertions, 73 deletions

diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 4c83c12017ef..aff9e16df9e5 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -3,9 +3,9 @@ AUX cifs-utils-6.7-talloc.patch 857 SHA256 ec979ead2ee53a0ee1244387ccba525d4a611
 DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
 DIST cifs-utils-6.6.tar.bz2 401831 SHA256 d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125 SHA512 0059c85a9faeff4bba052a9bfc672baa658a923e03304dfb0c51f427079afc6effb2f83d7d09cdcacb2c8a30cdfccd3946957b1616790f5ad3ae2300f161458f WHIRLPOOL 340b8ac0bcc42d83e757a1fd747444afb36d1b252b36ca77896d02e384c9c016a45f7cd5d1fa40a1f90163f652a4fc43c90818cb56c33b263f4d2a9b49cc62c7
 DIST cifs-utils-6.7.tar.bz2 363647 SHA256 b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e WHIRLPOOL 4fe0f0d73f69001e97e25b665134a76cdfb4779006a192188e066d8c63cb82ef487ac5a5e3f0722f54c2843032391411c2863497e420c83521d6bad08db18d47
-EBUILD cifs-utils-6.4.ebuild 2967 SHA256 0635bd2685a4b82e72a202102d2908190179b4c7fb2906d8fd11ce0133a5aaa6 SHA512 c8513c805d82cc91c057b1afae6ee8a858af7dcdd2510ed0c43515f3f8cbbeed2cd64488032999aa73bea89bd64addad7c5a9e2eb31a56ada023f4e59cbc458a WHIRLPOOL a840b0527ad6fdeb69d1ef288b6c84eadd84acd032a13a9f4d32f66df6ddccfd0c49c0c05b53bdf625b694b74451cda0a2fe02a8d770cf95074694d70b3a7198
-EBUILD cifs-utils-6.6-r2.ebuild 3089 SHA256 0e3794b22d3ee7f83a22463a93e22e719499994a13ed3686f4494b860fca7816 SHA512 2e39d65abf4546c0cbe60a6c1a14d505c7917eca4d2f6ed294f2e4300cb2b19a0990907f305ab8bf985b0937d14d06354a7e3c962470a5a21ee567a4d3e03608 WHIRLPOOL b254f0d6cca72a246da6e24f01c35f3fd12cd55439505eb1d19127ebc61762b07297b2e749529e2db8f40c1c9f9211b16ee247a92a5a9f080cea70f306c995bc
-EBUILD cifs-utils-6.7.ebuild 3245 SHA256 63acfc62263e42625965a5dc54f3d8337f115ebc318ab6e62b03211336f858b4 SHA512 16582ec8c9eb9fe48d1cead83a2e9a5c86bd54bf1ce45b80e913b10c24b2918bd37aa4dc4a2417355a54061a0543ccbf40b3f8a506e1561011b0f6a8d14759a9 WHIRLPOOL 94ee21198f1462f92bdf8c228eb0cbd5e0e7d1b8440f6b6a6a775b5d544b4ca2cc8d40cf0839a0ca3a37d4eb939ba8fa1ab3cee54d9f8fdafa2daeff8c8e631c
+EBUILD cifs-utils-6.4.ebuild 2974 SHA256 7a43602b2550aea780d9bf1e82fa74b9d7df6d23e62a12b900709833546ee714 SHA512 c5c12c57c322a2a87f03426a2d08f1fe1e69213efbc4463b04b5d2b60ca1b06578a018336666b5a2f4213c3681d1d1ee3c35df4b0bdf802e4a1e564d423ee4e1 WHIRLPOOL e9b84fc08ef82cb225100ba9a8bb9a28973da9b7bb919c3d97e4df2c4621a62ef4324a9a605403f3a9882385a04d7fdc54bc16294237a0d67b72d54e85606262
+EBUILD cifs-utils-6.6-r2.ebuild 3090 SHA256 1e0e47de28e2e86c089f5e82b9ee9e1bfe40bff2e6258b5e9be8fcf740d27be5 SHA512 5cd30a1f79b430fa846fd54e21bb8c47b1ad34fcafe21063fa4e95373bf045d3e9aa90f4ae6e211b255e8144bdb18db023e5784573f779e5dea8fc61c3243447 WHIRLPOOL 74585b37ddbdfaae18014c69373aff27aa0cac1df6a51814fddd840498c5df74f0e26b2073aea0583b2af9840ea1a515dc12bf830684d6154af893a26fb27c7b
+EBUILD cifs-utils-6.7.ebuild 3246 SHA256 899133cb6e37054c4cdc6a0bf818905b640a57022af2313c54f036f621f7be71 SHA512 dc2153bb30d70e7626d511130fba8aadafc54c5b8dbca6c258763e65779e3a0cc1d6e684d4c0c531fabb4ee824b0f33a771af8b0b03e203c7ecf614e12d2b6e9 WHIRLPOOL 7fe07560022ad51a179f1d14d6d0498bb17315a118bc2c039c49da3cedeeda9ea20d8a0b70cc0405de6b7084ca5549cdc58aceb1e96f854cae870a1f88e4d5e5
 MISC ChangeLog 6821 SHA256 07eed26f77562d41a3778f699eecbc16777e6a3ee692bd5a2e5fa2ac6613a79b SHA512 238bd10608deb895bf7a06ea1e1c706b01b33a2e555ca63b35f82bbab8338b1f23bc92e6ae8bb0bd7c6c39f68d3cd32878edd41969a58b929fffd4685e6a17a4 WHIRLPOOL 032de7e4b13f6f44df44155e4b6e68f76c7acdf1048f3fab521884034e96550216cab09e541b4a2b5016fa386319e59e717c5cabc54cc7ebab2fcbe1edec8ace
 MISC ChangeLog-2015 12721 SHA256 8b26bff3df84d27491a9a9aa39459c109a7643ebde9e8a375b5ad4c93e58c4ad SHA512 89a2674b5fdd892ebbf022faca0dace1b2f125d8eb6ea6034266930af391dcc1ce70292a6b374bd6f82d02029a0f7a75ccf705af678302a4ca750c1206d2b2e0 WHIRLPOOL 7e2959c4519617336b808fd5469a6950756d6841b957ef1e4e2c66c99d164c2c6dfd685c652f29be1f085d0061266ac71cca894dfff2862d8e12ad5651c0bce2
 MISC metadata.xml 889 SHA256 89bba935346607875e91cba58f764b546785ddfd0959a1da29332a8413285576 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66 WHIRLPOOL 6d0c66bb0c9349a25c87b051f91ee70dd489ffa89bc343922cc90f9961c343d56a8c596b08565576530a297a5f36e1cc65f8500b8af1570e7975ff0176e4db34
diff --git a/net-fs/cifs-utils/cifs-utils-6.4.ebuild b/net-fs/cifs-utils/cifs-utils-6.4.ebuild
index 6789aead638c..fcce7f6b93b0 100644
--- a/net-fs/cifs-utils/cifs-utils-6.4.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils linux-info multilib
 
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://www.samba.org/ftp/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild b/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild
index 8076f0fb3049..0751c696946d 100644
--- a/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils linux-info multilib pam
 
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
 SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index b18e773d4607..8572921b389b 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools eutils linux-info multilib pam
 
 DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
 SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index e19bd691eb89..36662d854f21 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -24,14 +24,14 @@ AUX rpc.svcgssd.initd 470 SHA256 272905335a7c82034c6bac007bd4477aae21d8ce49e8235
 AUX var-lib-nfs-rpc_pipefs.mount 111 SHA256 59e05e4e6d6af92d5fafaf2d6b8e87670bcda4de5c9fb748d1be40a21f594500 SHA512 f4502bf53fd3014987e53ffc5d4b9b8678103052289dfe9f9304bb7eab66b6b59d80e3a29c19e3bc794657c2e3dbb25e275f78e09bc25808ed9849cc4a748034 WHIRLPOOL c684e43627f4e9ec4c97f0db28ce28682fc5f17627573c0902bb17946b0012969e070bd9030e0c20b9bd10e140e2901a9c2246a7e70700cf7541d90aa7293c76
 DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c WHIRLPOOL 6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4
 DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448 WHIRLPOOL bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c
-DIST nfs-utils-2.1.2_rc3.tar.gz 475356 SHA256 5b379316a2cc49b07f72042b72eadee0bfe7c88e65d7b5baa4798e6cefca5a82 SHA512 2f948994f275b405678240deecc879900cc0e72476adaf552db059364f08f0929722013d751e0bc7913c30eb3f8183d1fc7693709c063fc92e20b71edd24ccef WHIRLPOOL 6a16a9cc3d22d883b6a8aa2d2f01dce81f9a1df03154a80e4aa43ae9bb878a15f0ca37951702f780341283da94d885b7be3656a950285ef79619e09dc465727f
-DIST nfs-utils-2.1.2_rc5.tar.gz 476401 SHA256 52b32896572e0f81dffd5ccd90c367e5d00b5d371b8deef45dc744ee1b7ad2ab SHA512 28670ca993c1bf953632086ab15cec1b6a525fb1b28243e382f246362cfb2629c9d0416f4f65c6a2f2c46202a4c6855d1924a7f8c984395ddb98b6d4f4b0cbcb WHIRLPOOL f2e2f75c0a989402f75740164870e250a12f29f4b3f0eb7102cecf57aea0d647a0a7860798f9333e8bef9efc4af72f516c885c62cd079e89470d108cdaca4b9d
 DIST nfs-utils-2.1.2_rc6.tar.gz 476695 SHA256 a88b499210eec4fb41414f9ba653570d1845981e414f5de6ae90ecaf14205977 SHA512 d7c054074e2ea4370a5e47922785fa2a0cf595623d0222cb16f910c4946ed7f3d6f093b471557ce139c85ad0dd321bed0222f5c5aa5b7bca04b31d422eb35f75 WHIRLPOOL 6dfec79baa7b37f57a162296b7e5acb07da9144d677cf1f7ec515fc220a844d9a0d7e935ac0f4b9a1db9eaa2816d5d1ea089141f11f6ae9e6ec8bd77d24be0b5
+DIST nfs-utils-2.2.1.tar.bz2 853812 SHA256 0d819d8da358bea6e005e1a6cf0f6fa0c5507a78747d36bc87a0182e6af14291 SHA512 05e2aa4f413a4a4927995847211680baf87f956a435d0d903dd7b6239f72e66a15a089758d41874c05c2137e0626d72c1714010c2a9ce854943fef7798db9a24 WHIRLPOOL 8cd39c83e0a761c3cc846f81184ec6cbe68289b2648c5605ba68a31379f86afafe67f6808f348b30875730a1ee1656d65738b74dd0863a70b48250a3d325f1fc
+DIST nfs-utils-2.2.2_rc1.tar.gz 509381 SHA256 5ed5c50ef20c49a9b96c99bd288d25dc94ecbdb4b314f5d885576692e89345bc SHA512 5cc9a19e1ebf1831f1914419c0e7f12ff12037caa35e5866dfba8bf30c5355dcf2e039928b9b336c6755df856549ccac6ea646d61b57c68f96fd586d21a27f1a WHIRLPOOL 407b721b43308b96ae48553169dfeafb2844dedbce3060860549d85322aea074539bac82bb5579a17d74b2fcc212156d1450feb8a5340570f3d33c763b8fed29
 EBUILD nfs-utils-1.3.4-r1.ebuild 5143 SHA256 14af2bab1372632aa119f64072b31163225a55f5332f1be698a7a2e3cb3fe268 SHA512 0d3c81edc4533db8e37527ba9f56f6456353dc3c926a5d5887e2a5f51ffc428c78fed780758317a991a2803d4031b37b7c715776b3babdb9101384141632ec83 WHIRLPOOL 9e596e0df33eb2ec38a8efa9d0ab1116097a32c35af81116839f1951ce71aaf297f930a637f44798661047a5696238dcea0b6bd02bce9ee958e0224f08d0304e
 EBUILD nfs-utils-2.1.1-r1.ebuild 5064 SHA256 e54c82752ed4b46354eb6e54d70dafa2c6302ec10c0b085359950b094b1d5a90 SHA512 213f9a4905ee77a3e02ee5894cfc2aa8bbedcc81014f0d85eabb54c4994e3e7bb7ab70fe7c501796add31deb8abfc8aaffaf077c0d177067145c9de3802e491c WHIRLPOOL 7c21a5f2b23883ad8614c31cdfebe54e833e1ec199ddc5abcd0fcf9d16bb06e193a2924eced829b39fbc4d5ecdd4cbeaf514d77a2d37bfcf0563290f77ce6ff0
-EBUILD nfs-utils-2.1.2_rc3.ebuild 5289 SHA256 5b4b33d8fd56a614466848030c3e6872a28eafa6b2874c81cdd915ce3fb7d4ff SHA512 81bc8b7e20eb65f451f2c0b4dd5034a603b71cefd0e6dd4bf3c4c96f3e1cba58d32f00c87e61ceb3aa545f0dcca2d74b85448b1d453ec578fb4a38c19b04ad5e WHIRLPOOL 7fc9aa7589ab8843145253bb0e289ca2e2b8a42fb215881f84891fa24aeac49c5ef7e4b95b0c5a98e730dd6dfe122346bc0025b5add1a680a11df0990640717c
-EBUILD nfs-utils-2.1.2_rc5.ebuild 5340 SHA256 98f810df2cd6e69debf60e98ac90ebfc7be36b6c672adc33a02d99c008b9d88b SHA512 7626cec28aeeb377acb2f402fa870a94daea38854ceafeb25dbdf93f36ca5fbdd1439f0e92e51a3f865f50756b5af5051c8caeadf617f3b4fb39dbe4b81e750d WHIRLPOOL e763b6302d3c226c6f7150f3a3473f11f8362ffcbef7f252163144c193f8bd9ffd60245e331fbe3466336f1e1d06e5198249e3b8ef8a7dfbcda220271bdc246d
 EBUILD nfs-utils-2.1.2_rc6.ebuild 5340 SHA256 98f810df2cd6e69debf60e98ac90ebfc7be36b6c672adc33a02d99c008b9d88b SHA512 7626cec28aeeb377acb2f402fa870a94daea38854ceafeb25dbdf93f36ca5fbdd1439f0e92e51a3f865f50756b5af5051c8caeadf617f3b4fb39dbe4b81e750d WHIRLPOOL e763b6302d3c226c6f7150f3a3473f11f8362ffcbef7f252163144c193f8bd9ffd60245e331fbe3466336f1e1d06e5198249e3b8ef8a7dfbcda220271bdc246d
+EBUILD nfs-utils-2.2.1.ebuild 5282 SHA256 49f315d08a2e1b78137918f61ea8fbc53ac5274a2879893f8cd9dacd521af005 SHA512 b2a1e0d368ef803ac8be205708e91f2256cbd8c7a2f304d5db2d8c326550da35eedfb67fae85bcbc68995a20d2f20ea0ad0a94163e5e9e8c85f23252525f01c1 WHIRLPOOL 4cd008ae5ec1dd3820183b4e6e94f5a0cbece3d1a0082bc8cab378d97762ab7ea4c87b76585211ff031d23a48a5aa3d684b945de258e15cda0769e845ac9b5c4
+EBUILD nfs-utils-2.2.2_rc1.ebuild 5282 SHA256 49f315d08a2e1b78137918f61ea8fbc53ac5274a2879893f8cd9dacd521af005 SHA512 b2a1e0d368ef803ac8be205708e91f2256cbd8c7a2f304d5db2d8c326550da35eedfb67fae85bcbc68995a20d2f20ea0ad0a94163e5e9e8c85f23252525f01c1 WHIRLPOOL 4cd008ae5ec1dd3820183b4e6e94f5a0cbece3d1a0082bc8cab378d97762ab7ea4c87b76585211ff031d23a48a5aa3d684b945de258e15cda0769e845ac9b5c4
 MISC ChangeLog 4793 SHA256 332289ca95671a4b5cdef50e7feb9a7ca6dd3932fb5d7dd15edf7cb5a28ef284 SHA512 fba2097f9cbfa7b0d354247415ed85db7ea13b6094da9c43a0b8fdc0c2ee62f4ff17d9d32661ad8e74623ccb2180a00270a3add38b5dd1096358db1236ef999e WHIRLPOOL 0d3b058b419df04477283b53224c71bdea2067af9aee05e10ee9738766e296f8cf9e217381b7599edb8606316c147994dd0ebe3a0d59480766c8c84e04218833
 MISC ChangeLog-2015 46341 SHA256 d909ce1f5fbc93ca1a57f34f3d3567e34bf331462f827b19bf33296a963ab0da SHA512 4140a6ce807d598b6bd3c2e24f3ec4c14f122089f72bfdde7b0985e92013fe0ffaf6c1bf84cf9d532e4784e3d4566541f36c0feae4ec1864365cc137fc07b009 WHIRLPOOL 405b59e201f22161623fab182db72287d7a4a5715ef439e37c9df32330c0446d1ee6d66c04b266284a54d3c3307c86961a890ce66638ca93d3735b5ff0a8ecd6
 MISC metadata.xml 815 SHA256 8ef118718c7d92dbb008dd3cd8bb89e40584967b9c930849ffab396829a43069 SHA512 18aa7723310d1c01653fa49266742b3c00413761af48586977a8979bd34088bd39f281f36d5784c980ada53b981e3654f67363be35d8c1872075d0c5e189da14 WHIRLPOOL 13844feb1774af2e735249a00e1a6bc0db2a08b434740e52b442c181929da4cd0372056606cd7c75d96dd336b73eead6a06d9bd79047a392433e2217bd419fbe
diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.1.ebuild
index 133e06869f03..9dcb159618a7 100644
--- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc5.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.2.1.ebuild
@@ -28,30 +28,28 @@ RESTRICT="test" #315573
 # files, and nfs-utils doesn't build against heimdal either,
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.4
+DEPEND_COMMON="
 	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
 	libmount? ( sys-apps/util-linux )
 	nfsdcld? ( >=dev-db/sqlite-3.3 )
 	nfsv4? (
 		dev-libs/libevent:=
-		>=net-libs/libnfsidmap-0.21-r1
+		>=sys-apps/keyutils-1.5.9
 		kerberos? (
 			>=net-libs/libtirpc-0.2.4-r1[kerberos]
 			app-crypt/mit-krb5
 		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			>=sys-apps/keyutils-1.5.9
-		)
 	)
 	nfsv41? (
 		sys-fs/lvm2
 	)
+	tcpd? ( sys-apps/tcp-wrappers )
 	uuid? ( sys-apps/util-linux )"
 RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
 	!net-nds/portmap
 	!<sys-apps/openrc-0.13.9
 	selinux? (
diff --git a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
index 4858d85705fd..9dcb159618a7 100644
--- a/net-fs/nfs-utils/nfs-utils-2.1.2_rc3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.2.2_rc1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils flag-o-matic multilib autotools systemd
+inherit autotools flag-o-matic multilib systemd
 
 DESCRIPTION="NFS client and server daemons"
 HOMEPAGE="http://linux-nfs.org/"
@@ -28,30 +28,28 @@ RESTRICT="test" #315573
 # files, and nfs-utils doesn't build against heimdal either,
 # so don't depend on virtual/krb.
 # (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
-	caps? ( sys-libs/libcap )
-	sys-libs/e2fsprogs-libs
-	>=net-nds/rpcbind-0.2.4
+DEPEND_COMMON="
 	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
 	libmount? ( sys-apps/util-linux )
 	nfsdcld? ( >=dev-db/sqlite-3.3 )
 	nfsv4? (
 		dev-libs/libevent:=
-		>=net-libs/libnfsidmap-0.21-r1
+		>=sys-apps/keyutils-1.5.9
 		kerberos? (
 			>=net-libs/libtirpc-0.2.4-r1[kerberos]
 			app-crypt/mit-krb5
 		)
-		nfsidmap? (
-			>=net-libs/libnfsidmap-0.24
-			>=sys-apps/keyutils-1.5.9
-		)
 	)
 	nfsv41? (
 		sys-fs/lvm2
 	)
+	tcpd? ( sys-apps/tcp-wrappers )
 	uuid? ( sys-apps/util-linux )"
 RDEPEND="${DEPEND_COMMON}
+	!net-libs/libnfsidmap
 	!net-nds/portmap
 	!<sys-apps/openrc-0.13.9
 	selinux? (
@@ -68,13 +66,12 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	sed \
 		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
 		-i utils/*/Makefile.am || die
 
-	epatch_user
 	eautoreconf
 }
 
@@ -114,11 +111,11 @@ src_install() {
 	# Don't overwrite existing xtab/etab, install the original
 	# versions somewhere safe...  more info in pkg_postinst
 	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib "${ED}"/usr/$(get_libdir) || die
+	mv "${ED%/}"/var/lib "${ED%/}"/usr/$(get_libdir) || die
 
 	# Install some client-side binaries in /sbin
 	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
 
 	if use nfsv4 && use nfsidmap ; then
 		# Install a config file for idmappers in newer kernels. #415625
@@ -146,18 +143,19 @@ src_install() {
 	done
 	sed -i \
 		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
+		"${ED%/}"/etc/conf.d/nfs || die #234132
 
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
 	systemd_dounit systemd/*.{mount,service,target}
 	if ! use nfsv4 || ! use kerberos ; then
-		rm "${ED}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
+		rm "${ED%/}${systemd_systemunitdir}"/rpc-{gssd,svcgssd}.service || die
 	fi
 	if ! use nfsv41 ; then
-		rm "${ED}$(systemd_get_unitdir)"/nfs-blkmap.* || die
+		rm "${ED%/}${systemd_systemunitdir}"/nfs-blkmap.* || die
 	fi
 	sed -i \
 		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}$(systemd_get_unitdir)"/* || die
+		"${ED%/}${systemd_systemunitdir}"/* || die
 
 	keepdir /var/lib/nfs #368505
 	keepdir /var/lib/nfs/v4recovery #603628
@@ -169,10 +167,10 @@ pkg_postinst() {
 	# src_install we put them in /usr/lib/nfs for safe-keeping, but
 	# the daemons actually use the files in /var/lib/nfs.  #30486
 	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+	for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
 		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
 	done
 
 	if systemd_is_booted; then
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index fecf7ccff363..a6999eaf3140 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -23,15 +23,17 @@ DIST samba-4.6.7-disable-python-patches.tar.xz 8896 SHA256 33702adba80e9886625fd
 DIST samba-4.6.8.tar.gz 21139872 SHA256 581deeb2543f5cedcb556cb950d0e82690d9f0cd33811d76624502ca0c32575d SHA512 fb40144210361bdeab09007aa49fa85077fbc8eeae2c49bcdafb01d33ec40425160882979f0829005a89766ed4fd4e36d7f952f6dbf6e0178f5b0945dc8d8efb WHIRLPOOL d669df156dcae5846d814eb30f577b9df0513383be91a87886b91dff12451d82c236dd7c1fd996a378d90619aabee5adc33ecd488534b612b8f82b7b88d0840a
 DIST samba-4.6.9.tar.gz 21154233 SHA256 c31db4aad82f0b9588ef6c4b4dab5dce3fa1787bd298e62d953c2628bb1af21a SHA512 20a0828afe2b7f834543a3efc8618bba78951f728da99434f084b7220477ef9e4b1ef09d5a3a5a16a96e1f0704bb2c8d2c3418402f0b8e5f8201bc022a4937aa WHIRLPOOL 996bc727317f0fa7ce9fd94f68cd9b20b7f10eea08c0ab100af73a2ac5a23700aa26abe3dbca6f384c20bb642ceb3755eb995e62e8991ca09bf94f7898a085fa
 DIST samba-4.7.0.tar.gz 16830569 SHA256 bd16d169988eb513e685a87e9964a5210482498fa9b3a22aaa8287a061e3c936 SHA512 c69da34566ec672ed17f86ecf793154374c71dd33b588adceed5fbd9345d978a4ffeced5d3a4033edb4daedac2294ed088beed8cdde19724f9d03da54e22e4ee WHIRLPOOL d2635df77e8dc82d0a6aeb345eebf5616fba1ab826b90aedac1f49669ff7faae8845737267c908956ade1904a2c85e918b6db678197e3a6c1f35f78ccc78021f
+DIST samba-4.7.1.tar.gz 16844730 SHA256 7ba932523c821ebfa4c31ebd183f7aa20d663059f9761563fcdec85cd1e9be1a SHA512 eaaa494501e0029fab8b0f1789fb28d33104a51b7365ba53741218786a4331f5adc5ea86d65aac1ccd970103c74a99fb875c4ba74460bd8b4597aaefbab18c7c WHIRLPOOL 1a09be343d47d2e61e7f236bd7ba4817de990f722a6e130150a0043ccc29da453e90b2eaf8443a48c5491bcbcbb0070b1ca72a3b5b25ec94759981ea13cb712d
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 SHA256 8903eacbabdfaf7b64cbde03d7c367d1efdc92e54090f0f4b9ed5d2a462b1c18 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372 WHIRLPOOL ad63db55d5dc96f56e6c9b30c2092e2f6e206b0ed5d13c249879d10753c8db2f475c5d4e651e2fc042ad992b648d3b4465f1b28c6b4bbf821cf503d27f741f7e
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 SHA256 fa0d776e04e3222c0dc4761e376717f4154937cdcb85f4117b8978dfb770a78e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927 WHIRLPOOL 6d55710895435ad012e23f8c252e5276966241014710349ca7fa9cf037e8742030b8e053f7cb71309a0a45f48d2235d55393243bf4d19476a22dd39bb1b7748d
-EBUILD samba-4.2.14.ebuild 7041 SHA256 c5e6ea8d2e28ef6ee10976157d16c11c1f8708fc18b321ad1a39ea4e9c4a06e5 SHA512 26eaf948b1b631347434603d01cb727feb1b25e5e1cc936086a7790aaccabbc6d2e0e0c0dc4b6ee76beab6ee8ed959f9c875b2940c96c497ce300b4306eb23ff WHIRLPOOL ea78ed40e61c52258fc6a66468bfbf4b0c540d91a017b50bf858583448d650d5f042af2237368b629d50f82292b9b32f2cd43534a910b2fc3008cf475ee10bee
-EBUILD samba-4.5.10-r1.ebuild 7732 SHA256 25dca274a37d51734f784a3d619f452c661665912e0928ea9d8ef1ab60821472 SHA512 ec4cf6f818c64bda6458a3f21476d5c1511a3e2aaf26a637789775fd99f34486dadbec61e513f986d78b47445625b7ba79c1e6574b4b193bd377f5fe54813c6f WHIRLPOOL 775d59dd8059c8e93a3330da48fea13a5b655cdf5f4dc98aea81a58536d0ec8ee9e7074050dbb096de73f5a4d20e9bda1ca0c1a864859838c58c67086804a629
-EBUILD samba-4.5.13.ebuild 7797 SHA256 31b9e91ac0a2ef2711b17a346a5a43b32dd1116cf0ad5611668b997adb09adf2 SHA512 a45c3285315eb47503df08dd9c027f75b31c5450da026108487d24ea3cdae88129ea9f886fec716b6fbbc995ee32f83d78714b2494f75006979d01e0965a2076 WHIRLPOOL f75074ea63cc5fde0e167b046665df978439ef027df6c74f04395fa072b4af872139ba898fec9665dbc6fc7cdd051cef0af1cf9a847b09bdf234fabe11b66152
+EBUILD samba-4.2.14.ebuild 7053 SHA256 ca745956acd5edf8629e20e3ae1e3b3656a1af580f2689295d9ab9326e392700 SHA512 38ffb1af7b80d82e93da2c93006fab9d754cef8073f74a97ddb9beda5c4a34388008169508bdfadfe8da9a0eea0b5cc56a72d92e93aa6dd65a5d329d56d8c085 WHIRLPOOL bdcdf28f679476cf170eb4d17a56e2a2ddcd7bf3bbecb724d1dc5c52e8ed7707a67ff6d03b650d8e4ebfa4d29a23b2cc0edbfcbcb7f6bf78f8dc605c37057ddb
+EBUILD samba-4.5.10-r1.ebuild 7743 SHA256 3e2638a7e963fd659ac7fc18b21dccb65fde5b901627333a7ba0d7d06cf778dd SHA512 b04a1ea862ecf882f69037ee3b4d55ba96bcec6cb70b50accb89e277587530a8ef0ae8500446981492176e46969b8b1db40f924dd7e23e1070e1f618a75d6931 WHIRLPOOL ed8f316d05a0fb7d9d70f005c2da74c05ef715b73426ab7449a68eb36e74f009a5cfa426ec1610555b535b971a3b6f6cb538b0e6f4167fe1a320788fca2f50e6
+EBUILD samba-4.5.13.ebuild 7808 SHA256 28c209d67f0653b8dcadfbaa4733e180edca40eb2bd33e4cb974bd61a057603b SHA512 5ab5bf2cb15c17390e8ee720e493f3119262a7c89d0e0447fc1cf504647f945873ac8a6fe67799e6621630b49e42ab53fa5f4b289af37912f577f3e9b2d35b29 WHIRLPOOL 3ba40b2c3c66706adcadcd2cd3fcaed3f9c5233b66c7e5a145fb6193ee0d38dbd0a305f2ed6960d752f683526608e2709a937b9c393972269f2715838d074e0c
 EBUILD samba-4.5.14.ebuild 7797 SHA256 31b9e91ac0a2ef2711b17a346a5a43b32dd1116cf0ad5611668b997adb09adf2 SHA512 a45c3285315eb47503df08dd9c027f75b31c5450da026108487d24ea3cdae88129ea9f886fec716b6fbbc995ee32f83d78714b2494f75006979d01e0965a2076 WHIRLPOOL f75074ea63cc5fde0e167b046665df978439ef027df6c74f04395fa072b4af872139ba898fec9665dbc6fc7cdd051cef0af1cf9a847b09bdf234fabe11b66152
-EBUILD samba-4.6.8-r1.ebuild 8541 SHA256 44f5bc8303cd3530bd9d386f1ff949c7f0019f19d97ffa139787b07e3787a80b SHA512 c9a846198e58746952e74a619316757f8f40891570484cc4e2950a5ba28d91aff198c7de8161735a9239ed1dfc2e6c4d657e0db08d2a46f9ea95705e0910a16f WHIRLPOOL 4ee11b357f9a49fdcb69c64d241c5d3322bc28f331a695e0d9d58b7475b5aeb9e2c87ccb58e124db87b809a6ca9c926166a23cba2b614e7835ec866ae1cf4b22
+EBUILD samba-4.6.8-r1.ebuild 8552 SHA256 362966dbb3a0ada15dc83094d153b7b2c584222202b6a8a5c9cce4e360a7873a SHA512 1cd2018b46dba9f49778dc15552969ee88056bbfeedfb32915bd3a3f7157d997490f86ddc0e85f7ead0bf6e688461fcfe90a818595d8e9d27293602b80882ba0 WHIRLPOOL 470bccc391cd0ff3796474fb41c509882f873606825e33417255969f9bf3a00097999334a19a2c08f6a37f7d772c81f58a8b6798c7aded5c8381db2296f97b9d
 EBUILD samba-4.6.9.ebuild 8623 SHA256 378ead6c80dc05395eeee5a2c1b7a3d6a6ef61aa5362d83fbdbd3ae68d4bbf42 SHA512 d2e8225495f8510721c48dc037450f636c69248d49afd7de2aae4519f17eddd58eaf47431d3b60c6627459532e38af696a6bfef32e92af20f8a7da8d733e864b WHIRLPOOL d27eda23197f11b92ad4a060ec83fd5bbd40dcbf081085d4991ccd459b2bb61d6042f96a244665c693d9505e732f96694f2c323caae3d0d03a0a79920e74f141
-EBUILD samba-4.7.0-r1.ebuild 8435 SHA256 7f6e67c6580fa740b524f2c4c9cf700601671cadcee916c026c960fa14bc6df0 SHA512 7cc4c8fa7e58ad2d6588881181cab128c51f79b3297d0412bd6e7dbdc272eeba230f9cd0e4d49a14eebebf14909d8e74fb5e00749bbebbc2541fe3e825e9f0b4 WHIRLPOOL e926e5929bf8c58aaa8f599236beccd10add0032df1a97671dc69da12bca0d624a0c6a7580a8158c7f3ca453ca79d1bfc9bcd56b1d77a2e050b2bc1086822c5b
+EBUILD samba-4.7.0-r1.ebuild 8446 SHA256 f91ddd196652a402f4348ef0a4ebed9b405e10b4bd4daa301bf956da20c9c7c1 SHA512 a6c25a3aca9fbd258e1803e887b2a7e3759ea9be8ddb5cd3b404ce71e27f0697ba7960ca5623bd7ec35fea00ceff1408a30917f727ddfdd59089b280751ca822 WHIRLPOOL efffb727735b1251b630743e7dc8462dcdfb4d7b9dd5c90da1390d582165298e83bc1fd08e1b4b55e2aca184392148716f27a3e245d78c0d6760e56a35da58cd
+EBUILD samba-4.7.1.ebuild 8435 SHA256 7f6e67c6580fa740b524f2c4c9cf700601671cadcee916c026c960fa14bc6df0 SHA512 7cc4c8fa7e58ad2d6588881181cab128c51f79b3297d0412bd6e7dbdc272eeba230f9cd0e4d49a14eebebf14909d8e74fb5e00749bbebbc2541fe3e825e9f0b4 WHIRLPOOL e926e5929bf8c58aaa8f599236beccd10add0032df1a97671dc69da12bca0d624a0c6a7580a8158c7f3ca453ca79d1bfc9bcd56b1d77a2e050b2bc1086822c5b
 MISC ChangeLog 29865 SHA256 9fdf9b583855db807230f491b4957583779bda1b46807e5a1f3fc3f16a584322 SHA512 6ac0456dcf57a73cb9ca984623b5fb4512b9cbcfd9189c3cbeeac5b2135aee2dbb99114e838c8f6438388d948da4ea7fe15712a38bcf834c75d414c538f460b4 WHIRLPOOL 271a5a1c45a6a6b5d41173c677e3c48053bf2aae078098ebdd8ab6de31defd2bbbc6679bbeca8f7a6426edeec9692ad2e86ff465ed7459f5800089ec1abc7a84
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC ChangeLog-2015 11570 SHA256 700ea64c0586d7957e3ef95425683f9bd711ae4311c7cd19575b6d1cdd814e94 SHA512 8d5d99a08a409db4cf8c8e9c3a82a080de66d9aac6ff39e53bb6eb5eeadb625d0ebd07c6fc81bce1755d2441ab91d96f90787d3975814f572e2ce2a366038299 WHIRLPOOL 340948bfd379c419985c93c21a543bb10d10a0c95c8ec2cf1d01697a3e47613b2b6e9f2292c1d03f353121a39b6be809ba432535ccab67b71adf333c69c5bc2e
diff --git a/net-fs/samba/samba-4.2.14.ebuild b/net-fs/samba/samba-4.2.14.ebuild
index 1bf4b2e16841..0213488e770a 100644
--- a/net-fs/samba/samba-4.2.14.ebuild
+++ b/net-fs/samba/samba-4.2.14.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -251,7 +251,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.2.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "https://www.samba.org/samba/history/${P}.html "
+	elog "https://www.samba.org/samba/history/${PN}-4.2.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild b/net-fs/samba/samba-4.5.10-r1.ebuild
index bb4953a89c67..92ac19751e02 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.10-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -138,7 +138,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
+	# when specifying libs for samba build you must append NONE to the end to
 	# stop it automatically including things
 	local bundled_libs="NONE"
 	if ! use system-heimdal && ! use system-mitkrb5 ; then
@@ -275,7 +275,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "https://www.samba.org/samba/history/${P}.html "
+	elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.5.13.ebuild b/net-fs/samba/samba-4.5.13.ebuild
index cbf7ec7d4fc5..5b022e87b8e3 100644
--- a/net-fs/samba/samba-4.5.13.ebuild
+++ b/net-fs/samba/samba-4.5.13.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -139,7 +139,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
+	# when specifying libs for samba build you must append NONE to the end to
 	# stop it automatically including things
 	local bundled_libs="NONE"
 	if ! use system-heimdal && ! use system-mitkrb5 ; then
@@ -276,7 +276,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "https://www.samba.org/samba/history/${P}.html "
+	elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.6.8-r1.ebuild b/net-fs/samba/samba-4.6.8-r1.ebuild
index b4690d4142ed..f0db4e738ccb 100644
--- a/net-fs/samba/samba-4.6.8-r1.ebuild
+++ b/net-fs/samba/samba-4.6.8-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -160,7 +160,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
+	# when specifying libs for samba build you must append NONE to the end to
 	# stop it automatically including things
 	local bundled_libs="NONE"
 	if ! use system-heimdal && ! use system-mitkrb5 ; then
@@ -299,7 +299,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "https://www.samba.org/samba/history/${P}.html "
+	elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.7.0-r1.ebuild b/net-fs/samba/samba-4.7.0-r1.ebuild
index 8e9afc791ab5..abccdda22274 100644
--- a/net-fs/samba/samba-4.7.0-r1.ebuild
+++ b/net-fs/samba/samba-4.7.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
 LICENSE="GPL-3"
 
 SLOT="0"
@@ -157,7 +157,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to 
+	# when specifying libs for samba build you must append NONE to the end to
 	# stop it automatically including things
 	local bundled_libs="NONE"
 	if ! use system-heimdal && ! use system-mitkrb5 ; then
@@ -298,7 +298,7 @@ pkg_postinst() {
 	ewarn "controller work previously known as 'samba4'."
 
 	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+	elog "https://www.samba.org/samba/history/${P}.html "
+	elog "https://www.samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.7.1.ebuild b/net-fs/samba/samba-4.7.1.ebuild
new file mode 100644
index 000000000000..8e9afc791ab5
--- /dev/null
+++ b/net-fs/samba/samba-4.7.1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.2.2[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.33[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}"/talloc-disable-python.patch
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(use_enable ceph cephfs)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with debug lttng)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_with gpg gpgme)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex python '' '--disable-python')
+			$(usex test '--enable-selftest' '')
+			$(use_enable zeroconf avahi)
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--disable-cephfs
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--without-gpgme
+			--disable-iprint
+			$(use_with ldap)
+			$(use_with debug lttng)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym /usr/bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}