gentoo resync : 29.01.2021

4 files changed, 198 insertions, 188 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9ffbe3a1110b..ed0aa75e5aa9 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -6,14 +6,14 @@ AUX samba-4.13-winexe_option.patch 2611 BLAKE2B 709cc020ac7bbce948151fca511299ac
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
-DIST samba-4.12.10.tar.gz 18244366 BLAKE2B 34361b7734b9865d2c2fa2fbfaf99c3f0b1efb8ea33c1289ff70703180369d21bcb341ff0b4bb3e90f55f8b9745b579d5d66472c394a735e757ba1c6325daa63 SHA512 9437d7c05bd6f7f0bf6dfd7ef9c475f30ef6572095c96e1d494a8b917bd139122677a5e25f803579f0fd27a6053f5e99684780684dccce0e259cdefd684ce5e5
 DIST samba-4.12.11.tar.gz 18249361 BLAKE2B 74208769d42f3cb534855c77933b3e820cf1cbb02ea8748e4d208281427640b0b3071099ca51fde43454c2d24733a9ba81ef489fd17597e7cf8bdb2e450c7864 SHA512 8147f36bc56dd1b7b6603e1e51b83cef59273a591bac77ba8cbefe9df85b0f85886f983979cbfc8fd11eb4e7552944ab4e8ac2400acb3e2b89ec584363961df5
 DIST samba-4.12.9.tar.gz 18236198 BLAKE2B e19cbbbb8416626ca2fe769bf26f3645e94f23781538b3c5e1f94ce618efb807d0732e5591525ec066a31cc0211463b9b66105d1d499989012d624edaa2a132c SHA512 8bd3122bcaab2f5a16a73902a9b628384063a8116a08f0254541e05c148016839b3215c60ff0d3291a332e7884708950ad64137204b0ac19801012d3b6684fa6
-DIST samba-4.13.2.tar.gz 18418249 BLAKE2B 9e3b9c284c56a90c22f3bbfb51bfcbd7d1eb8dc8e8b399c13537ea1b1265922e67d1e780f68fec6858bb93dca6a49284d01a723633909a3156f750b0482798b7 SHA512 60b8597b7fad13dd55ffec4c750ee4f5f39220d8e8d52232d3a8c4d830a5ff29254716a7230b0182e0717585e5a34b01373527caecd1d32f2170c6063a97d070
 DIST samba-4.13.3.tar.gz 18422056 BLAKE2B f2b8528047e47e65ce8e0a089092c5e68ee7555248e163c0ed969ae1bf19919ed55bb614f2adae75e26725bf2079b5be3efba9af3a18ff8cbf5a98e1f39dc1bd SHA512 e7d29a89ba31ac6ca6c2dfd2629b8e07e47f4b1f265907847b43845dcf19a2200bcb1ca9f6845dd39c1ffca5dbf89f998bcc4defe33f5e3c4d8006ec9c6e88ab
-EBUILD samba-4.12.10-r1.ebuild 9443 BLAKE2B e82901600cbdcb77505dd4358761f93f6465bb9106b68f2403e856bd89617b56c6a0ba33fe2b1d466f70c9ada6d2eba467153d7dc38692ba264fb3ac55913a25 SHA512 fc7b3279c63db4802ab7e3e23c3b6ffcd90a24a4e974a51e90fa3c63f5317c209f81f93eb0287f21a94cca874e8c3e5b107ec0b798113d7e70cf7900085f2bf6
+DIST samba-4.13.4.tar.gz 18429050 BLAKE2B b2141f5b39e849dce4607430fdde217535c6d9aa236807de2e8072415c0e408b2690ea7b335915d87f9a4b574615f282c6724886210d62ad1a059eed447a3e34 SHA512 fb7b0e2ad122a72ef534de6446e5a44b842553963fc331c68454e8ff761f16e921a0dcdd653fe6b5e90d4ccf28869bd13df53d615d86cccd85a5ec3589268cf6
+DIST samba-4.14.0rc1.tar.gz 18631458 BLAKE2B b454599f3f1aaf9d5c47b295c2326941e82493a5bffd16ee25ab4351d359742f663980767f47ba575467a175535fbf645cf33121dfc1095eef147f175684e02d SHA512 2e83dc6e6ecc3f22dacdf829559c6dde906b14e047c49c167c9722b07bef9f2cee8c74587dd917b0e1d0b91a6e3ba12e1e22da8d9d4eed27cabb7a3e06722d0a
 EBUILD samba-4.12.11.ebuild 9443 BLAKE2B 1251d7d952450f48d685a4a96c9b3436ce5ea8baf509aa05e52c020d92de9ea340648d8a9bfe50341a98d41720faba643c0de404d0d690e065a41aa896ef6c0f SHA512 55e92b5ee493b74362ca571297f7f756167ff6b57c1648747eb103e93cf87727e00b02c1e854f146dd5f0ab064316033038a4d34fb5438eaae259c701d16e011
 EBUILD samba-4.12.9-r1.ebuild 9482 BLAKE2B d36ca3f07b8cbf8bd0f5e67ff616ef9bc376a4a26108220883bbd36ddc494e743b9705cfa13164cc825a6c81da0995ee4f983e59e47d6dde6194d5464fc43da9 SHA512 7cb7ff24d65d86b0399574d74b217da18a01fb5835d1eee4f2dd3234f9a60417e2c84a97bb4e79cfcb9487d29a0bc95a9af9611fbd3b9a1279d70ae9d9a0789d
-EBUILD samba-4.13.2-r1.ebuild 9446 BLAKE2B 842a66c45fc20acff9fb1df4fdb15afedf7cc1915ce25d67063d3c0fb50fcb2b1a3ad7fa49cbd9dba135a022e56f375ab19399e1f01f1feed93f5c42dda93bd6 SHA512 cc161369926bb376c80ca7603d306a615c49f29f42b14799ebe789b29f55e9c4045ebc04142604f5d9113960257160d038944c807ab6b5914cee1cffb811be54
-EBUILD samba-4.13.3.ebuild 9445 BLAKE2B f95d9d66742e40d455499f35d4ed12558f9d226d4715449b6d758c9bbd7bbee74ce76ccd919be232dc46408ab6f9e60fac1105d7de0d91de570eeca1623254d3 SHA512 8ad46a5b588ee8f0ffeea0d43bdb0a6a28197b1f8ef774f3beeb54e93892890260b35b2055a0b5e72256d5f59bb0992be52a0e53bb1b1f91ce4024f239cd884a
+EBUILD samba-4.13.3-r1.ebuild 9541 BLAKE2B 5089de44910b2327cdf3a58314394ee91b0dcdbefd8e120cf145aba3506479bfab127862a91a6ad297a37f917b0b2cd8d2cf6cecbaef9d8082eebec9116d0404 SHA512 62f02b7427b7c275c990edfd24745480d54e0c39fb053e5957572b361b674a2465fed40d13d9f6147c1a8b181f90ae3bc939f4d67fcb83ea82014bb3dccf5654
+EBUILD samba-4.13.4.ebuild 9541 BLAKE2B 5089de44910b2327cdf3a58314394ee91b0dcdbefd8e120cf145aba3506479bfab127862a91a6ad297a37f917b0b2cd8d2cf6cecbaef9d8082eebec9116d0404 SHA512 62f02b7427b7c275c990edfd24745480d54e0c39fb053e5957572b361b674a2465fed40d13d9f6147c1a8b181f90ae3bc939f4d67fcb83ea82014bb3dccf5654
+EBUILD samba-4.14.0_rc1.ebuild 9541 BLAKE2B 848b409e126d54330f17b296c627fd91e11f7c216934db9c6a14fd8fe69d27dd86ee1fd0d7f8527e5904309b7258178269703f659e2d81504db1569568f44bb4 SHA512 16a608a3a4b75067ca2726a6da9bed71d7736812bb694e61d2bea29181241fd8821a19cb18da1d356122084d72b42ab2bf045a29f07821f58445dccf1e2be6ae
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.13.3.ebuild b/net-fs/samba/samba-4.13.3-r1.ebuild
index 9972add4bfa3..f7c3aa7715ae 100644
--- a/net-fs/samba/samba-4.13.3.ebuild
+++ b/net-fs/samba/samba-4.13.3-r1.ebuild
@@ -1,32 +1,48 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE='threads(+),xml(+)'
+PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
 
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
 
-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"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# 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"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
 	/usr/include/samba-4.0/dcerpc_server.h
@@ -38,7 +54,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/ctdb_version.h
 )
 
-CDEPEND="
+COMMON_DEPEND="
 	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
 	dev-lang/perl:=
 	dev-libs/icu:=[${MULTILIB_USEDEP}]
@@ -49,31 +65,27 @@ CDEPEND="
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${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/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${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}]
+			net-dns/bind-tools[gssapi]
 		)
 	")
 	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
+	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -81,57 +93,45 @@ CDEPEND="
 	gpg? ( app-crypt/gpgme )
 	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_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[dbus] )
 "
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
+DEPEND="${COMMON_DEPEND}
 	>=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/nss_wrapper-1.1.3
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
+RDEPEND="${COMMON_DEPEND}
 	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-samba )
 "
-
-REQUIRED_USE="
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
 "
 
-# 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"
 )
@@ -274,7 +274,7 @@ multilib_src_install() {
 			-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
+			-i "${ED}"/etc/samba/smb.conf.default || die
 
 		# Install init script and conf.d file
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
@@ -310,11 +310,13 @@ multilib_src_test() {
 }
 
 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'."
-
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
 	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.2-r1.ebuild b/net-fs/samba/samba-4.13.4.ebuild
index 7bb1a129015c..f7c3aa7715ae 100644
--- a/net-fs/samba/samba-4.13.2-r1.ebuild
+++ b/net-fs/samba/samba-4.13.4.ebuild
@@ -1,32 +1,48 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
 
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
 
-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"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# 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"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
 	/usr/include/samba-4.0/dcerpc_server.h
@@ -38,7 +54,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/ctdb_version.h
 )
 
-CDEPEND="
+COMMON_DEPEND="
 	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
 	dev-lang/perl:=
 	dev-libs/icu:=[${MULTILIB_USEDEP}]
@@ -49,31 +65,27 @@ CDEPEND="
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${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/talloc-2.3.1[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${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}]
+			net-dns/bind-tools[gssapi]
 		)
 	")
 	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
+	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -81,57 +93,45 @@ CDEPEND="
 	gpg? ( app-crypt/gpgme )
 	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_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[dbus] )
 "
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
+DEPEND="${COMMON_DEPEND}
 	>=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/nss_wrapper-1.1.3
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
+RDEPEND="${COMMON_DEPEND}
 	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
 	selinux? ( sec-policy/selinux-samba )
 "
-
-REQUIRED_USE="
-	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	!ads? ( !addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
 "
 
-# 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"
 )
@@ -274,7 +274,7 @@ multilib_src_install() {
 			-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
+			-i "${ED}"/etc/samba/smb.conf.default || die
 
 		# Install init script and conf.d file
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
@@ -310,11 +310,13 @@ multilib_src_test() {
 }
 
 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'."
-
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
 	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.10-r1.ebuild b/net-fs/samba/samba-4.14.0_rc1.ebuild
index 147317d03271..0e775854bc42 100644
--- a/net-fs/samba/samba-4.12.10-r1.ebuild
+++ b/net-fs/samba/samba-4.14.0_rc1.ebuild
@@ -1,32 +1,48 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+),xml(+)"
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
 
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://samba.org/"
+
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = *_rc* ]]; then
+	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+S="${WORKDIR}/${MY_P}"
 
-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"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	!ads? ( !addc )
+	?? ( system-heimdal system-mitkrb5 )
+"
+
+# 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"
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/policy.h
 	/usr/include/samba-4.0/dcerpc_server.h
@@ -38,7 +54,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/samba-4.0/ctdb_version.h
 )
 
-CDEPEND="
+COMMON_DEPEND="
 	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
 	dev-lang/perl:=
 	dev-libs/icu:=[${MULTILIB_USEDEP}]
@@ -49,31 +65,27 @@ CDEPEND="
 	>=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/ldb-2.2.0[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.3.0[ldap(+)?,${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/talloc-2.3.2[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.2[${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}]
+			net-dns/bind-tools[gssapi]
 		)
 	")
 	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
+	cluster? ( net-libs/rpcsvc-proto )
 	cups? ( net-print/cups )
 	debug? ( dev-util/lttng-ust )
 	dmapi? ( sys-apps/dmapi )
@@ -81,60 +93,47 @@ CDEPEND="
 	gpg? ( app-crypt/gpgme )
 	json? ( dev-libs/jansson )
 	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? (
+		sys-libs/ldb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/talloc[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tdb[python,${PYTHON_SINGLE_USEDEP}]
+		sys-libs/tevent[python,${PYTHON_SINGLE_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[dbus] )
 "
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
+DEPEND="${COMMON_DEPEND}
 	>=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/nss_wrapper-1.1.3
 			>=sys-libs/uid_wrapper-1.2.1
 		)
 	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
+RDEPEND="${COMMON_DEPEND}
 	client? ( net-fs/cifs-utils[ads?] )
+	python? ( ${PYTHON_DEPS} )
 	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}
+BDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
 "
 
-# 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-vfs_snapper_configure_option.patch"
 )
 
 #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
@@ -149,10 +148,12 @@ pkg_setup() {
 	export DISTCC_DISABLE=1
 
 	python-single-r1_pkg_setup
+
+	SHAREDMODS="$(usex snapper '' '!')vfs_snapper"
 	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+		SHAREDMODS+=",idmap_rid,idmap_tdb2,idmap_ad"
 	elif use ads ; then
-		SHAREDMODS="idmap_ad"
+		SHAREDMODS+=",idmap_ad"
 	fi
 }
 
@@ -214,7 +215,6 @@ multilib_src_configure() {
 		$(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
@@ -231,7 +231,11 @@ multilib_src_configure() {
 		--jobs 1
 	)
 
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+	if multilib_is_native_abi ; then
+		myconf+=( --with-shared-modules=${SHAREDMODS} )
+	else
+		myconf+=( --with-shared-modules=DEFAULT,!vfs_snapper )
+	fi
 
 	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
 		waf-utils_src_configure ${myconf[@]}
@@ -270,7 +274,7 @@ multilib_src_install() {
 			-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
+			-i "${ED}"/etc/samba/smb.conf.default || die
 
 		# Install init script and conf.d file
 		newinitd "${CONFDIR}/samba4.initd-r1" samba
@@ -306,11 +310,13 @@ multilib_src_test() {
 }
 
 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'."
-
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Be aware that this release contains the best of all of Samba's"
+		elog "technology parts, both a file server (that you can reasonably expect"
+		elog "to upgrade existing Samba 3.x releases to) and the AD domain"
+		elog "controller work previously known as 'samba4'."
+		elog
+	fi
 	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 "