gentoo resync : 18.11.2018

19 files changed, 630 insertions, 8 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 6369e9bd4e7c..eb45143c41e5 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index 3b7197783dcd..cd9894f7cf4c 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -2,8 +2,10 @@ DIST mc-2018.09.06.23.26.56.tar.gz 1724855 BLAKE2B 6a100fd117830db096afd6b44b268
 DIST mc-2018.09.10.23.39.12.tar.gz 1725434 BLAKE2B bee959661fae0fccc9af655f84fab3ae4c900978b2fcfaf63287f717221065fc382f41618511c511dbe18f405b3fadfbbb2a66f1ed4a4b1c4db5d40f45b24f07 SHA512 c1183ed1499c4b3e24cf6494bd8f3b35e4d7aa9fb32d85b55d0464ef10eea25e4dd98730363d3b4d36d7cf288d652b7c2cf5738d2d3b82062f1d6f567a511af5
 DIST mc-2018.09.26.00.42.43.tar.gz 1727396 BLAKE2B 6f446229619e9116d9e8f62fc21d82aa5325b1d10d3786232741cf072fab18e5bccf14b1d49118532db5f6b0b4c2a792f15c28979af058cc75355e92fde88132 SHA512 e6be63004c0600b6e85ebd09033ebf3b7237f9829114b8b4e86c418015a94f465c26287221ddcf6371d5d414d2c037dc21a6136e1f6c8f1c27e363e0c67a1854
 DIST mc-2018.10.16.23.25.25.tar.gz 1749339 BLAKE2B b712b5111582b513c10ab1a39a9d7d5f0100fb1f6beb5e899f5e838ecd4428de4f3eda420e7c288e93b44a384c86fe65255ae086cb5adb99ffe19f8f364c09df SHA512 6d44a17fb469b2770ed9b278dcb72c9a8f3e738a4dfa4b9af888469b4228401639b74fb4891dc504fabb3def7319c367ffefb16897f6ea1d39af71c408c86af5
+DIST mc-2018.11.06.01.12.20.tar.gz 1752016 BLAKE2B 0bd0291cc16915e2da15e79842e78fb1286c5c952ecf0dfb68ae8ff6fcf9309982685d1bfdd44b53475d94953d31ab91a3e81b0031b51aafe387a6cbd2ef5683 SHA512 52ff2747e810ac5a35c764af5548a469fa94ab4e3e7d1e92be0c5d505e212bd8a5fc849c0c651d323eacb6c14cf5bdaf4f070c70d09e9dd876d4a1997e89e1b1
 EBUILD mc-2018.09.06.23.26.56.ebuild 1178 BLAKE2B 30e3b7ef2c39f0d0e930b7a1127ef9544077add85260ebe73251edf81f681934e85fa1dcdb2bb131f41b14a5fa12c8f627e54ef408f7b23f2dcea4fb78e390ac SHA512 19111a0ca521095705c8f09df126aa50325f99488c968a415f60874f63f370eca0f8043803464ffe9ca9753b0e445a809a2ed41fdda1f8fddcf93b00ab4bad29
 EBUILD mc-2018.09.10.23.39.12.ebuild 1178 BLAKE2B 1828f65d44b115d8a52690dbbdd6d2a756aec8b4ddd5e7ca4da0dc5c678d336adac6b7f4d78fd9118abf3c4293b879e4e584e913d3e5e6a262a965b21ca8a342 SHA512 f456334d9eaf2d41a2b8ffa3c50933fa8e8ec624ad02885eb63a0abe3d726fb890ded0d57059180157ff4aeabaa4b3849ed43497a6dc39d8648bc217c5454ebb
 EBUILD mc-2018.09.26.00.42.43.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 EBUILD mc-2018.10.16.23.25.25.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
+EBUILD mc-2018.11.06.01.12.20.ebuild 1175 BLAKE2B 030b7bb80fe1cf27c89d99664b4ef050d187872f57b38b88acc16c6f8db0f06f0c5137ad32e609ca19c98697d6edc61c7b755428e40f0cd00e20140013a913c3 SHA512 07c68e08844d8243615d19edd2405ba62d498475fdc4c4fa468be3e54f88a04c2acdc45b7a67f1e8a61480721b6193f165f17874a42c4d4dddd0455ae4bcd860
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2018.11.06.01.12.20.ebuild b/net-fs/mc/mc-2018.11.06.01.12.20.ebuild
new file mode 100644
index 000000000000..28574278fd8c
--- /dev/null
+++ b/net-fs/mc/mc-2018.11.06.01.12.20.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver bash-completion-r1 golang-build golang-vcs-snapshot
+
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+
+EGIT_COMMIT="c352cadd4be2c6bed64884c78d1e8a8ac6efaf3f"
+
+EGO_PN="github.com/minio/mc"
+
+DESCRIPTION="Minio client provides alternatives for ls, cat on cloud storage and filesystems"
+HOMEPAGE="https://github.com/minio/mc"
+SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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="${MY_PV}"
+	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 120c97854c11..d60c1db56ba9 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -6,6 +6,9 @@ DIST minio-2018.09.12.18.49.56.tar.gz 8743369 BLAKE2B 8f7f2fdb75a0130348a6e06182
 DIST minio-2018.09.25.21.34.43.tar.gz 9187452 BLAKE2B d60567a90b95c86293cd34533cf65ced42ca11219963e2f6c843ed7d6988a9df160be3afda9cdbac4f5158f46b7daddb8c79e47e6a8ff54530725ada8fb14226 SHA512 2e70e09455ba56fc4230fbc836d2eb988315f0a43109cfdbaf49c57ef2ff126db4ba836473df3c9b6e7f3e69852fa44b894bcb8a7b49b688b0df73f2e7499fe8
 DIST minio-2018.10.18.00.28.58.tar.gz 9153624 BLAKE2B be2b9db53f0256bb7db1a1917003051ec0484d876702a54ea81ed38ae2853de296129a0ac1e5fbbf6e056bc5ac82e7ba389008001195f4b20daa8545275c9215 SHA512 64abcd10ade42f9bcecf498b2855426b8fbd2be428aa5aaa134295709849f8ebb57aede1d67a7302c7d05b8a861d5076a04ad126bc66d1fc9d4c45368e5e9cf1
 DIST minio-2018.10.25.01.27.03.tar.gz 9083869 BLAKE2B 8adc52a4557bde234c367b1a0d3a3ca5651700cdaca4c0cd3c1ff55d64ef7bb6f5dbb48eee9867eb7677293abdcd34e9469bd3980f7046934db17d1fa72229ea SHA512 8227a0b320877131b5822e077f3ee2cc03268de2c1f9a13dbc34f8ade8828b20afda964f1d389f311547750b8a7a613037042fe2a10f30610972a8d6eb4f40fd
+DIST minio-2018.11.06.01.01.02.tar.gz 9090585 BLAKE2B e7cfcdd0eb89fe1c65ceaa7893c2f2c5c4667bea689c2e42ec1f09969590ed06b2a5977015206ee18bb7a5481c9e82b4311c2719cae6df1fd2c3b5da87f9f1fb SHA512 f3d51f5a2c15b2c7cad0679fcb6c72647e090e64efb5e29ad04519fb8870809044f3ae6c2f95a36ad2f0ffb7401e602ea8f5d2f4e5b61c8b60082339b9b91c68
+DIST minio-2018.11.15.01.26.07.tar.gz 9075498 BLAKE2B 8b690a05a597d0c1d3212891a47f0db944817855138dccf7806f023f6e1e0028287cca3a96df28c36d6f91fea2117abb1a417c23863e5d1464430dd0f40c977c SHA512 aeaf3e4d3be48496742a48b9d7c0b49e040c6f5cc0501668b13aa1e81c64f759b547ab5c910d1fbc2d270d3f42b1b890c41043ad79edbbbbbf2caea74b6245d6
+DIST minio-2018.11.17.01.23.48.tar.gz 9076785 BLAKE2B 3dbbda0ee971d2ecedeff96fa61b2d5f3710361f34ded69075515c7cf9fa40e411360e68d04b85f43fc7082f66ff779368a984a5c1f429c4660b64c6f65dfdc1 SHA512 e460ae63bc2e23d4706c396d76c06c66fb61f20fa10544470b28f1764e64be7ed45c33b65fbb9386e7a07e374a29d700c3df2b794dd6e6bd6322e7ea40ad3434
 EBUILD minio-2018.07.23.18.34.49.ebuild 1355 BLAKE2B 96d20da0ec42fa260e914184526c474a3fad01f8bebff80e83d67361ef43429c076b120a604ee40a5f0bb80dcd315f2cd8b2c6f12f8feadf7155fa6d953a68d9 SHA512 c76ecd7a552e916bce25cea4d3284e581f8ea02596a9c9949e4284b4638bba193d320ffc33ba529aeeba65b42bc5a6e9c8acc9a41f8777afb8422f403d4ee600
 EBUILD minio-2018.08.02.23.11.36.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
 EBUILD minio-2018.09.01.00.38.25.ebuild 1355 BLAKE2B fc3585902532d8e1486ff3fea62d48946b3db44843a947dab27a1a77fee39830bad3d49e83996d9ca0c2c1c59fdac23d4ed7a5799d11056b588bc473f6e6524a SHA512 84f8839313af5a5a26043f9cac138e94442436e5207c94622f96aa4836ba8193bc72a096b84fd1308350014f356de92d0fd5bb7d535119e842eb147545e425ce
@@ -13,4 +16,7 @@ EBUILD minio-2018.09.12.18.49.56.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e4
 EBUILD minio-2018.09.25.21.34.43.ebuild 1348 BLAKE2B d27c700e8025bbacdb36bc4c0e42e273f4846312fa8320bfdcc0c5b4e85b92dd01608d124f7b32a4f1511ec48f3247dfaf864c53693a74782b26c471f8f3b282 SHA512 00be7fc9ec88e3bc36f0de276a924dc5e4b304830b75a5bae7c4f41bd96f4ecbf2512ea20a47388db44647d7c6f20d577953158f81db7a371383df79339cb7f8
 EBUILD minio-2018.10.18.00.28.58.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 EBUILD minio-2018.10.25.01.27.03.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
+EBUILD minio-2018.11.06.01.01.02.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
+EBUILD minio-2018.11.15.01.26.07.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
+EBUILD minio-2018.11.17.01.23.48.ebuild 1345 BLAKE2B 479e6235850893767ed313cff9d6d618f9cda277497be39403a251b0fe0a009e0d6a7e5588d5850eb8f0323bef576eaecde13bcc090dc27cfa5cf1c3d0bddaaf SHA512 90fe7448636aef31c6f577e2c3f3f4258dc438bc516b62a09c15944dd9d440a4e4857258725650ca99f7216b5105ed4dbbb77155c6fd5f2c7985dbf40bead83d
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2018.11.06.01.01.02.ebuild b/net-fs/minio/minio-2018.11.06.01.01.02.ebuild
new file mode 100644
index 000000000000..9adcc45356de
--- /dev/null
+++ b/net-fs/minio/minio-2018.11.06.01.01.02.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.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"
+
+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)/\"${MY_PV}\"/"\
+		-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="${MY_PV}"
+	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/minio/minio-2018.11.15.01.26.07.ebuild b/net-fs/minio/minio-2018.11.15.01.26.07.ebuild
new file mode 100644
index 000000000000..9adcc45356de
--- /dev/null
+++ b/net-fs/minio/minio-2018.11.15.01.26.07.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.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"
+
+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)/\"${MY_PV}\"/"\
+		-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="${MY_PV}"
+	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/minio/minio-2018.11.17.01.23.48.ebuild b/net-fs/minio/minio-2018.11.17.01.23.48.ebuild
new file mode 100644
index 000000000000..9adcc45356de
--- /dev/null
+++ b/net-fs/minio/minio-2018.11.17.01.23.48.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user golang-build golang-vcs-snapshot eapi7-ver
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="ce419c98352324caa4c79b159a9f840ca714c3d5"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.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"
+
+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)/\"${MY_PV}\"/"\
+		-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="${MY_PV}"
+	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 3df397485e64..a5f1d79ec70d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -22,5 +22,5 @@ DIST nfs-utils-2.3.2.tar.bz2 884068 BLAKE2B c4133cc12c5c1cd33346408e2d1286cf5088
 DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
 EBUILD nfs-utils-2.3.1-r3.ebuild 5293 BLAKE2B 785b622435b7f2a7ffe2993c4a3dfd4a18d25170761f1c59157d55fe3643ddee33862b9ce0da3d29a9a50d80ef2c50d1a77d61ef2c86dca5f10082761da712fd SHA512 70b6a1c3dce229571c1c07f0fe32a3cb392f349d8928b5d7007c4485c3cc3f20710eb400141d893af2098518af481a2fa79d3a0b5e8f2bab5dca571dacc86af6
 EBUILD nfs-utils-2.3.2.ebuild 5385 BLAKE2B 4dfc11b9a80be2dcd0501c3da9e541d16cd6d260cf28d18d2fe2cb539274b85b9fa2b29c4f1c251989b8cc2b2778f1aea0f93f10a259458f3e55a15787e03c02 SHA512 1e05759322d7726187956010ff65985970dc3b032838d8b4090361035a922c9d4d425a7c6cd1c415ea5e6f32aacf1f1fbdff1a3d50a58ac09f43e310964799a7
-EBUILD nfs-utils-2.3.3.ebuild 5385 BLAKE2B 4dfc11b9a80be2dcd0501c3da9e541d16cd6d260cf28d18d2fe2cb539274b85b9fa2b29c4f1c251989b8cc2b2778f1aea0f93f10a259458f3e55a15787e03c02 SHA512 1e05759322d7726187956010ff65985970dc3b032838d8b4090361035a922c9d4d425a7c6cd1c415ea5e6f32aacf1f1fbdff1a3d50a58ac09f43e310964799a7
+EBUILD nfs-utils-2.3.3.ebuild 5377 BLAKE2B 58b50e0f55ffd33e18dc69c9c928f54c2c9506cb209296b3848eec025ff987b8a69d39dc4f425e084ca9525c7c0af84192519e139ae90395647b698691520885 SHA512 f9ed894d933651a12ad50ca5691e65d5a02640c412b449ded9a7c6cd1419cf6573a2679d044f9f3d49186a9ccba88fb6facec66eb58d3ebca9c4e553aa49ee7d
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
index 553fb8c8b2d8..ef10bf62c844 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest
index 537741445b6f..65d9e8e3ade5 100644
--- a/net-fs/nfs4-acl-tools/Manifest
+++ b/net-fs/nfs4-acl-tools/Manifest
@@ -1,3 +1,6 @@
+AUX nfs4-acl-tools-0.3.5-jobserver-unavailable.patch 641 BLAKE2B 9b4976ff85927ca221360fe9ac8f8f55d9e2f47bd179ef13a2bb01f577d34f3ab705fcce4575b6ae8b797d26465573703634f3b2ce360984c71d98f4ca159598 SHA512 5f9518d62d26f06a40ef4b2cf494f42ccf75af47a349a83949c541382a11627f61cadec8914a7c4b1ca9d0d1a1063a22bf4c2eccaf310198c45c71b4d334b9b3
 DIST nfs4-acl-tools-0.3.3.tar.gz 176018 BLAKE2B d9788af56f4ce5d2ebb8cef95287227a646ec2ec60a7a2ff24c4c26158383271bed0a3aedd5c851dd1182f98ea32a57338d9b7bd68d24525cfab16dc4b401b6a SHA512 8efa67c9f8a2f360c96b0df4e4aad55c044544188ebacd2e23b5f1c8a2c6c03d06cb8ffa434b03f502351a3403e98f4013bf6e6d9c85909995747b5489ea22d7
+DIST nfs4-acl-tools-0.3.5.tar.gz 99113 BLAKE2B a51e7a1ab3c43d5844697ccb8afb3dbef19d72b688c1aa9af334d9ccd9e0b70c2d5c7fc762ef80d69b9b4038c2fc83d9edc26e6f6119c05525cd13d4b7e5ea1b SHA512 c23d5c5c676c03cbb8016de32e384086525df6f181c85b36331f42b9bab023ab5158c4e01096f837da5d59c64d8a247cc7e92c9d37bd6bb38fc2aed960705618
 EBUILD nfs4-acl-tools-0.3.3.ebuild 428 BLAKE2B 577004a4abe2773a558c72c4c1348c04eb987fa959fd347e52c545334391672580854e0ef0037692dc0be10a36e7b011bf710c79ab0e905d1829b049c9799a1d SHA512 05fc149e347707402bad76d2cd6a738eb6088a4926357102adbc430e8c92cab66c6601c7d6b852943f1a79754dcb75e767f53c7d052e99c030ba0b46e68e432f
+EBUILD nfs4-acl-tools-0.3.5.ebuild 555 BLAKE2B 29939ba96f5e072d422a0de4cf54f019928a114f35c4f04577b4d410c511e60111e922f049df1b46c15b7b62cc139e2a2a3a914c73141d5acbc6c611920f31f8 SHA512 6c641a87334b838d24936384dadb5489e1e4396ae426363d9c64e22281f9d9cbda69ab0494a4022ca6b64861de49fe3e8e05c8e6af31d6887fac6f14e01b9811
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.5-jobserver-unavailable.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.5-jobserver-unavailable.patch
new file mode 100644
index 000000000000..746d585d6cad
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.5-jobserver-unavailable.patch
@@ -0,0 +1,24 @@
+Fix
+
+*      gmake[1]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -152,7 +152,7 @@ INSTALL_LINGUAS = \
+ endif
+ 
+ SUBDIRS_MAKERULE = \
+-	@for d in $(SUBDIRS) ""; do \
++	@+for d in $(SUBDIRS) ""; do \
+ 		if test -d "$$d" -a ! -z "$$d"; then \
+ 			$(ECHO) === $$d ===; \
+ 			$(MAKEF) -C $$d $@ || exit $$?; \
+@@ -170,7 +170,7 @@ DIST_MAKERULE = \
+ 	$(MAKEF) -C build dist
+ 
+ SOURCE_MAKERULE = \
+-	@test -z "$$DIR" && DIR="."; \
++	@+test -z "$$DIR" && DIR="."; \
+ 	for f in $(SRCFILES) ""; do \
+ 	    if test ! -z "$$f"; then $(ECHO) $$DIR/$$f; fi;\
+ 	done; \
diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild
new file mode 100644
index 000000000000..d0bf66fbac80
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs"
+HOMEPAGE="https://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git;a=summary"
+SRC_URI="https://linux-nfs.org/~bfields/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/attr"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index b9c991cc5adc..67727fee71e3 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,6 +4,8 @@ AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb0760e9e487a3033718fa39b9ca4a87a04c9cf8ac41a4b9268020a1d41dee9efa5bde3f0e71498483102fcae80749ad62c SHA512 9605751653dcbbce41be807a9b4f8e5f657db6622f843e91c4df9c4b3e4ad621b6e8e3891f2b970208d55a80801355988f253e3c844ca51a658cd6de8c373e24
 AUX samba-4.7.3-krb-cross-compile.patch 1590 BLAKE2B 34cf304441731556556e40ed386f110dd8aa26a49680fa106b550edede86842e736c5652cd4aa54f0da7955600442cbc41350031dc8b67deae11f68050a6cf7c SHA512 0f762326f5b72d10e4c553630a8c4c433de884d80024c26e4f0e46b26bc24ac53c07642d833bb327f0010b7ee0ce2df05a94dc8868f3f363f68f9851b76265c5
+AUX samba-4.8.6-no-pydsdb-when-no-addc.patch 1493 BLAKE2B ce0de6426170645c15bdc4832fd35d8dcd6de9c1ce014846d3c8bbbb4d8f6c654c0e6a02252186f9de76d0735ac808d0326b1c57e9e98c00a357792430fbd4bf SHA512 f3e5c9ce1e75e8332e38ad33a637d7f687a77c8586511aad252db0176b4483e9e6a8ede09d7d448a0146d35f141d61a937561e16029606d08047974ee58dd982
+AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
 AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
 AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
@@ -19,10 +21,12 @@ DIST samba-4.7.11.tar.gz 16918373 BLAKE2B 3d74c3b7c6ce0563474ab01583320b31cf37af
 DIST samba-4.8.5.tar.gz 17715401 BLAKE2B fc1aef2f5362fff1870abe40eebfe932f5ca347e65d1a2502ee19c9fce8cbf71e3f4181a18056d8d6b3e92d2515f946e3dc746b00f2398d91f88b1172e91cd43 SHA512 23a88c48214c3bf4cbc135cb84873bb8d12f32187ccbda47b02495fa4a12458f103de5e968e8f9a5958c116f618332cfffbf54d084e4f1e363fbf079b897e3a0
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.1.tar.gz 18018259 BLAKE2B 783423098864c391f08b30e05b70308e922bdb4dad08b8b0b4d1112808357b9bb96aad7a094d0fe2e308f84a143d5f90be523b9c3551a3068ecdcad7347613f6 SHA512 267673b6d6ab0db59063480c20f02e5864ef96e9ad1097c23a99b2ab4b5fd2252193d7a152729b40cae0751fb9b0b108b087a190f5db11eabbd075224bd6e663
+DIST samba-4.9.2.tar.gz 18042752 BLAKE2B e6d361a38f1103c104015987fa2b67c49a91fb2fac77538b3d9fa0c1629348df00c8fb4ea0dbb1a1f3f62cd377699c1ebc00b1b1b7b1e0d073d3633d41a62e7b SHA512 67de5faeda45e5c245bf02cc195cdf9ca4b63f17625837badf7c50d97250e94de5309c9ef824bd7890bc771b1dc0a3bfbafea09880850b5167f0bf8a8ef488ed
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
 EBUILD samba-4.7.10.ebuild 8797 BLAKE2B 55cd5751599f69205abb9c6db4c575db7956dad63c1c74502d2249b88c480d21011911ea8d70cc47c7eb42304b4b20c04a3b9ab3f549726633c3514476b4fa8f SHA512 4c53c7748ad3acd4f4fc687eaa9d40808f5ec1b5bb02d97df46d3517ae4727343af29cf689065c483addeca86109561696156f77cdcb7edb5a835c17c7b96f62
 EBUILD samba-4.7.11.ebuild 8794 BLAKE2B 63af65ccb9ab8f40b7496e16a9b03a6d070726389bc053b85fa90be6dedfeef6f2915106f6f7900d56e66ac4c7d106b66aba999ec1119f8d21990477d6ebca55 SHA512 fe0b5f1c17c37f7473bc8f3bb7a747d59251f2d6742db1012b68a2293a5f753d70ded1055cb8657c8f3de8aea9d29bd1ca6f65e55a9aa74b45e463ff576e042f
 EBUILD samba-4.8.5.ebuild 8408 BLAKE2B 518354a225c001dbc3153e7fcb7f071b56e78108fcee69454bc04d92ef1c43e9b16703118e5926bf7ee3a189f19f2c0a02a2e1d251e909c73b8222cf5b326136 SHA512 b169a47c7b5967988874e549566102b18794c031b353dd5f7dc6ed47f4c5cfa36b5afc236f3c95a2937af8c76206c83ed4eb4297aa7202945aee9e62eaad6abf
-EBUILD samba-4.8.6.ebuild 8403 BLAKE2B e2ed93337f2123c01fb55f49fc302d783fb87b2347a88af50398371f9365d2e68a81043c7f895a058f70ad055e94db4ac103e2e5441b9e88e2e7eef2ab74deda SHA512 751bb195c25028e7ec7ad3e31c91b7e15977a5baeeae611a0524452c1d5168e07a564b898aa33d4db6cf9f94615893144a07957532062d70b50f891ca7ce51a6
+EBUILD samba-4.8.6-r2.ebuild 8457 BLAKE2B 84de103fe88ff1531e00454dc52ed2926afdd26437b7c9fa41e510745fa9caca5ce5beed872253c85882a58e6afc23450f9636bdaa494eb30536d9cb179bb334 SHA512 11c430743cae7775a8a882810ad71fa4a2451e1634cf185715170473dbefe26b7489ad97f72f961eed896fb0a58b6a3d0a7b783880958edcd9fa874353e0d014
 EBUILD samba-4.9.1.ebuild 8489 BLAKE2B 597bb03e025bd209f80717b558d66c2ec53ad83508cb1f1b8ad79f84614b25f339d112bd4b015b439759e2e150a4feda3f751ab26d4103825134be38a2b6ed3a SHA512 d969ba1ec0b4f5b830fb57a9a44cbe870fcaba080c5df5d9be505b39298b348036e02af12e0fdb9e3ad127712ed779fc9b9aceb5f6912c22c227fa68c681d56e
+EBUILD samba-4.9.2-r1.ebuild 8553 BLAKE2B 84cd6fa168d130645df1778835ac2d980de1d0d15b3fcd6cbf9136c1f2da42a5ab11993db09d8f5418bff8d5eecb9699df2a0173da3a35fdfa11d4c519c88d8f SHA512 b2d06b108d3bd4886e0a47bec8e3185b4cf03022a7057aae2ecc84c1be2b07412c4523d5b3735a9e0612c2efc139031b8a5d13509ade8bac2f89a1efc3640b8b
 MISC metadata.xml 1673 BLAKE2B 56bdd566235a3db45ebcbb546a11c12b035b41f54bd00df2fbb65f47ff29c7a2ab5466cdaff8fef6fd72a7b5fc9af2bac1e4050bfd6db3220c32ac383eeeeb1a SHA512 2436c4c24de5cebee90c6fb49d52dd9228a3f0deced53701d229f1afa3bb7eb29621864678325381dfacd1d221142368b27d4800ebd2412b18595ab106ddff01
diff --git a/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
new file mode 100644
index 000000000000..1093b1de71df
--- /dev/null
+++ b/net-fs/samba/files/samba-4.8.6-no-pydsdb-when-no-addc.patch
@@ -0,0 +1,36 @@
+Do not install the python DSDB modules when ADDC is disabled.
+This is a change integrated upstream in 4.9.1 (or earlier).
+
+Without this, the python dsdb_dns.so module is installed, which
+is linked to libdnsserver-common.so that is NOT installed, and so
+potential breakage ensues.
+
+--- a/source4/dsdb/wscript_build	2018-01-17 03:08:39.000000000 -0500
++++ b/source4/dsdb/wscript_build	2018-11-08 10:43:58.064486832 -0500
+@@ -63,10 +63,11 @@
+ 	)
+ 
+ bld.SAMBA_PYTHON('python_dsdb',
+ 	source='pydsdb.c',
+ 	# the dependency on dcerpc here is because gensec
+ 	# depends on dcerpc but the waf circular dependency finder
+ 	# removes it so we end up with unresolved symbols.
+ 	deps='samdb pyldb-util dcerpc com_err pyrpc_util pyparam_util dsdb_garbage_collect_tombstones',
+-	realname='samba/dsdb.so'
++	realname='samba/dsdb.so',
++	enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ 	)
+--- a/source4/dns_server/wscript_build	2018-11-08 11:49:03.450296286 -0500
++++ b/source4/dns_server/wscript_build	2018-11-08 11:49:23.327864408 -0500
+@@ -64,9 +64,10 @@
+                   private_library=True,
+                   deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
+                   enabled=bld.AD_DC_BUILD_IS_ENABLED())
+ 
+ 
+ bld.SAMBA_PYTHON('python_dsdb_dns',
+ 	         source='pydns.c',
+ 	         deps='samdb pyldb-util pyrpc_util dnsserver_common pytalloc-util',
+-	         realname='samba/dsdb_dns.so')
++	         realname='samba/dsdb_dns.so',
++	         enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/net-fs/samba/files/samba-4.9.2-timespec.patch b/net-fs/samba/files/samba-4.9.2-timespec.patch
new file mode 100644
index 000000000000..c82f4af4e7ea
--- /dev/null
+++ b/net-fs/samba/files/samba-4.9.2-timespec.patch
@@ -0,0 +1,21 @@
+From 11e8c14b78e2423041f3846882f74cd6490a3e44 Mon Sep 17 00:00:00 2001
+From: Joan Karadimov <joan@profuzdigital.com>
+Date: Thu, 18 Oct 2018 18:16:17 +0300
+Subject: [PATCH] Fix compatibility issues with the timespec struct
+
+---
+ source3/include/libsmbclient.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
+index 5e4a1715402..6487ea7a8aa 100644
+--- a/source3/include/libsmbclient.h
++++ b/source3/include/libsmbclient.h
+@@ -78,6 +78,7 @@ extern "C" {
+ #include <sys/statvfs.h>
+ #include <stdint.h>
+ #include <fcntl.h>
++#include <time.h>
+ #include <utime.h>
+ 
+ #define SMBC_BASE_FD        10000 /* smallest file descriptor returned */
diff --git a/net-fs/samba/samba-4.8.6.ebuild b/net-fs/samba/samba-4.8.6-r2.ebuild
index 5167caaa89c0..c959bbd6d78a 100644
--- a/net-fs/samba/samba-4.8.6.ebuild
+++ b/net-fs/samba/samba-4.8.6-r2.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
@@ -131,6 +131,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.9.2-r1.ebuild b/net-fs/samba/samba-4.9.2-r1.ebuild
new file mode 100644
index 000000000000..6ce5625ef29b
--- /dev/null
+++ b/net-fs/samba/samba-4.9.2-r1.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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
+
+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="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json 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}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[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? (
+		net-libs/rpcsvc-proto
+		!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 )
+	json? ( dev-libs/jansson )
+	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 json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( 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.9.2-timespec.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
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# 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_with json json-audit)
+		$(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 {} + || die
+
+	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 "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 970b1c8cd21a..328123944950 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -4,7 +4,7 @@ DIST sshfs-2.8.tar.gz 153230 BLAKE2B c2d7116d72145dee1a31093ce3225e92681a8bc5c5c
 DIST sshfs-3.3.1.tar.xz 46076 BLAKE2B 719c04e383b35ed5ce380db1a5a77858444768f27ac45a09205f4854a03aaad04ce418582dc79e5a9d23ccf9e225838bbdc20b0538bb867cca9af919fb294e34 SHA512 d0b623859a5b98db48c0ac6703e148603b2240114e22216e314f798ce645b39bbe7119a4e3f2d32d7bb41e07b2015761313e8249097a21bef9ad83287df9b80a
 DIST sshfs-3.3.2.tar.xz 46572 BLAKE2B 187fba299bfe4aaffab43eec39e508d99771cf6e182a709d64431975ef30718a918c58790b83aba05cf0028118cf63d42fa6f6fe3e227cb6b7fc70f2f15a4c75 SHA512 7aedb94358ef5d3c25ef054dd1f4ac147ab2917c8ca46c4b9af6bf0a26c7ef1ca139771f5e7bb9a98d8bda74c89151f2bee85707f630393273df38e7862febd6
 DIST sshfs-3.5.0.tar.xz 47564 BLAKE2B 9a6fb1cb347de2903fb67900253f8b28ecf3dd4c972210d4839d0ed7bbbe2dff1be2d847dbfc1727cdeeef74d4b32856aa6e3041b603dc1e3f865269524ddff7 SHA512 6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c
-EBUILD sshfs-2.10-r1.ebuild 553 BLAKE2B 721335d0ce16a7d1787641127e689c6bc437d83af77db6d3d2959dcfe9d324e2f20245b8a570b917b2ccc998d572d47b62e7bcc8c758d466dbb97ea7d83bee8b SHA512 0af5089a933133358ab48bc881adc07f001b8e4bb74b91459f87987eb44b17358fcb387aa33cfb7db6cfb9f40d2d77e9fbc275207c27e29547706ac8ac73f66a
+EBUILD sshfs-2.10-r1.ebuild 547 BLAKE2B ebeee3508a5a8e05fbdf0aa22b665b980a5a7c7f0c891564b796bacd82ba12f56356231cbf5c2c0da31133a89fbc3f7264d1b56ac5b20fcb04befba4f819397e SHA512 1f3fc4689b4ab71183e8bf955fe4c95d00f2f5c7067cfa71754840924de4b74984ee16b96bf24498abefdb8d60388e5520a203eed1ab78e58eec251434cabc36
 EBUILD sshfs-2.8.ebuild 575 BLAKE2B ef8b9184d236fc45695e8bf7e12cc3b46923e511351c830b0e1a96da640140a9b84f2d0854bae54341100ac6cbf20ea74e907a889f138a02e07de3074fa91940 SHA512 4f2f5bba1a0c52f813dd5e876f05f9f3e99293833c06353fc0327b9f028d8000c85bf9b0a572438b55c1c9f463d7bd5659e6791906ded99d2860e7e13f668e8a
 EBUILD sshfs-3.3.1.ebuild 563 BLAKE2B 8aa19d2a36c602bcfcf58fa2529f766c05e4918d04cc0f158ad7468c6916e20dc90bf5f97c62dec460fdd645680294c0f3d7040c2468976a61f7abbb90c5c722 SHA512 b59bd8ca41af8656c84dd0fe12e92e6de9a818ee09dbb09647bb9cf036131a153e5ebbbaf87ebaf1f5e1acb6a5507c51d11fc558ec32d7cc1061244de67c8a41
 EBUILD sshfs-3.3.2.ebuild 563 BLAKE2B 8aa19d2a36c602bcfcf58fa2529f766c05e4918d04cc0f158ad7468c6916e20dc90bf5f97c62dec460fdd645680294c0f3d7040c2468976a61f7abbb90c5c722 SHA512 b59bd8ca41af8656c84dd0fe12e92e6de9a818ee09dbb09647bb9cf036131a153e5ebbbaf87ebaf1f5e1acb6a5507c51d11fc558ec32d7cc1061244de67c8a41
diff --git a/net-fs/sshfs/sshfs-2.10-r1.ebuild b/net-fs/sshfs/sshfs-2.10-r1.ebuild
index fd397b6c6b71..71958903630f 100644
--- a/net-fs/sshfs/sshfs-2.10-r1.ebuild
+++ b/net-fs/sshfs/sshfs-2.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-2.6.0_pre3:0