gentoo resync : 15.01.2020

24 files changed, 65 insertions, 431 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 69dfe1b981b7..4955cbf464e3 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index 65e053b0753b..3fed17ff5892 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,5 +1,5 @@
 DIST btfs-2.19.tar.gz 24217 BLAKE2B 19e298fc4629e8292ed87aa817ed78da75df4c90cf1c437c967288a77355efcfee641d65d0d2732a88a78a40574144d06254f2fc4b04be6d0980f683d42552f9 SHA512 e890b25605808dbf09f70d4ad8703a4beafb098af39a872a6b98f6959eb30e1ba9be8ae420be0797ba8f2774b487f2434252e93eac599094a824ba411441fdd6
 DIST btfs-2.20.tar.gz 24107 BLAKE2B 3b9cc89e002e6b19160b1cec6d6c984013714cfb5229924c74921741d8c3e854ac626103f6e51845a3e44a97e30960241dcfe02dd2324953b23ae2ed4464729c SHA512 6a0e0abbe07329daf810fddf2557892ec69659a381c445f7a3ada4a69e422c371d587623a9cb5f079f0738d00fca579af56f37036a2ba8060891d167fa9bb947
-EBUILD btfs-2.19.ebuild 845 BLAKE2B 8d5ed2c7fc5ad3465fc6283a99a6208117919fbe7ac9e2b67efdbecd8cadd22def16c2531058450302e8a14de3788a350699db011c7965c34c0c1e7d0499ea24 SHA512 9fdb00253b3e5d4f91a03ce63d4133a5f6c42f517c61abb1122ed33672c22c800cbfab6b157381b775adc989581fcedfd62a0694e08f29e20cda8ff9b5d4c06b
-EBUILD btfs-2.20.ebuild 837 BLAKE2B e9ab80b615d74ed3bd23bb2a27ed99568aa36098b058142a04684df41f28324b2b5512931e7f51973d3a39921a963493ca4adc50f71d0bf99a3aa008b50d68cd SHA512 0c415a8470bea3f0cec50006a77ed3252bb4e6e073849d9ab98e4e12c08026416db5391a1ea876039d41552acab748cc191fe094467eeace7c2a4f0cf85ffa22
+EBUILD btfs-2.19.ebuild 841 BLAKE2B f6973f4f9ea491093a4abb7f796dba794aae6cf1b736409c3c78d01c042b1caa39944640547c5892368065562d26ef1e82f98e8d0c218b1e9667266300b95e1a SHA512 bf4a90d6a64dcc4b8480e407763e1000ee7fd7c9dac96ffaf41982b313775dcf1ec27d17d1e46ec4e1eebdaa838ab1168b08c1faef7a637f34640d7dd0f2dd72
+EBUILD btfs-2.20.ebuild 835 BLAKE2B 9c3ee44beadd2beb7814de0891274fa4a10b949f435845f8c85af36edb205ca9f252163e57616d025e163115b63a882746407a5d8fdb0f72a8a0c2be8bef9548 SHA512 a3ad9258928abf8b278e387fcf7c220aa9d9ac3378eecf4a0c9e553d2c3560cc0483fad6ae6a32a1be16d16e274b9bd35cd2b2e7d263b81d78243a78f833548d
 MISC metadata.xml 243 BLAKE2B 262c7522cd90dc8f37d3dcf6ab766c822b9b46427db78d436ba7a4218f17011f334d797c6e4accaf6948b5457821527d1cdeba032790b69832889f0032d9b519 SHA512 4656d88a219fa1a1c7c34f6e6e07815324f7976a4e26dfe94afa0a2743250c75782cdccd7f5be887878383f67d263200af99d46b059b7e14acb37e612eb8eace
diff --git a/net-fs/btfs/btfs-2.19.ebuild b/net-fs/btfs/btfs-2.19.ebuild
index c984674ed5dd..a5f21f8fbf82 100644
--- a/net-fs/btfs/btfs-2.19.ebuild
+++ b/net-fs/btfs/btfs-2.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools python-r1
 
diff --git a/net-fs/btfs/btfs-2.20.ebuild b/net-fs/btfs/btfs-2.20.ebuild
index 6122c1f065b8..387a9bfa37b7 100644
--- a/net-fs/btfs/btfs-2.20.ebuild
+++ b/net-fs/btfs/btfs-2.20.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-r1
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 29ad68bbf55e..67f0fb59e98b 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,6 +1,6 @@
 AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 BLAKE2B 6f1315a02a6070443fbd8cc943e382a02ac8ee99dbbc78f6b1b6c835548b80a78238ae4f7de18c7f02687df370bc58d628ed2bdbf216a41e80b5b589f1952c3c SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998
-AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97a1a73e7884bea01e0d22d5ec0a88cc4d5c8f152baaeb2b602961232c08330b311f3e98cb79c40b7d700a279842430e484d9 SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a
+AUX nfs-utils-1.2.8-cross-build.patch 2112 BLAKE2B f1cd8457eeb869c5830b775b65bc2d0bc8bcc4ef832cb4fcc30366f7978271cbb9f9e92c7a25b2a392dd3b11690f10a87db09ce1c4d51d800eb231aeef5bc706 SHA512 d4b5cfa9f3a210aff09749aead376f698c5a8ba1cb7403eea95d52e423f4d5f039e9d6d6f6a1b0bff5439fff5048b7abd2c509a42cd8b977352c840876ccbf3c
 AUX nfs-utils-2.3.4-no-werror.patch 1832 BLAKE2B 6e0f3da6a355c3b828bbaae3135c3a6c8bab29008cf160ca728ff5b72402f108221b4def304e9bf36f98310407bee9c26d828ab833bb7a9619fdaf609e66d06c SHA512 ce76f46c8dcef8b151040b9d198843746b6c20507c23a0dc511b3d3dec7681b3ac65c089de3f09d4e496ffa1bd011c034ce70198def374058a0805daf4ec8292
 AUX nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch 4020 BLAKE2B 9f9079879be7bbaaf7748d4c2e5711fdeacac8b389fdb48d7fdc1c781191dc283f2dc05c9aded7558eb0cf3801cf7eda7032d091592e45cb8eb47018a0ce5430 SHA512 36b80e0f1ef0826e25ee719980171f4d6215db246392e1dbceef6aab4f1fbe78e4e1222256dfb23232b7da1b5328a23050966f3608a10c8b70b2f75491603f31
 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
index 7317115a0e18..366a85badfe3 100644
--- a/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.8-cross-build.patch
@@ -3,6 +3,25 @@ for us atm, so hack away :(
 
 (recent autotools will always add $(CFLAGS)/etc... to the compile)
 
+posted upstream:
+https://marc.info/?l=linux-nfs&m=136416341629788&w=2
+Date: Sun, 24 Mar 2013 22:21:08 +0000
+Message-ID: 1364163668-15490-1-git-send-email-vapier@gentoo.org
+
+From 269ae1346d9ccc97304205066d20e7e7b638f30e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 24 Mar 2013 18:14:48 -0400
+Subject: [PATCH nfs-utils] locktes/rpcgen: tweak how we override compiler settings
+
+Newer autotools will use both CFLAGS and <target>_CFLAGS when compiling
+the <target>.  Adding the build settings to the target-specific flags no
+longer works as a way to compile build-time tools.
+
+Instead, clobber the global flags.  This triggers an automake warning,
+but the end result actually works (unlike the existing code).
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
 --- a/tools/locktest/Makefile.am
 +++ b/tools/locktest/Makefile.am
 @@ -1,12 +1,11 @@
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index 0eef8c720a48..8e71d6659d39 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -4,10 +4,10 @@ DIST s3ql-2.26.tar.bz2 775435 BLAKE2B e30d0108522e3bca2e3e16138c418af553d4a0cb50
 DIST s3ql-2.28.tar.bz2 779646 BLAKE2B 3ca734d6aac9118da03566080ae46514d83829a132f57741ffc509e6dfe80a2cbbdbe93f84598302c7dbebd188bd5148eda00a6e5dae378ff91742c026c9ef63 SHA512 089d0c47d9e507aa22a162ffbcb8703188d84cbc83d73c30629897250574603edc1ebbddc81682edf2cdd42b10cc6fe55e69d71339f68bfe537f862eeadbd883
 DIST s3ql-2.32.tar.bz2 1167243 BLAKE2B 41107069e2f02b38c704e61bbd531c82fe7dde9aaf82dc6b400d27206456772fbbda41f13c3eee7d0a8eb7ae2a6855fefea3406d9295ceb309cb21317379e316 SHA512 c4c929f182ca06fea58edd26e9eb8044276af68607106bdf1df44f0eff86fa51c1d10f32a55717c300984c4d8cb956506cb195aa9e97842568934dcedff51369
 DIST s3ql-2.33.tar.bz2 845921 BLAKE2B 914c8e029fd10c82eb932a4a68d3771905255763a9ebc88ee5503892d1eb5f1a9c355d2f041fef77afedc5a7237e79db931768667602d7987b41a7c6805a2fa7 SHA512 fbc3895008f19de43c8a90a0896631200e8d292027d8bebc8197271a5677c9922498a7762696b057c067e5b906830f2a88f87d5615d60f24fdfa58972fb367fb
-EBUILD s3ql-2.24.ebuild 1254 BLAKE2B 77439d59139789c7dbf8eba34df9757780a4ced5ed4a0f3cfb15c6137a4037dbd9de1bb1881927b012ee833a9a400369b4e22d4ad43bb222390e778f0b0f94f3 SHA512 409a78516f40c3bb64f0a4b4b1c83b1d3163fecbd58b8237c9b4a7e1a6f554cb3fb6d72edb37d5f58411eba77fd6f99684a49ec83f6e623ad661f61a0774caf7
-EBUILD s3ql-2.25.ebuild 1254 BLAKE2B 77439d59139789c7dbf8eba34df9757780a4ced5ed4a0f3cfb15c6137a4037dbd9de1bb1881927b012ee833a9a400369b4e22d4ad43bb222390e778f0b0f94f3 SHA512 409a78516f40c3bb64f0a4b4b1c83b1d3163fecbd58b8237c9b4a7e1a6f554cb3fb6d72edb37d5f58411eba77fd6f99684a49ec83f6e623ad661f61a0774caf7
-EBUILD s3ql-2.26.ebuild 1254 BLAKE2B 77439d59139789c7dbf8eba34df9757780a4ced5ed4a0f3cfb15c6137a4037dbd9de1bb1881927b012ee833a9a400369b4e22d4ad43bb222390e778f0b0f94f3 SHA512 409a78516f40c3bb64f0a4b4b1c83b1d3163fecbd58b8237c9b4a7e1a6f554cb3fb6d72edb37d5f58411eba77fd6f99684a49ec83f6e623ad661f61a0774caf7
-EBUILD s3ql-2.28.ebuild 1254 BLAKE2B 77439d59139789c7dbf8eba34df9757780a4ced5ed4a0f3cfb15c6137a4037dbd9de1bb1881927b012ee833a9a400369b4e22d4ad43bb222390e778f0b0f94f3 SHA512 409a78516f40c3bb64f0a4b4b1c83b1d3163fecbd58b8237c9b4a7e1a6f554cb3fb6d72edb37d5f58411eba77fd6f99684a49ec83f6e623ad661f61a0774caf7
-EBUILD s3ql-2.32.ebuild 1320 BLAKE2B 0e38c6b5b7d5ec9c648bd31c6a9c10eeff62fd29ceab6139dd9564e28bd54955fc84ab101d199bf116e1871b8a384d378d55e0b516e0153982b271e952f33b8c SHA512 478d6cc94d4ee89b96754b2d7add3584d1cc0331c962f56a3991b705c0924b742e074f1107492e17ded97130f080b885a48e65d5ec1288ceabe61979a463d6f1
-EBUILD s3ql-2.33.ebuild 1327 BLAKE2B 7d6f111097c336dc04b5b472cc6c3dc67c184e2e5498df4ac1396c0c880c7f9a7ce78e510ac7351e5a4b93e4e29c0db895c33c26e974522d67530b271d01e429 SHA512 c939804fd03ce437d1187b01f14e59bddffb85f7d6612b88d7b251f91702327e85fde0775a0f41de98e11473e6f4ec9b8c895b603d7d96ff169586319a7a9059
+EBUILD s3ql-2.24.ebuild 1250 BLAKE2B 42c597c75c218d46ac17d17f73fd51322bcec2867b8a681742b90f6936c1d82c5dba766dbc5069744fc0c9308c80dc76d2429429484c51f031d0797571694cd6 SHA512 9c6c052ece75af911eb07bf0e50e7a3f79bb37a88caa2531879485a0e8dd1b22e8f492ba8848a236f27318854e5fa3b6a90e5bdfd593870244c5a2df83771f02
+EBUILD s3ql-2.25.ebuild 1250 BLAKE2B 42c597c75c218d46ac17d17f73fd51322bcec2867b8a681742b90f6936c1d82c5dba766dbc5069744fc0c9308c80dc76d2429429484c51f031d0797571694cd6 SHA512 9c6c052ece75af911eb07bf0e50e7a3f79bb37a88caa2531879485a0e8dd1b22e8f492ba8848a236f27318854e5fa3b6a90e5bdfd593870244c5a2df83771f02
+EBUILD s3ql-2.26.ebuild 1250 BLAKE2B 42c597c75c218d46ac17d17f73fd51322bcec2867b8a681742b90f6936c1d82c5dba766dbc5069744fc0c9308c80dc76d2429429484c51f031d0797571694cd6 SHA512 9c6c052ece75af911eb07bf0e50e7a3f79bb37a88caa2531879485a0e8dd1b22e8f492ba8848a236f27318854e5fa3b6a90e5bdfd593870244c5a2df83771f02
+EBUILD s3ql-2.28.ebuild 1250 BLAKE2B 42c597c75c218d46ac17d17f73fd51322bcec2867b8a681742b90f6936c1d82c5dba766dbc5069744fc0c9308c80dc76d2429429484c51f031d0797571694cd6 SHA512 9c6c052ece75af911eb07bf0e50e7a3f79bb37a88caa2531879485a0e8dd1b22e8f492ba8848a236f27318854e5fa3b6a90e5bdfd593870244c5a2df83771f02
+EBUILD s3ql-2.32.ebuild 1316 BLAKE2B d735149d579837a01441df6bf1076612dbf386e1d5d731af01dae129676a9deaaea4007ec34b6f3716ba9a7f4c699acec37bb04bbdd713e197ddd46b9c380818 SHA512 1959fdf5ce4b61390ee9b903cfcfbb786ead9b2b39e51256badb1d917609a0755468bdf03011540a07d58e454cf8eb914e8cc555af36398a7d69b98f1779c15b
+EBUILD s3ql-2.33.ebuild 1323 BLAKE2B 250d6e60e27ea5a3f8f157d287dcb02124868236346de129c079f3fb79be35d8d0f9ce85b03afbfb7569f59b0f61abd11ee44a97d8d25740cb23d94bae61a838 SHA512 9c4f3cd5fe8ce2d2ce89533e52388ef4413eca6f4e83543c6ac2f9d64be596e857b4ce5b7a3cbc952e1d24a40357a2866d3b6e9ddb3ea790712a7f6b53d0f404
 MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/s3ql-2.24.ebuild b/net-fs/s3ql/s3ql-2.24.ebuild
index 66221db6c565..e7ea8df04112 100644
--- a/net-fs/s3ql/s3ql-2.24.ebuild
+++ b/net-fs/s3ql/s3ql-2.24.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/s3ql/s3ql-2.25.ebuild b/net-fs/s3ql/s3ql-2.25.ebuild
index 66221db6c565..e7ea8df04112 100644
--- a/net-fs/s3ql/s3ql-2.25.ebuild
+++ b/net-fs/s3ql/s3ql-2.25.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/s3ql/s3ql-2.26.ebuild b/net-fs/s3ql/s3ql-2.26.ebuild
index 66221db6c565..e7ea8df04112 100644
--- a/net-fs/s3ql/s3ql-2.26.ebuild
+++ b/net-fs/s3ql/s3ql-2.26.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/s3ql/s3ql-2.28.ebuild b/net-fs/s3ql/s3ql-2.28.ebuild
index 66221db6c565..e7ea8df04112 100644
--- a/net-fs/s3ql/s3ql-2.28.ebuild
+++ b/net-fs/s3ql/s3ql-2.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/s3ql/s3ql-2.32.ebuild b/net-fs/s3ql/s3ql-2.32.ebuild
index 5671ac728470..e1a89240d13f 100644
--- a/net-fs/s3ql/s3ql-2.32.ebuild
+++ b/net-fs/s3ql/s3ql-2.32.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/s3ql/s3ql-2.33.ebuild b/net-fs/s3ql/s3ql-2.33.ebuild
index 4fe0eeaebf22..05468dbfc075 100644
--- a/net-fs/s3ql/s3ql-2.33.ebuild
+++ b/net-fs/s3ql/s3ql-2.33.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 844d137c2e7f..10c6ddc30793 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -16,27 +16,25 @@ AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
 DIST samba-4.10.10.tar.gz 18335638 BLAKE2B f8c215b82fea4ef69b9baf8ffac417e8530b17e4974c249fbf566c231374c299f4de9a1fd9ba5027fdf41d59f3e275456a6e1e435edd4bebba35eacbaa9a9c1a SHA512 d82f96af5754d484673d3497b2837d9df06352d7be4810fe6d812d64db5b95d588ed42d5565bf0f6f7c305bb9c6d3274e740ea9acd75b32aad75d0b38e4d2bc9
+DIST samba-4.10.11.tar.gz 18342499 BLAKE2B 9555f0e7ee46a7d372defd1c0978024cf36e23a33229cba2e374bed7bad67cb1e24ad5f37e989e01397fec2bcf7aa403bbb67669a764ec0a669571b182915c34 SHA512 776978698cc2d0e86d22d61caadc24f886f0e7fd35788806ebc641502a9a1f4a46afcde7c82e3d644eaaef8c302da5f795b9518681014b7f46a39422766fb758
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.10.8.tar.gz 18316560 BLAKE2B a1b89169a13eb96202e846e9e501b364235d61459a5d2f2e443af569d8a754df8546b5fb52e9e1b9629535d838a7fdfd9cd1fb631870880dad9981587c14be5f SHA512 14d463dfba36473f4a1d2b306ff2a18c664e1a01bc8077ef62afc6796cf4dd65461d72b519b8df3a777eaf322cb98653b416468d770541cd21fab2383c8dce66
-DIST samba-4.11.1.tar.gz 18516111 BLAKE2B d2f557f0e53782783189c415cd086065a37b6808707dc0ec5096175a75eab9d6045b41ac1597ca1ea2d463a8261d7b299602f2da5dfecf5dddaf03d89ea1056a SHA512 3a711b11254cff4c0d74f883d8bc6e454094ba2c6a10fb0d08e85cbed11a1326bb39f0e47600380a5f293a14a6463dbd09be7404305923ac579b6f85072309c8
 DIST samba-4.11.2.tar.gz 18516056 BLAKE2B 2b2a11e9b72deec54cf19830a402a5f2ae0dc2c3437116a636823d29e55c68842fce2434d196d567a8250b59e5bdffe9af367592c6949496f63caccbf4a5cb6f SHA512 f91053f019c9f979d7e29af00ea9b03a79c6f8efe91413ac2d6dca823f45ca9c30686264fdc0545dddabc687ad369a80c9ec78ebe75d1787dfc9b834233e12c1
+DIST samba-4.11.4.tar.gz 18530105 BLAKE2B 39e0cc6965681f3d64e861edebe2b77e558b68d9a3f4d7fa52e6ccfe704f2294fb3fb1a619d07d2130f36b1bf572300c733a273ccf78d554807e0f5897dcbcff SHA512 18ae1cb8b092c441a3fd4c6ecc9f35841dc51e3061f435107f7d2579b5e8ca6f8c96a947627dbd401b81c7de2293ff2587c30be694e160bf8a10c6d15aa73880
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
-DIST samba-4.9.13.tar.gz 18109481 BLAKE2B 948ef6b0e1a9796c70635119f5aea5887e9f1c1d2a5264d072f3f3d218dfae3b6a16c640233063c9df0670dc7835a92a8c97447f57518aa9d387bc5d04831675 SHA512 ce80486c9ab093d44ee68b0e2ab28f9af97c7ed00cca1b8a0c65de18254ae40759a1e9fcb9a0ba18006aa296c6a6fbadf53dcd730785a96ac0c167efdbe9d3ae
-DIST samba-4.9.15.tar.gz 18110369 BLAKE2B fb09601f424b7e0368328023a80c3dbfcfc48e6d66d59bf13b828e9706d3e663b8fc80f0baecdc6b646855750e64f96d961edbeaf2110b6432568f600f9ddad6 SHA512 6eb589ad3a5070b5649f1c76bafd2d691c3efbef264a100f5cdda457ccdb633fcbe64a9c4f7f0b8a5422fa08aa73534dc6f87248c6c871a1fa09577364e962c0
 DIST samba-4.9.16.tar.gz 18110660 BLAKE2B 5a75fb9b0010ce7a2eec00e911744a2b180525eea06ca08126bbfd558928e4165ed32da449ee31ee8e7f1bc705949548b9a6da8ed60de23a616bdb0acd020690 SHA512 bd9e7ee68351f0a7d006b47ed102bbd2984c08b483b20f4cf1db0354bef725d2e77816f7f3c3a20da46f69c4c9a476a18d22b8197414ea427abbd3acf6be6db0
-EBUILD samba-4.10.10.ebuild 9230 BLAKE2B 09314c37068f12da89a3d3c049efab5639c3d0f69d10e857a0d0e229ca08e7b9508f76fe57c24edc6196a7cfa0d9d8eddb77522de0397d2687544ffce7722ae1 SHA512 b8312593ebf58f42454b4517a6ae5bdc6fcf57c4f11eab9a95ecd27685294ba9b5f2fd17e78f34b24ae6c72d6900cc3d8bc6c427b8d614b801caf1a9d6343d9f
-EBUILD samba-4.10.2.ebuild 9093 BLAKE2B caf7aad5a5b17b0e0e9572010b8178648a03d474fa863c4bff7800f61d5b89dc948f243f9db29edaf539def301539e8922e83bf7dd50ccf1c53de7288c905a55 SHA512 8a2cfdea16e67ad5ab81aabd1c05629465e8fb482cc34e1d84a68f06124823916ba4048acf001d52c1abdf6ed61469e3c68d01af609516b6b3ba32f046877d3c
-EBUILD samba-4.10.8.ebuild 9230 BLAKE2B 366620e44d8c27a48277cd7609807113b438a229f2860e0a4ba53ffdd0772c19a11681087c878c4b31d4e596e948e32590ccd1a91d8acdb2657959abd0368c78 SHA512 4966c5a5fdb300892a6a8cfe34b314972ed4c28b74e1f0b580902518057a419adf501e7e254328e07c510f86cedf2878acca6619ee0018fc5a4110508c5329c3
-EBUILD samba-4.11.1.ebuild 9122 BLAKE2B cf950e7f6b9d6a3d8d5e275f76400794b3e3e37958df60fa45ace21a683315eff70d4cfdd0884ef1f35da66d48e6f1b0e2cec07a729fc8050e2f261d28617af8 SHA512 5a59bee38acdf87389407fe9efa694b76236e4648f5f6715858c0884fe9688dc4aa0928d0d39505ea456d9a71a4f650cff2d26c859d2730fe1a0816a6c76a0eb
-EBUILD samba-4.11.2.ebuild 9122 BLAKE2B cf950e7f6b9d6a3d8d5e275f76400794b3e3e37958df60fa45ace21a683315eff70d4cfdd0884ef1f35da66d48e6f1b0e2cec07a729fc8050e2f261d28617af8 SHA512 5a59bee38acdf87389407fe9efa694b76236e4648f5f6715858c0884fe9688dc4aa0928d0d39505ea456d9a71a4f650cff2d26c859d2730fe1a0816a6c76a0eb
+DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
+EBUILD samba-4.10.10.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
+EBUILD samba-4.10.11.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
+EBUILD samba-4.10.2.ebuild 9091 BLAKE2B 0bb02d822c1844b309024dc9baa3deec2c640d1b730d5e65ffafacb9699a6b99d3ee1e081e0c71ff4bcb13eb3fb35ed42c1a0e60ac744ebbbd812576f9e57dfb SHA512 581cdec2ecca48938e44234a3a304dac9812fe4a46fed1baa80c12761c20e2e396841e7b2d709b2b70958ace6f762b586286f582106ff4a33d78cc861e21f26d
+EBUILD samba-4.11.2.ebuild 9120 BLAKE2B 4d7cfcefef618c01187a718f51274730203b751ce993293e682498cd6fb60774e51639fd878bbabd4f47b660af40c4923b640c21ed0e3f5255a1d9c065829bb0 SHA512 3c926ec0362e7740d0ce9c90cbbc35b6b1719579ff87d2c0cd30050d6bfdbf3fbe686b3dc00cf3f24a20a0e480d9f69696d14d8fd8aed49bb1eadd520bc093cc
+EBUILD samba-4.11.4.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
 EBUILD samba-4.5.16.ebuild 8193 BLAKE2B ddc187ed358b6f2bd6727d3fe74bca0872dd46fbe6b12a606b2f7cf4c3903314bfdae35ea186be3999f9cc01a4b2f1d725f13a655707d71aef162a21f2914599 SHA512 2aecf97660ff948ec8341da21c7b43a8ed8c465ba19e7a157ca591b1d21e0cff12ceaa4fe57740aba7416eb0b780dd8b4f4549ba90634ec7c5c0028bbe09c000
 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.13.ebuild 9083 BLAKE2B 3ab11deaa3d0e13a7db15c41bd6572bdb7eecc4152362c7c7f8acd9ce2463cfbac705e06e75655964bc3dd1e7e8d164b9c2c4a65b211fa44c1b49fe1435c8a87 SHA512 6d525b03ad5b247803da393c1289f8a3e4e4f1f5f5a8945ad7aa68869161fb13c8e459b3538b803e419944e5bf7d24fa90fabbc60e0d9ca046e83883774e5aa8
-EBUILD samba-4.9.15.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
 EBUILD samba-4.9.16.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
+EBUILD samba-4.9.17.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.10.10.ebuild b/net-fs/samba/samba-4.10.10.ebuild
index 1f0de6ef9a86..329dc7c24129 100644
--- a/net-fs/samba/samba-4.10.10.ebuild
+++ b/net-fs/samba/samba-4.10.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.11.ebuild
index b675f8c85a89..329dc7c24129 100644
--- a/net-fs/samba/samba-4.10.8.ebuild
+++ b/net-fs/samba/samba-4.10.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
@@ -50,7 +50,7 @@ CDEPEND="
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.5[ldap(+)?,python?,${PYTHON_USEDEP},${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/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
index 7517cb4afc56..8e78eb25717e 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
diff --git a/net-fs/samba/samba-4.11.2.ebuild b/net-fs/samba/samba-4.11.2.ebuild
index 8a88f65a21d8..1f6514fb4b36 100644
--- a/net-fs/samba/samba-4.11.2.ebuild
+++ b/net-fs/samba/samba-4.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
diff --git a/net-fs/samba/samba-4.11.1.ebuild b/net-fs/samba/samba-4.11.4.ebuild
index 8a88f65a21d8..56647c0a98fa 100644
--- a/net-fs/samba/samba-4.11.1.ebuild
+++ b/net-fs/samba/samba-4.11.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE='threads(+),xml(+)'
 
 inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
@@ -52,7 +52,7 @@ CDEPEND="
 	>=net-libs/gnutls-3.2.0
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.0.7[ldap(+)?,python?,${PYTHON_USEDEP},${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/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild
deleted file mode 100644
index b65c53c68ed6..000000000000
--- a/net-fs/samba/samba-4.9.13.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
-iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/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/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.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	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/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	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 gnutls json winbind )
-	addns? ( python )
-	ads? ( acl gnutls 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.5.1-compile_et_fix.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 json-audit)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-		$(use_with profiling-data)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.9.15.ebuild b/net-fs/samba/samba-4.9.17.ebuild
index 3ad0587ccb32..3ad0587ccb32 100644
--- a/net-fs/samba/samba-4.9.15.ebuild
+++ b/net-fs/samba/samba-4.9.17.ebuild
diff --git a/net-fs/tahoe-lafs/Manifest b/net-fs/tahoe-lafs/Manifest
deleted file mode 100644
index bc1b674831bc..000000000000
--- a/net-fs/tahoe-lafs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST allmydata-tahoe-1.10.2.tar.bz2 1378204 BLAKE2B bfbd36861b8f868ee0bf667a5b64b1a47d7a0fb255ff19a9f5c2db020988397a8ea57c7dadfd1fb8edbb94d55e247a78a8f61d0e66af56129aea4c528b0c6c84 SHA512 79d4e3395aa7ef8e1e7c97eebdfcb75b3b36edb75aa5d5f805c568b842b9b2f4ea5f8529dbf32fbdd9cc467cf82f153aca09310bc3b69fa00efae7be8a7bc198
-EBUILD tahoe-lafs-1.10.2.ebuild 1352 BLAKE2B 1aa21cb2629604af7dde472e0314cc27a73a3f3f82755306b2d4f1ed93e8856f0ee5551098fb5645a25fc28d0226abc3377f1fd6c0fa6069d371b1dafbb31dfa SHA512 2397c34bca1c5a47542539a6a6a5729f6c0761457594312ecaab3461705ada73bb83babcbfe641e6cf9b64984bb0ebdda78d0e18c7df7ed4953b52c1df76c1e6
-MISC metadata.xml 736 BLAKE2B 7578baf99b5e3c54252c63cbc5793397a76de9926d7f389934174ba0d48f376e447e214573cc7e745051827dfbd822a35ef631c4bdb44acb16181de6c0c43c3c SHA512 52ad1244425d834c155be80945160903a0ed07d580be29fa31414edc0e53f9271c49eb32f864d07073e6870bc8f9a30db19f270d716387e0ed2faaef5a3285e2
diff --git a/net-fs/tahoe-lafs/metadata.xml b/net-fs/tahoe-lafs/metadata.xml
deleted file mode 100644
index 28b6d980aad7..000000000000
--- a/net-fs/tahoe-lafs/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Tahoe-LAFS is a Free and Open cloud storage system. It
-		distributes your data across multiple servers. Even if some
-		of the servers fail or are taken over by an attacker, the
-		entire filesystem continues to function correctly, preserving
-		your privacy and security.
-	</longdescription>
-	<upstream>
-		<bugs-to>
-			https://tahoe-lafs.org/trac/tahoe-lafs/wiki/ViewTickets
-		</bugs-to>
-		<doc lang="en">
-			https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Doc
-		</doc>
-		<remote-id type="github">tahoe-lafs/tahoe-lafs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild b/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
deleted file mode 100644
index 031d09ff8c46..000000000000
--- a/net-fs/tahoe-lafs/tahoe-lafs-1.10.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_PN="allmydata-tahoe"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Secure, decentralized, data store"
-HOMEPAGE="https://tahoe-lafs.org/trac/tahoe-lafs"
-SRC_URI="https://tahoe-lafs.org/source/tahoe-lafs/releases/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	>=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]
-	>=dev-python/foolscap-0.8.0[${PYTHON_USEDEP}]
-	dev-python/nevow[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pycryptopp[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	dev-python/pyutil[${PYTHON_USEDEP}]
-	dev-python/service_identity[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-	dev-python/zbase32[${PYTHON_USEDEP}]
-	dev-python/zfec[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm -r setuptools* setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	use doc && dodoc -r docs/*
-}