gentoo resync : 10.02.2020

14 files changed, 461 insertions, 121 deletions

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 195c9e7a2257..9c5cfcb7161b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -8,7 +8,7 @@ AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb
 AUX samba-4.8.6-no-pydsdb-when-no-addc.patch 1493 BLAKE2B ce0de6426170645c15bdc4832fd35d8dcd6de9c1ce014846d3c8bbbb4d8f6c654c0e6a02252186f9de76d0735ac808d0326b1c57e9e98c00a357792430fbd4bf SHA512 f3e5c9ce1e75e8332e38ad33a637d7f687a77c8586511aad252db0176b4483e9e6a8ede09d7d448a0146d35f141d61a937561e16029606d08047974ee58dd982
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
-AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
+AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
 AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
 AUX smbd.service 250 BLAKE2B 70b1bf1dfb5f099ca9880d6eeee3996f6f69cc2744e07c577b396ac973326c60dd3874129c23fc0d53b7d3a50891a607d35781a8eda1702029c3602a212bb89a SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3
 AUX smbd.socket 121 BLAKE2B 1261742bb1cd586f376ccd1027a5c57754460bcaf7aed4b800ae8afeefb663a761cae38e89da56dfef06b9b82aaafa8d98f2f7d9fb45ca52652888ec92470618 SHA512 2db4a707fcc6ef1928ac010e5e92cdaf0f6ff3ffa8aef918e0db1ce910abfb481d6a19082337f9c8444cd780d1d442fa8df2bb65e6142fc109d29657532572ed
@@ -26,15 +26,16 @@ DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
 DIST samba-4.9.18.tar.gz 18103049 BLAKE2B f1071f76924722294be545534c3462d12963073dade444d9aebbbcb56bb84f5ae608bf9a97583e1050713ea668ced6aaf13f0a180e7b682da8405d40600cace9 SHA512 c7161fdf90d5e2ee5fd28aca93b596f4dc4417d2f8519a586a2319e42a62107a026adc128b90f7c3ad71d4d21c0b782bc8eb79005714bf0ee93fba19ffeef624
-EBUILD samba-4.10.11.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
-EBUILD samba-4.10.13.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
-EBUILD samba-4.10.2.ebuild 9091 BLAKE2B 0bb02d822c1844b309024dc9baa3deec2c640d1b730d5e65ffafacb9699a6b99d3ee1e081e0c71ff4bcb13eb3fb35ed42c1a0e60ac744ebbbd812576f9e57dfb SHA512 581cdec2ecca48938e44234a3a304dac9812fe4a46fed1baa80c12761c20e2e396841e7b2d709b2b70958ace6f762b586286f582106ff4a33d78cc861e21f26d
-EBUILD samba-4.11.4.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
-EBUILD samba-4.11.6.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
-EBUILD samba-4.5.16.ebuild 8194 BLAKE2B 23e95a991215abdc79c68b1e24682a6fb5d2cff89916fe480adf4d4de91501d6fc4d3e39efab8cae8b3ec7e4c6b927feb66b715ed3c460ce39d6110ca50125f4 SHA512 f24289fa7576dfd647ddd2caf286ac2f0403c1cb9e1902cc5197394e063294199bfb57bc773494371f53a081434221432489d2b5aea1919aab002a8f09f8aadb
-EBUILD samba-4.8.12.ebuild 8924 BLAKE2B 4ea486ecca9964519c4739195d14ce22e013acb7a9a9308cb9ce43b3ed6aa9cf64ab2a4a3bff13983e13f217b511d12a8726a57bb97d19952f99bb53b15a2db1 SHA512 f795b98e9a0580c034247fe8f64f1b7158ed239630b92666686cf32945907ab9159acc93ac541b3f9f04d2132da9f820e72ea80e242c440d72605d5ccd500578
-EBUILD samba-4.8.6-r2.ebuild 8497 BLAKE2B 4db3c17b11ef2146db59131877014b44c136ba0b720c906a407f6f7b6c405a858fe3fb0e0b31a7e17df8af68f02d881849b270ca8141b47dd401beb5a6465e92 SHA512 063682dafc10fa9505be914e2986f8abde6eaab92bcbda68a06f0d2a153f0659e1c75f7eef63153862e9699be5bec56de73b74b41f8988aa8b06f09eaccf2ca6
-EBUILD samba-4.8.6-r3.ebuild 8885 BLAKE2B cc2ee57e0463f6daaaeecd0bd149538f838e39534589f2a94d7f331981563c544d27a2e94860b4a701f6ad1150f20891590af93a5cd9db229615033063251c10 SHA512 bed25be8178f0b2899fcca57bb577a86c917075d901abeb8ba46462c82629c2a832ebf5f7b36e95cffea7189eca082b3863a3b79ad29c972569826d3ac906ac9
-EBUILD samba-4.9.17.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
-EBUILD samba-4.9.18.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
+EBUILD samba-4.10.11.ebuild 9311 BLAKE2B 4be84e08601ec008a2f4fd3c00dab7b74e313175e3b444b831ef1f2ebee292532dca7ceeb95239deac1b30716d82b16527b7d220ee669559cacd0089e5bd9a4b SHA512 e1758cb0eb7713e8ad098d646e365eb72016058df7a9b86b1a5c378103370cf5f71948611eceb7007aa89f8ce15a3634f80f4eba7acf649604dc8c8a7eef1572
+EBUILD samba-4.10.13.ebuild 9311 BLAKE2B 4be84e08601ec008a2f4fd3c00dab7b74e313175e3b444b831ef1f2ebee292532dca7ceeb95239deac1b30716d82b16527b7d220ee669559cacd0089e5bd9a4b SHA512 e1758cb0eb7713e8ad098d646e365eb72016058df7a9b86b1a5c378103370cf5f71948611eceb7007aa89f8ce15a3634f80f4eba7acf649604dc8c8a7eef1572
+EBUILD samba-4.10.2-r1.ebuild 9174 BLAKE2B eb180ea72de902834376ae5ed94867f208d03c45ab75817ac7d9a726c5081d66714f14d6e268bdc2e008400883615a7935c5cbf0c2e14d9a923c9a76a01ca043 SHA512 2dc542237c1caafc9d2902850f9e312dfd7e78b313d385bdffd0a7206fd441163b06112f14bf96081e463d7d82cc228618a0921a88fdf49acc55f9248e37e71b
+EBUILD samba-4.11.4.ebuild 9203 BLAKE2B c8e019f9d1d6e205a7ae04dfb8a88b53cbf82bc6e35a74e713e237d78f5ea9c006bd7b860664ed31ee7bae9325c63def437c2f31356fcd110bca385acd176c1e SHA512 fdbafa2bf18b6ffb395c21151c37027f2a3994bb7a07cd0ae0955d7f7ad3eae270798c7fb1d8b71465266d177ddb5152eb40bcf10d209f7916c7c37ee5952a97
+EBUILD samba-4.11.6-r2.ebuild 9337 BLAKE2B 84988819d594a8a7fd949d6734c2a14ab020df9131307a4e097ac96799c3f5106adec505333a3667bb8bb6605434287b595a7a2d33ad20592418ba463f7b75c1 SHA512 23c1b54c173c9e5282b036e38550e61004e7c72284b6e7dd695da0ca95fda060ed4f40cd6d062c0eb156b2f5dba65b621fb296dc633b16f0d42d96dfd29cd9d5
+EBUILD samba-4.11.6.ebuild 9203 BLAKE2B c8e019f9d1d6e205a7ae04dfb8a88b53cbf82bc6e35a74e713e237d78f5ea9c006bd7b860664ed31ee7bae9325c63def437c2f31356fcd110bca385acd176c1e SHA512 fdbafa2bf18b6ffb395c21151c37027f2a3994bb7a07cd0ae0955d7f7ad3eae270798c7fb1d8b71465266d177ddb5152eb40bcf10d209f7916c7c37ee5952a97
+EBUILD samba-4.5.16-r1.ebuild 8245 BLAKE2B 9ab6043f813d9b086c0975645a2f513af870f558a1443d82a071eeb327439f8b8b2051bb6264cc5007a3e5b998acfaf3f1e41fc3f1bde6a92ce33281a00111c6 SHA512 31bdefd0054775050fba330030a9e885f60645627a380643aba84dadac4fb0381070a6f5e5a8e22bdcd1a315d9bc9ac941d25e918dcc3855ec746beb10366a4b
+EBUILD samba-4.8.12.ebuild 9007 BLAKE2B 0c142305855bf70cc6bb4d7a6c1d4eba10a31aa89b7d60a836d69a2e0c000867d1843c871c2c4b1e2acd4a99f326178b428b079e5f242c7671da06797b8bac3a SHA512 121e088b0a60af4692754b28482ce6ae9a06fdf36757b26fbdde71c10c5723b77057edf6a69311f1cf312a6f120c5d3482fd9b141748f385e159a2a4ec6bb889
+EBUILD samba-4.8.6-r4.ebuild 8580 BLAKE2B 8ec4fddc1f73759e047ff3d709a4552aecc498f48d2cf6b5e4bb88b56e143d37227d3f4530a4a8ba7a7526ac9459fb480c32a13d5a74ae6b1925b553d334cf3d SHA512 67e16e6b9b31299b72d52a5ef8c56e7bb649abd28e9545e8e93d8ffcfa5a5e124cd67cf083f9904e8f7ef3072ac730c78d94f2269a7ddf5832afe4ca2e23c33b
+EBUILD samba-4.8.6-r5.ebuild 8968 BLAKE2B 57f592bb11006adce6bbc0c748aee714c6e7ec22b4cab892a06afcfe897b6eea6fec8dc5111e2f11b6a7490963c68cf24e3468dfda6cf1c77ee36c2577b1b24d SHA512 c86c0755c845a441abaf6af11493ed3d33f08ef87e68b93c62598e15bb846cd46620f79817635f751395c526a58a005e3a49ae88ddbd8e0c2dfc06376db8b770
+EBUILD samba-4.9.17.ebuild 9166 BLAKE2B 36ddbf387d1d696cb4fde6550638677612df864dc353baf5875571df2263470ead19b78d37d83682691872c8e3447f2015fa5c2e55a06f6129803ff1859f80f0 SHA512 07afcec6d311b1ec32550a26f21bec34288e6fecc5ff785ac20801330b7f1d0f4a8a14f8eb69cdb5edf05a822af7b7897dc867bc5012002b554a5f533182e19b
+EBUILD samba-4.9.18.ebuild 9166 BLAKE2B 36ddbf387d1d696cb4fde6550638677612df864dc353baf5875571df2263470ead19b78d37d83682691872c8e3447f2015fa5c2e55a06f6129803ff1859f80f0 SHA512 07afcec6d311b1ec32550a26f21bec34288e6fecc5ff785ac20801330b7f1d0f4a8a14f8eb69cdb5edf05a822af7b7897dc867bc5012002b554a5f533182e19b
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
index e0a6f325cf9a..a7f4946fb07c 100644
--- a/net-fs/samba/files/samba.conf
+++ b/net-fs/samba/files/samba.conf
@@ -1,2 +1,3 @@
 D /run/samba 0755 root root
+D /run/ctdb 0755 root root
 D /run/lock/samba 0755 root root
diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
index 329dc7c24129..e782b5089c52 100644
--- a/net-fs/samba/samba-4.10.11.ebuild
+++ b/net-fs/samba/samba-4.10.11.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=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/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
index 329dc7c24129..e782b5089c52 100644
--- a/net-fs/samba/samba-4.10.13.ebuild
+++ b/net-fs/samba/samba-4.10.13.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=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/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
index 8e78eb25717e..78940866cb22 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2-r1.ebuild
@@ -45,26 +45,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=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/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
index 56647c0a98fa..fb5e20da359d 100644
--- a/net-fs/samba/samba-4.11.4.ebuild
+++ b/net-fs/samba/samba-4.11.4.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
 	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.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_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/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 )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.11.6-r2.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
new file mode 100644
index 000000000000..9219eea8564a
--- /dev/null
+++ b/net-fs/samba/samba-4.11.6-r2.ebuild
@@ -0,0 +1,316 @@
+# 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 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-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.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	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}] )
+	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
+	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)
+		--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 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.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
index 56647c0a98fa..fb5e20da359d 100644
--- a/net-fs/samba/samba-4.11.6.ebuild
+++ b/net-fs/samba/samba-4.11.6.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
 	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.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_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/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 )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
index 0a8cd5fdfec9..c9c162895ae3 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,9 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+	")
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
 	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
@@ -60,8 +62,8 @@ CDEPEND="${PYTHON_DEPS}
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index ad3cf03c2386..5ddbdf19249f 100644
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
index 4461b2d6f1ce..edd8d3088f6b 100644
--- a/net-fs/samba/samba-4.8.6-r2.ebuild
+++ b/net-fs/samba/samba-4.8.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,26 +45,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
index 9d93bd81c79e..67b7b1eb3268 100644
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,26 +45,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
index 3ad0587ccb32..9d8f3c2110ea 100644
--- a/net-fs/samba/samba-4.9.17.ebuild
+++ b/net-fs/samba/samba-4.9.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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
diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
index 3ad0587ccb32..9d8f3c2110ea 100644
--- a/net-fs/samba/samba-4.9.18.ebuild
+++ b/net-fs/samba/samba-4.9.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(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