gentoo resync : 30.10.2021

3 files changed, 25 insertions, 24 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9e8c72f2a3d0..3c87dc4f5739 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -3,16 +3,16 @@ AUX 4.4/samba4.initd-r1 1112 BLAKE2B 91d28710ccd512e19307bfd5ba97710ca071b478696
 AUX 4.4/system-auth-winbind.pam 590 BLAKE2B d8c0190dff88c5b65f7f01b3a84fd776194d3b4ce5c973bd1145e6a12750f01882b2873be03b537e9a68899c0a19fee7a4834385961090e4cb69dda7ae1763c0 SHA512 0886cfd99b3c3dc117b2a83b04bf59d080ebf77d6ea91f24cfc4d8be7af9db377e0efc2216e7c1f8a180b09fb425476ef6874180d9f0fa47e4889faf1d429679
 AUX samba-4.4.0-pam.patch 895 BLAKE2B bdc0601527a932424d55946b2eeaa288420ce90a8fd9be2271709da5c113625e80ae3783975b725c515004382bea65336ef725241079081cec213e81cc6e3056 SHA512 5a00c6131c372fc1cc9e23e4a37314442bf9af8e420a040a7b20ec3d76a357959d456437ed13e2e17f938eb6dcb4e7c5d899ff3d670526b0a444f63e35d5262c
 AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
-DIST samba-4.13.11.tar.gz 18476158 BLAKE2B 43bf88a62078c980e274ad978be0e7de46afbb35a873b0f32638bde20a92cf22a27ea6d3da87b2c79fff76bbc932505aac7e7a5aff04ddbada220f019b7ebb44 SHA512 d22da31ebbea4c4fb33827b47ab0d21e7753802ab310b68fb5edc48a2419f419737f4df6cc138488f28b70142734e68865ad63944445ede921ea09ebc83fbce7
 DIST samba-4.13.12.tar.gz 18586809 BLAKE2B e6cfc942c5c10314b9d92510785f26a21c27cc66de3379cb2133af2ac4dd38bcd8cc72063ebcc6f97f9f45d2f4ef4cd5bbfa4f75b81414c08b9a93acdbb25b97 SHA512 6447733e4c07669bd2dd95a0056be92c507fa4f8c29dd0bc86881004cc24206d9c2c49ace1cb00c4fc7f08109cbf110015f51cd3ab77f2fa95818bcebc437974
 DIST samba-4.13.9.tar.gz 18443813 BLAKE2B 24046586f666e9db02e1dd71d7eb854691f39e6b575b9652a8b7c1aa5569c856dfd48911e3f221de74f9deec5808152fa2836d03bb9810d55d4f526f1567574b SHA512 35c98979c1141fe4bd700e3c8f2439ec08876697faeaced6668ea6a9fea1d8303ca34e82123499aa4a41054b9ed6e1260ae779ea8d59978ba6de6b5861f21948
-DIST samba-4.14.7.tar.gz 18668592 BLAKE2B 3cd8c806c6af85eecafa93ba10562544815f3d73aaa6152774d2443971e8c46e4c12c3097f82d04d1560410e796d60d681ce6b1a637a09f0262b39a1fe28cbea SHA512 155621b44232f696f389b8e01fd7d8a5ef8d4aa6b3de54090589268cf377c09714715a05e6198ee7e168ead71c08b5b20cd63a71811ef7d9bc9746c0d05ae9a6
 DIST samba-4.14.8.tar.gz 19039206 BLAKE2B f0ae6a3476c9f7b33e260cb379bbccdf5294b8694f44f37c6c06df849d34d9090379e20e105919e26a2e2e51a75ecf50dcb43ee90e0a88e113964dccaf51ba81 SHA512 e5d5f26eeee92e1d7d3e70b389debe331b2d14d4f5ca7796f850275897fdf16e96b507b6862c8fc4bab1bfca312ea22b60b090d881149cd1e9725fe9877dabfd
+DIST samba-4.14.9.tar.gz 19063803 BLAKE2B 157665aba6d2449781ad3781deb2cdb3ae325879a796b8ba07a9d981ed93aaccd7f098841136a3be9d4e304ecba00b7ecb0c4a84cdfc6593172d4bc66cb38c69 SHA512 e7eb8b55656f51d94d99358dbe39869a74e34b2c69e14ac813c2387a4b2a10d8a5c22ad9b6a3a3ed4dcec4c13df810f577e22d7f1cc903176c0962e412496deb
 DIST samba-4.15.0.tar.gz 18895040 BLAKE2B ac560e280d5fbea6499547de480f973bf1987558ce6b832fe0f6e5bad8cd58180731e7d1a37f85fce82c52bf735106aedec3ccfda09fa430a5c435e2437994f9 SHA512 5fcd8797f0ac2821f1bb213c9a39c0928847905f701003618f9f160eaa98f3fea25e3d8d4047658b0bd164f3e6a2a63fd7b0133317e536997c764acf7803950d
-EBUILD samba-4.13.11-r1.ebuild 9951 BLAKE2B cf9ea21b58111b468af87022d8d1de629319817c051e54d35b7d81c3053e7977c3ffb358ffb519da24f3bd29fce8d530fa3a60880984819afa47957c3171e875 SHA512 ebc5498caa155a0b987fdd500aa501004dd96b600ec452e53033bbc90b38df1af60f154898841966d15248c4f17e75027c3f2ff04bffd17366b504c020348a04
+DIST samba-4.15.1.tar.gz 19192249 BLAKE2B 1348e1fd8ba69c2b4d9a70418805c4a893d2198d8571d4ee66953b8326cb18245f54053eb873accf59b82edb5ee82305f4933451ce35842e598863bc1d54040c SHA512 caa6365f26b2b19c96732252b4f8446e82a1f12f08e4ad7803709d8a10b9cc4f1075723f0249419f387b2a8de9020f68cbf0ca780f0e56efbe11fb7ddb32ebf6
 EBUILD samba-4.13.12.ebuild 9951 BLAKE2B cf9ea21b58111b468af87022d8d1de629319817c051e54d35b7d81c3053e7977c3ffb358ffb519da24f3bd29fce8d530fa3a60880984819afa47957c3171e875 SHA512 ebc5498caa155a0b987fdd500aa501004dd96b600ec452e53033bbc90b38df1af60f154898841966d15248c4f17e75027c3f2ff04bffd17366b504c020348a04
 EBUILD samba-4.13.9-r3.ebuild 9944 BLAKE2B 616fe72b46377be83605ef1a9e50d459edae637443e167c22ab3e3434b11d00b5890ba8fba46b3db8f49587ec758a9d9ea3ce65454b231adf3439c83492957d6 SHA512 de44699398edd95cc4e05271c2768285441b7af96ab76ea8a62fce8cf00dc53367c48c6cb8525fdb829509f058c99b1f9a387505b894dfd092647d354f0a4155
-EBUILD samba-4.14.7-r1.ebuild 10059 BLAKE2B 9564c2685f5204847b33a512c43a4edd4520b3378aee234a917e7812dba933df7b91b3d06885b18183aecf41e12a598176c83f8d29926b2e90134c038c84607a SHA512 c1d5492c4afdec6bcdb281c71d4aca4ade8a7cf2988533fa4e0e39e7de144f509162c3bd1c1e0b5dd683d0fd0bb709267b34678a2b4678294f5dcb91df71da3d
 EBUILD samba-4.14.8.ebuild 10059 BLAKE2B 9564c2685f5204847b33a512c43a4edd4520b3378aee234a917e7812dba933df7b91b3d06885b18183aecf41e12a598176c83f8d29926b2e90134c038c84607a SHA512 c1d5492c4afdec6bcdb281c71d4aca4ade8a7cf2988533fa4e0e39e7de144f509162c3bd1c1e0b5dd683d0fd0bb709267b34678a2b4678294f5dcb91df71da3d
+EBUILD samba-4.14.9.ebuild 10052 BLAKE2B d63e4247053b175464f130e50c806f85510090a413b434704972b3bd79d31a8bf475f1407e5f981e7ee1c452e6e5c3896313ee4d4dc252011e63afa082107c76 SHA512 f88c3fa4b1eb2d85974a7f662571755dc62504af314df784b4d78468aa6dab65f8a49d49ff048fd98bf66f1c7e15a7ae6a454d7da9a284dd914611f0fc665204
 EBUILD samba-4.15.0-r1.ebuild 9919 BLAKE2B dae14ce9c11091c9b480bd8ff118ee0f62710785616e6a7a57c1e7e51b6b90f6c2bf57b29a95cd7beeb9eb3dca17c29fcda42e2f4da9d0b378a67f2d15f66c7f SHA512 03eec036b3c9db9e65ef03cedfb3d90a06050ebbb0e51645b8c487da1a864be47d24cb24b193137ca519ab5de13ab1c8f88ca2fa800891a00b344417718323f1
+EBUILD samba-4.15.1.ebuild 9919 BLAKE2B 0f66888dbbabe8d3c66860ea7b94aa229c1bae0c9d560c8d9bd38100d420a242549541f0f33873d7fcec4268da0075f1c47ab4cbc55fb9f9d3f908f07ceacc40 SHA512 6738ccaa70fe416448be87e85b171a4136517b6a7c4cf047f4a90dc043650280d4927e6af7a845e397135c81fa54b7553a0c40c38677d190588ed6ea7a2367f0
 MISC metadata.xml 2166 BLAKE2B 147e131d456bd90334b48d551e47ce92f0fd7a0708df2f4cce0ffeb3f2e541689090f8edd043411d982574285e06a1b31fb087c18bd02b1296c6e15ccd0b2e92 SHA512 332354a6247d9ef8d50b71e07c66a10fcfbdb34dd876490f8517d0275d87a7d486789c19824c7ccd9066148a92ece3061649bd7ac0b7280cbc695c92ec70ef29
diff --git a/net-fs/samba/samba-4.14.7-r1.ebuild b/net-fs/samba/samba-4.14.9.ebuild
index 3ca6d2708a41..d94a70025926 100644
--- a/net-fs/samba/samba-4.14.7-r1.ebuild
+++ b/net-fs/samba/samba-4.14.9.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
@@ -68,7 +68,7 @@ COMMON_DEPEND="
 	>=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.3.1[ldap(+)?,${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.4.0[ldap(+)?,${MULTILIB_USEDEP}]
 	sys-libs/libcap[${MULTILIB_USEDEP}]
 	sys-libs/liburing:=[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.13.11-r1.ebuild b/net-fs/samba/samba-4.15.1.ebuild
index ca82cc436a82..762c3a397cba 100644
--- a/net-fs/samba/samba-4.13.11-r1.ebuild
+++ b/net-fs/samba/samba-4.15.1.ebuild
@@ -16,24 +16,22 @@ 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam glusterfs
-gpg iprint json ldap ntvfs pam profiling-data python quota +regedit selinux
+IUSE="acl addc ads ceph client cluster cups debug dmapi fam glusterfs
+gpg iprint json ldap pam profiling-data python quota +regedit selinux
 snapper spotlight syslog system-heimdal +system-mitkrb5 systemd test winbind
 zeroconf"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	addc? ( python json winbind )
-	addns? ( python )
-	ads? ( acl ldap winbind )
+	ads? ( acl ldap python winbind )
 	cluster? ( ads )
 	gpg? ( addc )
-	ntvfs? ( addc )
 	spotlight? ( json )
 	test? ( python )
 	!ads? ( !addc )
@@ -66,22 +64,25 @@ COMMON_DEPEND="
 	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.2.1[ldap(+)?,${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.3.0[ldap(+)?,${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.4.1[ldap(+)?,${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.5.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[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.3[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.2[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.4[${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	$(python_gen_cond_dep "
-		addns? (
+		addc? (
+			dev-python/dnspython:=[\${PYTHON_USEDEP}]
+			dev-python/markdown[\${PYTHON_USEDEP}]
+		)
+		ads? (
 			dev-python/dnspython:=[\${PYTHON_USEDEP}]
 			net-dns/bind-tools[gssapi]
 		)
@@ -208,7 +209,6 @@ multilib_src_configure() {
 		--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)
@@ -219,7 +219,6 @@ multilib_src_configure() {
 		$(multilib_native_use_with gpg gpgme)
 		$(multilib_native_use_with json)
 		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with ntvfs ntvfs-fileserver)
 		$(multilib_native_use_with pam)
 		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
 		$(multilib_native_use_with quota quotas)
@@ -329,7 +328,9 @@ pkg_postinst() {
 		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 "
+	if [[ "${PV}" != *_rc* ]] ; then
+		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 "
+	fi
 }