summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2016-08-25 17:24:35 -0400
committerTim Harder <radhermit@gentoo.org>2016-08-25 17:33:23 -0400
commit64265cfc2773d640695cb58330882ceeb69aaadb (patch)
treee38585c84011a6aa0a26f3b017fbbb709d0b3085 /net-fs/s3ql
parentdev-embedded/gpsim: version bump to 0.29.0 (diff)
downloadgentoo-64265cfc2773d640695cb58330882ceeb69aaadb.tar.gz
gentoo-64265cfc2773d640695cb58330882ceeb69aaadb.tar.bz2
gentoo-64265cfc2773d640695cb58330882ceeb69aaadb.zip
net-fs/s3ql: moved from sys-fs/s3ql
Diffstat (limited to 'net-fs/s3ql')
-rw-r--r--net-fs/s3ql/Manifest7
-rw-r--r--net-fs/s3ql/files/s3ql-2.14-ceph.patch75
-rw-r--r--net-fs/s3ql/metadata.xml15
-rw-r--r--net-fs/s3ql/s3ql-1.19.ebuild61
-rw-r--r--net-fs/s3ql/s3ql-2.11.1.ebuild55
-rw-r--r--net-fs/s3ql/s3ql-2.11.ebuild55
-rw-r--r--net-fs/s3ql/s3ql-2.12.ebuild55
-rw-r--r--net-fs/s3ql/s3ql-2.14-r1.ebuild59
-rw-r--r--net-fs/s3ql/s3ql-2.14.ebuild55
-rw-r--r--net-fs/s3ql/s3ql-2.17.1.ebuild55
-rw-r--r--net-fs/s3ql/s3ql-2.20.ebuild55
11 files changed, 547 insertions, 0 deletions
diff --git a/net-fs/s3ql/Manifest b/net-fs/s3ql/Manifest
new file mode 100644
index 00000000000..240e07c17b9
--- /dev/null
+++ b/net-fs/s3ql/Manifest
@@ -0,0 +1,7 @@
+DIST s3ql-1.19.tar.bz2 641689 SHA256 280271c156d027583ba4aa94c2fd189c3d63dd833cd4fd3c5c84bf97cb2d96c7 SHA512 5751f4d21abdc3996d877785bb07752fca75ec60ad716a102f666b5329e9b225519c4365c93031e056db78e3bffc80a7a1afe227c375e1c19e35b8bdffe5a0bf WHIRLPOOL e7025a95cf9aaf48ec7a7091e0d91cca1f8d15cf62901cbf9fb853b4c3b09ffe9e4ca6b1added432825c3dccec398ff31c85fba9375a72fd489bffcbf0f3c399
+DIST s3ql-2.11.1.tar.bz2 897259 SHA256 15c09a7b733d2b7a0eced31f0bfc4b423f27c70b5f20ce47d2f2ab270a829560 SHA512 72e873f0d23dd86ca5f7a65809189225feff0f6f14bb046dcc8117f3eb725c3327408fe504ffd80566d70bad620b5f5c34174784f1d318bf1f7e6abf4edcb1a7 WHIRLPOOL a59c4c3735081e21dc103dbf531c162bfcaa7fae45b7d8ef81e5dadeaf24588fed1cfc913643c64bc39e52df47f1a21d2b8f4920cdb2632f1053ae4cc7ff9363
+DIST s3ql-2.11.tar.bz2 867710 SHA256 bfa893ffbe26f3b3480c6e60664ca33af3c3d65b05767b759d5ed6b580c57b3e SHA512 86f3cb3294f38ab25ddf593dae2ea36af6d4df8871e15b3c99bddd7c8c5c038ab5cd0adaf067afb508dd3f7e163e8b86ab7994f2401cf33543cdeb43bc9fdb9d WHIRLPOOL a4e01f0971e687da594d1c106866cf05b7010e56091c6ddad635039d455a7c8973a6fb37de1ffa71efd1b314cbd533ac380c8b508e7e4e9c752a40300f1d9126
+DIST s3ql-2.12.tar.bz2 906837 SHA256 1b8c727fe2490328ba880218c57e29b2c3376600e529f576629c443a5b7c8b81 SHA512 51c90a983a6b076fd70468406e6a1c74592b85458068bc07325d43b75d1ca50fb80694fcab83e6c41a1e3ac8209a203716624971be1cecc9cad75a8f3f4761d9 WHIRLPOOL d5225a104c7b02fe0a17a86ad6f48eeb17265aa74a2de793829b5a3b84a3d60ec5039839f801a1c8648f58e5007ba021ca949a7384842993f2b4a3e3e06f4393
+DIST s3ql-2.14.tar.bz2 907415 SHA256 2f4e4bb27b2ad5eb8d2f1ab8c7c5a643a031dee635b582bad77b4348f747098f SHA512 8ada75934e438928bca03f59fc6b08f013887dfc926bfe1069108cf9172c1fbf20229db4c6248022b9af1e7f52ec9cf1ab536acddcc8993ca55f59a7be43c218 WHIRLPOOL faa06a2b637f58167e810bbb4a61942cbecac83c741e2adbbc9ce728edf5f202e6d78565f5d2e4b9ebad90629c698db8a578049b174578401b6544e8d2c87c3b
+DIST s3ql-2.17.1.tar.bz2 957313 SHA256 fddd00f576048b25eb4263c6c07acb500f6203a0e2e59336d947453ff7be3b11 SHA512 dd2c16dd30c0f103e0cdd42329b2cf242dad7edf2aed773746a8e00cbfd3e4735174293347fa68bceacb2a8379099356b32b2c35e9f1c2524740e92929185611 WHIRLPOOL ab141c383b9ec933a14d49524586e3d45f3d9bb52396bd6b7ac43929d3ec6595afa642a94b8686170db7d8ceb55b816498098cae22121e963f4ec95a794a3241
+DIST s3ql-2.20.tar.bz2 726268 SHA256 08b7365cc2c0a7ff1f12c8a92aa71b9bd42a0af6d7f17e225f617b85f62e0692 SHA512 a5a25a7b02c3d7bf5f87ad0130d24b8e0b95f20a269d74b35edeaec1a47011e30a3d1416c3d8332075be82dc09733321da8e7e4200893d893f37d1e4970cf7fb WHIRLPOOL f87d49d466a4322ff42d8070063b46072b1878abccef934504f40ce9764f9061e8ff4eb6f8b7681423d47eeba68340e71b6cd0f7575c008bd12279af69f44006
diff --git a/net-fs/s3ql/files/s3ql-2.14-ceph.patch b/net-fs/s3ql/files/s3ql-2.14-ceph.patch
new file mode 100644
index 00000000000..f5b4c3b123e
--- /dev/null
+++ b/net-fs/s3ql/files/s3ql-2.14-ceph.patch
@@ -0,0 +1,75 @@
+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/metadata.xml b/net-fs/s3ql/metadata.xml
new file mode 100644
index 00000000000..38ca05fddf8
--- /dev/null
+++ b/net-fs/s3ql/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <use>
+ <flag name="contrib">Install additional contributed scripts</flag>
+ </use>
+ <upstream>
+ <remote-id type="google-code">s3ql</remote-id>
+ <remote-id type="bitbucket">nikratio/s3ql</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/net-fs/s3ql/s3ql-1.19.ebuild b/net-fs/s3ql/s3ql-1.19.ebuild
new file mode 100644
index 00000000000..14374669fd2
--- /dev/null
+++ b/net-fs/s3ql/s3ql-1.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
new file mode 100644
index 00000000000..cf5f32acae4
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.11.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..cf5f32acae4
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.11.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..cf5f32acae4
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..50dd9cc1aae
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.14-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..e9c5940a60b
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.14.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..f0dc2945868
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.17.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,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
new file mode 100644
index 00000000000..099c1db4224
--- /dev/null
+++ b/net-fs/s3ql/s3ql-2.20.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_{3,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
+}