gentoo resync : 23.09.2020

15 files changed, 777 insertions, 206 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 221ec2f57b2c..8b0ec893fb3a 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 29b2a89e3ca8..a5ea860f1382 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,7 +1,9 @@
 AUX cifs-utils-6.10-ln_in_destdir.patch 813 BLAKE2B 71ac0215407a2350c19a15545d96f77115357c04bbcae2d1e09b7fbe54fd344d40638d3778195865eff3f9686b1fa9a0a13e188fdd4cc3d25c7a100fc5c376a1 SHA512 f9ccbd0d4d14cde1d07cc165533c51cc2876ed65e651a797a8b7c69958f6ee827090731888cbc425aecbb879b41e87a0e9ed1fce6817e1907cc7b114c53b8fc9
 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae
 DIST cifs-utils-6.10.tar.bz2 364221 BLAKE2B 45b692fb85217a25b7042fbe7e40cc8c4fe0d6cc9c905acde2c6fc9c3048343064e376f47128bcacba88f745452148040ad3f5e8ca15e297531f0dc868e1b75b SHA512 e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc
+DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.10-r1.ebuild 3150 BLAKE2B ac64dfce87fef3bbd040cbacd39d1da49ba515835c72dec1e97486a7015584409137639a388449aa45acca17a4e3e8d4968864d1feaf9729abd98c5d14734045 SHA512 d800e881ce6a9f23f3d6deb2b8e779bea83d91f3b2903bc4d44e8c0369d2555eeaf130289ceaaa52634a35bb103434ac827124b963f99bac266d002430a796ef
+EBUILD cifs-utils-6.11.ebuild 3213 BLAKE2B 9efda1843904b35ff4d4bdc7a1b0764666fbe6d26ff9cf2f246b72d7f2c1e092da03ec435d49a2b79abee0a5ede9dfb199987996289daac9dea7d341fa9489ca SHA512 0c834924b83a8eed6c597603e38d5a949343f4c156c7787eef38596b72ba2ab061c57f6046c4791eed6f7ecc6cd3fca219b37a3c27c839e10d39a5fb779f527e
 EBUILD cifs-utils-6.9-r1.ebuild 2999 BLAKE2B ab685dc316b4541f1c2b8c8a6c4804bd7618988ccf25ea4ad0ea45a90204f1ede1672143d4b9572d5ccd9139447f8bd7514c308da94b3a7a27060d6ba0453cdf SHA512 df98e0e70572601330f2a75deb4f934eb468e8dd398f961cfd1e76244b06bf4a408b010c7accc15ebc4070bd2c06930e6a9ebe04f1bd3b0d5e8a7cc76922ef05
 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b
diff --git a/net-fs/cifs-utils/cifs-utils-6.11.ebuild b/net-fs/cifs-utils/cifs-utils-6.11.ebuild
new file mode 100644
index 000000000000..19c1f928eaa3
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.11.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info multilib pam
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
+IUSE="+acl +ads +caps creds pam systemd"
+
+RDEPEND="
+	!net-fs/mount-cifs
+	sys-apps/keyutils:=
+	ads? (
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( sys-libs/libcap-ng )
+	pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils"
+PDEPEND="
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+PATCHES=( "${FILESDIR}/${PN}-6.10-ln_in_destdir.patch" )
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_prepare() {
+	default
+
+	if has_version app-crypt/heimdal ; then
+		# https://bugs.gentoo.org/612584
+		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-man
+		--enable-smbinfo
+		$(use_enable acl cifsacl cifsidmap)
+		$(use_enable ads cifsupcall)
+		$(use_with caps libcap)
+		$(use_enable creds cifscreds)
+		$(use_enable pam)
+		$(use_with pam pamdir $(getpam_mod_dir))
+		# mount.cifs can get passwords from systemd
+		$(use_enable systemd)
+	)
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -empty -delete || die
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.spnego.conf"
+	fi
+
+	dobashcomp bash-completion/smbinfo
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index fd93ce01f2f3..14d02d765394 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,9 +1,4 @@
-AUX libnfs-3.0.0-utils.patch 499 BLAKE2B 0000a2140ea34201b41237b9fde5d7c0adb77e9bee38b9bf5d1126c1b52aa5ebd60af8c098f185fc4f57253d149dd3e4950724d5f1bd457faa7bada3b3b0e9c3 SHA512 19298e53e7d69ecdf23ed17c0a1ed9937e525f02a4b208287fd5892ea0cc1f5dea36f2d9564d38fc9a545f4c06238623bdc33a2335ab4819aa4f52f2bb2467da
-DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
-DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
-EBUILD libnfs-2.0.0.ebuild 1104 BLAKE2B 48e778f6746267304ab5b9bda20a841004a7ba7a2bc14887e4665e9ac7e1bc78fa3ee05f05603b049aa68695516632788886420c79497aed1f845f5c91bffa66 SHA512 9f849f4e864eb262fd87d8d2645df6f07bb24806f540905b192eab4b1954143f8d8e18d78e6ade56261833696d972e184cfad4f0e773d4fd1a6733d91c8613e9
-EBUILD libnfs-3.0.0.ebuild 1255 BLAKE2B 6b87b80f4e85f556f4a01573f5b539b95da72e7d98b36bc2913d5caa3428db586c12e8683169fb1d775e5f53cedd6866f686937bd83461a67e04345764d71dce SHA512 9b281707a6f99af238072c602c9e59e9e2f81178e7a77d643cd45e0deb0bb2c7fd2fbcac4723a645a051ea74fbf0ed007ae10528c539865684aef94ecdd08b6d
-EBUILD libnfs-4.0.0.ebuild 1196 BLAKE2B b9659165832755ececbf97f3b506b1e4d0dad18ac2184eedec881d169636b970b66118f3a858faa01e3a67d96aa673bd5d70fcdc86dd0c91f0944ae9ac2afc8a SHA512 e1f3d9b631085dd393ccc91c4c8cde95cac10d9c29ae270e41274013bd972bb9a37be72d412555f822230297ff84173a67cdc8ea8359c2eaf376e957f613e1cb
+EBUILD libnfs-4.0.0.ebuild 1195 BLAKE2B 78388183ac880e6f418ab0a9e940a60666ee13d6bf3147e358c95d951bf9d329cfa43ad909ba3aad0b291c4ae2615b0fec68f392c0353492d2cb04f8bcaad341 SHA512 f14e08c553cc26c6085522a206cf6ef0749c96b7b21a45f9dfd699e7d2ff4d7ba4c126ebf85adb0d21ca9286093b48ead1e8e96769c69213c5c8e8eb1e44b757
 EBUILD libnfs-9999.ebuild 1203 BLAKE2B c2f6f95e87478e5f33574dccdac1c9261ea6bb1942199deca4179ed1238e681a3e92595f2b049438841ac432f8bf5464bbf659de29c5953f9f0f67a69ace4aaa SHA512 2162d6b5a34347117bfe99f3697bd804621c7b9afbcead44687767b360481122bb49799d444df882557e2619b3fc6d13ff1e25680f28975030cc17e9cdbf693b
 MISC metadata.xml 416 BLAKE2B dd298d1b48b996a31ccef799be0e581239d99bed3f79f05aba02693821e869cbb73425af4ba1d581d641ca52a7b636dba591e68cbcb7c647cfd6840745c16721 SHA512 69475dd9d86a2335ee1780e6a330ff6096ccf99d14fea094b8bab5a59aa1deb2841b7c0e1bf5c00fcec38756c219af9b7ff255f1986a54756c28128b9e447ce5
diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
deleted file mode 100644
index b26716158b59..000000000000
--- a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a1f51d0..f96879a 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,11 +25,13 @@ fi
- AC_SYS_LARGEFILE
- 
- #option: utils
-+MAYBE_UTILS="utils"
- AC_ARG_ENABLE([utils],
-               [AC_HELP_STRING([--enable-utils],
-                               [Build util programs])],
--	      [MAYBE_UTILS=""],
--	      [MAYBE_UTILS="utils"])
-+	      [if test $enableval = no ; then
-+	    	    MAYBE_UTILS=""
-+	       fi])
- AC_SUBST(MAYBE_UTILS)
- 
- #option: examples
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
deleted file mode 100644
index d238b5498112..000000000000
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools autotools-utils eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/11"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-}
diff --git a/net-fs/libnfs/libnfs-3.0.0.ebuild b/net-fs/libnfs/libnfs-3.0.0.ebuild
deleted file mode 100644
index e5153c2d2546..000000000000
--- a/net-fs/libnfs/libnfs-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/12"  # sub-slot matches SONAME major
-IUSE="examples static-libs utils"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-utils.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable utils)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-fs/libnfs/libnfs-4.0.0.ebuild b/net-fs/libnfs/libnfs-4.0.0.ebuild
index e4e268925312..45f09e152b3c 100644
--- a/net-fs/libnfs/libnfs-4.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-4.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
 	S="${WORKDIR}/${PN}-${P}"
 fi
 
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
deleted file mode 100644
index b8840de8e071..000000000000
--- a/net-fs/s3ql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST s3ql-2.33.tar.bz2 845921 BLAKE2B 914c8e029fd10c82eb932a4a68d3771905255763a9ebc88ee5503892d1eb5f1a9c355d2f041fef77afedc5a7237e79db931768667602d7987b41a7c6805a2fa7 SHA512 fbc3895008f19de43c8a90a0896631200e8d292027d8bebc8197271a5677c9922498a7762696b057c067e5b906830f2a88f87d5615d60f24fdfa58972fb367fb
-EBUILD s3ql-2.33.ebuild 1323 BLAKE2B 250d6e60e27ea5a3f8f157d287dcb02124868236346de129c079f3fb79be35d8d0f9ce85b03afbfb7569f59b0f61abd11ee44a97d8d25740cb23d94bae61a838 SHA512 9c4f3cd5fe8ce2d2ce89533e52388ef4413eca6f4e83543c6ac2f9d64be596e857b4ce5b7a3cbc952e1d24a40357a2866d3b6e9ddb3ea790712a7f6b53d0f404
-MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/metadata.xml b/net-fs/s3ql/metadata.xml
deleted file mode 100644
index 38ca05fddf8f..000000000000
--- a/net-fs/s3ql/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chutzpah@gentoo.org</email>
-		<name>Patrick McLean</name>
-	</maintainer>
-	<use>
-		<flag name="contrib">Install additional contributed scripts</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">s3ql</remote-id>
-		<remote-id type="bitbucket">nikratio/s3ql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-fs/s3ql/s3ql-2.33.ebuild b/net-fs/s3ql/s3ql-2.33.ebuild
deleted file mode 100644
index 05468dbfc075..000000000000
--- a/net-fs/s3ql/s3ql-2.33.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://github.com/s3ql/s3ql"
-SRC_URI="https://github.com/s3ql/s3ql/releases/download/release-${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc systemd test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0
-	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0ba84d293dc5..002ded917844 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -7,9 +7,13 @@ AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8f
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
 DIST samba-4.11.11.tar.gz 18590837 BLAKE2B 0d585d4561717c6a08ac51fb8ae9944901aa81e437fc8e78ca22e5a43232295002f5456d78b302278aa7a0a4596f8c5b0b910e092aa54a8d9c46fd804b772d33 SHA512 71403fe4c1de3730b115a7e1b1cdfcae6f2e8c7ca8b18ed154be309f06484d136e66ef64379409c6e39ade3b5bfa5587f9229755e9ee1747915c546fd1f08d5f
+DIST samba-4.11.13.tar.gz 18598813 BLAKE2B 5671498058e61c1afbdb0976b6931dc4e13087792612d4fdc3073e8e40a60be82f578836e3baa48f111a600da5c6e0e08aa7ba638fbc1285bbb57644ae7e8b1d SHA512 396ab636db6f9583b772935d58a3cf1860109bb9e1ef841a38c08d7be9f3839d6e198d5cdc80ef0803fcbfa6c06f1173585f3b582937e8834857fc47d90f7181
 DIST samba-4.12.6.tar.gz 18224870 BLAKE2B 5a8086c3575dd46cc8f428db818dc3db8772fa08fb7a431940377219f782555923f9b0a62b067b4c89a0208aa022bfa0c0664706a1241487183344e822c20bc3 SHA512 16a4ced3942bc6d51e80db257e8caeaa426980f66caf2aaf2324f091ec5063bc6b9029d90ff2f321b68be4cede7555d1ebf142405105468bd581e7a7bf9f0be5
-DIST samba-4.13.0rc5.tar.gz 18404324 BLAKE2B d8830623332c348c15e3b988e5e413eb050927d55f34984fddf5a33816d5bc0608716d72650e2037a98615685320444e4bd1b230545bcc1acd636b8ef5917b0b SHA512 addf0d9a9b100814c7f3dda6930b60032a8ab615cadf35a304a1397c9064588211b6702019b4afedcb3c43394294704cc10825972bc7c1ebf7a8ca5fb0b6831e
+DIST samba-4.12.7.tar.gz 18230157 BLAKE2B cf0ed50177e1e0d840892753537d8fab8c31ed4a6ba9b4e6bfc12e56c9f14a760c9e3dd230dc8e6caf2d7493e204bffb2fbd1bfa0931ae3fd93311ae2d5b3e32 SHA512 5afb1f24b029e665bb4f6bd7b7cf915243476b09b304942b2105586fa99adc6a19b46b4753ca116e230e5bb7b82e011fbe296c62bc70a8a897e56aece55a7f0b
+DIST samba-4.13.0.tar.gz 18406380 BLAKE2B d54db52102c6d507c3e6f32fc6c64051a95ef8ccfdb1e81a379d2c0325f6f9fe79c64ce9a26ddf48ae11351912ad988f6f532474a81284c7a7147521ceacc509 SHA512 0c15e887efa79ba8c1d24eda2f03898a1a080cb947056df12abc361f12eb5659f9ee37132767f5ef7e4ecb9c431759e5b619cb785921276fda17f4a9411af81c
 EBUILD samba-4.11.11.ebuild 9507 BLAKE2B 0b7db425eb6ef3183c7574d16227928877addbdadcc88ff87d84786d0011179e4a8d6ec4cbfef885974de638ed175a577678b3e76fde49f58c8b77a97c42877b SHA512 13d5c274e40d7e87081c4884cde042f8ccc0d07471415000a34dbbf453be46eeeb04fc12fcf9899a311babc8eac0dc4d836a9bc11b7ebcf874c3f77e275bc2c9
+EBUILD samba-4.11.13.ebuild 9514 BLAKE2B 65c47d9863bf57641de1175e395dcbfd539921cda81844f481d6ad61f8060834a2b8efb3fee71704cf2daf190f0887f7362fa51ffb07438298520464b05a6177 SHA512 115480e02c93829acd29edcf2e2191550d00ee00198cf8e234d5af888125bb4370eb5dbd13c00d8540233835aa15bd96d44af4a580450607bdc66402c0643770
 EBUILD samba-4.12.6.ebuild 9505 BLAKE2B 5d3c61a5cf21dee15b67c390b927bd47e0246a06e22243465e7731e2ce8bbf0353bfb3224176cd499e2f8b87ca463dc371e0496b5f0fd2be7187ec835f739066 SHA512 95e54513ff1cecd34c9625527785c34395caad11dc37ee39c22a060fb101c34101d21e0d16ef6aff879feb85834cddb0e211a2afb04c8c2d059a52d2cab37bfc
-EBUILD samba-4.13.0_rc5.ebuild 9392 BLAKE2B d2ac7cdc8718b5f67f6c9482b8f6bc9067d0ae2dc565f7af63e2ad78b9c4e7f6474fdc0a286cd0053b4c1170b46379ef182ad0fde3ed293c84ce7e9a01dbdcfe SHA512 f1d8d7154cc3685c1abd79a9dcff8f3ad86aad0bc878062c1a3842a8b7ddcb59407623a37557e4bf7661d301559be9efd4170cab6df7a5f283d1177d6078f074
+EBUILD samba-4.12.7.ebuild 9505 BLAKE2B 5d3c61a5cf21dee15b67c390b927bd47e0246a06e22243465e7731e2ce8bbf0353bfb3224176cd499e2f8b87ca463dc371e0496b5f0fd2be7187ec835f739066 SHA512 95e54513ff1cecd34c9625527785c34395caad11dc37ee39c22a060fb101c34101d21e0d16ef6aff879feb85834cddb0e211a2afb04c8c2d059a52d2cab37bfc
+EBUILD samba-4.13.0.ebuild 9390 BLAKE2B 911f343e6c0b8f8a655cee98e3217719e39d1643bbbe79d85c8fc7a2ebac82e073d77304a18f218c60e0888884c2df16b1b24ac0681b68f11dfdcc55211e5a74 SHA512 2a2b666d24ff807f412789927e3c7b14cd9d70b555c6a9abb88028761f377438296fdb6934e9eeaad4e6c5a397be59feecdcef48e8c696276bdee88aece7654d
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.11.13.ebuild b/net-fs/samba/samba-4.11.13.ebuild
new file mode 100644
index 000000000000..3a2dc8d2c1e7
--- /dev/null
+++ b/net-fs/samba/samba-4.11.13.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 snapper 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
+)
+
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.2.0[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.12[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.1.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_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}] )
+	snapper? ( sys-apps/dbus )
+	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= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	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"
+	"${FILESDIR}/${PN}-4.13-winexe_option.patch"
+	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	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
+		--without-winexe
+		$(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_enable snapper)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(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)
+		# bug #683148
+		--jobs 1
+	)
+
+	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
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.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
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/log/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 that 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.12.7.ebuild b/net-fs/samba/samba-4.12.7.ebuild
new file mode 100644
index 000000000000..89a685c05fc7
--- /dev/null
+++ b/net-fs/samba/samba-4.12.7.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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 snapper 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
+)
+
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libtasn1[${MULTILIB_USEDEP}]
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-perl/Parse-Yapp
+	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.1.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	sys-libs/liburing[${MULTILIB_USEDEP}]
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_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}] )
+	snapper? ( sys-apps/dbus )
+	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= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
+	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 )
+"
+
+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"
+	"${FILESDIR}/${PN}-4.13-winexe_option.patch"
+	"${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	# Package fails to build with distcc
+	export DISTCC_DISABLE=1
+
+	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
+		--without-winexe
+		$(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_enable snapper)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(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)
+		# bug #683148
+		--jobs 1
+	)
+
+	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
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.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
+	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/samba
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware that 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.13.0_rc5.ebuild b/net-fs/samba/samba-4.13.0.ebuild
index ae09ce8cd659..edb967449d4c 100644
--- a/net-fs/samba/samba-4.13.0_rc5.ebuild
+++ b/net-fs/samba/samba-4.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam