gentoo resync : 06.08.2019

22 files changed, 828 insertions, 648 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index e2d817105595..20ba865d65b1 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index cfd0b52e2202..4f1991e8cb63 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,13 +1,5 @@
-AUX autofs-5.1.2-libtirpc-as-need.patch 808 BLAKE2B a36fab796d78adff8cab4c10f8316d51809ef36781f7d95616b8c87ad093855a7c625c8cda907017c3000b3ee8a69cfc6ecfc60c655c32cd8dea0d2ede76ea0d SHA512 96441e4a040ceafd4bf323003d13170f419ea09c7d9cfdaeaf8675c945d28afde9b9ccf0ae3b0180d2038f5120e6d651c6657115658591093b778ed8f21b1bb3
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
-DIST autofs-5.1.2.tar.xz 294792 BLAKE2B eeecac768726a1b2d336908b48222c53b1ffbc9eeff7b7f597ccbf55214d35f0d99eaeaa1c065509fffa31ec86729bdd51be873e003aa1fb7d88a9e2ab04f4c8 SHA512 435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1
-DIST autofs-5.1.3.tar.xz 300632 BLAKE2B 500325ec790304442e896208e94e25cf862621fc2354fa3c31fbf277dcc570d0b2b27894728d9f881efdcca262b1ef6e2c957cd23e2aea1d5b3cd2cd822c813b SHA512 d5363f4442be5258465140920a32cb63340c5da060ef2e66678f003d6a0c00579880837f0a04f59c7bce57d1cbc0f42bdd26546a2195f87e7bd46334c9e32e35
-DIST autofs-5.1.4.tar.xz 304864 BLAKE2B 7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f SHA512 1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
 DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898
-EBUILD autofs-5.1.2.ebuild 3157 BLAKE2B 29c4a6f616f3da60798d51d01fd2547509a9e74ac8d98abe570bf13b68f5c3a104d28d19c76bdc1be8fe0002ec38d835c1f3b28d51f57bd7e1f46ce33698cf3f SHA512 2be0c80720dca0ebc3c0ac654cfdc4eddd388bb244808f904e82f3346a8d9d6cbcd83d50c776aaf6adef27288c411aacc5dec0bd4e10954d1e3f33ca41211ba1
-EBUILD autofs-5.1.3.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
-EBUILD autofs-5.1.4.ebuild 2937 BLAKE2B 90927d80b1250c13391c681fb605a0c9d5348b3f6e132f71d4ba58be285254d4e3f132a413b2a2c4d826ea07d56d8865df769d63647c038a8486d794f44622a9 SHA512 fd292b5aa28d53738e60e9fa21449c4af5f31b3d418fec30bc5ff371db5bce56cc5c385a04f9287d7c5b6af92e032dd0c2dcefbae58c99c64179c95cff697795
-EBUILD autofs-5.1.5-r1.ebuild 3083 BLAKE2B 2b9237308a753fdc6fa3fc260cff723026543476753866f4f4bf39e1f19f5a33b2376fed696784cdb296e15cbfcb8c5be26188e0b6dba382f1faeb36fe5a7bd9 SHA512 228c6d1b49d9e400da1837db73cfad7e1e4339beb4b99a10183a1a2a5da57bc5cde5f6aa26023c80f7ae2c4f4223eea5250a32413cc82ee57df1790200f964d7
-EBUILD autofs-5.1.5-r2.ebuild 2930 BLAKE2B badacbf6e32ab37700c08dfc6cf15729d83b73850c07d331bbb9b173f7bd21b82de0edd1b05b99d84afeee5d6c49a1ca68330754867dac7e7fc880c79f9fd5ac SHA512 c54017c16f012145a4351722bf360e4e6de7f825081d79bc60b70cd8d9e58067e26d22465fa4403639ee974d788cb2301275f3067178977efd2d189ed9db5aa3
+EBUILD autofs-5.1.5-r2.ebuild 2927 BLAKE2B 6863078a585f3cdbdd1b897a47cb92ba6d7e681fdc995bd6f4b044a36163527622eb9f44afbecafddaf20fbb59e082840774e591f4ce85f4463f3788c4c3c598 SHA512 519ed73687be9f06273a9dbce8639ec00a2d089b955cd4bf73954826f9181884bb5bc4757b433a750e9e72f16fdcdc6facfc4bf43d799a68901b2a6bcdec43f0
 MISC metadata.xml 897 BLAKE2B a986a7de6079af006edec362f4ebda0a0da7baf04ce9151164bb60aba9e73ed3b398def4c0693e6905ff36c4f7bb4c94e3bb72ddc04c24e520e3a1c5909eacde SHA512 ea9849bee9f3e8247a366f9fab08cb40d0421df977e4071bff1a04cad68766815059bbf3de64cd8670b8cd024d5f455e14cd41b2bcfa8bac00f032ef8aaaa821
diff --git a/net-fs/autofs/autofs-5.1.2.ebuild b/net-fs/autofs/autofs-5.1.2.ebuild
deleted file mode 100644
index 902979caabdf..000000000000
--- a/net-fs/autofs/autofs-5.1.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libtirpc-as-need.patch
-)
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_unitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile DONTSTRIP=1
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.3.ebuild b/net-fs/autofs/autofs-5.1.3.ebuild
deleted file mode 100644
index c09dd3334e1f..000000000000
--- a/net-fs/autofs/autofs-5.1.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.4.ebuild b/net-fs/autofs/autofs-5.1.4.ebuild
deleted file mode 100644
index c09dd3334e1f..000000000000
--- a/net-fs/autofs/autofs-5.1.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		--with-systemd="$(systemd_get_systemunitdir)" #bug #479492
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.5-r1.ebuild b/net-fs/autofs/autofs-5.1.5-r1.ebuild
deleted file mode 100644
index c7f1f39104fe..000000000000
--- a/net-fs/autofs/autofs-5.1.5-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-	PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma"
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="
-	mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
-	${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${PATCH_VER} ]]; then
-		EPATCH_SUFFIX="patch" \
-			epatch "${WORKDIR}"/patches
-	fi
-
-	sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die #bug #479492
-
-	# need for install autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) #bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.5-r2.ebuild b/net-fs/autofs/autofs-5.1.5-r2.ebuild
index 81532f3d62be..1e2fd32e46a7 100644
--- a/net-fs/autofs/autofs-5.1.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch b/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
deleted file mode 100644
index f6e176978164..000000000000
--- a/net-fs/autofs/files/autofs-5.1.2-libtirpc-as-need.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make configure compatible with -Wl,--as-needed following
-https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Failure_in_..2Fconfigure
-
-2016-07-05 Martin von Gagern
-
---- autofs-5.1.2.orig/aclocal.m4
-+++ autofs-5.1.2/aclocal.m4
-@@ -413,9 +413,9 @@ AC_DEFUN([AF_CHECK_LIBTIRPC],
- [
- # save current flags
- af_check_libtirpc_save_cflags="$CFLAGS"
--af_check_libtirpc_save_ldflags="$LDFLAGS"
-+af_check_libtirpc_save_libs="$LIBS"
- CFLAGS="$CFLAGS -I/usr/include/tirpc"
--LDFLAGS="$LDFLAGS -ltirpc"
-+LIBS="$LIBS -ltirpc"
- 
- AC_TRY_LINK(
-     [ #include <rpc/rpc.h> ],
-@@ -438,7 +438,7 @@ AC_CHECK_FUNCS([getrpcbyname getservbyna
- 
- # restore flags
- CFLAGS="$af_check_libtirpc_save_cflags"
--LDFLAGS="$af_check_libtirpc_save_ldflags"
-+LIBS="$af_check_libtirpc_save_libs"
- ])
- 
- AC_DEFUN([AF_WITH_LIBTIRPC],
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index fa91c7f68bc1..d4e7ac8667b6 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -127,6 +127,7 @@ DIST github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz 43
 DIST github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz 8823 BLAKE2B 6470a0221efb65e13d22e7cb8c5c5e43065d2980511b3972e22dfedb77b374879e4be055cae64fe9e95ca7dd0fc89c99159dd49651d43db8466f0b18e8128f4e SHA512 3a3820a4029a310e69d997dcd2a378fae2e8c0c0f76c9e2eef87bf43754832999ab4dc4c506a75e3b788ff855842b62fde8b1782ea7259a6c640a0de99a3921f
 DIST github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz 26764 BLAKE2B 1756704c32c465c7368f7947ec0c7f257dcc007a0a4eaa3b18c3a3dbcebc5bd952d128dd92010bb04a4ad55a0a1e2e3e3c6524bd18ef082671d39fb9225eb0b6 SHA512 314d63ad24d9b5c4133f8a2f603a19e09f73958a61c8b10b758f760825a411fd478ab47a1fa0e95c1c5156e7b2aa0ad611ba2ca91bf0b10f6bf2b9608bbc8f4a
 DIST github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz 8055 BLAKE2B 89cd909922bf9e565cd01e86b5970dfd55e0f4cbb3109ac052080013aa9a1dfef79761b5f3e08f6c2f2fe1cbcc99d7148e129461b7f95e266ff8253b38124732 SHA512 1455ebfeb0457da779eda76de3bdd5ef8aa18aa440563b3933d2013bff5b3742f245dd396cc9e93bbb343d166d048877b192b159b23b41c630128ac2e2ab26a5
+DIST github.com-valyala-fastjson-v1.4.1.tar.gz 728333 BLAKE2B bf43df3d72c0e9c06667bf6670aef178b638efc51ac5918c2bd9dc1a3016daa9bd98b78f426289262963e40b4233434e46086d113d4dabe43296a8e4e19bdc46 SHA512 6af810588ee07c39d3e4416aca6dc3ea6aa344b3febd0a2204cfb12e1ac3383a6736a1e1d48593bb31ddaf59520bc5a566ccd489d8596632e6fceb7672ba6582
 DIST github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz 4579 BLAKE2B d1c4bdac60073d25e0d953c2f48820c72e0da13b730f439abff498ff9fe09165ee006b021df4d6c925e9d364f5565025dd0fb8f10cad20d16db3e14aa32ddafd SHA512 69f9afd7e71c9dabb851b2592f99d565d83be9dea2ff55ee0208401debf6445e92d74973079f369d4028c64bcf6e9156a9144ba536cef8b6f72685762f28197e
 DIST minio-2019.01.10.00.21.20.tar.gz 9272639 BLAKE2B e8d64c436795894ad6e20cfc5acc193598312a6c1d7e20b58a1250f0bcc4791f004afd1dfed4d0e2d506f4690290d0d29596a263853c216456555792e84da5b2 SHA512 fe68bbd56f131ba4e189114b45fbf2f95925cce3a11384503c67debdc9eb04cf1c034f28f792adbcca373783cf74f3f57853a6e61241a5864898e19946c31e6f
 DIST minio-2019.01.16.21.44.08.tar.gz 9284989 BLAKE2B f54ecdd5892375c2bc8c3f2c8dc0144ee61c4e94342e12a27d8c55e1745b74c82a480a5562274553d2a5c968fc252ec8b95d0c708405089304b63520eb10405a SHA512 457c2adfe15a70c39fba8e8c7ac6dfa3dccc7265a725c932f57d4e45b5285859ce45701c8c7fa953300ad28322a46d1083f27e668ada5c3616c62337cdaf006c
@@ -150,6 +151,8 @@ DIST minio-2019.07.24.02.02.23.tar.gz 6071931 BLAKE2B 927d20dd4d0d905004bd4f6f69
 DIST minio-2019.07.31.18.57.56.tar.gz 6075316 BLAKE2B f1ce00ac4ef82a543afadf8d816b5f3e771b5ca6e1f24d31fbec25f2e6202ba740b3887c4530df9583a518b2bc364dc5949a18943353876e145408585f6b4efa SHA512 ecceb4d66caafafa5a0af80d493822d2dd2f93ba53f876d6eecb94cfb7e8963034e64ac138f818f1bc114f2a26b9b3d26ae732fd03f1d3ffea7a166dc0041676
 DIST minio-2019.08.01.22.18.54.tar.gz 6075510 BLAKE2B 73d21e067c5e067465a98dbbfc0442317f11ae6c08c1b910624dfbfc7850022b12e29bdff75c6cd2c0d5f45b2ff6607349bebce17864d69db1079be5be4860b8 SHA512 a2a6008a5516210048e2258c0c3dff9788efc6f7c510225d4e49da78d7c9ebae84be696796d4ca49bddea7cf8804784e743fcd1fab635ea9c6eb613678a6b8dd
 DIST minio-2019.08.14.20.37.41.tar.gz 6943472 BLAKE2B 5f79acc95d25f33d3428dba27a22c6c7b6ccedea0a996994931b21e1376f3a8d43dc8f4b091fee5e320d7b5198e58ec493e3a3a0902b0bad3ea0c6d598be8663 SHA512 87f4c47eb3d7c719099da3704e9144b5c8e5b93fa7fd49434c0764670a8a164d21af0a05474c6ee049b99d162a62c47b6a145d5876b2c723a0c415f7b26811e6
+DIST minio-2019.08.21.19.40.07.tar.gz 6945260 BLAKE2B a44d09e1344ff3e24c7de66a4b6250ad2f49dbaa9d8512a2eeab12465a4666e975e9917cb0bbe5b591f187be31c8f043e70620151505f70ae0b9bad41f247731 SHA512 f66a746a3155ab20054e70b48aac035000bb590adda63e74520eb6da54a37e11c978b3528238cfe90ed5ce9270e93b2951a513b261e1ed4d7360fc6e082450c7
+DIST minio-2019.08.29.00.25.01.tar.gz 6944687 BLAKE2B c37cc1d232ff947d6bee2c6dcffbc61886f5ce5e372b2c599d9c26d1c609da3d6c1ce30c86c46135764e7a62ea502ea8ca5363d1885f0ee298d17fd9ef173f5f SHA512 760f1b7532b86fc537bbd09fdf42c1a5be62ffae199f7e948bca00d6d4044bd97a6addea1b5a2af3b2721e855d485f845785672c332b45c842d6b1a99e148bda
 EBUILD minio-2019.01.10.00.21.20.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.01.16.21.44.08.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.01.23.23.18.58.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
@@ -172,4 +175,6 @@ EBUILD minio-2019.07.24.02.02.23.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba5
 EBUILD minio-2019.07.31.18.57.56.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba53b71af3ef8149537af6e0b96a2f77127e109daf621e1f619b5af4da6f49f1893965f40f3e492224498e0665a39bb52e1f65560 SHA512 666c9a7e023134d5aa8d484bc17d5574a66494060498952a3bbe860bca850027dd8bfdb6b7e4bd6fd98913cf4f4a2ef309a1eea6ceeae67d432968876dfd8eb7
 EBUILD minio-2019.08.01.22.18.54.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
 EBUILD minio-2019.08.14.20.37.41.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
+EBUILD minio-2019.08.21.19.40.07.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
+EBUILD minio-2019.08.29.00.25.01.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2019.08.21.19.40.07.ebuild b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
new file mode 100644
index 000000000000..c0b5ee79d46f
--- /dev/null
+++ b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
+	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
+	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
+	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
+	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
+	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
+	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
+	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
+	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
+	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
+	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
+	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
+	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
+	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
+	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
+	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
+	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
+	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
+	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
+	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
+	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
+	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
+	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
+	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
+	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
+	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
+	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
+	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
+	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
+	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
+	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
+	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
+	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
+	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
+	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
+	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
+	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
+	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
+	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
+	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
+	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
+	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
+	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
+	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
+	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
+	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
+	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
+	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
+	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
+	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
+	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
+	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
+	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
+	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
+	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
+	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
+	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
+	     "github.com/minio/lsync v1.0.1"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
+	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
+	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
+	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
+	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+	     "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29"
+	     "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs"
+	     "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43"
+	     "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692"
+	     "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+	     "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+	     "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts"
+	     "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils"
+	     "github.com/klauspost/readahead v1.3.0"
+	     "github.com/kurin/blazer v0.5.3"
+	     "github.com/minio/dsync/v2 fedfb5c974fa2ab238e45a6e6b19d38774e0326f github.com/minio/dsync"
+	     "github.com/ncw/directio v1.0.5"
+	     "github.com/nats-io/stan.go v0.4.5"
+	     "github.com/nats-io/nats.go v1.8.0"
+	     "github.com/minio/minio-go v6.0.29"
+	     "github.com/minio/hdfs/v3 v3.0.1 github.com/minio/hdfs"
+	     "github.com/minio/gokrb5/v7 v7.2.5 github.com/minio/gokrb5"
+	     "github.com/minio/minio-go/v6 v6.0.29 github.com/minio/minio-go"
+	     "gopkg.in/jcmturner/goidentity.v3 v5.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/rpc.v1  99a8ce2fbf8b8087b6ed12a37c61b10f04070043 github.com/jcmturner/rpc"
+	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
+	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
+	     "github.com/valyala/fastjson v1.4.1"
+)
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="3e3fbdf8e6e5e889232eb7afc0b27ac054adfda0"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+
+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
+
+	pushd src/${EGO_PN} || die
+
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" GOCACHE="${T}"/go-cache 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-2019.08.29.00.25.01.ebuild b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
new file mode 100644
index 000000000000..c0b5ee79d46f
--- /dev/null
+++ b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.com/go-yaml/yaml"
+	     "gopkg.in/olivere/elastic.v5 f72acaba629a7ec879103d17b7426a31bc38e199 github.com/olivere/elastic"
+	     "gopkg.in/Shopify/sarama.v1 879f631812a30a580659e8035e7cda9994bb99ac github.com/Shopify/sarama"
+	     "google.golang.org/api/option bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/iterator bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "google.golang.org/api/googleapi bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "golang.org/x/time 9d24e82272b4f38b78bc8cff74fa936d31ccd8ef github.com/golang/time"
+	     "golang.org/x/sys 81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2 github.com/golang/sys"
+	     "golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	     "golang.org/x/text e3703dcdd614d2d7488fff034c75c551ea25da95 github.com/golang/text"
+	     "golang.org/x/crypto 38d8ce5564a5b71b2e3a00553993f1b9a7ae852f github.com/golang/crypto"
+	     "go.uber.org/atomic 1ea20fb1cbb1cc08cbd0d913a96dead89aa18289 github.com/uber-go/atomic"
+	     "github.com/valyala/tcplisten ceec8f93295a060cdb565ec25e4ccf17941dbd55"
+	     "cloud.google.com/go/storage a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4 github.com/googleapis/google-cloud-go"
+	     "github.com/tidwall/sjson 25fb082a20e29e83fb7b7ef5f5919166aad1f084"
+	     "github.com/tidwall/gjson eee0b6226f0d1db2675a176fdfaa8419bcad4ca8"
+	     "github.com/tidwall/pretty 1166b9ac2b65e46a43d8618d30d1554f4652d49b"
+	     "github.com/tidwall/match 33827db735fff6510490d69a8622612558a557ed"
+	     "github.com/streadway/amqp 14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688"
+	     "github.com/skyrings/skyring-common d1c0bb1cbd5ed8438be1385c85c4f494608cde1e"
+	     "github.com/segmentio/go-prompt f0d19b6901ade831d5a3204edc0d6a7d6457fbb2"
+	     "github.com/rs/cors 9a47f48565a795472d43519dd49aac781f3034fb"
+	     "github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7"
+	     "github.com/rcrowley/go-metrics 3113b8401b8a98917cde58f8bbd42a1b1c03b1fd"
+	     "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+	     "github.com/prometheus/procfs 55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352"
+	     "github.com/prometheus/common 5df5c82edb7502fd6cbe093223a19b6e1231494f"
+	     "github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	     "github.com/pkg/profile f6fe06335df110bcf1ed6d4e852b760bfc15beee"
+	     "github.com/pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4"
+	     "github.com/pierrec/lz4 315a67e90e415bcdaff33057da191569bf4d8479"
+	     "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f"
+	     "github.com/nats-io/nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/nuid 3024a71c3cbe30667286099921591e6fcc328230"
+	     "github.com/nats-io/nkeys 1546a3320a8f195a5b5c84aef8309377c2e411d5"
+	     "github.com/nats-io/go-nats 70fe06cee50d4b6f98248d9675fb55f2a3aa7228"
+	     "github.com/nats-io/go-nats-streaming 4366d43a0648b4997ed32080f937e8702ab86c48"
+	     "github.com/Azure/azure-sdk-for-go d659f2a91175cac99aa5627d09b83026eacc978d"
+	     "github.com/Azure/go-autorest 3b1641ed03046f2ee28d73f7a51e5b884d55b92a"
+	     "github.com/DataDog/zstd c7161f8c63c045cbc7ca051dcc969dd0e4054de2"
+	     "github.com/mailru/easyjson 1ea4449da9834f4d333f1cc461c374aea217d249"
+	     "github.com/gorilla/mux a7962380ca08b5a188038c69871b8d3fbdf31e89"
+	     "github.com/coredns/coredns 8dcc7fccd74454134b33c8bc9f780ed6d7f076cf"
+	     "github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	     "github.com/eapache/go-resiliency 842e16ec2c98ef0c59eebfe60d2d3500a793ba19"
+	     "github.com/minio/minio-go 5325257a208fc630aaaac31bc00789acbc998c14"
+	     "github.com/alecthomas/participle 98cb121381c371cf1542c7ae145e485d703aec0b"
+	     "github.com/aliyun/aliyun-oss-go-sdk 86c17b95fcd5db33628a61e492fb4a1a937d5906"
+	     "github.com/bcicen/jstream 16c1f8af81c2a9967b30d365a29472126274f998"
+	     "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+	     "github.com/cheggaaa/pb f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11"
+	     "github.com/gogo/protobuf 382325bbbb4d1c850eec1f3ec92a1a16f502d68b"
+	     "github.com/davecgh/go-spew d8f796af33cc11cb798c1aaeb27a4ebc5099927d"
+	     "github.com/inconshreveable/go-update 8152e7eb6ccf8679a64582a66b78519688d156ad"
+	     "github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+	     "github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727"
+	     "github.com/klauspost/pgzip 083b1c3f84dd6486588802e5ce295de3a7f41a8b"
+	     "github.com/marstr/guid 8bd9a64bf37eb297b492a4101fb28e80ac0b290f"
+	     "github.com/coreos/etcd d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9"
+	     "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+	     "github.com/gorilla/rpc bffcfa752ad4e523cc8f720afeb5b985ed41ae16"
+	     "github.com/djherbis/atime 8e47e0e01d08df8b9f840d74299c8ab70a024a30"
+	     "github.com/dustin/go-humanize 9f541cc9db5d55bce703bd99987c9d5cb8eea45e"
+	     "github.com/eapache/go-xerial-snappy 776d5712da21bc4762676d614db1d8a64f4238b0"
+	     "github.com/eapache/queue 093482f3f8ce946c05bcba64badd2c82369e084d"
+	     "github.com/golang/protobuf d3c38a4eb4970272b87a425ae00ccc4548e2f9bb"
+	     "github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+	     "github.com/minio/parquet-go 9d767baf16793cc4b7fd55d642474c36c077ef77"
+	     "gopkg.in/ini.v1 c85607071cf08ca1adaf48319cd1aa322e81d8c1 github.com/go-ini/ini"
+	     "google.golang.org/grpc 3507fb8e1a5ad030303c106fef3a47c9fdad16ad github.com/grpc/grpc-go"
+	     "google.golang.org/genproto 64821d5d210748c883cd2b809589555ae4654203 github.com/google/go-genproto"
+	     "go.opencensus.io 43463a80402d8447b7fce0d2c58edf1687ff0b58 github.com/census-instrumentation/opencensus-go"
+	     "git.apache.org/thrift.git c9b1e29bc9e0702d7441383358d565e1e76ccea7 github.com/apache/thrift"
+	     "github.com/elazarl/go-bindata-assetfs 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+	     "github.com/eclipse/paho.mqtt.golang 20337d8c394721c308cc6ec096990ee451a7cd7f"
+	     "github.com/klauspost/compress 30be6041bed523c18e269a700ebd9c2ea9328574"
+	     "github.com/hashicorp/vault 36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd"
+	     "github.com/fatih/color 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+	     "github.com/miekg/dns 73601d4aed9d844322611759d7f3619110b7c88e"
+	     "github.com/klauspost/reedsolomon a9588190c00b0ccd742218388f6ff68bbad83e5c"
+	     "github.com/gomodule/redigo 9c11da706d9b7902c6da69c592f75637793fe121"
+	     "github.com/go-sql-driver/mysql 72cd26f257d44c1114970e19afddcd812016007e"
+	     "github.com/gorilla/handlers 7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce"
+	     "github.com/mattn/go-isatty c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"
+	     "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"
+	     "github.com/golang/snappy 2a8bb927dd31d8daada140a5d09578521ce5c36a"
+	     "github.com/klauspost/cpuid e7e905edc00ea8827e58662220139109efea09db"
+	     "contrib.go.opencensus.io/exporter/ocagent 902c0ccba68df93f7fefbe7e7c6f16be33108b40 github.com/census-ecosystem/opencensus-go-exporter-ocagent"
+	     "github.com/lib/pq 4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
+	     "github.com/mattn/go-runewidth 3ee7d812e62a0804a7d0a324e0249ca2db3476d3"
+	     "github.com/census-instrumentation/opencensus-proto a105b96453fe85139acc07b68de48f2cbdd71249"
+	     "github.com/minio/cli 8683fa7fef37cc8cb092f47bdb6b403e0049f9ee"
+	     "github.com/minio/mc a1355e50e2e8984d645cc7745230c42b27396341"
+	     "google.golang.org/api bce707a4d0ea3488942724b3bcc1c8338f38f991 github.com/googleapis/google-api-go-client"
+	     "github.com/grpc-ecosystem/grpc-gateway 20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea"
+	     "github.com/mattn/go-colorable 3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"
+	     "github.com/minio/blazer 2081f5bf046503f576d8712253724fbf2950fffe"
+	     "github.com/minio/highwayhash 02ca4b43caa3297fbb615700d8800acc7933be98"
+	     "github.com/minio/lsync v1.0.1"
+	     "github.com/minio/sha256-simd 05b4dd3047e5d6e86cb4e0477164b850cd896261"
+	     "github.com/minio/sio 035b4ef8c449ba2ba21ec143c91964e76a1fb68c"
+	     "golang.org/x/sync e225da77a7e68af35c70ccbf71af2b83e6acac3c github.com/golang/sync"
+	     "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+	     "cloud.google.com/go 458e1f376a2b44413160b5d301183b65debaa3f6 github.com/googleapis/google-cloud-go"
+	     "github.com/googleapis/gax-go beaecbbdd8af86aa3acf14180d53828ce69400b2"
+	     "github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
+	     "github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29"
+	     "github.com/colinmarc/hdfs/v2 fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50 github.com/colinmarc/hdfs"
+	     "github.com/hashicorp/go-uuid 4f571afc59f3043a65f8fe6bf46d887b10a01d43"
+	     "github.com/jcmturner/gofork dc7c13fece037a4a36e2b3c69db4991498d30692"
+	     "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+	     "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+	     "gopkg.in/jcmturner/aescts.v1 f6abebb3171c4c1b1fea279cb7c7325020a26290 github.com/jcmturner/aescts"
+	     "gopkg.in/jcmturner/dnsutils.v1 13eeb8d49ffb74d7a75784c35e4d900607a3943c github.com/jcmturner/dnsutils"
+	     "github.com/klauspost/readahead v1.3.0"
+	     "github.com/kurin/blazer v0.5.3"
+	     "github.com/minio/dsync/v2 fedfb5c974fa2ab238e45a6e6b19d38774e0326f github.com/minio/dsync"
+	     "github.com/ncw/directio v1.0.5"
+	     "github.com/nats-io/stan.go v0.4.5"
+	     "github.com/nats-io/nats.go v1.8.0"
+	     "github.com/minio/minio-go v6.0.29"
+	     "github.com/minio/hdfs/v3 v3.0.1 github.com/minio/hdfs"
+	     "github.com/minio/gokrb5/v7 v7.2.5 github.com/minio/gokrb5"
+	     "github.com/minio/minio-go/v6 v6.0.29 github.com/minio/minio-go"
+	     "gopkg.in/jcmturner/goidentity.v3 v5.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/rpc.v1  99a8ce2fbf8b8087b6ed12a37c61b10f04070043 github.com/jcmturner/rpc"
+	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
+	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
+	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
+	     "github.com/valyala/fastjson v1.4.1"
+)
+
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/minio/minio"
+MY_PV="$(ver_cut 1-3)T$(ver_cut 4-7)Z"
+MY_PV=${MY_PV//./-}
+EGIT_COMMIT="3e3fbdf8e6e5e889232eb7afc0b27ac054adfda0"
+ARCHIVE_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+KEYWORDS="~amd64 ~amd64-linux"
+
+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
+
+	pushd src/${EGO_PN} || die
+
+	rm go.mod || die
+
+	sed -i -e "s/time.Now().UTC().Format(time.RFC3339)/\"${MY_PV}\"/"\
+		-e "s/-s //"\
+		-e "/time/d"\
+		-e "s/+ commitID()/+ \"${EGIT_COMMIT}\"/"\
+		buildscripts/gen-ldflags.go || die
+
+	popd || die
+}
+
+src_compile() {
+	unset XDG_CACHE_HOME
+
+	pushd src/${EGO_PN} || die
+	MINIO_RELEASE="${MY_PV}"
+	go run buildscripts/gen-ldflags.go
+	GOPATH="${S}" GOCACHE="${T}"/go-cache 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 ccb0a647861e..34c40be3e212 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -9,7 +9,7 @@ AUX nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch 1629 BLAKE2B 8d9739
 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
-AUX nfs.initd 4244 BLAKE2B 0df8f270cf38b16efb331202d300d0bd648ee90c9dc44704e4db6f6aaad53e1c16059e94e14278923db59ce17752e4f034ad948ed53d6f2aefe8ecd6faf808c9 SHA512 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018
+AUX nfs.initd 4013 BLAKE2B 3ccbafc56cb1aaf7b091ca5e895e71516a899177dbf5b74d3b8ecd7cb369ed2a3108cef8f76f6abc72272fbc1c692bc50a219025a9abc05d2ffb0e9caf2309d9 SHA512 2bfd641d1ff3b377aef81632ceba75e1e9aa0305d776ac8ca03217f253040ea3e6349d6d2d1815b91c5f6c90d076d6cb86294e41ecd19f31c288219620703ecc
 AUX nfsclient.confd 592 BLAKE2B b661b726aa50f904752ec73a201a088f403a1e0f8d11181615e794da259a03b98131fff68e27645d4371564c796bb44915d6a13db9dc5a909294c4d1613c429d SHA512 f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92
 AUX nfsclient.initd 752 BLAKE2B 8e3303be602ed97b9c6db0238b950039ec87830d733e7490f62657953e18d8050d5cd75e603d566b00db86ba910384d36e488d149112c86f1b9ed8e0901f5c16 SHA512 85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb
 AUX nfsmount.confd 326 BLAKE2B c9506a71d28358d0ee7eef18985e3f65decd6cd2735cae17cef911129fe0531e2859c833ef75b04c1521c364c5aa1245d38a03191cb4167f6c1fa02383e7c091 SHA512 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28
@@ -23,7 +23,7 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
 DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
-EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B 1da519c6135e9fd70d88bede60e19479dca05e80645a04a4a57ee21be978589d86a6adb3bc1f1881fbaff8839685da6fa1b1e37212a36ced856f60220b6bd5d2 SHA512 39b5e83e3140d203d3b7d411a81d8341ffc55fc1f72d81a4b2ea2be0b2398607fcd7fb3b45ed7dfdc71a4ef13f6c28fa2d3139543fa65553fa8855e943e4d79e
-EBUILD nfs-utils-2.3.4.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67
-EBUILD nfs-utils-2.4.1.ebuild 5306 BLAKE2B 864bcc061e57e5cd75c7f938f0d8488e2c5d0932a45edbcbaf1e9be8584a0c9d0b6a9b5ad1a6a69bab84e1a0ebbb21aa8ef2fdd77aff8b86944a1c1c72e914b9 SHA512 18b01051c9fb02f509c49cc29486044c7cc2fd46e658284fb3b3dd0c25e706f3911beefdb4fb8ddf46077b6a029316b5786c70c4f0b86fbc1a191c2b3981b5cc
+EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
+EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
+EBUILD nfs-utils-2.4.1-r1.ebuild 5894 BLAKE2B f9568ff4f507190f60bfbf728b19f6809b5752f1089700b8d2dbc18a61af469962ab1044044f004bb2b2510bba6e32753d124a91bf5b93ff651795f4148951c2 SHA512 e8489c99b89fbf51163f94759541532d88edd4f72b020b2927922e8c1de1586653133d90702a7aeaf9a62acd9c872b2a824859a5325b6b1d9864c4b25f2cf753
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 4b572fc2e5ed..59120629be3f 100644
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -4,10 +4,6 @@
 
 extra_started_commands="reload"
 
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
 # The binary locations
 exportfs=/usr/sbin/exportfs
   mountd=/usr/sbin/rpc.mountd
@@ -88,7 +84,7 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
+	if grep -qs '^[[:space:]]*"\?/' /etc/exports /etc/exports.d/*.exports ; then
 		ebegin "Exporting NFS directories"
 		${exportfs} -r &
 		waitfor_exportfs $!
@@ -131,7 +127,7 @@ stop() {
 	# then "exportfs -r" will reread the xtab, and all the current
 	# clients will be able to resume NFS activity, *without* needing
 	# to umount/(re)mount the filesystem.
-	if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then
+	if [ "${RC_CMD}" != "restart" ] ; then
 		ebegin "Unexporting NFS directories"
 		# Exportfs likes to hang if networking isn't working.
 		# If that's the case, then try to kill it so the
@@ -155,8 +151,6 @@ reload() {
 }
 
 restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
 	svc_stop
 	svc_start
 }
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 b98297ce0b07..77465d97e588 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -179,12 +179,14 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
 	else
 		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
 		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
index dafe5f83ce34..975b78c549b1 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -176,12 +176,14 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
 	else
 		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
 		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
index c579954763ad..3bb65dad7568 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib systemd
+inherit autotools flag-o-matic linux-info multilib systemd
 
 DESCRIPTION="NFS client and server daemons"
 HOMEPAGE="http://linux-nfs.org/"
@@ -38,7 +38,7 @@ DEPEND="
 	libmount? ( sys-apps/util-linux )
 	nfsv4? (
 		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
+		>=sys-apps/keyutils-1.5.9:=
 		kerberos? (
 			>=net-libs/libtirpc-0.2.4-r1[kerberos]
 			app-crypt/mit-krb5
@@ -70,6 +70,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
 )
 
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -128,6 +138,9 @@ src_install() {
 	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
 
 	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
 		# Install a config file for idmappers in newer kernels. #415625
 		insinto /etc/request-key.d
 		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
@@ -177,12 +190,14 @@ pkg_postinst() {
 	done
 
 	if systemd_is_booted; then
-		if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
-			ewarn "We have switched to upstream systemd unit files. Since"
-			ewarn "they got renamed, you should probably enable the new ones."
-			ewarn "You can run 'equery files nfs-utils | grep systemd'"
-			ewarn "to know what services you need to enable now."
-		fi
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
 	else
 		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
 		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a8458c2d5aa2..58d2e27b37be 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -5,7 +5,6 @@ AUX nmbd.service 224 BLAKE2B 499598b7e80f3dddbcc0b2d3ba217774cfcd7d87cc5287bdc75
 AUX samba-4.10.0-disable_gnutls_build_fix.patch 1152 BLAKE2B 39ad43d93ac0cd7b9072ce02d88fcc9615b4442868cebb358c68002a163a0e7628e6d4a3397e2bdd46133c629a411b874001bf31a78b5d61df1782c2a6a6d057 SHA512 318fe8eab7bad814eac1ae33771e25bdbe0dc3511f03b9e1999471e2e16d452fe259311a4c162cee5b7107efa79e0e7f9d70c5258ef3092ec953fa2ee49b25e1
 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
@@ -17,23 +16,25 @@ AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.10.5.tar.gz 18290612 BLAKE2B 731ea29b02db5158c5cc564d5663e3f9552d7e1164ed8a41738dba8656692b685cc9a7ba57e8cd32fe9a1cb24eed5373929d2b805bf3da3982c0f4b1246883d0 SHA512 82961791a43511aa42f0d648edd13f0533cb20e1d673903e6a1f6235b0df19dfc0755ab0c8e6d4518ca19c188968a38a6c8e8c80d05a20141c097fb0b3e2b795
 DIST samba-4.10.6.tar.gz 18306135 BLAKE2B 236598c26294e1b7b23e48eba7d6429eec01e65a4a73a45fea16ef0e0b7cf1c7b861d824e860bc178d358c298400e829577525b0438e0384fca7bf4409bd69f0 SHA512 6c06a55ac686210965cf52f79190700a3d3a5cba8ea54b32e5bdb4d6b6167f1fa9aef308c3d5fdc7078496aa78b46d5cea3c623438d3a049b11fc58d334f8d0f
+DIST samba-4.10.7.tar.gz 18318281 BLAKE2B ccb97823e8e23e48141b2585b9f6d1f786460a8ee9077e6a0f71d2e2c797f79cb155f4d418f0d18d046307ba5e8bf0780f975707145d1c7f94bc5aa5a65e34b6 SHA512 3ef05754fc12343cf76c7981ca25e4898bd0bf133f394b9fbe9393e8447b18626977e80ddc76f1597921abc378ad058cc363f1f277856d6fa4d783c902514c88
+DIST samba-4.10.8.tar.gz 18316560 BLAKE2B a1b89169a13eb96202e846e9e501b364235d61459a5d2f2e443af569d8a754df8546b5fb52e9e1b9629535d838a7fdfd9cd1fb631870880dad9981587c14be5f SHA512 14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66
+DIST samba-4.11.0rc3.tar.gz 18490189 BLAKE2B 1bddf744bf33b501a67e14dfc6e935285c458d1362e9c403fdb4abbbcbd71aaa3ae87d225f270cfbd0a0f6221072db070d04a984dfbc85ba607b5326ebcf835f SHA512 0a8998977d746b6fd37f51f2615a4a91296579d17e9f19818635f2042e844a69b1669c6ee0386e6ef8068bf75a141a483d2cbce4ea75d65e254cfca12e94f428
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
-DIST samba-4.7.12.tar.gz 16923189 BLAKE2B 98ea5e535482a4cdfeb4f9ad70bc8c40bb6d5a8920ce9bc6dda84f20698245c3c5d472a5f79984efc81f9c32d1d1e72b1fcdffb137e3a27634f4c521a1d46a48 SHA512 951dfc0ea7130da9d9aa3069ca276e630d67171a1995dba368459e0cdf00337d0f6271827bffec694371010614a1a7ce2349840ddedd0231315f6a56dce2fcac
 DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.11.tar.gz 18095745 BLAKE2B d06a15608f71e73e26dbb15ddfb3512a0cd6f6ce5cffe663451cdf1552473c28cc5a66fc5e28d0e3fbfc80be8524903bd42d75050b664e713efdb09855175bdf SHA512 3d1cd7e3f1ffbfa6bb44fe0cb12be47dd17c9b614b6509ecec20210ac734fa1ab90ea5d2d2180fe7c80bd4eb5bb9a73a09183edf70bdd28dde2d33e092c9e71a
-DIST samba-4.9.9.tar.gz 18080757 BLAKE2B 3cfe741d21584d74654607d6c1450b67f80524f5809607b0c796fad501c06b34ddfb8eb7ef639cca70e8bc54f53805be4c45d78eeb2760aa7728ba907e99589f SHA512 636fc7073cf9dc9ff9bfe46403d35d7a058024708d090bd0ecc7e900a8468ffb7c9a8d564b2df85758c4ef3d184ed3f2c8fa3079ece13d6b9afa816136f0b608
+DIST samba-4.9.13.tar.gz 18109481 BLAKE2B 948ef6b0e1a9796c70635119f5aea5887e9f1c1d2a5264d072f3f3d218dfae3b6a16c640233063c9df0670dc7835a92a8c97447f57518aa9d387bc5d04831675 SHA512 ce80486c9ab093d44ee68b0e2ab28f9af97c7ed00cca1b8a0c65de18254ae40759a1e9fcb9a0ba18006aa296c6a6fbadf53dcd730785a96ac0c167efdbe9d3ae
 EBUILD samba-4.10.2.ebuild 9070 BLAKE2B 80a704b0a82cbe4a720cfb8418da6c5b6245f54da0689ff704ec579f38a05894d7a5474977b2802432670a9424c4efa8fff3f234782a551d54b5ac247db8075c SHA512 ea1422a0eb843444d7ab232d85fd1e5be1022aaf2ff785ee67edbe65516acc7d6d40ecff4a767de2f18290c8f91710c90aba19c2a19b91c32c98be61fe57a3a7
-EBUILD samba-4.10.5.ebuild 9115 BLAKE2B d0d8c4b014098218e7dc30b5169c5ee474ceada2e774e78b7e8a3f76d61703553da7c6ab298dadee21db500124858089497711783307f801c1d92443411204b9 SHA512 4c1c41e3e4cefce8721d07f29894dbb64825f1d514fbfd964285a9509986aafc2aa8819bc6db4fda24b864e3412a620323bfbf5d437803f9a907f5f4b400eeca
 EBUILD samba-4.10.6.ebuild 9266 BLAKE2B 206634d5aca6854b6e94d05fb86d02e7313f9261c4adfa41f5ffecb68e109d90fcc379d2aa96bdf493877bde09a2da55b4753183808cdc0b68601a461c44cf22 SHA512 6fd185aa69cc59031aeda035563e00a84392a8a73a70cbf499aa3e4e5ad76ec857ff06356a74de061e76a37dbdaf3b7e39674316880eafd616fc36c3bf62e59e
+EBUILD samba-4.10.7.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
+EBUILD samba-4.10.8.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
+EBUILD samba-4.11.0_rc3.ebuild 9099 BLAKE2B 9502151e0d54c22eaddc7b0c877b10c83d9acf7fe62a5e926f8ba59273bbd3c8bd59d2556fd69fcbb29bb15470d9a09cb16c98f1848fe8aa94f24655e308f877 SHA512 c7a1bb3e41eb5485c53760e0544eef103ba50781d2a7e028ae4c3c389f8805d1689b5fc1eb62e4b1555200ce665867937f9a9a33ffd97eb65d53dd6734b42a44
 EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
-EBUILD samba-4.7.12-r1.ebuild 9188 BLAKE2B 458197bbc0248729c819bcd347fd6fe6a31acf4e858d6b7d204c91f528bc029901a7a30004e16146baf789b4aae1a82d2eadae8e257a1a89fe320220bacbe2b5 SHA512 9bbc844a9cd1883eb6097e12482641c83ec140caf1870cca8879b9d3f3392a462fa11084ff285c547725661747432c0c9a327f83d2da1997709eafe5c133dc52
 EBUILD samba-4.8.12.ebuild 8901 BLAKE2B f01720de64da1ed13c6f717891919c2ccfad0221d1e0f6a612e620d7de8bcea57fdec4c10bed8e9842c31a412a1681b2e0376e7ac628646d121584de54220944 SHA512 deed37996e47a8889f783898fd0c99c63feb20a4d6b811384b8a964cbc4363c3e63d8c404de4a3bf9cd310cbdfd0f440434cd86d7c7426cb8a4bc6f5c88ea9fb
 EBUILD samba-4.8.6-r2.ebuild 8467 BLAKE2B bb9806f40f062f742e5e82778fdb82e1a9366c2f53fb977be373ca2dd54d3fbf49632c4f424acc12eb73847ce2d944d02fb54951bbbc6a02c11b42a521c05e2d SHA512 71a940ea88b17096512e160236dbebb9d82603c19262e2b955212b4a361d0c0f51466eb1150f501c0e13e2fcce0f29c1f480d1c38fd32bc27ebae0207e40dd79
 EBUILD samba-4.8.6-r3.ebuild 8862 BLAKE2B 23eea9d9f1e1aa4b5812b10a190a6c6d609dc9d7ce48a5052eb0505289aabc7644090e15bc72c7bbc2d79a42707d16fa36c3e41a58cdcec0c292b50d20ec7905 SHA512 d98d4a73c0404912a6946b0b9b793542158d061a72a1979e4e8aa7a8d378c818e29f3049daa07db71f4b3ccd550ce9325b85d5beab3d13204957912ac99cc4e7
 EBUILD samba-4.9.11.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
-EBUILD samba-4.9.9.ebuild 9060 BLAKE2B 966a27c76b743bf6548e5a8e794344c100dc65031d42aca9351e5d9f56e5fb66fe150b4e22ef5c5701d70dcc845218bebd28e276aece5d8b81b7bb247e45b2dc SHA512 5fb312a2f176e7f4fb928411ff9d212c21aa004837fe5e81aea43cd8d78c5c96c6f81b7dae1763913a82488550d989219aac12b73324925b3f9aaddf7e7258d8
+EBUILD samba-4.9.13.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch b/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
deleted file mode 100644
index 9fad9fca44fb..000000000000
--- a/net-fs/samba/files/samba-4.7.3-krb-cross-compile.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://lists.samba.org/archive/samba-technical/2017-December/124344.html
-https://git.samba.org/?p=samba.git;a=commit;h=70f92025ae504cda97ff3a130f19035450967836
-
-From 70f92025ae504cda97ff3a130f19035450967836 Mon Sep 17 00:00:00 2001
-From: Zentaro Kavanagh <zentaro@chromium.org>
-Date: Mon, 11 Dec 2017 12:41:16 -0800
-Subject: [PATCH] Remove unsupported colon from configure msg.
-
-- When cross-compiling an answers file must be supplied via
-  --cross-compile --cross-answers=<path to answers>.
-- The lines in the answer file have the form;
-    Config Msg: Answer
-- The colon is used to delimit the msg and the answer when reading
-  the answers file.
-- WAF doesn't support the message containing a colon.
-- It's not possible to override this variable so cross compile fails.
-
-Signed-off-by: Zentaro Kavanagh <zentaro@google.com>
-Reviewed-by: Uri Simchoni <uri@samba.org>
-Reviewed-by: Andrew Bartlett <abartlet@samba.org>
----
- wscript_configure_system_mitkrb5 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
-index 9c351131ad1a..803dad7ab63b 100644
---- a/wscript_configure_system_mitkrb5
-+++ b/wscript_configure_system_mitkrb5
-@@ -282,7 +282,7 @@ conf.CHECK_CODE('''
-        ''',
-     'HAVE_WRFILE_KEYTAB',
-     headers='krb5.h', lib='krb5', execute=True,
--    msg="Checking whether the WRFILE:-keytab is supported");
-+    msg="Checking whether the WRFILE -keytab is supported");
- # Check for KRB5_DEPRECATED handling
- conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
-        #include <krb5.h>''',
--- 
-2.15.1
-
diff --git a/net-fs/samba/samba-4.10.5.ebuild b/net-fs/samba/samba-4.10.7.ebuild
index 9abce7be82cd..87c4c3061f9e 100644
--- a/net-fs/samba/samba-4.10.5.ebuild
+++ b/net-fs/samba/samba-4.10.7.ebuild
@@ -50,7 +50,7 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
@@ -134,7 +134,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
 	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -291,6 +290,12 @@ multilib_src_install() {
 	keepdir /var/run/{ctdb,samba}
 }
 
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
 multilib_src_test() {
 	if multilib_is_native_abi ; then
 		"${WAF_BINARY}" test || die "test failed"
diff --git a/net-fs/samba/samba-4.7.12-r1.ebuild b/net-fs/samba/samba-4.10.8.ebuild
index 98b097983e0e..87c4c3061f9e 100644
--- a/net-fs/samba/samba-4.7.12-r1.ebuild
+++ b/net-fs/samba/samba-4.10.8.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils pam
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -23,8 +23,9 @@ 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"
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
@@ -49,14 +50,14 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.2.3[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.3.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.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.9[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( virtual/pam )
@@ -79,6 +80,7 @@ CDEPEND="
 		>=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}] )
@@ -88,8 +90,8 @@ DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	virtual/pkgconfig
 	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 	|| (
 		net-libs/rpcsvc-proto
 		<sys-libs/glibc-2.26[rpc(+)]
@@ -98,7 +100,7 @@ DEPEND="${CDEPEND}
 		!system-mitkrb5? (
 			>=sys-libs/nss_wrapper-1.1.3
 			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
+			>=net-libs/socket_wrapper-1.1.9
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
@@ -110,9 +112,9 @@ RDEPEND="${CDEPEND}
 "
 
 REQUIRED_USE="
-	addc? ( python gnutls )
+	addc? ( python gnutls json winbind )
 	addns? ( python )
-	ads? ( acl gnutls ldap )
+	ads? ( acl gnutls ldap winbind )
 	cluster? ( ads )
 	gpg? ( addc )
 	test? ( python )
@@ -131,8 +133,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-pam.patch"
 	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}"/talloc-disable-python.patch
-	"${FILESDIR}/${PN}-4.7.3-krb-cross-compile.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -158,7 +159,9 @@ src_prepare() {
 	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
+	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
@@ -179,8 +182,7 @@ multilib_src_configure() {
 		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
 	fi
 
-	local myconf=()
-	myconf=(
+	local myconf=(
 		--enable-fhs
 		--sysconfdir="${EPREFIX}/etc"
 		--localstatedir="${EPREFIX}/var"
@@ -192,61 +194,35 @@ multilib_src_configure() {
 		--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)
+		$(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 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
 	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_enable ceph cephfs)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with debug lttng)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex python '' '--disable-python')
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--disable-cephfs
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			$(use_with debug lttng)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
 
 	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf[@]}
@@ -260,9 +236,9 @@ multilib_src_install() {
 	waf-utils_src_install
 
 	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
 
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi ; then
 		# install ldap schema for server (bug #491002)
 		if use ldap ; then
 			insinto /etc/openldap/schema
@@ -314,6 +290,12 @@ multilib_src_install() {
 	keepdir /var/run/{ctdb,samba}
 }
 
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
 multilib_src_test() {
 	if multilib_is_native_abi ; then
 		"${WAF_BINARY}" test || die "test failed"
@@ -328,6 +310,5 @@ pkg_postinst() {
 
 	elog "For further information and migration steps make sure to read "
 	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
 	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
 }
diff --git a/net-fs/samba/samba-4.11.0_rc3.ebuild b/net-fs/samba/samba-4.11.0_rc3.ebuild
new file mode 100644
index 000000000000..8a6b44acada0
--- /dev/null
+++ b/net-fs/samba/samba-4.11.0_rc3.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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 gpg iprint 
+json ldap pam profiling-data 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/libgcrypt:0
+	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/gnutls-3.2.0
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[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 )
+	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.9
+			>=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 json winbind )
+	addns? ( python )
+	ads? ( acl 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.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)
+		$(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 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+
+	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
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf || die
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
+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/samba/samba-4.9.9.ebuild b/net-fs/samba/samba-4.9.13.ebuild
index b254b52dad44..c983eaa51e3e 100644
--- a/net-fs/samba/samba-4.9.9.ebuild
+++ b/net-fs/samba/samba-4.9.13.ebuild
@@ -50,7 +50,7 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.7[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}]