Split the dev-python/jinja dependency in two to allow different slots to satisfy it.

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 52 insertions, 5 deletions

diff --git a/dev-python/flask/ChangeLog b/dev-python/flask/ChangeLog
index cac9f19120d6..a9d36f1c7b5a 100644
--- a/dev-python/flask/ChangeLog
+++ b/dev-python/flask/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/flask
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.17 2013/03/28 03:18:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.18 2013/05/23 00:32:56 floppym Exp $
+
+*flask-0.9-r2 (23 May 2013)
+
+  23 May 2013; Mike Gilbert <floppym@gentoo.org> +flask-0.9-r2.ebuild:
+  Split the dev-python/jinja dependency in two to allow different slots to
+  satisfy it.
 
 *flask-0.9-r1 (28 Mar 2013)
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 64061ecb8b97..d7c8831d79e0 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -9,14 +9,15 @@ EBUILD flask-0.6.1.ebuild 1486 SHA256 632487d635a2c16d616061b1f87d2cf8c8534ea185
 EBUILD flask-0.7.2.ebuild 1493 SHA256 b5213a54051d4305e9e27b2c859a9b583628c815c9cc1bf4ed1f8b4cd4804f14 SHA512 afef2143f255c84cb74be324ef53810e68a265971c6bf8230724f6cbeff9d0d0af89ebf80b67e4c0861d9bfa959f90cc4e83895600ef3dc1a05bca3c6002d0b5 WHIRLPOOL 141db7a2796d54a7a2ee1e211d5e1ba6781f1b8ef6ca4a2f38600cbc35def34be40bb0bb0283546fc43d1fcecf037d6439940bfcb1635ed1636225669dc1c1f4
 EBUILD flask-0.8.ebuild 1787 SHA256 35a8907c25abb51f16963f443898c049f8e712eff28f2ae5281265e2b6c19321 SHA512 48ca7b3e34fccf0902a9401cda37c4b967fd4b79a19821ec3f73ff8f5f1b1dc258c155c0dabb5beaec4eaa03931cc8dde014d8f96a092ac55538d1bd195f6519 WHIRLPOOL 4a8fb4dff913c9eca55a990f55b3d70c9ed1683df9544694b29578fd34357ca357e27ab61cfa34e0fb7391081db10b0a297776796537eba29b5079b28292499a
 EBUILD flask-0.9-r1.ebuild 1047 SHA256 59195a8057c0a977d17f1568e5f457f8c1aae4466e40134d870c36579e7c447a SHA512 75940f6bccc44f9f49266f4564932473f4c03d7ec1d3470517183b65f06cdd18f95af47d42ca25f3c3dfc1de82492c000e1f0e727c39136cc94b7cdc09585b51 WHIRLPOOL 799cf7b3ef2fac34ff56c7a7c5eb4df8ad848b313a726b7f48fd1b6e26f56a77afc0732aa63d70ffae21a25a4e1f68ad3bdbc2876b478c75286a485cced59eeb
+EBUILD flask-0.9-r2.ebuild 1131 SHA256 a01330b0613786df2fc30953250fef5c587392c6670baf9d4a660f84f03a19c0 SHA512 68729164ff549b3adf9bca7d108042f17ff6c9939193545f5edc31b0aa73cab474efdf3d1afe4a9bcb2ac2e69ff49c72eb264ddade76d3d761e26f127e54091d WHIRLPOOL 4061879061e8a75cd27b5ca3bffee31a085fe4f849e980327c8e0838078b9efb1340aa3023aa3dca015614f53a0b7e0c01174c4a6423e0334b01a37e09a4e356
 EBUILD flask-0.9.ebuild 1101 SHA256 6b993f064332d51d3783abdd3658941853a055311b9719f1039d4e884b712992 SHA512 dbf3386f63f0195e56c9628d3838ee47d31acfc40a5cebb06e9455d858390cde63988f057ad0cc54dc65c68a5f025ad02a63b0dce362d3b21910dfe340499a34 WHIRLPOOL a82517b7f7c78c5a3d2dec9a2b732d66f266fd0182c4a303a7901f7e045790a753894de6e0652e4e4456d8497722b5b4540c2c512bcd9ecab465055323594568
 EBUILD flask-9999.ebuild 1203 SHA256 28114e6efcd574fe37abcf5029edf520d351edb00fbd4b052be4856101dbaa27 SHA512 f53de1276beb8f4cd1c6d909ed6a5576d8521fdaaa740eae01269c7a8b5e425facf3c38c64300adf18cebff8a1fbf5717832a2e03bc49e8a5cb37bc229739109 WHIRLPOOL b6968e73ca886177c4b29a0aad328ed23a9773ab985aff27d7fbfe5607411f93583d4db4353e073e4dfdcbcfaaf1b238defc1975dc7a035c07b0325618666eac
-MISC ChangeLog 2338 SHA256 3fcc2f53bc702fadb08f052ee3bcf03538fa5a3e8b31eede8be9d561c90927ef SHA512 e9fa2a8151ee90649fc733fe2a6e33b7f2d69a1186c4ea6e307e09f0ddf691ac3754905f7a9069754cf6e50783e44f7b1a3bdec970c6600ddd046e2093d05dd0 WHIRLPOOL e05fd3ef5c364c3ca80dc868cf660348303c4ca6d6e2215dd9cebcd9cfc04d6e1fd6295063aede807ee9cbd2b1351bdbbb0e11562d2ac946655a1e1a66b209ae
+MISC ChangeLog 2528 SHA256 385d72b1fe14049fb0ca483a73c3c3ea10d4dc47079c799228da3f6d8250a63f SHA512 39ca229afcc6461fb3c6029b1a4a40da534cbcc92e6a53c1ee5dafdfd7a94205049886c85a98f9d525760f5946c102a130aac76699740d5532d15762f2395ad6 WHIRLPOOL d99f089416c8ad402fffba178398abdc02befbd762c61cdbed09d0d16211d605fe12dfc9da8023da0d0643df797bcfe11bd17909aa4d64b8e184b40c9359e121
 MISC metadata.xml 228 SHA256 fb512dea8a54907a0d04e012d7a0b47a7f884600d1e1fcbd5094a17dde3f3cfe SHA512 147993a63e6528ff1250a76caf4b923d2307ee987eb38bb5cc9d61465c4d6156e65aa37e12377f56d70d8214a8a919fcb4cf9d461804c29d8b231072a179bc49 WHIRLPOOL eac02505f094986ae26315962fa10eee56249e432f5de219de3fd06d601eb0cadf8bb0b55fdd8055340f39a168791dcd8d3817074fa309adfb75e2841f6eaeda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFTtnwACgkQC77qH+pIQ6TNLAD/Sp/ScbX/aGsYkRjxXr2vXD8C
-Cgo5X8ljOibCjedRsocBALrtG9rDeEqoY+PdvqdacNS/Z97dXRCBhFOUjuk9VVhN
-=aiW2
+iF4EAREIAAYFAlGdY7kACgkQC77qH+pIQ6T65gD+N1eoLeuSWlYaU0neNt2VVkkB
+UE/gxCMA1x5GA//+EcoBAKAyNcFexjbgdYGQi4k3frsvtb46yaXLZ+WMEV3AcDxt
+=PLDQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flask/flask-0.9-r2.ebuild b/dev-python/flask/flask-0.9-r2.ebuild
new file mode 100644
index 000000000000..d0c874374aad
--- /dev/null
+++ b/dev-python/flask/flask-0.9-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.9-r2.ebuild,v 1.1 2013/05/23 00:32:56 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python2_5)]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python{2_6,2_7} 'pypy*')]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.6.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" run-tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}