From 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 2 Mar 2018 15:59:12 +0000
Subject: gentoo resync : 02.03.2018

---
 net-fs/Manifest.gz                                 | Bin 5025 -> 5029 bytes
 net-fs/mc/Manifest                                 |   2 +
 net-fs/mc/mc-0_pre20180209.ebuild                  |  46 ++++
 net-fs/minio/Manifest                              |   2 +
 net-fs/minio/minio-0_pre20180209.ebuild            |  52 ++++
 net-fs/nfs-utils/Manifest                          |   2 +-
 net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild         |   2 +-
 net-fs/openafs-kernel/Manifest                     |   6 +-
 .../openafs-kernel/openafs-kernel-1.6.22.1.ebuild  |   4 +-
 .../openafs-kernel/openafs-kernel-1.6.22.2.ebuild  | 134 ++++++++++
 net-fs/openafs-kernel/openafs-kernel-1.6.22.ebuild | 134 ----------
 net-fs/openafs/Manifest                            |   8 +-
 net-fs/openafs/openafs-1.6.22.1.ebuild             |   4 +-
 net-fs/openafs/openafs-1.6.22.2.ebuild             | 222 ++++++++++++++++
 net-fs/openafs/openafs-1.6.22.ebuild               | 222 ----------------
 net-fs/samba/Manifest                              |   4 +-
 net-fs/samba/samba-4.8.0_rc3.ebuild                | 278 ---------------------
 net-fs/samba/samba-4.8.0_rc4.ebuild                | 278 +++++++++++++++++++++
 18 files changed, 751 insertions(+), 649 deletions(-)
 create mode 100644 net-fs/mc/mc-0_pre20180209.ebuild
 create mode 100644 net-fs/minio/minio-0_pre20180209.ebuild
 create mode 100644 net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
 delete mode 100644 net-fs/openafs-kernel/openafs-kernel-1.6.22.ebuild
 create mode 100644 net-fs/openafs/openafs-1.6.22.2.ebuild
 delete mode 100644 net-fs/openafs/openafs-1.6.22.ebuild
 delete mode 100644 net-fs/samba/samba-4.8.0_rc3.ebuild
 create mode 100644 net-fs/samba/samba-4.8.0_rc4.ebuild

(limited to 'net-fs')

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index fff9ec52794a..e703999e6197 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index b567548d0df8..cf0a9f93ee4e 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -1,3 +1,5 @@
 DIST mc-0_pre20171014.tar.gz 1103870 BLAKE2B 4d2131c629e9eb61db29c4809bb8f5efe385ee4527b2759d093d51926583faaf5aaa06d1614abbd0725a6e567f2ee0ec5f4d066725cb4dc13c1082c830effdae SHA512 7d33b70ca1be9a0f1e1c6706c22bf92fa0e13292f9be07b8fecf108f34cf13f272ebcd4bb04495d6e769f4cce5411c43d3dd1732f43a5dd2c8eae608f9a89310
+DIST mc-0_pre20180209.tar.gz 2770164 BLAKE2B 5ca4b9571df86ab4ac9d3f9a12bf9c99ff081ed30ec05fd7fe28e82798ceca176dabb08d41cca251efafa47f0b1b9884072e4511d3419ee197f9080472156ec2 SHA512 141644aa4b8f99a8747d9dd672df6aa9d3cb21ab35f2b96070d2e914ba912022dff787632bb7bc7ee4c9f04efe35c835e375c35c21e403ef8d68c57d60c24380
 EBUILD mc-0_pre20171014.ebuild 1188 BLAKE2B 8a3da19a8e4eefca0c7063398ddb20ce00c3e4618995100137ac3b7ea1d5bb5d0f6c13192bfb67dd2decf52142a26df784843f44ac264e8dc4b2b6ae5f6962d3 SHA512 d884e645d25a5a038e8cec343569cd08f9fb1ca12133f6f6846b6b1983dd5540e290908b87f98d0b2ad0f06aa8f0903b4cdd6cb8c039a31e87455e555569008e
+EBUILD mc-0_pre20180209.ebuild 1188 BLAKE2B bc79dfcfdf898d0a0c3317c74dc4e787f5229e4b147221dac9a2284dbec6a7a74220c489eab490951c2253ec983ce9775ad6aac9470cecd5f97afe1d8131523a SHA512 a16cf03488aa12e5253e97811e4acd30d0f408af0a2b2254f80237e6c1408863651ea7a9ba24b9c5c3e3b380e615e7b8bcbc0fcaf71ab38f2ba3621a46e3d176
 MISC metadata.xml 318 BLAKE2B c743c3bd11a4461e1bc6b5def1e574324c427bfd4a24d8e255f669b127f706a78373b39ec43e7263e1f04c61664ec5960c5915060b9c05185f1601b4f9cafad2 SHA512 b627aad120dd63394294c46d13e87ba647cc5f44e83460e4de610b8099633124017c9f8d46e687dc4312c540fe231df2467228bc6d95fe83a48510ee138331fe
diff --git a/net-fs/mc/mc-0_pre20180209.ebuild b/net-fs/mc/mc-0_pre20180209.ebuild
new file mode 100644
index 000000000000..ae5ff99a53c4
--- /dev/null
+++ b/net-fs/mc/mc-0_pre20180209.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+EGO_PN="github.com/minio/mc"
+VERSION="2018-02-09T23-07-36Z"
+EGIT_COMMIT="3987f1405aa7a0faaff019cc3b55da4ded9ebbe5"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!app-misc/mc"
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MC_RELEASE="${VERSION}"
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md docs
+	dobin mc
+	newbashcomp autocomplete/bash_autocomplete ${PN}
+	popd  || die
+}
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index 1a505771b9e3..6b939fa7d29e 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -1,6 +1,8 @@
 AUX minio.initd 410 BLAKE2B bedce560151142afc4961569f6fb803c9d7bb4263d56061191e3dc7e867dccd62fa1a363d41c16afa931d0ad138bd8cd858d7dc636851c6a0130bb1405396e3b SHA512 01610c5dd7e5887f85b1246d475e5b5c23cf3fbaa0de21e9579bfa929f3634cccbab1b7a7b8e66fa9bec41ed3feaae033c4380cc3911a7af6f64286c4ed0cf78
 DIST minio-0_pre20171027.tar.gz 6904926 BLAKE2B 442f57d77d3634f269dbcba36333e2116fb189efbe63d50d387511d23e6edb98b0d9089f7742e717afee69a38dcfcaa7dc43ffac6ba2fff3d24a307ea8efc6e5 SHA512 15be3adf502efb9eecf2ef83a8339a1c965ee9ff6507e4a61e13faa187a3592cd88f9868716ce2834e54dde03f3bec12337a68e72fbaddf103c880ce3c4554f2
 DIST minio-0_pre20171122.tar.gz 7030932 BLAKE2B a06b81bcc16c9880a13a615f894d04f55e6824feed603bb466e0d95c6ed1b1e9c28b639e5ef6240e0d33ac17791465def51bf7b92f7a9c836c0a20541d2b422c SHA512 06f404381c33a053c402b90b1353b4a5284923bb5b5264eef5b6a59fa94e6f85f4bf8306a865bba2eeccdf4b484e92c1d353a7a15d8dacc1a5d8c11d108dc8fe
+DIST minio-0_pre20180209.tar.gz 7521636 BLAKE2B af76c858c3afc97067b2f69025c3e3623179e80c93d537e1f90b27b078379c4e3485399f0d30a3b4c196629dd78fed969a3d0da150e79757d58fc6db74b9fce1 SHA512 1c654a40fc809ae010643451c504cc61f5343c9fa210d3e00ceeeeb0917865bed8e07759293853d195f414dbcbb99ed34dfb2f913a6e607659ab6646492598fe
 EBUILD minio-0_pre20171027.ebuild 1123 BLAKE2B 05579a962c082fb5413fd6f55e0415be0a9de26d822aa02e1312c163f7dc07ff814d177e305d75ca667740fa105ffd678530002ca2332922f4be7a7a36e8b06f SHA512 3eff3cd68c1d444955219b0d7459fb73c5eec45324dfc5b64518d77ecf6e7bfc142d1fe44ecde2a9de0e9540735ff5fad513649cc9695fc6c710541bcc4a5aba
 EBUILD minio-0_pre20171122.ebuild 1319 BLAKE2B a53af7254afcb9d727fbcc82cfcf7732860178f48515cfe547fea72d2f53c9fce2cd19f60ed9d1b2a66ebe1c61c60d2632006d34c7455a76cfe6ff86c3a65893 SHA512 33216262eeaaf391616610004fceee8c5699a16c64b7db31b7a46b91eec298f1a1e9d64c1c43af0d908786d013d7e21ff7e9afcfc86fac9c3180793a76eb65a3
+EBUILD minio-0_pre20180209.ebuild 1319 BLAKE2B 71a1c48dc34cdd6f6c79cddd56566f476e4da211f3643ca0427671e2f0c1bbb36376cdc045956601e8513cb9a818bc52fe384843fc65df68732a5d30c619187a SHA512 213ad23adfbe038d28c0158cd05787c087034ff698624bfa0b507e753b24f1613635211f3790196bd23411d24f6e0efad43c54a1ffffbbe60826d6b50d64ac5a
 MISC metadata.xml 321 BLAKE2B 7e012bd9c28f71a0c8ccecc85f4ba3a18e5d4d20f7ad6d0f493d228118ecef3412886a8adbf5585aee9e22c8141a9065b06f980d40588e1db408e9d0f7ac715c SHA512 b44c2fe36086faa97355cc6d55571ceca91836e6874530529d13d909974795a553bf1701eadd85a461da1f2f53c885230cce33589d1527117d7232ff959171b0
diff --git a/net-fs/minio/minio-0_pre20180209.ebuild b/net-fs/minio/minio-0_pre20180209.ebuild
new file mode 100644
index 000000000000..121c8905500a
--- /dev/null
+++ b/net-fs/minio/minio-0_pre20180209.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+VERSION="2018-02-09T22-40-05Z"
+EGIT_COMMIT="289457568c2c812604484ae9b4efeca0f33aac2c"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="An Amazon S3 compatible object storage server"
+HOMEPAGE="https://github.com/minio/minio"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${VERSION}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		src/${EGO_PN}/buildscripts/gen-ldflags.go || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${VERSION}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" go build --ldflags "$(go run buildscripts/gen-ldflags.go)" -o ${PN} || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dodoc -r README.md CONTRIBUTING.md MAINTAINERS.md docs
+	dobin minio
+	popd  || die
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 322f07ada476..2b26373e5a5e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -29,5 +29,5 @@ EBUILD nfs-utils-2.2.1-r1.ebuild 5399 BLAKE2B a44119f006ec1123ea235478ad0425a5dd
 EBUILD nfs-utils-2.2.2_rc1-r1.ebuild 5378 BLAKE2B 8e5cd7e2de1546fd148a7c295c4ab9830e7c250dee1ee5862ae8501075bdf0abf894362cca6954b05d69e2149f781420e0084b9bfe90e2c8c8662810546cb0c8 SHA512 85326df8b59fd0bfe1d0b862fe9270704fc69e05183ce4f9662e8af12b9033681ad70593336b29e5050e2d0bf14f6721787b59c1927064a1c53bed88d2d8679c
 EBUILD nfs-utils-2.2.2_rc1_p20171107-r1.ebuild 5263 BLAKE2B 9edaccda54726385d778c22cf70c13e7532ba1c49ef7593dc0aec5e17376ca3bca0732a1a8182e753791313426c1c838d8e47baeba2bd904a0439c4154660a07 SHA512 043e4a3d76bf7e51d4199c566ac2dde2567715f24af27354672263d68572b500a8a1adaf34dfd6572fe833181761d8e9b84db0edf15e9b7a7bc1995961eb2d10
 EBUILD nfs-utils-2.3.1-r1.ebuild 5440 BLAKE2B aba69b2b931c7414d6ec266b6bc6bb38d105e0006c85c3ca66289d6e0dd10a5a229ca2516a75186fc1b82f3c8fc4b457010f34da42be90cfffa067efbaa785e1 SHA512 0774440f9e4d862122dd80d90d0d8b03d75e4cc2b898bf426c35fb5a80e19a237c682c040ffeda716c6335b4b7e57376d14f89825eca3410b591ec7112d1ca2f
-EBUILD nfs-utils-2.3.1-r2.ebuild 5236 BLAKE2B dd184727e1472530aaa9a2ed873e092addd6c15212fde715280294e8a783a98eebf3ab314cb1ae13ac301f9e9fcb8de1ef92cfcdd4091265e4af4a0e2299c8a3 SHA512 0ccb95225f6a5682445f4f63b124ba7caf002b4e49cc2ade37ad67f745021e1cb4d9d0c601e40071aef81f77613b8e42558596a78493bc92c7f68915b541b91a
+EBUILD nfs-utils-2.3.1-r2.ebuild 5233 BLAKE2B 0c0dc3bc163dd5821c5cdca8162c5a1766ae06d14caca8e290984d5f7cebbe572bce367d6b285ce8ba50d6e66af90a10cacf954b2d680a95ad8d27bcf27d3334 SHA512 cfa3a0a3afe9186a53745b36ce5f5765788b11409660c3619a033491bf6c7794655fb5e960e07720a818a06a2854538465531d0007ea9856f67a1737f5532f83
 MISC metadata.xml 861 BLAKE2B 14c4f9e530e9c3a695f615d698f7a96d1252c14936849a846536790059c79f992c79246028b1945f496fda813891e1079ef0a6ad3411d18e0ee8ad9b6e0315c3 SHA512 21e7e63ddddda196f114b98b6ae2c67abe9cbabf91d60ab7877b34ed96e749c0ea167169c6ffa0502c80f993bbd2243db7bf544b304900a07d2b6c84141d1cf5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
index 3d235405ae57..80f54b04a927 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.1-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 4a20fd42d792..b34d833b41e6 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,6 +1,6 @@
-DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557 SHA512 7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
+DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-EBUILD openafs-kernel-1.6.22.1.ebuild 3838 BLAKE2B ed86c39e18e34f9ca71b5f117f6c60952517c16fa1158019287abec1d3c6dbd19abf7cec3664598296099e2ba19884816f5160748538e55de5e69350f1f95f81 SHA512 f9047dfd42213e8b8d728e75db4ae72c50f89a80195a56f37f2f70a377264b0ae5120aad0fb89204323304d2087af1688213e8aa1c3bc56bbeb392b54662bf48
-EBUILD openafs-kernel-1.6.22.ebuild 3836 BLAKE2B 06888ae8ce414b601b53ce1d436f26e642b62afc8fe0d5caaece748488b29f0bbb955c7125227b98556c44ffcacfc2ed1d893a9572d6e486ef735be13cf719cc SHA512 26f8796203f7af9a96cefb8f6a2b46b7551e0156b3312622ff25fc78ef3efd85500ef9be51643fa44ba85c35e1be4a324ab2a34d030c32c2bb0724f3d714d2b4
+EBUILD openafs-kernel-1.6.22.1.ebuild 3836 BLAKE2B 8dd7a31dcf4750985b848b50c915f2482b82501ff37e28940e695a9a50537ebc81445ce029713e30934a8b9415aea0d9b2647eac7c9a9b59ba3c6db5abb7d04e SHA512 de63b3202d81d2874bb28a6281642ed15cad6e73f707e79344d07335e5b9188e1d8454aaa536060f829c0c55fc230939f165029923d4e60074f1975ca0311a32
+EBUILD openafs-kernel-1.6.22.2.ebuild 3838 BLAKE2B 83a540f625303ae50f68a9f447614cc91e10522c767458c2a58065c13df86a9a4c07f46462e6d3a5507723aa17c63ed6076c29c86d8d4497c7671bff1b19046b SHA512 e1f2c1f5467c75b7ebccbc59938435af23f28e103a1e855a3dc463490e9027b6f3b47d2e387aab66d8edf7cddb0a01d6e71ac0d64957f8520e5892d32c581ec2
 MISC metadata.xml 325 BLAKE2B d173efd11e6fdc79eafa352e60e091bf539ceda665d052395047f255cb7682a72c7b839b6e3db6005e23ad38fa5cb008228f8971ef0622d801bb41f248c52c31 SHA512 60554e65e28506ae082618d223c5b00615f26c849f799a3077294430a1e23f9e5cc4d69aa115dcbf247d5805dfaaa06e3533e576434abe13426022f6776d9947
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild
index 31eba0372fd6..4dd3b12d469d 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.22.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="6"
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
new file mode 100644
index 000000000000..772d026fd5e4
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20170822"
+
+DESCRIPTION="The OpenAFS distributed file system kernel module"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+S=${WORKDIR}/${MY_P}
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
+ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is ge 4 16 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: < 4.16"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	local myconf=""
+	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+		myconf="--enable-linux-d_splice_alias-extra-iput"
+	fi
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	if use kernel_linux; then
+		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+			--with-linux-kernel-build="${KV_OUT_DIR}"
+		)
+	elif use kernel_FreeBSD; then
+		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
+	fi
+	econf \
+		$(use_enable debug debug-kernel) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
+}
+
+src_install() {
+	if use kernel_linux; then
+		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
+		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
+
+		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
+
+		linux-mod_src_install
+	elif use kernel_FreeBSD; then
+		insinto /boot/modules
+		doins "${S}"/src/libafs/MODLOAD/libafs.ko
+	fi
+}
+
+pkg_postinst() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postinst
+
+	if use kernel_linux; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.6.18.2 ${v}; then
+				ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires"
+				ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config."
+				ewarn "If you only turned this option off for OpenAFS, please re-enable"
+				ewarn "it, as keeping it turned off is a security risk."
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	# Update linker.hints file
+	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+	use kernel_linux && linux-mod_pkg_postrm
+}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.ebuild
deleted file mode 100644
index 406275e0ca54..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools linux-mod multilib toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_PN="${PN/-kernel}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="~!AFS_FS KEYS"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is ge 4 14 ; then
-		ewarn "Gentoo supports kernels which are supported by OpenAFS"
-		ewarn "which are limited to the kernel versions: < 4.14"
-		ewarn ""
-		ewarn "You are free to utilize epatch_user to provide whatever"
-		ewarn "support you feel is appropriate, but will not receive"
-		ewarn "support as a result of those changes."
-		ewarn ""
-		ewarn "Please do not file a bug report about this."
-	fi
-}
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-mod_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf=""
-	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
-	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
-		myconf="--enable-linux-d_splice_alias-extra-iput"
-	fi
-
-	local ARCH="$(tc-arch-kernel)"
-	local MY_ARCH="$(tc-arch)"
-	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
-
-	if use kernel_linux; then
-		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
-			--with-linux-kernel-build="${KV_OUT_DIR}"
-		)
-	elif use kernel_FreeBSD; then
-		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
-	fi
-	econf \
-		$(use_enable debug debug-kernel) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
-}
-
-src_install() {
-	if use kernel_linux; then
-		local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
-		[[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
-		MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
-		linux-mod_src_install
-	elif use kernel_FreeBSD; then
-		insinto /boot/modules
-		doins "${S}"/src/libafs/MODLOAD/libafs.ko
-	fi
-}
-
-pkg_postinst() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postinst
-
-	if use kernel_linux; then
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! version_is_at_least 1.6.18.2 ${v}; then
-				ewarn "As of OpenAFS 1.6.18.2, Gentoo's packaging no longer requires"
-				ewarn "that CONFIG_DEBUG_RODATA be turned off in one's kernel config."
-				ewarn "If you only turned this option off for OpenAFS, please re-enable"
-				ewarn "it, as keeping it turned off is a security risk."
-				break
-			fi
-		done
-	fi
-}
-
-pkg_postrm() {
-	# Update linker.hints file
-	use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
-	use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 4671ee740c54..9abd1e00b3e8 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -1,8 +1,8 @@
-DIST openafs-1.6.22-doc.tar.bz2 3567926 BLAKE2B 49c20ba0cf28cf567bbdbdd9f34bce504bfc90fe87d74bc9a1f30250a51802239ff9ee1286da5961fed50e84c71d311df7b3c11e393a10f58f88e4dc57773ca1 SHA512 6ae43aa86744b1a7879e583faea96ecbdf4dd6f9c4eb39040ca58217c63ae5bbf565cd70e48cddf870b8cb7623e923260a31559d7d1e22b4ef86922601aedd62
-DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557 SHA512 7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
 DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74 SHA512 1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
+DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
+DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-EBUILD openafs-1.6.22.1.ebuild 7027 BLAKE2B a1c4fc676f871605a2e4909666bad89182c55d690151284b37fbad593d2a0bb24265dc90e7bd80ea64512b8eb4bef0be0fec31256c621a1dbda4b3c2e5dfa8c4 SHA512 bb058ead9fc46b8cfe19eaeff73bc1fe213e11ccfb0bb837753b3748810d72963925bcbdcf1c1311aef4992cbfe422d14a652273c5524bb4276b2969817a032a
-EBUILD openafs-1.6.22.ebuild 7025 BLAKE2B a99844715433a7645bc4a8d9793a3116fa8797429c84b3ea20fca58732f4bfcbf81588ba98213b184f29552fe08769cfe70b4e5247d9a8ba6ad0b502c49441fd SHA512 b635c9e39e1034f35ccf90e843ca8e61122e8a6692fe9a7074b0a16ad738c5160886209bcf362a3bbee673506395e3eefa95e70e3db82e662788eba22e4fd176
+EBUILD openafs-1.6.22.1.ebuild 7025 BLAKE2B bf11a12986899a5807f09da71cd2bea0a4b5f4f51ed66be78a96007df1e7649e1ab37adaee5c1faab13b0c4d354406df6f82980d3ea02bd2e9b50cccecbb6d25 SHA512 04055fd88ad4479ffc2f1f17c214b20588a81177a175f850232a0facffe0823ee58350220b7bce09ab8fd735573bbabddafd23a03f2ec9123294482de37dac8b
+EBUILD openafs-1.6.22.2.ebuild 7027 BLAKE2B 16d9d79f95b996982baaf1e5334afa7f5c3b5aa7f02e306b05045a0328e393350fcff4cdc5f7a59e933321172332bce47c7afd672d9dd7f4adcd0fba75fddf3b SHA512 33418b31c69fcfddff0134350389994a58515554358ce71981d43cab3d9c1e0c3e29f090fb68e64497971d9220dd1a74113a658a3ffcd57a02f2c8c602228a97
 MISC metadata.xml 799 BLAKE2B caf76c428f163ce06736336ed8fc7c3904704007802675062940b4f2b0c249118085536253274f01536be1753f68438308b7dc2209e306f0062d678c9b9c1a76 SHA512 c18b15cf358b99aae5e2cd7fa8c2e6255b70e71586c42479da411890795b052a161698ec8cccb0beac000e3c60b7e1d569decd54a599b6bc8b570f8664a9a3c1
diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild b/net-fs/openafs/openafs-1.6.22.1.ebuild
index 4ecf063fc89f..b28e663b51da 100644
--- a/net-fs/openafs/openafs-1.6.22.1.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.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="6"
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
 
diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild
new file mode 100644
index 000000000000..249ca428710e
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.22.2.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20170822"
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://www.openafs.org/"
+# We always d/l the doc tarball as man pages are not USE=doc material
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
+
+CDEPEND="
+	virtual/libintl
+	fuse? ( sys-fs/fuse )
+	kerberos? ( virtual/krb5 )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( virtual/pam )"
+
+DEPEND="${CDEPEND}
+	virtual/yacc
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+src_prepare() {
+	default
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# packaging is f-ed up, so we can't run eautoreconf
+	# run autotools commands based on what is listed in regen.sh
+	eaclocal -I src/cf
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache
+}
+
+src_configure() {
+	local myconf
+	use debug && use pam && myconf="--enable-debug-pam"
+
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		$(use_enable bitmap-later) \
+		$(use_enable debug) \
+		$(use_enable debug debug-lwp) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable ncurses gtx) \
+		$(use_enable pam) \
+		$(use_enable pthreaded-ubik) \
+		$(use_enable supergroups) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5) \
+		"${myconf}"
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+			src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	if use doc ; then
+		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
+		dohtml -r doc/xml/
+	fi
+
+	einstalldocs
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+	elog
+	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_config() {
+	elog "Setting cache options for systemd."
+
+	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+	if [ ${CACHESIZE} -lt 131070 ]; then
+		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+	elif [ ${CACHESIZE} -lt 524288 ]; then
+		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+	elif [ ${CACHESIZE} -lt 1048576 ]; then
+		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+	elif [ ${CACHESIZE} -lt 2209715 ]; then
+		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+	else
+		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+	fi
+
+	# Replace existing env var if exists, else append line
+	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+		die "Updating ${SERVICED_FILE} failed."
+}
diff --git a/net-fs/openafs/openafs-1.6.22.ebuild b/net-fs/openafs/openafs-1.6.22.ebuild
deleted file mode 100644
index 3c3aa6efbac9..000000000000
--- a/net-fs/openafs/openafs-1.6.22.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator '_')
-MY_P="${PN}-${MY_PV}"
-PVER="20170822"
-
-DESCRIPTION="The OpenAFS distributed file system"
-HOMEPAGE="https://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
-SRC_URI="
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
-	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
-	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
-"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
-
-CDEPEND="
-	virtual/libintl
-	fuse? ( sys-fs/fuse )
-	kerberos? ( virtual/krb5 )
-	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/pam )"
-
-DEPEND="${CDEPEND}
-	virtual/yacc
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)"
-
-RDEPEND="${CDEPEND}
-	modules? ( ~net-fs/openafs-kernel-${PV} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${WORKDIR}/gentoo/patches" )
-
-src_prepare() {
-	default
-
-	# fixing 2-nd level makefiles to honor flags
-	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
-		src/*/Makefile.in || die '*/Makefile.in sed failed'
-
-	# packaging is f-ed up, so we can't run eautoreconf
-	# run autotools commands based on what is listed in regen.sh
-	eaclocal -I src/cf
-	eautoconf
-	eautoconf -o configure-libafs configure-libafs.ac
-	eautoheader
-	einfo "Deleting autom4te.cache directory"
-	rm -rf autom4te.cache
-}
-
-src_configure() {
-	local myconf
-	use debug && use pam && myconf="--enable-debug-pam"
-
-	AFS_SYSKVERS=26 \
-	econf \
-		--disable-kernel-module \
-		--disable-strip-binaries \
-		$(use_enable bitmap-later) \
-		$(use_enable debug) \
-		$(use_enable debug debug-lwp) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable ncurses gtx) \
-		$(use_enable pam) \
-		$(use_enable pthreaded-ubik) \
-		$(use_enable supergroups) \
-		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
-		$(use_with kerberos krb5) \
-		"${myconf}"
-}
-
-src_compile() {
-	emake all_nolibafs
-	local d
-	if use doc; then
-		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
-			emake -C "${d}" html;
-		done
-	fi
-}
-
-src_install() {
-	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
-	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
-
-	emake DESTDIR="${ED}" install_nolibafs
-
-	insinto /etc/openafs
-	doins src/afsd/CellServDB
-	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
-	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
-
-	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
-	if use pam ; then
-		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
-	fi
-	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
-
-	# remove kdump stuff provided by kexec-tools #222455
-	rm -rf "${ED}"/usr/sbin/kdump*
-
-	# avoid collision with mit_krb5's version of kpasswd
-	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
-	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
-
-	# move lwp stuff around #200674 #330061
-	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
-	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
-	# update paths to the relocated lwp headers
-	sed -ri \
-		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
-		"${ED}"/usr/include/*.h \
-		"${ED}"/usr/include/*/*.h \
-		|| die
-
-	# minimal documentation
-	use pam && doman src/pam/pam_afs.5
-	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
-			src/afsd/CellServDB NEWS README )
-
-	# documentation package
-	if use doc ; then
-		DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
-		dohtml -r doc/xml/
-	fi
-
-	einstalldocs
-
-	# Gentoo related scripts
-	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
-	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
-	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
-	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
-	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
-	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
-	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
-	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
-
-	# used directories: client
-	keepdir /etc/openafs
-
-	# used directories: server
-	keepdir /etc/openafs/server
-	diropts -m0700
-	keepdir /var/lib/openafs
-	keepdir /var/lib/openafs/db
-	diropts -m0755
-	keepdir /var/lib/openafs/logs
-
-	# link logfiles to /var/log
-	dosym ../lib/openafs/logs /var/log/openafs
-}
-
-pkg_preinst() {
-	## Somewhat intelligently install default configuration files
-	## (when they are not present)
-	local x
-	for x in cacheinfo CellServDB ThisCell ; do
-		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
-			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "This installation should work out of the box (at least the"
-	elog "client part doing global afs-cell browsing, unless you had"
-	elog "a previous and different configuration).  If you want to"
-	elog "set up your own cell or modify the standard config,"
-	elog "please have a look at the Gentoo OpenAFS documentation"
-	elog "(warning: it is not yet up to date wrt the new file locations)"
-	elog
-	elog "The documentation can be found at:"
-	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
-	elog
-	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
-	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
-}
-
-pkg_config() {
-	elog "Setting cache options for systemd."
-
-	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
-	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
-
-	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
-	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
-
-	if [ ${CACHESIZE} -lt 131070 ]; then
-		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
-	elif [ ${CACHESIZE} -lt 524288 ]; then
-		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
-	elif [ ${CACHESIZE} -lt 1048576 ]; then
-		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
-	elif [ ${CACHESIZE} -lt 2209715 ]; then
-		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
-	else
-		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
-	fi
-
-	# Replace existing env var if exists, else append line
-	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
-		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
-		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
-		die "Updating ${SERVICED_FILE} failed."
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4b68cb321863..5cc6036ec9df 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -26,7 +26,7 @@ DIST samba-4.6.13.tar.gz 21160952 BLAKE2B 6d7927f00c8d013f8ce702168f5810fb112b0e
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
 DIST samba-4.7.5.tar.gz 16862398 BLAKE2B dd5fc044e70483dc04e423ee8221afaeb90b1bfaf4ace434000b89d28248b4d9c73a11c15acca31e4b81d27b89f789b59de3da4e27faa4fa5eb025cde112e824 SHA512 1cd70ebbe59e467701e6607147d19492c3fdad99371aa182ded9e4e2f37a53c76c04e796725bd747e5e1fb882bfb73d82a0d26f25de5ef135266d33be9f7fb61
-DIST samba-4.8.0rc3.tar.gz 17647231 BLAKE2B 6e5ad34cf9bb459f02bfefa02b070d3062ad8299b1e58d9e19648f8fcc62025aec00bc34fa8597231874a9c79b777de07733acba8477ae4bdb9c0432e6017ff7 SHA512 03df9131f171fb78d5f09ec5b1b68982c0f88699e6913cd9024df3a7e35fe91ba7172735c3a3f37e5287c89a74620b28147ebee67778b90bac2cd8efdbb85579
+DIST samba-4.8.0rc4.tar.gz 17662979 BLAKE2B bcafc3e26062ad31ae8cd946fabf1fbfa0d2f83c497ffa49e40e943314f98dca9920d3ccf6cdcd29e5cd4bcdd66b01791cc1dc233f655f88b1590477d45940b6 SHA512 dddcce6933bd7126e2bda0554f5702974d094dcff70487189f497824a2f6ca567bc3c8637dce6c60d444b040ce3fd144a6ec045cf5ddc2d13dfe3470e0de251b
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
@@ -36,5 +36,5 @@ EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62d
 EBUILD samba-4.6.13.ebuild 8598 BLAKE2B 0a65164727671d2b354aaea1ee2e5a52e5f79578311ec6eff7084aaa5203c137bd2fffd74c8aebd7bd521e4445ad694d0f582014890f67fa0d76042bc92b2a4c SHA512 dfd1ada0fa469758a020df2d8f809392435161317a973f3238a525d0b7bb1bd8b616789895a9c29d403f230de20691ad8fef947cd1ae0aa158731ae8d07c21a6
 EBUILD samba-4.7.4.ebuild 8679 BLAKE2B b30fd404a691591979e9036b4d134c8e6773fef3c475ee1dfd2e9ea829d83853b52f3f587a22456ef5c6fdaec86bbc62f136a01335e08825d51d17b9c438fe61 SHA512 aa49e259e6b863c66596e80dc3c561542452bd27a7692ba64478c133734d83b62d764949d09fddaf12f84bfa69eb9db43a62d827cb7d070bf809712af10d32af
 EBUILD samba-4.7.5.ebuild 8633 BLAKE2B 05750e87f1128adaf53bd8bd3df7dd84e7a78ca1e812f0bcbedf2bb43ec16ea0a7ded6d509660755c820d037d9dc1cfe50443a41af7034c7454419992846c385 SHA512 1cf04d30e69908d4c006c7653d3b955aad1413056f89f4e4795c438367fce09dfe6298c6d0e1f6676edc1160b0a5287dd5789474af46ac8132b863606eca9c49
-EBUILD samba-4.8.0_rc3.ebuild 8243 BLAKE2B 7defaaa97e2e731333cc7eab4bfe9a477312b090fee299e0f8bbe4529e9450a804247db547ec524de8f4022bfd2144f3fdf59c56af1fad5f22a1138524358659 SHA512 05ddf008b70bf04d027685ab543c645cc0dc694183a4f9e6eec995b0de4532024349696730b5d9567fa0e2c1e62087b46ea246a4aec492ddc9351c6fcf9bff11
+EBUILD samba-4.8.0_rc4.ebuild 8243 BLAKE2B 87914e1670184308cbd28f69cb8f84d8d775fc5458c4e70999fbaf601fad244a6250513409e4a6fc667b15285762efa754c70daa54409d9a0c5176304f5bbadd SHA512 85652064abfb209a54c20755c983abb69ab5fb7ebb3a27a4b27a818b680358bc18a6f8038c9a663a60555272875d8ed3eb40cfd7bcc6629b3e56e2f7cbcc0e70
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.8.0_rc3.ebuild b/net-fs/samba/samba-4.8.0_rc3.ebuild
deleted file mode 100644
index 5f0c42ef44e4..000000000000
--- a/net-fs/samba/samba-4.8.0_rc3.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2018 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.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.35[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
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	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}/${PN}-4.7.4-no_ads.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=(
-		--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
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	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 "${ED}" -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 ../../../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://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.0_rc4.ebuild b/net-fs/samba/samba-4.8.0_rc4.ebuild
new file mode 100644
index 000000000000..e1772d73e9b7
--- /dev/null
+++ b/net-fs/samba/samba-4.8.0_rc4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2018 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.3.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.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[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
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	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}/${PN}-4.7.4-no_ads.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=(
+		--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
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	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 "${ED}" -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 ../../../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://wiki.samba.org/index.php/Samba4/HOWTO "
+}
-- 
cgit v1.2.3