Version bump, use system setuptools.

(Portage version: 2.2.0_alpha186/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 74 insertions, 2 deletions

diff --git a/sys-fs/s3ql/ChangeLog b/sys-fs/s3ql/ChangeLog
index 1034ce90c940..2bbe96ae8081 100644
--- a/sys-fs/s3ql/ChangeLog
+++ b/sys-fs/s3ql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/s3ql
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/ChangeLog,v 1.22 2013/07/20 01:41:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/ChangeLog,v 1.23 2013/07/21 08:52:12 radhermit Exp $
+
+*s3ql-1.16 (21 Jul 2013)
+
+  21 Jul 2013; Tim Harder <radhermit@gentoo.org> s3ql-1.15.ebuild,
+  +s3ql-1.16.ebuild:
+  Version bump, use system setuptools.
 
 *s3ql-2.3 (20 Jul 2013)
 
diff --git a/sys-fs/s3ql/s3ql-1.15.ebuild b/sys-fs/s3ql/s3ql-1.15.ebuild
index c404b152c1c1..826fe1c1b7d3 100644
--- a/sys-fs/s3ql/s3ql-1.15.ebuild
+++ b/sys-fs/s3ql/s3ql-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/s3ql-1.15.ebuild,v 1.1 2013/05/29 02:08:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/s3ql-1.15.ebuild,v 1.2 2013/07/21 08:52:12 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -30,6 +30,11 @@ DEPEND="${RDEPEND}
 		virtual/python-unittest2[${PYTHON_USEDEP}]
 	)"
 
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+}
+
 python_test() {
 	if [[ ${EUID} -ne 0 ]] ; then
 		ewarn "Skipping tests: root privileges are required so userpriv must be disabled"
diff --git a/sys-fs/s3ql/s3ql-1.16.ebuild b/sys-fs/s3ql/s3ql-1.16.ebuild
new file mode 100644
index 000000000000..01d930c1dea6
--- /dev/null
+++ b/sys-fs/s3ql/s3ql-1.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3ql/s3ql-1.16.ebuild,v 1.1 2013/07/21 08:52:12 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured file system for online data storage"
+HOMEPAGE="http://code.google.com/p/s3ql/"
+SRC_URI="http://s3ql.googlecode.com/files/${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
+	virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		net-misc/rsync[xattr]
+		virtual/python-unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	# use system setuptools
+	sed -i '/use_setuptools/d' setup.py || die
+}
+
+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
+}