revbump; convert -> distutils-r1, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 84 insertions, 75 deletions

diff --git a/dev-python/storm/ChangeLog b/dev-python/storm/ChangeLog
index 9a69774ac986..aceb90641dc8 100644
--- a/dev-python/storm/ChangeLog
+++ b/dev-python/storm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/storm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.17 2015/01/23 05:06:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/ChangeLog,v 1.18 2015/02/20 11:30:34 idella4 Exp $
+
+*storm-0.20-r1 (20 Feb 2015)
+
+  20 Feb 2015; Ian Delaney <idella4@gentoo.org> +storm-0.20-r1.ebuild,
+  -storm-0.20.ebuild:
+  revbump; convert -> distutils-r1, rm old
 
   23 Jan 2015; Manuel Rüger <mrueg@gentoo.org> -storm-0.18.ebuild,
   -storm-0.19.ebuild:
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
index 93553d02747d..5bb4509f5a07 100644
--- a/dev-python/storm/Manifest
+++ b/dev-python/storm/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX storm-0.20-exclude-tests.patch 358 SHA256 551c11afb5fa3985f01ea92df34a434a4662a52e3926929999c02a3401b8ef3c SHA512 cc621b324f747c984ee2f684a52be24e4ff26cc432f9ae0427d920a11e3201b3215061269dfc8277eea4707114a19fb70049b43917118a110cb9883a7c7f1a90 WHIRLPOOL d7c226b98e08b873347c2bd8eb9e49b6d52452248d060bf41d474df162a374b2b7d6696fb6693fb34fbfcbb8327c7c7351b7a1c35c25cff74ee1f40cbc3501ca
 DIST storm-0.20.tar.bz2 213069 SHA256 1fe016c9ec40520eafc3cf359f1ec2b7fa86be91e45c9279bfb0ea3b06390a82 SHA512 7a22c6a6fa45f7bbeeb5c6f934d6f889a6d90d78a6d3e3b9c6a6825485ec35301f573d08c619693a2587e795582db633254631c0be7cd8f1fee6b03a88378a8d WHIRLPOOL e18fb39e127eedd0f7691fc9b3c043b79da02beaab8088dc1f461cfdd23c91034ae6dbf3450a778ea2e06b93239463d5813015f5b6b6901f775da38b4188d2b1
-EBUILD storm-0.20.ebuild 2332 SHA256 f38fe3e25de822070d955d967e53fa3bf773dc7d5f6189b20799df7c84bef71c SHA512 83514be5b3dfa002e44c72b64a6e047faf5ca63ba4ddaba13d598aab49bc03daef037078d6ae3b29ac00776548daf1647b85a3f44b1d9d0be8d3c42e9ab6c35a WHIRLPOOL fb0a0050247a4ffd4eaf19e74b0f7c1073fc431d4159ac1f1c817464d04d6b88c7eab93f76071710489fed559ba2d33bf96335a1749fc6a7da4eaed48c8f0841
-MISC ChangeLog 2499 SHA256 020134e7518bfd90a6a695fac521a5ad20cf0d99930d3017c30c5fb46fac1796 SHA512 a0ebe1c99b6df7d7e112167eff6d67c6d9ebe931cce187d6bace637aa72125edf28dab22ba700ed84ff9d48cb2ac67e538ab491ce2bc093598336a7996469f2c WHIRLPOOL 063fb8e6449883a1cf55ec3f14d450e62351c045ffb94da38a7e515e0d96458c339f8b3f77722b2bd16cfce542108a4f93d7e3f345d79521cee80a063759e166
+EBUILD storm-0.20-r1.ebuild 2046 SHA256 05a6e0e0ad2ed4e85733bc32afc964426a19e12043b253db149d1dac30c8751d SHA512 0559d702b4bdb9053d0c2a7d94dd139df70f2c922c343e3811520c4a69c1bc2cab22a4d3336c997475b21cff3879a91ffe2357702f39552727127c91028f810e WHIRLPOOL 798d3e8f2d7b9d1e517f943fc7e77d6904e7fe8afad31c56ef70cd5a563bf2a5b4fdfb4de12518af62b3013db5952ffdac7ab1cf356d837676f408c34e8f4e2b
+MISC ChangeLog 2668 SHA256 0f376f57d1dec51ea4c0ebde8454efd128049475552286a07cf4effc6021b839 SHA512 6693e3055c8faa161c8089aba888a11794c232ed167abb8091c385c728b1a178335e0f46a341bdc86044f25489a7f1bd43093aac622eab94fae58d92ddc31bdd WHIRLPOOL 9fcc4576e4226ceece677f68bae4c635a0f2fd76aec1d2c2ff726b2ba9bd6a29d4b924b818ffb7a20804d52f4ba7c1b7250610162b4bb284ec198555e465b54e
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTnGuoACgkQso7CE7gHKw3RrACgrlyZtgZcScBGqPwPDSUeMgzQ
+W8YAnAtfvgpk69Z8Q88fpRdPL0ASnEdU
+=7gv1
+-----END PGP SIGNATURE-----
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
new file mode 100644
index 000000000000..9f05c02be4a9
--- /dev/null
+++ b/dev-python/storm/storm-0.20-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.20-r1.ebuild,v 1.1 2015/02/20 11:30:34 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1
+
+DESCRIPTION="An object-relational mapper for Python developed at Canonical"
+HOMEPAGE="https://storm.canonical.com/ http://pypi.python.org/pypi/storm"
+SRC_URI="http://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres sqlite test"
+
+RDEPEND="mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( =dev-python/psycopg-2*[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
+
+CFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+DOCS="tests/tutorial.txt"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" \
+		-i setup.py || die
+
+	# delete rogue errors in setting exceptions
+	sed -e '/module_exception is not None:/d' \
+		-e '/module_exception.__bases__ += (exception,)/d' \
+		-i storm/exceptions.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if use mysql; then
+		elog "To run the MySQL-tests, you need:"
+		elog "  - a running mysql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
+	fi
+	if use postgres; then
+		elog "To run the PostgreSQL-tests, you need:"
+		elog "  - a running postgresql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
+	fi
+
+	# Some tests require a server instance which is absent
+	"${PYTHON}" test --verbose
+}
diff --git a/dev-python/storm/storm-0.20.ebuild b/dev-python/storm/storm-0.20.ebuild
deleted file mode 100644
index ba7b5581fec1..000000000000
--- a/dev-python/storm/storm-0.20.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/storm/storm-0.20.ebuild,v 1.4 2014/08/10 21:22:56 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="An object-relational mapper for Python developed at Canonical"
-HOMEPAGE="https://storm.canonical.com/ http://pypi.python.org/pypi/storm"
-SRC_URI="http://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres sqlite test"
-
-RDEPEND="mysql? ( dev-python/mysql-python )
-	postgres? ( =dev-python/psycopg-2* )
-	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
-DEPEND="dev-python/setuptools
-	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
-		dev-python/fixtures )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-DOCS="tests/tutorial.txt"
-
-src_prepare() {
-	epatch "${FILESDIR}/storm-0.20-exclude-tests.patch"
-
-	distutils_src_prepare
-
-	preparation() {
-		if [[ "$(python_get_implementation)" == "Jython" ]]; then
-			sed -e "s/BUILD_CEXTENSIONS = True/BUILD_CEXTENSIONS = False/" -i setup.py
-		fi
-	}
-	python_execute_function -s preparation
-}
-
-src_test() {
-	if use mysql; then
-		elog "To run the MySQL-tests, you need:"
-		elog "  - a running mysql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
-	fi
-	if use postgres; then
-		elog "To run the PostgreSQL-tests, you need:"
-		elog "  - a running postgresql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
-	fi
-
-	testing() {
-		PYTHONPATH="$(ls -d build/lib*)" "$(PYTHON)" test --verbose
-	}
-	python_execute_function -s testing
-}
-
-src_install() {
-	distutils_src_install
-	python_clean_installation_image
-}