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

6 files changed, 193 insertions, 21 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
+}
diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 9bb97faafafd..5c4376c9f4bb 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.134 2013/02/15 19:07:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.135 2013/05/23 00:31:17 floppym Exp $
+
+*sphinx-1.1.3-r7 (23 May 2013)
+
+  23 May 2013; Mike Gilbert <floppym@gentoo.org> +sphinx-1.1.3-r7.ebuild:
+  Split the dev-python/jinja dependency in two to allow different slots to
+  satisfy it.
 
   15 Feb 2013; Agostino Sarubbo <ago@gentoo.org> sphinx-1.1.3-r6.ebuild:
   Stable for x86, wrt bug #457156
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 9da77b636aac..a78c849a7f2f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX sphinx-1.1.3-docutils-manpage.patch 1310 SHA256 97d29af271a833188245399912fb459c4182262138411f9f745821493507977f SHA512 340340215c5549aa3d59afbfacfef9e5b08a5d22700bd8d2391edd38960c5a5f4db95abe2c052f01fd4873852ce2dbe485f9a87f0f2fc8689fe8b3f1fa064521 WHIRLPOOL 9d50448b9c7fbd7cc95e4675df2f2be79b15c654d82f7f0740ff7ca3881e4227005eedc0ad7bd6a12548c71fefd06479a5cec1d255e089c0cb39fa9ae53257b9
 AUX sphinx-1.1.3-python3.patch 1793 SHA256 f21f0f4f8b1f83660344b7b8c1512f853d579eb2938e7f6b4305008252824f46 SHA512 c7970403bc8f6d329a5e9c5abf0ad0a7465f1249706f5ca7cffbc374c5214c14903b524c415df8bd14cb7c2f080a19c96ddbba77f7fc8ce0a699b36005fdbb36 WHIRLPOOL a7f69a5da9f258ac583a86046547362c1c3547187f4074eaec4b605b6a09ca9a070f4257a3cb6ae2cd2fbc3a33c4e893c313741625cee3f482b5b52dd8116466
@@ -7,22 +7,13 @@ DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab
 EBUILD sphinx-1.1.3-r3.ebuild 3573 SHA256 86c4b9339c1f8e8456e39b59686ef264f743d386c3888d2202584f1793b6ce96 SHA512 0d42c768d620e2e2b76b3b769bd5961748c7dac865fb3a596028675136fa6f9d99ffa73701221b090d1c985f55c125ab270f61c319207358292dd8d02cb4e1e4 WHIRLPOOL ad7694e9c9ca90d7725b46f24b2caf649d65c6878d5dabc6211d0d206497c5c179af60c8f239a050d4bf2bf3b42a730ef2658e6e4e6cc09e461cd176539f8a87
 EBUILD sphinx-1.1.3-r5.ebuild 2961 SHA256 e93bf8e6c6e57dc86f442d11c0bc9af37190e40e7186334fdd61e3e10a2f20e3 SHA512 ecf72879b6ccb38d446b6732bb796c66f1a72d13030ed7edb913ecd4eeb19c92c4846f85b4efd06f2559ab7902acbe4c704d0652d8866ecb9f72983bab255379 WHIRLPOOL 6a2b4e96d02bf2e0a173e1ccd9ed3221ea735a2c3af41413f6509ca0ab147e59653a60a4a0235a0ca43a75636b07617fbb1de4896a2c130a4d1bd841e96f1cec
 EBUILD sphinx-1.1.3-r6.ebuild 3155 SHA256 081066a4cd955b2249427bbdfe8f31dd4011048f873598caeeed5ff9fa530a23 SHA512 e9279dd75da19c7fec0e4bb019525f1506de61c3f75e53bbbec101526db460969876e87c217fa5018709938f1509cb66f03bd79447fb1f001a6b3d9874bb294f WHIRLPOOL cfa58501ec291e2121bc4d057ae8c58e133a2ba21121c9a633f6d1f19c80bca628b25609969ed4ef54d9c568d268e983f2104b7c6776c78cc0fba409d0d9c97d
-MISC ChangeLog 16645 SHA256 b0ee9cdafde9c421d72485e0d8e0fa98a9c14ae07bfa3342403e5c26e436160a SHA512 94eab96638393d8ef563fd14e6cf6d93098da16fc481df4b81057019bd78fc929add4b54a88db5e5dc2205f99d7b18441efdff62c73b55ffec19ac5e0eb5707c WHIRLPOOL 25f61c443adf3fdef1d52a687edbcee999a1db018bbd773f0446cd93cc3950154b68d60da6ccbd28325cb1c256c84ad48db212d04645c7d7de6ef3ee0e1ecf89
+EBUILD sphinx-1.1.3-r7.ebuild 3320 SHA256 068566393fa12bb8d3f02b570f45921f137ea955320f2ae8099f63c29b5b637b SHA512 eafbaf8c9fde23b243c3845c60da313a364ad9f05144f2bf4be05e3327157b6ff5b64a3f6ba61a3107f88888fca575d45a6e1832c6252a8b278055ef18e07997 WHIRLPOOL b9260ce034d45f6c1d3703061c9e0468afc860109fd66829285e85507c009f38314a61ca071befa097534e12bf37c703ad7c064cc78c7ab8272b3c7571698085
+MISC ChangeLog 16845 SHA256 ad259c2172cf9f28b46bdf93ad15a610af21711fbbfde79f6c97f53ec8531690 SHA512 31f82553738a648f3a731ec307d0e6d2c7ed69776537b0db57540c946af02a5448dd42b8a9bed8c8a51ca853d8128aba3754c137a0ee2091bcdf00475565ecf9 WHIRLPOOL 7c05d3a72c6a8f11618e2e9d3f2eaf2993077eb0055bfa2b13bebde30f586e2426c3ba88aef63f2c9ee7fa178f3d44b1c39835a27af7d28d6d8abad08ae54ed5
 MISC metadata.xml 410 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367 SHA512 fd9b5eefde8b8f976e679f754281b4a5a07b62bba71820cde1b109ecc33c094ea08a6f904501b671bb309a6d23a1290a2e37e56f9b0902a3704a03ba4481b3dc WHIRLPOOL cae66b5efcefd9b3b8c61845fa1c77b38641eb16d63dfe888fb7eaeac713d6b4722727c2edf03330f1a4bb9144f4f4f26f886e3de509bbcd72b51acf94b46c95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRHoeMAAoJELp701BxlEWfrTEP/0/x6/xgxJSXvm1anXUkGHeW
-MNKmdqjBZ+1PYkKRwaM0Mgq27leoTk10WWRJdd634j60jgdIzVPDPKYMQp+bPiLM
-12ZUldgeghRxpYA/9pyqIMqBhCON80J+Q2VxzrtpdKou62q4XQU6yb9xbCxPDxlf
-9g3eXiOVFpeSbAlfyqDNg274pcDCoxhgXVkwk4eaDFePFI+tvbiDYXOVhf6RJIP0
-+AD0jHaveQU84AWBEtZytJtgY/CgoGQjywbP6KTulP0sezBRbeL52zZFRGJNEO9w
-m0QcrUq0wtTNzwdcUZqfdWP2yOZRjna2VTd4rGBTXDWDZyD4mPf6jT1QMB9J/hme
-01VAS4XukTt/P2lyudc1YKjzPk2r/xnVCr/QKi2GM17+ouAXkxe0TK2Dw04q8m3X
-vsCNMq0upL4AIlHaU682GWa4TTkzwzaX42KBRb+asR8jveSerqxqFb9FL4o04fvn
-hMtgIZQ173Ka4XyCmngmpuOsNwCCZU7ire9Kgs/b4jOpdxs+9lHZSNpm2R1c4cg6
-XqAXm0Wqsto9BZuMtf6+HMKfem9JdcWS8KMGOvpBI/mWgacC9K4p9OTDzAuROov7
-Kp6I0xD0CZZO1QLEQXVc99rVgvLUsWr+CJ8H+pXw0l0D8Zpwaphdc7Fj2xJxhylO
-kEuLUa0RbxvUdL2LyUXu
-=vG4U
+iF4EAREIAAYFAlGdY1cACgkQC77qH+pIQ6QUcAD+MoQy4R5u/KMuHCxO57e2FAHm
+wIO0ZX0H9+/OTXhGLU8A/38/XJPjmwBdRUEAkgDIfPlvRuqwfYXgnL5wBKS/rZUI
+=vfJZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
new file mode 100644
index 000000000000..a156c673e9a1
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.1 2013/05/23 00:31:17 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Split the jinja dep to allow different slots to satisfy it
+RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_5,3_1,3_2})]
+	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_6,2_7,3_3} 'pypy*')]
+	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-docutils-manpage.patch
+)
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	cd "${BUILD_DIR}"/lib || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}