revbump, migrate -> distutils-r1, drop old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 23 insertions, 48 deletions

diff --git a/dev-python/flask-sqlalchemy/ChangeLog b/dev-python/flask-sqlalchemy/ChangeLog
index 6335f9b215e2..062c591e81f7 100644
--- a/dev-python/flask-sqlalchemy/ChangeLog
+++ b/dev-python/flask-sqlalchemy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/flask-sqlalchemy
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-sqlalchemy/ChangeLog,v 1.8 2012/11/15 14:23:34 idella4 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-sqlalchemy/ChangeLog,v 1.9 2013/05/27 13:25:11 idella4 Exp $
+
+*flask-sqlalchemy-0.16-r1 (27 May 2013)
+
+  27 May 2013; Ian Delaney <idella4@gentoo.org>
+  +flask-sqlalchemy-0.16-r1.ebuild, -flask-sqlalchemy-0.15.ebuild,
+  -flask-sqlalchemy-0.16.ebuild:
+  revbump, migrate -> distutils-r1, drop old
 
 *flask-sqlalchemy-0.16 (16 Nov 2012)
 
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.15.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.15.ebuild
deleted file mode 100644
index b7a093b81014..000000000000
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.15.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.15.ebuild,v 1.1 2011/09/08 07:03:16 rafaelmartins Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="Flask-SQLAlchemy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="SQLAlchemy support for Flask applications"
-HOMEPAGE="http://pypi.python.org/pypi/Flask-SQLAlchemy"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/flask
-	dev-python/setuptools
-	dev-python/sqlalchemy"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="flaskext/sqlalchemy.py"
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild
index 6e98d8c3816c..8b1e786ed89f 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16.ebuild,v 1.1 2012/11/15 14:23:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-sqlalchemy/flask-sqlalchemy-0.16-r1.ebuild,v 1.1 2013/05/27 13:25:11 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="Flask-SQLAlchemy"
 MY_P="${MY_PN}-${PV}"
@@ -22,15 +19,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/flask
-	dev-python/setuptools
-	dev-python/sqlalchemy"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PYTHON_MODNAME="flask_sqlalchemy.py"
-
-src_prepare() {
+python_prepare_all() {
 	sed -ie "s/flaskext/flask.ext/" test.py || die
 }
+
+python_test() {
+	https://github.com/mitsuhiko/flask-sqlalchemy/issues/128
+	nosetests || die "Tests failed under ${EPYTHON}"
+}