update HOMEPAGE, add patches (from upstream) to fix broken tests (13 months old), update ebuild accordingly

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

5 files changed, 89 insertions, 24 deletions

diff --git a/dev-python/flask/ChangeLog b/dev-python/flask/ChangeLog
index a762e4aa51f4..82cb9371a87a 100644
--- a/dev-python/flask/ChangeLog
+++ b/dev-python/flask/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/flask
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.34 2014/08/21 08:23:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.35 2014/09/29 03:30:24 idella4 Exp $
+
+  29 Sep 2014; Ian Delaney <idella4@gentoo.org>
+  +files/flask-0.10.1-sort_json.patch,
+  +files/flask-0.10.1-test_appcontext.patch, flask-0.10.1-r1.ebuild:
+  update HOMEPAGE, add patches (from upstream) to fix broken tests (13 months
+  old), update ebuild accordingly
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> flask-0.10.1-r1.ebuild:
   Stable for x86, wrt bug #518474
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 629a7191ae1f..98ab03c811d4 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -2,26 +2,18 @@
 Hash: SHA256
 
 AUX flask-0.10.1-is_package.patch 655 SHA256 cd564c6aa58798e61a0759645ebd6ffbbdb1f694d8749d5ecb49d85b2cb30314 SHA512 d68d5db64f629f106151bfe8b4ddbc837a38f54e4a55897e64abccd48f533ffdad0395428e2e5f39f9f733ca20b08170de21f5250e522a78ea95631410915d50 WHIRLPOOL 4355b5ec26b24dbbee2a01659a8ec053a17442087fde41fd59bb8cd1fad780e554985f3428d6d21dc2f5b5bc89777f2224e8e6d80eec44df62cae5bd3e168a20
+AUX flask-0.10.1-sort_json.patch 1563 SHA256 50449f406b0164a5f2d1934e0f7f24aa48967fc434d93b3953bd4699bb32941c SHA512 d03d38d6a8cb96ee56c6f678955fea60df151a712d0bc42eb98464817bf436e6846b445677d8a961e13f2c6f6774c44a3c4fd16a1656107212852632f0bc708b WHIRLPOOL 2f66700910a5abeddc4bc8d8b9a3887a6ac6f829d38ae918bc38d713229d3589f81ddc814a311499148e096d3ff22bdecc26069f89be291539d56ae5cb79f9c8
+AUX flask-0.10.1-test_appcontext.patch 550 SHA256 866872ac74d58dc024dfbffbb6d16cddb18a09f1db69d6700d2b6ab26e4d7e27 SHA512 5510d536ee432429ba2f0da8248653192e9e5ed9ad107b05dd3cc640d63039327f1f495148da5b7de403cd124d04760fb94d185b6b774ce39a8ebb171bca4d61 WHIRLPOOL c9af7a75be4e6dc3b62b55248443686a2918826755be73ed9a11db7856254e163a6deacb00fa11dba4dc58398685a2ec11750a7dc1b78c2cbc6f85d18349354c
 DIST Flask-0.10.1.tar.gz 544247 SHA256 4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373 SHA512 0008d62d03a46b071c7d0510513d011a9bfd2b77df7f677371a446ca9805d16b1ee5e17dd8dd7cde6443a629370234e44735e20381de20a7da385969797f053f WHIRLPOOL f30a306ed00fe6d4c8e47b781c556c576b99b3545f833ae06f6b778d91c3127dc0adcc34d48221a0f1db1bb1633f2329d6085b7a4550afc672530525fdff474f
-EBUILD flask-0.10.1-r1.ebuild 1807 SHA256 0029192c9fb28c52c69394d34462e5c7c01930be9fe1114895d0c7f65dad1146 SHA512 68105805b081f694d9edccf929a2877aa35d0665d3af455a3eacc9084d9f486b2b4021a4bd7ceb6e4c78d11775e621753cf73299398e4fdb6494402807d9214d WHIRLPOOL 5db411579df475ad7237206fbbf388e4c3af92b5b9b2178dd40466d94d33e3a05663d9f7350f27c3bc2a88d15ede9c9714ace8a6420f92282da6360230878422
+EBUILD flask-0.10.1-r1.ebuild 1735 SHA256 adc2bb5bb1d76b3fe8cc7cc5c04a4b668e2d62e28c63efbe4ff4a895e891ea31 SHA512 24e52ca5b1cfb47ce5295dc5b4d97a13473348760ac760b8d17a25502af38fcddf19189f207c9f83b2296c3952039ffd1bbbf6b0c557c0fa5166c4606e2cab28 WHIRLPOOL 5c38d6d4e5e60f532ac363b0fca2c7a0ed5625ee31d1501429376e0f7d407dde03bc8e617715e377d081ddfdf508f2c6b654f1aefb14197c6a0712098a206a86
 EBUILD flask-0.10.1.ebuild 1111 SHA256 dd7a6a7baca42d24d355a0512a8e9372070448e9135c1f9b162acd73b0bcabdd SHA512 73a2a8a5c51f950482e15000f0c6c966e21a229edb3dddb85d985b65dd2dce45f4d92cfc2c18345f56a1c028373c26c7690b90980f336fcb145c2fc0566d9db6 WHIRLPOOL fb08d36ebf5bd239959c414015180f96bd104645a9ea31866e44e74355ddf8110964a80f962ef7a7cf806e04bb69c3b3895ab2c1b3d2e77ddd78a2b91fa2c27a
 EBUILD flask-9999.ebuild 1250 SHA256 e7a9351a5cf683ea7766dd39ad2fdcf75cefdc2dec38f5d24b3ee1336a48e037 SHA512 bd5a98ab46e1832ed9ac529221d6a90ccca66e031ca5a073c8da600519b1d0c39ce51b98d8cd3dfb028e7540ba0981823f67a39819fa7703449b18cdb4ab1962 WHIRLPOOL d306896b612f79dbcb1e3e4904344bb1ed52fcdaa06a87420902e0b8ee364f24b681ed79d0ab85f05b9ff586b90470369220a9a7d46a08b22b4f6c61a6b8ffa5
-MISC ChangeLog 4788 SHA256 a680710120cf40a94dc6e370beeac983568377755155a8170ccf3ccd9e58a909 SHA512 b033b9a2becc69f920935e52aba5b2ee1f397333dfe3ac9517879cc46e458d2408bd86355cd5d54996352583e6cdf6ac7f2ac60519f2954cadf43970624afe9c WHIRLPOOL 4b4ea26db2e7c95cd00f2483e2459be5d62ecbe4abd9c7db66baa5b89c5abbbd940b0fb1964dcb1fa6b016d87f67a6aa7a918485e0909be5fc0a8f9d835d4648
+MISC ChangeLog 5061 SHA256 71f43e215716cd247e1edcff0c005a2cbd77d54a2bbd5bc67753d529917ae279 SHA512 84f26ba7ca78f443510623835925703ddcb9b13ecc7abe3df586058808e109759a1c10016661518f99cc0e030170838cf92b15c3c292af8993113bc81bbc26aa WHIRLPOOL 42423176ef3805415d4b2a1481ded2668fc0bc0dbb8fd2db726712699ce58f026e85a731ab4dc99db55071411eb1a68eb9788e34855a348974fc0f1f29a0af74
 MISC metadata.xml 228 SHA256 fb512dea8a54907a0d04e012d7a0b47a7f884600d1e1fcbd5094a17dde3f3cfe SHA512 147993a63e6528ff1250a76caf4b923d2307ee987eb38bb5cc9d61465c4d6156e65aa37e12377f56d70d8214a8a919fcb4cf9d461804c29d8b231072a179bc49 WHIRLPOOL eac02505f094986ae26315962fa10eee56249e432f5de219de3fd06d601eb0cadf8bb0b55fdd8055340f39a168791dcd8d3817074fa309adfb75e2841f6eaeda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJT9axnAAoJELp701BxlEWfNjwQAInWZJbLgCEAmYe/67vRID0B
-D7tRi57gn+T46nMlRXRMVTI4uLuIDlnBQjBiqzUGdI8sIRc5S/vbuaiDgtNgo4Po
-8egsTLm+elQdfYR8hNlBBn/P5KQUGdZH1ilRQcLnZ7Ec5iXoG4uNlXu4IodrLhBX
-6CAisnktk+kJ/U0qoj9TqjmmuiKbXwbo/aNwjD+dLx57RrfWFu0LT0IKkX+aRs9E
-IYE2gjCD8L5hv4iEDUCyc82OqwqKfttzmZMNzzcT/AjOv15JoTCyWs6JdjH34D4d
-AKZPfLzceXvwOkQVL4NxZYp9Os0Jqpc6bRgEcd311rBtLXgq5zAD/bp/ohQJVQQz
-zjKAamT87efAn8drQd7Wo2kzXums5l1MsRKkw546QUIbLb8/BPSRgW9+92KF2NBI
-GDdX6S7R3L/oabbYq2GiVXbKKIJlf8Ul63fv/CsSMjhfNF949oK73RoXlUnPhQta
-qBFZWIZHwd/5gESSAw7v0S5uvljZfkbuiGzA+v1HfbMuf9Hps4vcKPxmZzDiPqBy
-enJziQBcDlqoPWmuNIEszE2cfcbaFZ5fpmp+guPMf06PM7USqWAYhmnaGtymWjlm
-W4NJiQdfdT9I4w2Tlo6sYNSXfuwB/+1tGJxmwMyS32x16k/xvtuBByfaLACwocWD
-U6QsYwpBggMGCQjlzWpu
-=mT6e
+iEYEAREIAAYFAlQo0BgACgkQso7CE7gHKw3i8ACfYGiXBMTQg+zFB/9WcqwpPBax
+prQAnAkkMqoQ7r7UnwmJ/lVhq6neEtCP
+=ArKU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flask/files/flask-0.10.1-sort_json.patch b/dev-python/flask/files/flask-0.10.1-sort_json.patch
new file mode 100644
index 000000000000..e78cd0dee825
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-sort_json.patch
@@ -0,0 +1,54 @@
+https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5
+diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
+index 636f67f..7de70c0 100644
+--- a/flask/testsuite/helpers.py
++++ b/flask/testsuite/helpers.py
+@@ -173,7 +173,33 @@ def index():
+         c = app.test_client()
+         rv = c.get('/')
+         lines = [x.strip() for x in rv.data.strip().decode('utf-8').splitlines()]
+-        self.assert_equal(lines, [
++        sorted_by_str = [
++            '{',
++            '"values": {',
++            '"0": "foo",',
++            '"1": "foo",',
++            '"10": "foo",',
++            '"11": "foo",',
++            '"12": "foo",',
++            '"13": "foo",',
++            '"14": "foo",',
++            '"15": "foo",',
++            '"16": "foo",',
++            '"17": "foo",',
++            '"18": "foo",',
++            '"19": "foo",',
++            '"2": "foo",',
++            '"3": "foo",',
++            '"4": "foo",',
++            '"5": "foo",',
++            '"6": "foo",',
++            '"7": "foo",',
++            '"8": "foo",',
++            '"9": "foo"',
++            '}',
++            '}'
++        ]
++        sorted_by_int = [
+             '{',
+             '"values": {',
+             '"0": "foo",',
+@@ -198,8 +224,12 @@ def index():
+             '"19": "foo"',
+             '}',
+             '}'
+-        ])
++        ]
+ 
++        try:
++            self.assert_equal(lines, sorted_by_int)
++        except AssertionError:
++            self.assert_equal(lines, sorted_by_str)
+ 
+ class SendfileTestCase(FlaskTestCase):
+
diff --git a/dev-python/flask/files/flask-0.10.1-test_appcontext.patch b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
new file mode 100644
index 000000000000..11dee7a9f6bf
--- /dev/null
+++ b/dev-python/flask/files/flask-0.10.1-test_appcontext.patch
@@ -0,0 +1,14 @@
+https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c.
+diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
+index e061932..45ca45d 100644
+--- a/flask/testsuite/signals.py
++++ b/flask/testsuite/signals.py
+@@ -102,7 +102,7 @@ def test_appcontext_signals(self):
+         def record_push(sender, **kwargs):
+             recorded.append('push')
+         def record_pop(sender, **kwargs):
+-            recorded.append('push')
++            recorded.append('pop')
+ 
+         @app.route('/')
+         def index():
diff --git a/dev-python/flask/flask-0.10.1-r1.ebuild b/dev-python/flask/flask-0.10.1-r1.ebuild
index c28eaaff542a..1268f6555ad2 100644
--- a/dev-python/flask/flask-0.10.1-r1.ebuild
+++ b/dev-python/flask/flask-0.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1-r1.ebuild,v 1.9 2014/08/21 08:23:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.10.1-r1.ebuild,v 1.10 2014/09/29 03:30:24 idella4 Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -11,7 +11,7 @@ DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
 MY_PN="Flask"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://pypi.python.org/pypi/Flask"
+HOMEPAGE="https://github.com/mitsuhiko/flask/"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,16 +29,15 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-is_package.patch )
+PATCHES=( "${FILESDIR}"/${P}-is_package.patch
+		"${FILESDIR}"/${P}-sort_json.patch
+		"${FILESDIR}"/${P}-test_appcontext.patch )
 
 python_prepare_all() {
 	# https://github.com/mitsuhiko/flask/issues/837
 	sed -e s':test_uninstalled_package_paths:_&:' \
 		-i flask/testsuite/config.py || die
-	sed -e s':test_json_key_sorting:_&:' \
-		-i flask/testsuite/helpers.py || die
-	sed -e s':test_appcontext_signals:_&:' \
-		-i flask/testsuite/signals.py || die
+
 	distutils-r1_python_prepare_all
 }