gentoo resync : 25.04.2020

16 files changed, 8 insertions, 315 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index ab3ca8b342c7..ee84d03cc161 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 693bb625ceed..29b2a89e3ca8 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -3,5 +3,5 @@ AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672
 DIST cifs-utils-6.10.tar.bz2 364221 BLAKE2B 45b692fb85217a25b7042fbe7e40cc8c4fe0d6cc9c905acde2c6fc9c3048343064e376f47128bcacba88f745452148040ad3f5e8ca15e297531f0dc868e1b75b SHA512 e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.10-r1.ebuild 3150 BLAKE2B ac64dfce87fef3bbd040cbacd39d1da49ba515835c72dec1e97486a7015584409137639a388449aa45acca17a4e3e8d4968864d1feaf9729abd98c5d14734045 SHA512 d800e881ce6a9f23f3d6deb2b8e779bea83d91f3b2903bc4d44e8c0369d2555eeaf130289ceaaa52634a35bb103434ac827124b963f99bac266d002430a796ef
-EBUILD cifs-utils-6.9-r1.ebuild 2998 BLAKE2B bcdbb08ac12e1c8083c3e76b918ea379f695de5230d7243d5e4cad6f9c93dfc7c6a659790a1e81982767b83119c3a0ca6ce2c5586dff2e5831774c0f374e11dd SHA512 b6201729d3991570af0fa0f87cfa275e86c609fe8c4ba55e0c946611557fb115932becf123c261428d652a14e68a41eadc2d27f32970c10420c1e1865371e3f2
+EBUILD cifs-utils-6.9-r1.ebuild 2999 BLAKE2B ab685dc316b4541f1c2b8c8a6c4804bd7618988ccf25ea4ad0ea45a90204f1ede1672143d4b9572d5ccd9139447f8bd7514c308da94b3a7a27060d6ba0453cdf SHA512 df98e0e70572601330f2a75deb4f934eb468e8dd398f961cfd1e76244b06bf4a408b010c7accc15ebc4070bd2c06930e6a9ebe04f1bd3b0d5e8a7cc76922ef05
 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b
diff --git a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
index dfb877e4d7cf..121a2f961098 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam"
 
 RDEPEND="
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 37772e76ed07..dfda8b76498d 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -2,7 +2,7 @@ AUX libnfs-3.0.0-utils.patch 499 BLAKE2B 0000a2140ea34201b41237b9fde5d7c0adb77e9
 DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
 DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
-EBUILD libnfs-2.0.0.ebuild 1103 BLAKE2B fd25b97ccc7dc54e6a217ae42dade2f0c6c643710ec5d5178f792250b367c2fb4ddbc2def4d1eab9644aad0c48a8a42084cbbfabc191aa05ffb4070db3aa52ec SHA512 a715719403682eafe85e3318848903fb141b3f17b307e87c7be91e4a9d0e03b1a3f8130539724e0961ddf259a1903b0d8b7ae18a08023ec59ee172c739e3bb2e
+EBUILD libnfs-2.0.0.ebuild 1104 BLAKE2B 48e778f6746267304ab5b9bda20a841004a7ba7a2bc14887e4665e9ac7e1bc78fa3ee05f05603b049aa68695516632788886420c79497aed1f845f5c91bffa66 SHA512 9f849f4e864eb262fd87d8d2645df6f07bb24806f540905b192eab4b1954143f8d8e18d78e6ade56261833696d972e184cfad4f0e773d4fd1a6733d91c8613e9
 EBUILD libnfs-3.0.0.ebuild 1255 BLAKE2B 6b87b80f4e85f556f4a01573f5b539b95da72e7d98b36bc2913d5caa3428db586c12e8683169fb1d775e5f53cedd6866f686937bd83461a67e04345764d71dce SHA512 9b281707a6f99af238072c602c9e59e9e2f81178e7a77d643cd45e0deb0bb2c7fd2fbcac4723a645a051ea74fbf0ed007ae10528c539865684aef94ecdd08b6d
 EBUILD libnfs-4.0.0.ebuild 1203 BLAKE2B c2f6f95e87478e5f33574dccdac1c9261ea6bb1942199deca4179ed1238e681a3e92595f2b049438841ac432f8bf5464bbf659de29c5953f9f0f67a69ace4aaa SHA512 2162d6b5a34347117bfe99f3697bd804621c7b9afbcead44687767b360481122bb49799d444df882557e2619b3fc6d13ff1e25680f28975030cc17e9cdbf693b
 EBUILD libnfs-9999.ebuild 1203 BLAKE2B c2f6f95e87478e5f33574dccdac1c9261ea6bb1942199deca4179ed1238e681a3e92595f2b049438841ac432f8bf5464bbf659de29c5953f9f0f67a69ace4aaa SHA512 2162d6b5a34347117bfe99f3697bd804621c7b9afbcead44687767b360481122bb49799d444df882557e2619b3fc6d13ff1e25680f28975030cc17e9cdbf693b
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index d400b0f8083c..d238b5498112 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index 8e71d6659d39..b8840de8e071 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,13 +1,3 @@
-DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
-DIST s3ql-2.25.tar.bz2 770189 BLAKE2B d0d3c7656f93b7bdac97ab7b9afdb6b53c6e909a5fd4e5a1cf9e5c153d81349dfb809409f79ec45768297e7c7eb89a590338cb9726b2eda51b3ca02734fa1001 SHA512 e2aa9f5d68a00b36ae33a7d36bf4aa42f761fb7e2cfb8370c914a78d0ed54edab85dd224fa7ef08e9e240161f5c66e46c0cbe99b6c5451cab3a50f33c78bde36
-DIST s3ql-2.26.tar.bz2 775435 BLAKE2B e30d0108522e3bca2e3e16138c418af553d4a0cb502671b70dee689be2795c02bc4fb47a2aa5d225a1ad748c7fadc099ff28443c9dedba737d89e8efabb455a0 SHA512 5bdf89fba0a0d354dbdb84bdc3f31a2cefaf3bc701989b9f413c428cb2de9e7449255c3f7ed775fccd2f2fbe3bdb3156ecfb43de5a958dedb83ba63399427569
-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 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
deleted file mode 100644
index e7ea8df04112..000000000000
--- a/net-fs/s3ql/s3ql-2.24.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.25.ebuild b/net-fs/s3ql/s3ql-2.25.ebuild
deleted file mode 100644
index e7ea8df04112..000000000000
--- a/net-fs/s3ql/s3ql-2.25.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.26.ebuild b/net-fs/s3ql/s3ql-2.26.ebuild
deleted file mode 100644
index e7ea8df04112..000000000000
--- a/net-fs/s3ql/s3ql-2.26.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.28.ebuild b/net-fs/s3ql/s3ql-2.28.ebuild
deleted file mode 100644
index e7ea8df04112..000000000000
--- a/net-fs/s3ql/s3ql-2.28.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.32.ebuild b/net-fs/s3ql/s3ql-2.32.ebuild
deleted file mode 100644
index e1a89240d13f..000000000000
--- a/net-fs/s3ql/s3ql-2.32.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured file system for online data storage"
-HOMEPAGE="https://bitbucket.org/nikratio/s3ql/"
-SRC_URI="https://www.bitbucket.org/nikratio/s3ql/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc systemd test"
-
-RDEPEND=">=dev-db/sqlite-3.7.0:3
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/dugong-3.4[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse:0
-	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-RESTRICT="test"
-
-python_test() {
-	addwrite /dev/fuse
-	py.test -v tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use contrib ; then
-		exeinto /usr/share/doc/${PF}/contrib
-		docompress -x /usr/share/doc/${PF}/contrib
-		doexe contrib/*.{py,sh}
-		doman contrib/*.1
-	fi
-
-	if use doc ; then
-		dodoc doc/manual.pdf
-		dodoc -r doc/html
-	fi
-}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index e7e3fb216bfb..02657fba9bb9 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -10,6 +10,6 @@ DIST samba-4.12.0.tar.gz 18156651 BLAKE2B a02a5cdce9551743bfa88fe9e42ab2f2b6fc3e
 DIST samba-4.12.1.tar.gz 18159628 BLAKE2B aff697383ed53f4e8d7506ca284d160e76747ea49849c32bfe712fff83cd1a66a835c8da4f325a78599e53dc29f59e626fc7b285c67c5364f180491c3ba62f7d SHA512 2645f72dcc4718bd2e85af73a54b3e6d0ca9e11bd6991a47a6c17a8b89b69f294a0875ef9762dde28a25d1ff030e0e2d0e073a6993e2df0d6b17e75b72d1cd26
 EBUILD samba-4.11.6-r2.ebuild 9331 BLAKE2B fabf6baea685d888cad0cf974005986043b2d21ee2915db9b97fb6d24a43e148e28aa77e22a0456952141a55d97ff496631a59b481fb4b25af1134f418865bf0 SHA512 c35ed162c8e1d9a3824d9e46524ecc7728bdd11c503fab0fe849d271c37aa2d3c93dc2a6a08054f69cdfbedb218ab1bd46e6da9d4b4a169e8e0bc240860116a3
 EBUILD samba-4.11.7.ebuild 9282 BLAKE2B 83053cf6eaaaae615840ff00ff6fe36db222b441d66827e6333f89a4de1f712f22b8c3bfff01e9d4f5871908eb11a15ddb4f43f36e80116e27e514e59c7d6989 SHA512 6efa0d4cd1724cb30e5bc5ff8b4bcfda054159606e756d5cab124d2d6d8a8f5dcb1dcb4e22893ff9d7ce2e9b370cfa63c2df760fc088e48daafe86ad3765cc5c
-EBUILD samba-4.12.0.ebuild 9224 BLAKE2B 55544d46bca69736afdbaeb2df478f61a53c6dca7e1989691287f4c8a6b295ff5e5bfdad8616b7da508f11919f5b7e51cb86e3c1282902833705feee7e62e63a SHA512 730e95d10d99d075dc18cb7662be9cb1bc2173264000be4fb49fd562dfcd7bbfae7d84b912c3a916f8c44dbaf07c523b4393ef92f1c1cf55446ea0011f0d9acf
-EBUILD samba-4.12.1.ebuild 9224 BLAKE2B 55544d46bca69736afdbaeb2df478f61a53c6dca7e1989691287f4c8a6b295ff5e5bfdad8616b7da508f11919f5b7e51cb86e3c1282902833705feee7e62e63a SHA512 730e95d10d99d075dc18cb7662be9cb1bc2173264000be4fb49fd562dfcd7bbfae7d84b912c3a916f8c44dbaf07c523b4393ef92f1c1cf55446ea0011f0d9acf
+EBUILD samba-4.12.0.ebuild 9243 BLAKE2B 62a25139e3aaa021a57828a70e433f675fd6672750769396efa6682a530be78e8a0d7c5470cdaa9b141b49020645f6bc1aa25702957b86847b44140b5dd9e98f SHA512 2109db5189555b3129ae59b3767fda58c2954acc221c411e88507ab2098c4fe822cba47b7c2ad926a1b6c0692000e5ca9d7179cc8866bef3cd89cc5ac2365887
+EBUILD samba-4.12.1.ebuild 9243 BLAKE2B 62a25139e3aaa021a57828a70e433f675fd6672750769396efa6682a530be78e8a0d7c5470cdaa9b141b49020645f6bc1aa25702957b86847b44140b5dd9e98f SHA512 2109db5189555b3129ae59b3767fda58c2954acc221c411e88507ab2098c4fe822cba47b7c2ad926a1b6c0692000e5ca9d7179cc8866bef3cd89cc5ac2365887
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.12.0.ebuild b/net-fs/samba/samba-4.12.0.ebuild
index c727b591ae99..e774fbd4ca57 100644
--- a/net-fs/samba/samba-4.12.0.ebuild
+++ b/net-fs/samba/samba-4.12.0.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.12.1.ebuild b/net-fs/samba/samba-4.12.1.ebuild
index c727b591ae99..e774fbd4ca57 100644
--- a/net-fs/samba/samba-4.12.1.ebuild
+++ b/net-fs/samba/samba-4.12.1.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index 8979c798b0b8..630147b5cee1 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -1,5 +1,4 @@
 AUX smbnetfs-0.6.1-docdir.patch 432 BLAKE2B e58dd4835d816b6908fb4f0198bf1f6a7a9de8bbedb1736f5137c6ea7ae2f271420c3afceda6b30739403a010c0c917153a82233873cdf8a4b301cdbfc910c8a SHA512 3c75db469adad6d6e69fd7406a17fbd7d60d1ee43371a1f9b4780dbaa51c0e893cd3bcbcd3c96c5c5a81c8616267c4fbc921f04bf2bd14368f47c5c93bfed598
-AUX smbnetfs-0.6.1-use-proper-xattr.patch 609 BLAKE2B b05b18598ea00a6337276a85de485af54c9453427d5b7f4736f551151277caa12c09de9dab8edbfc094a9fa30b25922eed3d152c2b3b61676042f09d83f8eb5c SHA512 ddd31c147bd65bde5ea9f05abc9b08b5630f293e4641d996d2571b99933969b7985da82040098547490e158f283cf04df475a966186f3f29c7239493b0755101
 DIST smbnetfs-0.6.2.tar.bz2 174322 BLAKE2B 5165cb438c7dc844a72b3b0d75cf61118f0c2241750ed2aa50c33779f31f32094ff19571b213a0d12b7dd89f894150a5faf14b02be9122174473e239c6afc39f SHA512 713b6f0423eabf0fd16d22beccbe8ff01c20af2c488e43329b65b510a29d5bbdd7cf211a9539e10d9fa1822635c1050d29808842ae1bf1b19ac637ae3995ea1a
 EBUILD smbnetfs-0.6.2.ebuild 841 BLAKE2B 278f50c82b500e5e1a1f71267fbec396def0dd2b3743837b063ef583351e21904bb43752ef4468b754c88f83a82a3b1ff9694cf9f177bb0da761656d88408d96 SHA512 acd4441d4574a63e8c3ca1effec16f1b1594d21535697fa95a4b6555ee34a9162b0ba4f4b71207afa8275f07a4d8ccb69655c71b32875ff388dd4cca76bfed05
 MISC metadata.xml 1149 BLAKE2B 420bbe890fc54b92ac4a3bb91e45649c775b3a1f7b593e78f3b9afb6e3f765369da3d0460fa10a336b542f94024961bd2c2954cd7ed6517b4671d240ed236c70 SHA512 1984bb9a158582347cd4ec4ab6a0277848db9c5e2c2d59a6f0e63301f3cc0fd86439c9be1eb3dc2bfd18d400712350573010a16b333b9675425ccc5da1e73544
diff --git a/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch b/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch
deleted file mode 100644
index 925a8cf8fefe..000000000000
--- a/net-fs/smbnetfs/files/smbnetfs-0.6.1-use-proper-xattr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 398e8169ea6d3d854af0173b1e66bf13c124f901 Mon Sep 17 00:00:00 2001
-From: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
-Date: Thu, 1 Feb 2018 11:55:41 +0300
-Subject: [PATCH] use proper xattr
-
----
- src/function.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/function.c b/src/function.c
-index 9728eae..3e88f42 100644
---- a/src/function.c
-+++ b/src/function.c
-@@ -8,7 +8,7 @@
- #include <dirent.h>
- #include <sys/statvfs.h>
- #include <sys/types.h>
--#include <attr/xattr.h>
-+#include <sys/xattr.h>
- #include <time.h>
- #include <pthread.h>
- #include <libsmbclient.h>
--- 
-2.16.2
-