Version bump. Clean up and fix the ebuild (plus fix using wrapping internals, wrt bug #484408). Drop old.

Package-Manager: portage-2.2.3/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

6 files changed, 73 insertions, 200 deletions

diff --git a/dev-python/django-pipeline/ChangeLog b/dev-python/django-pipeline/ChangeLog
index cc3f0b98009e..c77eab84d1e3 100644
--- a/dev-python/django-pipeline/ChangeLog
+++ b/dev-python/django-pipeline/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/django-pipeline
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.15 2013/06/04 16:28:45 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.16 2013/09/12 10:56:16 mgorny Exp $
+
+*django-pipeline-1.3.15 (12 Sep 2013)
+
+  12 Sep 2013; Michał Górny <mgorny@gentoo.org> +django-pipeline-1.3.15.ebuild,
+  -django-pipeline-1.2.6.ebuild, -django-pipeline-1.3.11.ebuild,
+  -django-pipeline-1.3.9.ebuild:
+  Version bump. Clean up and fix the ebuild (plus fix using wrapping internals,
+  wrt bug #484408). Drop old.
 
   04 Jun 2013; Mike Gilbert <floppym@gentoo.org> django-pipeline-1.3.11.ebuild:
   Fix typo.
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index d7fd80d347b9..3b4f06973c2f 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -2,21 +2,29 @@
 Hash: SHA256
 
 DIST django-pipeline-1.2.24.tar.gz 35938 SHA256 7c4f98f45f4cfda925d3b8a8848adaf41aa8f317b0c19269cc74df048ffaa611 SHA512 9912be18eedbe24615798581c252c7a23a18cebd8594877da852b07aa16f1febad209c561c41131f092ea2bbc232f2d0f954175cfa4c5ca609be0295dbcd0a22 WHIRLPOOL 669fcf99b74de76aa23d2b7b210a56bb570f1409eb2cd95a9bcccbcc9d37af212241e6dd2c88e8b2b313fd179454cb4aeaffc167fd19fa78e03219036dc99e93
-DIST django-pipeline-1.2.6.tar.gz 27135 SHA256 8de30a83ff1a1ea2683713580aae8be4ecc5bd1a4a22da6296115caaff67c60f SHA512 8dc02d1f0021179d4f430be18597f704d04c41580d523877bfe1206fa713f7ff7687f101ccd2dd50d1b729bf500015fc55303c740068d171bec41433eaf2a75a WHIRLPOOL 9847cedd633c75d04240e20b3529579701335bd29f21d3dc5f69a2146a887f7186c545775bd20b8933464957db7a9ddb329517be5a00ca2ec126524860211a84
 DIST django-pipeline-1.2.9.tar.gz 31805 SHA256 2838b7fb359112121d4fcb06c96ab5e1de8d9abbb578016747dc0c6c2cf0ae8a SHA512 d02b4a65738b794d919e88c4f57ab587c22f032d8e9e4cf951ba49580b986f4d8d6c533804e89ab06649aaed7b9893671530319ae3e627fa755f261c35a6c68c WHIRLPOOL ac574eb4fb9b69500825da7587ff6afacda9c2dd5345896a7a99c0c65ade5087d541cb465ef1121e6060d9a035bf52c310985d8bddc01443887386a6423aaee5
-DIST django-pipeline-1.3.11.tar.gz 34673 SHA256 24281f55cf366a049de29f3052d9d814fbb205a6bece994689038ec680834932 SHA512 15650eeafdbbde04b26a658cee99c0d73ac0fbffb69c01f7333e10013603735e9f49ae4c81c9f65ac1da9c5d483d36536a2d9099efe9b6bc02ce57d6e37f9445 WHIRLPOOL 45fd4630e270b94b956b1d9e4858d738effb2bd00ff20da8bdd33182c6000d9860868b2bed48c1881ee6aa4acb1d9406d390a3e0b3fcb9177b1e60f5a37ef8b8
-DIST django-pipeline-1.3.9.tar.gz 23990 SHA256 b859d0c3cb729b9980c6c91fb509b0ff10cca1f659d1273a60676d018214ea3a SHA512 85a577752c35d3486de8b1e706aa2ed61069f425b1df65c3e003e2e4bcfce950e5277cfaf988b071a7367c9d855869985f31d59513803013819208aa1cebbee6 WHIRLPOOL 69776fb7902a24ca52de43bd0c7c1dd0b1120be927822e0c862d4d2f7ec357b8cf01ceb9ff2654af3cc297c1cde009b6b78c85b787d34ea4de56079da85985d5
+DIST django-pipeline-1.3.15-gh.tar.gz 36960 SHA256 9af008057532c7707ffb231b1919b127076b4c3a5e70f18af0a3fdc8effaaf91 SHA512 8580a06169f34434a492b925f1cfcf319ccf39597da9d4ba6b827e7ced4531fdf8b419f4ee2eacfad5f8bc7a73b1eef2f587a912dd552d084566622db85a927e WHIRLPOOL ef6ce9020382d44df4ab10dab31affb49a26dcf095a2590e98ba9a2838049f07fe8ed7f8dcf78693e63b36ae605cd699f85ab8dae5396ecaeab7f2f147e1cd28
 EBUILD django-pipeline-1.2.24.ebuild 981 SHA256 3ed25489c8b25061f4b19ae871588535344a728281a53a8707657e6e6e786f30 SHA512 0fca9a730536ffe494fd3465b774a3a39fd082f4c6c7c04dbf6cd70004dc38e3476000e3dda580c44909a6e5a9d332e570214b4a558e6244ce9fd00fe99e1a27 WHIRLPOOL 46b44d4c8d7f7b4003d5e0437fdf7e67892ae10b6fe702ddd234e1fbc5bd57bf720ba622f41f905163e23dea35c9434735eccc084451334d3c74e714f6e0aa6a
-EBUILD django-pipeline-1.2.6.ebuild 1543 SHA256 fc56d6136d3946d8e5e5278a141c04bb5a91935e920a4e2c5cade3e749ba3708 SHA512 a17b819768fc89591f702447d1bb3ac71ba20111a5df63fcaa04e7da98e0cf9ba0f6a105d2ab40caadc5ea86f553dcb9376b0ca1b575f9b40393d841c257cf73 WHIRLPOOL 20f0fd31daed355b990d64999ee821734aa30c7968e85ca4905791737c666be5b721799ad103b4b9d37c29ce7fdda4182d9905273132587bce70b498d56fb14d
 EBUILD django-pipeline-1.2.9.ebuild 1566 SHA256 d35b093f5ed3fdafb7956a842a8520a8aac67735231709db0a6bd82bae38b25b SHA512 8a1df64afb185750b861ce2480a2f2429bcdd43f032dcb8c65c5d2cbde9ceef20b9db8a57b209bb0146f751e0697aa4e879680ba780a4d6fef07bd025aefcf2d WHIRLPOOL 9f9eef4ddbd8b35d0da444e095a170ab19c48efdc961aaa2400d77adb215d7904fbed1899c6a44f58f832d36a028244ca18d88324c750609fdaad2c827773165
-EBUILD django-pipeline-1.3.11.ebuild 1732 SHA256 496c00d6b7076632c97a379b9268be085102d5bcf54fac8a725627401543669e SHA512 6e15dff64fc449d4d59fd8408b56c79521b83aabde771a2a00f99d42160e2f87309575714f4f3f2592eb1ed7de18f7a97d1ac8e74db38958a8f1926942949912 WHIRLPOOL 4cc85994c5ee16221e98cb8dfb047e2e03ef34f52dd7641ce1918cf67168ca7b63d69a18aec96ef585b82d15287ff8f75894d11a552651419115e2489e2680b1
-EBUILD django-pipeline-1.3.9.ebuild 1710 SHA256 2b4e73b60078b65f02b8a2ba74bd8c917f1de9bc4b7ec63b43c7a9b09ee371f9 SHA512 3281e80bee3b7675e698f897569c9be9f9d5814771a16c48e9b433a30b733193ff6899131a38c29aae27794caf05dfc89f8a5f1dc9dfbcb432c16dc2f814bae7 WHIRLPOOL 152029fa700248f3568336cc459bc19857e9a47f42cbb929f7c5618903c49b8894871b14c7141875012579d10df5a1c8770463645401b40cf7b86bfd9317aea8
-MISC ChangeLog 2514 SHA256 d8590aaac2417b0a3515aa48f18968456c7a9ad1ceee108cf8ce55decedf3a1a SHA512 5b8e9b97aac19fbdc355296e5a3fa981791d859acb833010ec0aafde5e3cab05fd191c1dbffae9af79abf80e81deca3c88896ae0d037af1eabf262c1b2ffb7a2 WHIRLPOOL fc484144007b089a18ab2217c16c578352c6950e681327974f6d92b8a1af6d5dd5ce2a3e274e0547cfd492a1dfd3dd6b8908e1974e2e6559e8f6fe054ca62f28
+EBUILD django-pipeline-1.3.15.ebuild 1398 SHA256 0930407b20d7e93ebb545e7d83e1d6a204342fb7655a7ebd0530f0ea88c56bc9 SHA512 90355f1dabe9694c94ed4459acc57d4e25d039a41cdc7a23c7e09a9555a5c8dd9207916694d6d0857962a49e3e1ccd8a3bc1bc9ec25f3294614f821e9dd04a89 WHIRLPOOL 710140f3a6d66359d6812a5d002cb268b4b5d3f8d2903ff9bb4f46d55769b216c1c50d5813a5c3d4faddf9381105fce248e61c19665a21f60d053b3d670381bd
+MISC ChangeLog 2843 SHA256 66c0ffea4c3a3efd579e01c6583dba592be23534947cfbcac7c4b3a43150c3cd SHA512 766f8c610fcae4ba6cc98ab29362699b0d2c2f81de3d1d1c1e5f785d75d8c792ff21ab87c4aff8df56e3910ac9253ddb1f3da1149650bfe8db4fe58d02f5cfde WHIRLPOOL 08264042099145eb0374fe50ecefc6befe9f9298b90ae52b6ffcfa020aee766da814c5087f82b70d79f653f0fd50e450b452a6eabf826415c474246baa09a45e
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlGuFb4ACgkQC77qH+pIQ6SdcQD9E7xEShTPN9eefrOI2gd6GDze
-8LsUFgDObCxISDePjfYA/ApcN+HlK6OktQnbZ6Zv87qxb4LGgHb6xfhVpnf0f/Oz
-=EEvX
+iQJ8BAEBCABmBQJSMZ3xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpGoP/1msL3AikcVLViB1cbO2Ytzv
+Op2bCLfMQrlYKtN8i468Jf/iNPI7CFA6d18LMineuPBUaQdMJ9npdPrazDV8Y++3
+QaVsIw5Wdnq0nGCnu18vjMUTjO9sw3HtEWO/OQ0Ehf/iaE9W/m9RL+p5Jk4oBy2b
+mIyznNJZ4fAdvUbIZELosuYk78Vc4JbV88R+hsZbkNlxCSJoeydOzAtyKBThlved
+X/YZyPzQF0LhGTdBUawG2e67tLIp2/PP9jmPnxoXBVdT+zKYVeiiLU4YCIGTN8Px
+WyKPXT8A/1/vQD6fMCyMFhf/GONlhihS9EMgrfWtyIPmFI87cl6wDX8iRTSvjFXg
+lfRU2cCtD5bP3vH2GFPazCLJCNnxS3PMdIn24DXc9/9rKKkDqL451CyFkpono3O9
+wEDUwDNHCRceay3GG/4KKAlTQZhxGBJFnkthxMCYSPVc/RAL03lA+Ufrd89TDgT1
+3ffir5bgihSW1M40Bk7BBh//n/GjjDDKybUKOwjApBls5lfjMjFUrEBY+QpWMUBe
+n/JGMgFqUsv59X7A7WllpYWTAPLVljrWZTtfhXC+ukffWAprfXcTr9jWrfCf28JY
+xnzb/a0gyRP8cWuP6pWTyKU/R0YbXVHKdRZEohQvciHru5Dn5760IIorZpWgI93q
+zoWw4RQejekYt2UJcKGW
+=u/DD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-pipeline/django-pipeline-1.2.6.ebuild b/dev-python/django-pipeline/django-pipeline-1.2.6.ebuild
deleted file mode 100644
index 7d164dc72ca6..000000000000
--- a/dev-python/django-pipeline/django-pipeline-1.2.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.2.6.ebuild,v 1.2 2013/01/21 05:46:14 idella4 Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="MIT"
-SLOT="0"
-PYTHON_MODNAME="pipeline"
-DISTUTILS_SRC_TEST=nosetests
-RDEPEND=">=dev-python/django-1.4"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-src_compile() {
-	use doc && emake -C docs html
-	rm -f docs/_build/doctrees/environment.pickle || die
-	distutils_src_compile
-}
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	# Python.[56] trigger a harmless deprecation warning
-	testing() {
-		local exit_status=0 test
-		pushd build-${PYTHON_ABI}/lib/tests/tests/ > /dev/null || die
-		for test in [a-z]*.py
-		do
-			if ! "$(PYTHON)" ${test}; then
-				eerror "test "${test}" failed"
-				exit_status="1"
-			else
-				einfo "test "${test}" passed OK"
-			fi
-		done
-		popd > /dev/null
-		return ${exit_status}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-
-	# Remove un-needed tests to avoid file collisions
-	rmtests() {
-		rm -rf "${ED}"/$(python_get_sitedir)/tests/ || die
-	}
-
-	python_execute_function rmtests
-}
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.11.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.11.ebuild
deleted file mode 100644
index 580af3712135..000000000000
--- a/dev-python/django-pipeline/django-pipeline-1.3.11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.11.ebuild,v 1.2 2013/06/04 16:28:45 floppym Exp $
-
-EAPI=5
-# There's doubt in py3.2's readiness
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
-SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/1.3.11.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
-	dev-python/futures[$(python_gen_usedep python{2_6,2_7})]
-	dev-python/jsmin[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-	distutils_python_prepare
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-	rm -f docs/_build/doctrees/environment.pickle || die
-}
-
-python_compile() {
-	# Need remove tests before reaching distutils-r1_src_install
-	if ! use test; then
-		rm -rf tests/ || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	pushd "${BUILD_DIR}"/lib/tests/ &> /dev/null
-	ln -sf ../../../tests/assets . || die
-	ln -sf ../../../tests/assets2 . || die
-	cd ../../../ || die
-	django-admin.py-${EPYTHON} test --settings=tests.settings tests \
-		|| die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ || die
-	rm -rf "${S}"/tests/ || einfo "tests folder already removed"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.15.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.15.ebuild
new file mode 100644
index 000000000000..b7fafb09fb72
--- /dev/null
+++ b/dev-python/django-pipeline/django-pipeline-1.3.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.15.ebuild,v 1.1 2013/09/12 10:56:16 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An asset packaging library for Django"
+HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/ https://github.com/cyberdelia/django-pipeline"
+
+# PyPi releases lack docs/ subdir:
+# https://github.com/cyberdelia/django-pipeline/pull/254
+SRC_URI="https://github.com/cyberdelia/django-pipeline/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
+	dev-python/futures[$(python_gen_usedep python{2_6,2_7})]
+	dev-python/jsmin[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	cp -r tests "${BUILD_DIR}"/ || die
+	PYTHONPATH=${BUILD_DIR}:${PYTHONPATH} \
+	django-admin.py test --settings=tests.settings tests \
+		|| die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
deleted file mode 100644
index f6efc4939461..000000000000
--- a/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild,v 1.5 2013/05/31 16:21:20 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="An asset packaging library for Django"
-HOMEPAGE="http://pypi.python.org/pypi/django-pipeline/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
-	dev-python/futures[$(python_gen_usedep python{2_6,2_7})]
-	dev-python/jsmin[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-# Test phase unworkable due to missing source content
-RESTRICT="test"
-
-python_compile_all() {
-	use doc && emake -C docs html
-	rm -f docs/_build/doctrees/environment.pickle || die
-}
-
-python_compile() {
-	# Need remove tests before reaching distutils-r1_src_install
-	if ! use test; then
-		rm -rf tests/ || die
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY='green'
-	local test
-	pushd "${BUILD_DIR}"/lib/tests/tests/ > /dev/null || die
-	for test in test_*.py
-	do
-		if ! "${PYTHON}" -c \
-			"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" ${test}
-		then
-			die "test ${test} failed under ${EPYTHON}"
-		else
-			einfo "test ${test} passed under ${EPYTHON}"
-		fi
-	done
-	cd ../../
-	rm -rf tests/ || die
-	rm -rf "${S}"/tests/ || einfo "tests folder already removed"
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}