revbump, migrate -> distutils-r1, drop old

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

4 files changed, 28 insertions, 55 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/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 18aa7a743b40..64870f568888 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST Flask-SQLAlchemy-0.15.tar.gz 97763 SHA256 21345eaeb581035a5e21cda1042e6d41ba169d9f86047f0baea5239be8ca91c2 SHA512 f9c6fdeb965c5bffcd45384ce214ebb5a42930d719e9a5fd47cb987168e3c11ba555166e4f816bc66e3c9102632c0c0c14d3060d62af98c0f6d21e41dec9fbe4 WHIRLPOOL 03183fba573c0cb478f73edd9f24a2cfeca95e9d1e41346db772afd9856d3dc2be144080e92c79cb599a274a00e9c2886cf0527d63abe0140b3d63ad9f2d1cec
 DIST Flask-SQLAlchemy-0.16.tar.gz 97968 SHA256 eaffc4252657229bb8da7447726e9e74b83087b96a3b8990121361b322985b6f SHA512 a6a8f5043aba14fb7fc2c59631d76ec0277d1a01f8b6bd4890271a59f9480ed40665747630194a43a5c19f694e932f86e56b1dfe4a3060176941c82c310ea5fa WHIRLPOOL c3f5fc30c956d39518229289cf7017b589392e18b448d2ec9d5650ed21d5d26309e1f2a60e4bc0e4e5f5cc8fc943f51f0cdc9e8f99d801ab6bfcb6c9600499c6
-EBUILD flask-sqlalchemy-0.15.ebuild 814 SHA256 68dbfe68e308581d29f5696336ce96acf48be0c7c08d7a5033f9c41eed0652f3 SHA512 8ac704cc73b58acd234ff2c117574351ec884697a949612b52547bec699fadacf6dfc88f6eeaf5413c2d7526a10dc7f11b673b352a32ed1c907898358ea4559c WHIRLPOOL 1977107da8923fa88bb2accc0fb00fe47845f32a05147bc77a6bbeda116988742e2baae54a91dd201d579a03bdf1b4762a12eb223cd7db0619b9bf2b029be26b
-EBUILD flask-sqlalchemy-0.16.ebuild 868 SHA256 abb2dddec546c4ef52f8cee12632e492953b9083442b43da94f6aa32072827b5 SHA512 8ee6ea16257db63865630b5345b5263d7af65d866d183debe8a0f0df8dabef44090e564447b7fe0e938d656d25275cc983cf544b3f30ff5f414a722060686d6c WHIRLPOOL 4591a6bdf99e415fdc5e27df7bdc60d25b3ecb1eec3d2045022591b4adb454068e290362542428afd83157e96816f87001c79d18ca71544297c50bdd80f860bd
-MISC ChangeLog 1623 SHA256 2641e0c45a0e0de98bb9298633dbcad82724b0d5d8b53d0605d51f03b3236b2c SHA512 b709b020421db9ce33830f1a8b623b859bdd49d95bf864f4c04d6d645e4a3605ea729b7126a5ab27950e0f13e66a43f09f90e27cdbbd44dca1fca1bf2194f063 WHIRLPOOL e499fb2d795f6f0a63b572cb1bc8686cc9deef41a3d8cb7efcbc1eff2f71a8dcfc7a1903559645914415ec1e1f101301b66e999bad18b8f7010463e85622db7f
+EBUILD flask-sqlalchemy-0.16-r1.ebuild 974 SHA256 ac1ee9bc5cbecd1858395cbade125dcef178cc178916ef9870fff3e69e34386d SHA512 a11fb501776d1c772007e54397082e08c5b8cdb1be68505482e7c7a07ab22bd687b494dcaa7639c60ccffa1ad6029701447598ea790df40bec05266b04f9cfdc WHIRLPOOL 1621dd0e8a346d05e804c98a40f903b2960740a2a89d617a8f8c920b8f42f2460e0e623dafd4828d2feefa5e9711312a5b89f4373503772b5fc7e58740b0b6ed
+MISC ChangeLog 1858 SHA256 4e614fa1c7b880b7cf1d70cfff4c8348476fb017419b565a83f96ac32fef94e4 SHA512 4aefa099eadbeb8f952950f6d926c7759e545fc27c82052bd1dd53601bc9e582a404def576cf6ff1c5322e1a5288b100febbb1fd6c4cfd2421db1a39bbe837f2 WHIRLPOOL cba60ec95e46c967ee272ff2f70c186a08e914c98bb7af66a83215cb5fb2cd892141c17ae437656be647298129894988a51c2509c2a228cd75d87b74e0c81a27
 MISC metadata.xml 304 SHA256 7d339f5da4d642654892ed51d208a41ccb89ae5ea3060b04b43363b43f241f50 SHA512 247ceeba9a7fa6c297bc76969e81817c9a6112da522e8b0f1dd3e08ec1b5c3683f4be91bdb0647d493c4bbf850f7b16c70ec484225d6ca770170bde0f928004c WHIRLPOOL c139aed71bc851493bfaffc13848b842e7a1bfbdbb9e732ee3de174d702649c853467ef226d0103d2a9830dd8b9b65a129633cb37c2b8e73d862454cc4f76a88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCl2+oACgkQso7CE7gHKw2YbACdGkWj4pK8pougGlfvJH3l+iXh
-t9UAnRnz7X7nYdQIHZYP/eWiQgpnlPPL
-=jB/I
+iEYEAREIAAYFAlGjXscACgkQso7CE7gHKw0ryQCg36M201pWrOlrZ3VyToAHBoON
+OJ8AnAmrRUEa51/MP0fA5XIRdWhTSzvx
+=O0pd
 -----END PGP SIGNATURE-----
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}"
+}