gentoo resync 04.02.2018

12 files changed, 0 insertions, 645 deletions

diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
index d33d09299817..ed046fa76be0 100644
--- a/net-fs/s3ql/Manifest
+++ b/net-fs/s3ql/Manifest
@@ -1,23 +1,3 @@
-AUX s3ql-2.14-ceph.patch 3323 BLAKE2B d99fee824b6dc06053b634f589bcd58857574036f7ef7c5c4a581f8f541435439c3a01ebb8095c7d19f1e28359739b570dd0263c0150670474f3fac3beda2880 SHA512 cead3e2ab677d25a892ba834a0f18162843849f623fbb9be67798059518b7984aa3abecd5572371a188fb6e00534c6d6006147b0f98c32025567f794510f5b37
-DIST s3ql-1.19.tar.bz2 641689 BLAKE2B d9b878b79d60a02de652898e080bdeed8df09d6d3414e51030b09f941044ec00bc7819085370398f054baf78f834cc103e0a77cabab379ecf0ef55f105f6bc7c SHA512 5751f4d21abdc3996d877785bb07752fca75ec60ad716a102f666b5329e9b225519c4365c93031e056db78e3bffc80a7a1afe227c375e1c19e35b8bdffe5a0bf
-DIST s3ql-2.11.1.tar.bz2 897259 BLAKE2B 58aa0a166084d209a553f21a05dc6aa1e896ebd85f36e49dcb4580ad44f15b3ddf87ff2459a4fdf301955abaf277a118803aa154d78304378815c3606e918818 SHA512 72e873f0d23dd86ca5f7a65809189225feff0f6f14bb046dcc8117f3eb725c3327408fe504ffd80566d70bad620b5f5c34174784f1d318bf1f7e6abf4edcb1a7
-DIST s3ql-2.11.tar.bz2 867710 BLAKE2B 2a0db6ac704691ed909ceb952dfd1d2dd6609b7d0cc8160deae2a3947717811b3dac9096ec0b5970d0c978b20d7cf9f27ed6c2803698d8b0c3498c8ba8dd3c57 SHA512 86f3cb3294f38ab25ddf593dae2ea36af6d4df8871e15b3c99bddd7c8c5c038ab5cd0adaf067afb508dd3f7e163e8b86ab7994f2401cf33543cdeb43bc9fdb9d
-DIST s3ql-2.12.tar.bz2 906837 BLAKE2B af86076647918a85d07536a34c0a045e2d77e1bcedc5a1b79009870dfcc21e2d23a0b8d962c4ce8c9c877013465f20d30db0500002d7bd098e2036fb8d427a11 SHA512 51c90a983a6b076fd70468406e6a1c74592b85458068bc07325d43b75d1ca50fb80694fcab83e6c41a1e3ac8209a203716624971be1cecc9cad75a8f3f4761d9
-DIST s3ql-2.14.tar.bz2 907415 BLAKE2B 72648f2f28981cf585e6b978197b92f4ae3843561f205ff4639db15a64777989434786d26a0a39ca2fdf42fec1875767e944821be53a7843b03c92c1eb7e432f SHA512 8ada75934e438928bca03f59fc6b08f013887dfc926bfe1069108cf9172c1fbf20229db4c6248022b9af1e7f52ec9cf1ab536acddcc8993ca55f59a7be43c218
-DIST s3ql-2.17.1.tar.bz2 957313 BLAKE2B 1849cabd1cf0d88c6ee9474b67d5294cfb83cbf3847be45316c2ffe4732548d01592044086a1a44e07a8eb25ad0fae5e075875d650ac7159c7de262a7c471218 SHA512 dd2c16dd30c0f103e0cdd42329b2cf242dad7edf2aed773746a8e00cbfd3e4735174293347fa68bceacb2a8379099356b32b2c35e9f1c2524740e92929185611
-DIST s3ql-2.20.tar.bz2 726268 BLAKE2B 5751b7c8c68ca52fc98f1929fc50fc1967005fe80c61046950f62d86301a0e6e602cef6bf4c692bbfb55c10e6f6f95eb73ff73b8396e26f512c234344e2171f3 SHA512 a5a25a7b02c3d7bf5f87ad0130d24b8e0b95f20a269d74b35edeaec1a47011e30a3d1416c3d8332075be82dc09733321da8e7e4200893d893f37d1e4970cf7fb
-DIST s3ql-2.21.tar.bz2 726450 BLAKE2B 74d70d687e1b67f5b758c04cc8b4073575c04871908b6c5b9f259c0146c5829777867e45d4eaa2cb8be97fb5dc74faee6c0ed4db769068817d78ecefd62b948f SHA512 2aa5324d529feb73d9c562f42d5bcb49e4c605315e032924bec8005ee6cba24b8bd100a8ca6ab559dde4e7d4b25db9458b49bd8421bfeb74609ce32a6cdf7055
-DIST s3ql-2.23.tar.bz2 770488 BLAKE2B 44d7b0e67397db187932f7561bbaffab6e1a579919ff5024de2272d5a0c484213d6aa6a6727e74a98eac49e506e50bdec70e60ab413cf97004588fba508c7a88 SHA512 99863394002c5f941e1e8dabce606703a20a2614e316484c9d5b3de774ff2864284911283573dcebbcd10c4a3aefc1a3c12f1ae511af3f0c42be88ba8f6f1f7d
 DIST s3ql-2.24.tar.bz2 773766 BLAKE2B e780bc7d3376241d9b04ba0b09b064050f1ecaf22a44eac6e793ac4a01cc0ae7c44f1c40d39cc2984bb62f52dac9b55be22cfc63309dc4af4a1f93784303865f SHA512 20f32fcde425e2e5f07f1b52a5399bc6c1aaf8d6ad866e3496f7608a590f6a9bfa2ccf7c0ee18be7e8d6e374d1a2679ae72c5438775ca3b0b0c214735d26c9dc
-EBUILD s3ql-1.19.ebuild 1350 BLAKE2B 55bfdd48ca5431695d9403965a38af1c875e3ab044ab49c092a97e251362cff7ab178efa5a43712227704951530e4bbe02b3f429de4b14c1fb511691b82cd74c SHA512 5be50b779d5ead6da27f1a4f268dc97436e2cbabc16e3623d382200a1d8dff80a4d2640c58e33951757b66f27af8d5c15c228b1727ea8eb5d49e4e60c86d9462
-EBUILD s3ql-2.11.1.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.11.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.12.ebuild 1255 BLAKE2B 3beb91abb759f4bda60a9fe9a857ff18704b088b3070d172c0bcd2fe5ef7bef6d5e19b15f898fe7a2d7ae74c9fcb3ac468761c6edcf4a936746af75d53bd9728 SHA512 0075b0089fe1a778ba2d4d77f5c1ad9c69100c5dbad81ce7481e15f5bd00e6aad739a98bbb3ad123eb1ec30ac9c3c73b087d797d4753706c6aa9f798509e8d8d
-EBUILD s3ql-2.14-r1.ebuild 1317 BLAKE2B 794d7d98bb3044c6f1c1b5831edc119be74cf135460cb8cd291f875a8b2977846b097999d5e0838e532d60ad4059bb04e5a12445753984837e89fcc313fc2da6 SHA512 c15832c2e13a945f06e59521b294a1c101daf3a4b9db1d95f6c915e19384a13525685fc4ac2394d0c157fae7521b5bb9a123da7ca74450fee9d67e55fe4a002a
-EBUILD s3ql-2.14.ebuild 1255 BLAKE2B 1a591b13fbbb7a1f1f53ff962e777e95e81d8f8c54f9228b8540211cedff201ab06887ecf9a3fdd4440e3535415512e2957ef350623034174ba4d1b5322a173f SHA512 4cb03ba91c19233ea7bccf93c489f0aa047946ec714b6709a6ef99bbcedff242abf27dc0619e217e1168bf2aed0131e6eff4bdc43ee0083decae79918f2f82fd
-EBUILD s3ql-2.17.1.ebuild 1258 BLAKE2B 468b6b10d1a5ddaae654012ed393e075258d490b1ff11b95edbc6eee73e8dbeff5faee24c67ffd2debf719c2fba986b78336a4015372491e0b210a96b4a71406 SHA512 4f6f6cbba1c77e225ee2cc188b91e6ef2a2b342ac716b8ce436fd6fcfbff1b323733a622d49fdf8edef2ba03923566f60f0067d79e668d7e3d162ca3827da2cb
-EBUILD s3ql-2.20.ebuild 1255 BLAKE2B 99a7aa1e6341aab307aee961572d5a0da3f0bd67e15eb1223bf8cc8e4c1dec3a6f0c101c10430c30cbe14f33acb0ecd4a85f14b9fcf2a126227dd0703ae1c02a SHA512 ba52467b66905b9bf3b0792b3a85a3a1bf64738d53ac989bf4b32d68051cfdd6a478f1f136b54e29db07433ca6a4036d795049aa6e47287f7cde578cc3f4607f
-EBUILD s3ql-2.21.ebuild 1257 BLAKE2B eaa53d39e6684f98b44c51a2228eb671be5171d7381b7bdecb5bb68a0a1d38ab9a5642b7fbf109eadf4887543a29eb1fd1404ede193501e6e8959cef87b4f4d6 SHA512 f136079f7cb351cd9bee25f9d78023e187c03dc696664fd66c13af27e33a65815d74744c23163638da7ccbe603621f99acd875dd3e75f32b0f07f0048600c2dc
-EBUILD s3ql-2.23.ebuild 1257 BLAKE2B eaa53d39e6684f98b44c51a2228eb671be5171d7381b7bdecb5bb68a0a1d38ab9a5642b7fbf109eadf4887543a29eb1fd1404ede193501e6e8959cef87b4f4d6 SHA512 f136079f7cb351cd9bee25f9d78023e187c03dc696664fd66c13af27e33a65815d74744c23163638da7ccbe603621f99acd875dd3e75f32b0f07f0048600c2dc
 EBUILD s3ql-2.24.ebuild 1259 BLAKE2B 70fcff067f9dd5ecb42d8ee4487017ad17151407dbf88c78c0e18233955e9efefe1b414f94a2fdb256d7064a3f1ae11d8c64c0ae494c8cdfbb9411988f6b82d3 SHA512 56629a8387e72e4b345f57174f1ad722c012b86655f0e4a6fead7dfc800430859f84799dd6de28e2035d280abd18d6fd58fe41887ca83af9eaf20bfb907d89cb
 MISC metadata.xml 463 BLAKE2B e1b6d823fd6696f0c18592981f399b884e4aa2987cfebbf4c3f071d815d3d3260fbf4b1e68a8de80ce8135a8f593ed3fd40bbcbf8387cbf9658c2f0a9334e073 SHA512 7021866874fac865898c724916b0b455f3416351aba40ce8eeef55436e93c8616786be656101bcc693ec0762626e60b44814f9dba788ff5e17b2b22f3daf5f88
diff --git a/net-fs/s3ql/files/s3ql-2.14-ceph.patch b/net-fs/s3ql/files/s3ql-2.14-ceph.patch
deleted file mode 100644
index f5b4c3b123e5..000000000000
--- a/net-fs/s3ql/files/s3ql-2.14-ceph.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bitbucket.org/nikratio/s3ql/issues/190/sq3l-should-not-rely-on-xmlns-declarations
-https://bitbucket.org/nikratio/s3ql/pull-requests/5/s3c-be-more-lenient-about-xml-namespaces
-
---- s3ql-2.14/src/s3ql/backends/s3c.py	2015-07-20 19:41:07.000000000 -0700
-+++ s3ql-2.14/src/s3ql/backends/s3c.py	2016-01-21 22:41:33.000000000 -0800
-@@ -126,6 +126,15 @@
-         conn.timeout = int(self.options.get('tcp-timeout', 20))
-         return conn
- 
-+    @staticmethod
-+    def _tag_xmlns_uri(elem):
-+        '''Extract the XML namespace (xmlns) URI from an element'''
-+        if elem.tag[0] == '{':
-+            uri, ignore, tag = elem.tag[1:].partition("}")
-+        else:
-+            uri = None
-+        return uri
-+
-     # This method is also used implicitly for the retry handling of
-     # `gs.Backend._get_access_token`. When modifying this method, do not forget
-     # to check if this makes it unsuitable for use by `_get_access_token` (in
-@@ -215,7 +224,6 @@
-         keys_remaining = True
-         marker = self.prefix + start_after
-         prefix = self.prefix + prefix
--        ns_p = self.xml_ns_prefix
- 
-         while keys_remaining:
-             log.debug('requesting with marker=%s', marker)
-@@ -232,16 +240,27 @@
-             try:
-                 itree = iter(ElementTree.iterparse(self.conn, events=("start", "end")))
-                 (event, root) = next(itree)
-+                
-+                root_xmlns_uri = self._tag_xmlns_uri(root)
-+                if root_xmlns_uri is None:
-+                    root_xmlns_prefix = ''
-+                else:
-+                    # Validate the XML namespace
-+                    root_xmlns_prefix = '{%s}' % (root_xmlns_uri, )
-+                    if root_xmlns_prefix != self.xml_ns_prefix:
-+                        log.error('Unexpected server reply to list operation:\n%s',
-+                                  self._dump_response(resp, body=None))
-+                        raise RuntimeError('List response has %s as root tag, unknown namespace' % root.tag)
- 
-                 for (event, el) in itree:
-                     if event != 'end':
-                         continue
- 
--                    if el.tag == ns_p + 'IsTruncated':
-+                    if el.tag == root_xmlns_prefix + 'IsTruncated':
-                         keys_remaining = (el.text == 'true')
- 
--                    elif el.tag == ns_p + 'Contents':
--                        marker = el.findtext(ns_p + 'Key')
-+                    elif el.tag == root_xmlns_prefix + 'Contents':
-+                        marker = el.findtext(root_xmlns_prefix + 'Key')
-                         yield marker[len(self.prefix):]
-                         root.clear()
- 
-@@ -404,9 +423,12 @@
-             return
-         body = self.conn.readall()
-         root = self._parse_xml_response(resp, body)
--        if root.tag == self.xml_ns_prefix + 'CopyObjectResult':
-+
-+        # Some S3 implemenentations do not have a namespace on
-+        # CopyObjectResult.
-+        if root.tag in [self.xml_ns_prefix + 'CopyObjectResult', 'CopyObjectResult']:
-             return
--        elif root.tag == 'Error':
-+        elif root.tag in [self.xml_ns_prefix + 'Error', 'Error']:
-             raise get_S3Error(root.findtext('Code'), root.findtext('Message'),
-                               resp.headers)
-         else:
diff --git a/net-fs/s3ql/s3ql-1.19.ebuild b/net-fs/s3ql/s3ql-1.19.ebuild
deleted file mode 100644
index ba871ca91224..000000000000
--- a/net-fs/s3ql/s3ql-1.19.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-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-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/apsw-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.37[${PYTHON_USEDEP}]
-	dev-python/pycryptopp[${PYTHON_USEDEP}]
-	dev-python/pyliblzma[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		net-misc/rsync[xattr]
-	)"
-
-python_prepare_all() {
-	# use system setuptools
-	sed -i '/use_setuptools/d' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if [[ ${EUID} -ne 0 ]] ; then
-		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
-	else
-		addwrite /dev/fuse
-		esetup.py test
-	fi
-}
-
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.11.1.ebuild b/net-fs/s3ql/s3ql-2.11.1.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.11.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-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.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.11.ebuild b/net-fs/s3ql/s3ql-2.11.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-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.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.12.ebuild b/net-fs/s3ql/s3ql-2.12.ebuild
deleted file mode 100644
index 5ab6fccd8527..000000000000
--- a/net-fs/s3ql/s3ql-2.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-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.2[${PYTHON_USEDEP}]
-	>=dev-python/llfuse-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.14-r1.ebuild b/net-fs/s3ql/s3ql-2.14-r1.ebuild
deleted file mode 100644
index fac9efee1de3..000000000000
--- a/net-fs/s3ql/s3ql-2.14-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-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-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-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}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/s3ql-2.14-ceph.patch
-}
-
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.14.ebuild b/net-fs/s3ql/s3ql-2.14.ebuild
deleted file mode 100644
index e651e50c86e8..000000000000
--- a/net-fs/s3ql/s3ql-2.14.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-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-0.39[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	sys-fs/fuse"
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.17.1.ebuild b/net-fs/s3ql/s3ql-2.17.1.ebuild
deleted file mode 100644
index d19cb3ff1f2d..000000000000
--- a/net-fs/s3ql/s3ql-2.17.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5} )
-
-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"
-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
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/net-fs/s3ql/s3ql-2.20.ebuild b/net-fs/s3ql/s3ql-2.20.ebuild
deleted file mode 100644
index 9c3d9019d5a6..000000000000
--- a/net-fs/s3ql/s3ql-2.20.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-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"
-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.21.ebuild b/net-fs/s3ql/s3ql-2.21.ebuild
deleted file mode 100644
index e0e4b6b43963..000000000000
--- a/net-fs/s3ql/s3ql-2.21.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,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"
-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.23.ebuild b/net-fs/s3ql/s3ql-2.23.ebuild
deleted file mode 100644
index e0e4b6b43963..000000000000
--- a/net-fs/s3ql/s3ql-2.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,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"
-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
-}