revbump, migrate -> distutils-r1, rm old, patch to fix tests

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

4 files changed, 57 insertions, 17 deletions

diff --git a/dev-python/flask-themes/ChangeLog b/dev-python/flask-themes/ChangeLog
index 5a4278ded95e..79d212248c9f 100644
--- a/dev-python/flask-themes/ChangeLog
+++ b/dev-python/flask-themes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/flask-themes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/ChangeLog,v 1.2 2011/09/08 07:20:02 rafaelmartins Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/ChangeLog,v 1.3 2013/06/10 13:12:38 idella4 Exp $
+
+*flask-themes-0.1.3-r1 (10 Jun 2013)
+
+  10 Jun 2013; Ian Delaney <idella4@gentoo.org> +files/fixtests.patch,
+  +flask-themes-0.1.3-r1.ebuild, -flask-themes-0.1.3.ebuild:
+  revbump, migrate -> distutils-r1, rm old, patch to fix tests
 
 *flask-themes-0.1.3 (08 Sep 2011)
 
@@ -13,4 +19,3 @@
   14 Dec 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   +flask-themes-0.1.2.ebuild, +metadata.xml:
   Initial version.
-
diff --git a/dev-python/flask-themes/Manifest b/dev-python/flask-themes/Manifest
index 433b3f555daa..5f72c6a15916 100644
--- a/dev-python/flask-themes/Manifest
+++ b/dev-python/flask-themes/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fixtests.patch 1036 SHA256 b63d6a26e0374403bd3014c82ba6a31bc0b178ee56f3199d9b6a2b6cff221bbd SHA512 a3ca31a2bde1539b0ae2a552952f8ef82f7979446eaf7874029d65362bb30151a396becef07f97c12bd5d3264696ee66f2213cd7b3a305bc7ff6faa628320575 WHIRLPOOL 97f47ac8a812a0ae3d07a9b100c2c9cd1af5ed183e535fe2448468cff83523a678cba657fe6b1a2417457f37b470954dd8d007a8cd7f5a809245619a02d38a45
 DIST Flask-Themes-0.1.3.tar.gz 9723 SHA256 0586fdd29a4ccfaa37effc92652a3fe50c6a37d929493d5ab7b4b747be08d9fc SHA512 baf609b8b08446dda5b5d6d39bc0a2e7406f9270d70924c795243384be8967c82f82adcebe5e060352a0c33b763d600eeb5600d3116c10bdbbb3ceddfadf764a WHIRLPOOL 7c77e4ce39d3c9e1ac9f4fb5d3fe9b3bea71a71a2619e11a0bcbd413bd9215606f1beb76ca27dcbebd2dfefcfe835c84eb2a0bfc337a17ee9aa021edad75aeab
-EBUILD flask-themes-0.1.3.ebuild 905 SHA256 0c038299d5d6a5e5720717f3952d83944ad5c28aaf477b90d0f3a811e2f65209 SHA512 e329a666989f35ef1eb1f7c6edab70773516398734edc7f85dacd002b523301e3596c527b24e69371d66410ad71cbe8647fec4692e26c9d51de4e53e99d0de55 WHIRLPOOL 53b1226c11335a1d24abba8ed9b6149573681a50f7d6bda00ad2dd6464c96b8d1b6b59f7096f49d6bfa89e16c7553f8b26344a5acd290cca735ca85854cced05
-MISC ChangeLog 597 SHA256 36955a7078c029246d8d816c1fa0aed8fb524388bf8e30cb499e94eb66b54295 SHA512 db237f335521d45105b172650024ce01569a9be6342729eaec50e5092217d958f6ee20168226dc4fc28b5fbcb6abaa7534005268d7f641b1c98af9721d394d4e WHIRLPOOL 95e555464f2b513a7e2003448639d51cc796921dc00f17495e324e234c54cab5d3dc0ae417f94888e64fb9744616bcd58c129ca498b202ba62464a145c846c33
+EBUILD flask-themes-0.1.3-r1.ebuild 939 SHA256 d68f069db76afee520cf09515bc2387a45019f4599919fc8d21315e0f6f00e1e SHA512 272460bfd5e91cfcb11f48c9d30a1890dc8fbb1f5e33e2bc82605bd2adcf92d313e2b644fd373aaaa929fcf44cd3835918eaeb23460c496f24f0dd608e14362d WHIRLPOOL 9ffe0beb49be61c81c2020a00850dd0957464529a3e9172466b212c146044bc0c8b3012ab1bb8bc4661fc4c72791abbbbd66cc37fe16c9cff591b0563d45dd90
+MISC ChangeLog 824 SHA256 105bdfd9e23133edc18f5dbb6d9b1048bf24b3d5ddcba0e3ac2c8a33f09db388 SHA512 596a1320913e14066b80a62798b683845cbc520745aeefbdceb757dbc00232a4f5e24b3edde08f01f61a9539afa63a6611f9eaa6a11e855fe06d6112259880db WHIRLPOOL 86c22f3a45f6f79ffc06052bcf97d005cdc964408e84bdf2a0c3381d2fbe0c4af6a836a552d047657d106d83fc5f035a5677036543b027f77ed080cd2eed25de
 MISC metadata.xml 235 SHA256 2e24c5cf0ccf5654e879ec808dc0bc236aee82ec1894b9e0d370e4c6896ad639 SHA512 64c77dc20ac71e02ac8959a28bd6f5babcd944891ab094df9b3a7414075ab64cb24d73be3eb34464ad250b3d734799e6f630f44455ccac09267b1141d2b98a48 WHIRLPOOL 2efc139432498961bbc24ed7bd7870d60d44ee70bf60c7a74107d9126df6c048d99e512a489eca088f85e5e509dcda324868568341531fb323696fa927697577
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlG10M8ACgkQso7CE7gHKw1fgACbB7X2cx1Vs/xMMiWht0K1FLGk
+WZQAoI3jhRasYWi/suUrQcS8jTQbd60Z
+=Y6Dd
+-----END PGP SIGNATURE-----
diff --git a/dev-python/flask-themes/files/fixtests.patch b/dev-python/flask-themes/files/fixtests.patch
new file mode 100644
index 000000000000..014508e4ddd2
--- /dev/null
+++ b/dev-python/flask-themes/files/fixtests.patch
@@ -0,0 +1,23 @@
+diff -ur Flask-Themes-0.1.3.orig/tests/test-themes.py Flask-Themes-0.1.3/tests/test-themes.py
+--- tests/test-themes.py	2011-07-14 06:36:33.000000000 +0800
++++ tests/test-themes.py	2013-06-10 18:20:25.901480529 +0800
+@@ -129,8 +129,8 @@
+         
+         with app.test_request_context('/'):
+             assert template_exists('hello.html')
+-            assert template_exists('_themes/cool/hello.html')
+-            assert not template_exists('_themes/plain/hello.html')
++            assert template_exists('cool/hello.html')
++            assert not template_exists('themes/plain/hello.html')
+     
+     def test_loader(self):
+         app = Flask(__name__)
+@@ -140,7 +140,7 @@
+         with app.test_request_context('/'):
+             if USING_BLUEPRINTS:
+                 src = themes_blueprint.jinja_loader.get_source(
+-                    app.jinja_env, '_themes/cool/hello.html'
++                    app.jinja_env, 'cool/hello.html'
+                 )
+             else:
+                 src = themes_mod.jinja_loader.get_source(
diff --git a/dev-python/flask-themes/flask-themes-0.1.3.ebuild b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
index b23a9bab93d4..329e8bcd8852 100644
--- a/dev-python/flask-themes/flask-themes-0.1.3.ebuild
+++ b/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2011 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-themes/flask-themes-0.1.3.ebuild,v 1.1 2011/09/08 07:20:02 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-themes/flask-themes-0.1.3-r1.ebuild,v 1.1 2013/06/10 13:12:38 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="Flask-Themes"
 MY_P="${MY_PN}-${PV}"
@@ -22,11 +19,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-python/flask-0.6
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )"
+RDEPEND=">=dev-python/flask-0.6[${PYTHON_USEDEP}]
+	virtual/python-json[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
 
-PYTHON_MODNAME="flaskext/themes.py"
+PATCHES=( "${FILESDIR}"/fixtests.patch )
+
+python_test() {
+	PYTHONPATH=.:tests nosetests || die "Tests failed under ${EPYTHON}"
+}