bump, update of deps, remove old, closes Bug #470664

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

4 files changed, 72 insertions, 58 deletions

diff --git a/dev-python/django-compressor/ChangeLog b/dev-python/django-compressor/ChangeLog
index 84c52259528b..e0795af14736 100644
--- a/dev-python/django-compressor/ChangeLog
+++ b/dev-python/django-compressor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-compressor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/ChangeLog,v 1.2 2012/11/13 10:38:19 idella4 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/ChangeLog,v 1.3 2013/05/29 11:54:23 idella4 Exp $
+
+*django-compressor-1.3 (29 May 2013)
+
+  29 May 2013; Ian Delaney <idella4@gentoo.org> +django-compressor-1.3.ebuild,
+  -django-compressor-1.1.2.ebuild:
+  bump, update of deps, remove old, closes Bug #470664
 
   14 Nov 2012; Ian Delaney <idella4@gentoo.org> metadata.xml:
   Updating maintainer, metadata.xml
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
index c4ba31cae1cc..9565c892c1e3 100644
--- a/dev-python/django-compressor/Manifest
+++ b/dev-python/django-compressor/Manifest
@@ -1,4 +1,14 @@
-DIST django-compressor-1.1.2.tar.gz 59735 SHA256 d164a428248fd62af402920bead041fd9622e76bcade80ff6e782788e8aca0bc SHA512 bfdb586d1241e509e3271a1c7a9aabc9d2e24cd15f6e3249811ace5444e89a621b079e2ca4b5ccbf502556afe3b615878d3a5fe17f97b9ef049a34c7944d42b3 WHIRLPOOL b531c0fd62e31402090d9e478ed9092a991cf1d19c1dd4f7debd306dd149e7c63e8b2949c919afd6ad66b4381d002b62107e3a3c8cf48e9600ba77d830785f1e
-EBUILD django-compressor-1.1.2.ebuild 1401 SHA256 421c4cd70d7855f5d4ffdba168c0a056b02420e17c20ba389161a4116d66bab0 SHA512 3da45f13df771bf07565ab788470943461f4110b8cbd9d956a4562b9679fb003a976e9665e4916d5a5f955d4b1d0b60eef9123e49e3e5d023f622518bca47ad2 WHIRLPOOL da6db02492e2c1223407557b4c99789ae2be0246b3bf63b686c7d62674680038c6810247a3a56e5ec98b3bb02c5049092590767ca6512617e3d12267c6d3825d
-MISC ChangeLog 511 SHA256 3b0b4f51583f8f7c36d3e18f7f5f1c9fcce0e14608f6aafa8f433b5671320b11 SHA512 a08e2c26daa8e9092a84232c6eead8bed24b2140d063168c0e0361f015b261c69e72f48a6303d8381965473e0fe288f81ffbf38c30fe4324c4a9b72c52fb6bb1 WHIRLPOOL dbd1cf8a76ca88df0b9668a50e8c0727e055690057a5eeb1c3554afe15cfeb12d8eea147eb3c84aa3c5aa8180bb7b9c8a6787ab8e48fbafa7f82b603dd0877ff
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST django-compressor-1.3.tar.gz 91190 SHA256 66ff1a845a6c1b16c4cf552ee3d746033979e46cd9bd5d999d4b5dae93327a52 SHA512 73d7ed68c9050945968324eb061e8bf605c3758d4df924c8e12b326cd823b1ec92aef7b984fd282cb491ef3025a3ae5733f03063036361fdd0f1e0a23e875ea2 WHIRLPOOL aea5f2cd38f54a25b7b2f5053d7ce5d7fdead1a4d7e98a15a555cd56089641103f47bf5ba65a1e493f198c9a26f9b0086107ea8270f635954a420845a53f66f5
+EBUILD django-compressor-1.3.ebuild 1462 SHA256 00f652bb8dce208c5808432ad0caf5d6ac63cd1ebc7b3e8630f01a2c6ec92f01 SHA512 bcd3ec98bffe2822e05ea32b75961b4ba0e256d2b224864016431b2385da4af233790ce18f62cbabccde1557025feeb989711cdca12c752f4787dfe0b59da773 WHIRLPOOL 74f2f93bd9c420bb7ceeb0a36bfcee61e317ae61abb2355b4e885deca7798040bdbccc6eaa0f078736375139e15187689d0e2fb36e0339936decddd76ed273e0
+MISC ChangeLog 719 SHA256 4de2f489926dc87d80f1d998bc76aa9ab5698f5bf15084a3c0616110c999edb0 SHA512 15b7ef5fb520875707cf6940ed973adf35f075dc7f6709d562f74e28a2c07133d026f59763a171d2fd2a3a06966851a7083b96656fba001cb347a3d199185702 WHIRLPOOL ef9e6eee3aaded335b5b2dcf15e430aece5354bd3754793446f9cb07a4f00f386cacefd47f1fa48f1cbfd6996773704e664a646e46659cd0aafb5c1e0095ee33
 MISC metadata.xml 260 SHA256 aa42fd34367f8532e3ec288da5a0ccaec0973c77a3ff9e1b5f7f529a7ca0140b SHA512 358bb417582243eea5b359fba2198daea33f24b411a3334552560210bc7f112d00b5243c83fd4c6621f4470d4d80c47f99ff29b745e6c5a2cbc797bf4669b62a WHIRLPOOL 714636fb56e549ccef61f50adfd5f858aca9a4a1183fe17e0ab0a7fe9e6070a65e33bd55581a430eb18c17780bbe2b704389e89206d167f1ff1e5b8f8f6b2bf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGl7H0ACgkQso7CE7gHKw33ygCfcTydiGHF587VsWgLGfqIGhsS
+lQwAoKk9Xf3SZB5MoNKJhic7AM3g7OJp
+=oTbg
+-----END PGP SIGNATURE-----
diff --git a/dev-python/django-compressor/django-compressor-1.1.2.ebuild b/dev-python/django-compressor/django-compressor-1.1.2.ebuild
deleted file mode 100644
index 3a83763d01a4..000000000000
--- a/dev-python/django-compressor/django-compressor-1.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.1.2.ebuild,v 1.1 2012/04/25 12:37:22 tampakrap Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils
-
-MY_PN="${PN/-/_}"
-DESCRIPTION="Allows to define regrouped/postcompiled content 'on the fly' inside of django template"
-HOMEPAGE="http://pypi.python.org/pypi/django_compressor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-LICENSE="MIT"
-SLOT="0"
-
-PYTHON_MODNAME="compressor"
-
-# tests I think worked in the live ebuild fine.  It's tripping over a
-# setting missing; COMPRESS_ROOT in compressor/conf.py
-RESTRICT="test"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-RDEPEND=""
-DEPEND="${RDEPEND} >=dev-python/django-1.1.4
-	dev-python/setuptools
-	dev-python/django-appconf
-	dev-python/versiontools
-	test? ( dev-python/twill )"
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	testing() {
-		local test
-		for test in tests/tests/*.py
-		do
-			PYTHONPATH=. "$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}"
-			einfo "Test "${test}" completed  OK"
-		done
-	}
-	python_execute_function  testing
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r compressor/
-	fi
-}
diff --git a/dev-python/django-compressor/django-compressor-1.3.ebuild b/dev-python/django-compressor/django-compressor-1.3.ebuild
new file mode 100644
index 000000000000..a0459bf9261c
--- /dev/null
+++ b/dev-python/django-compressor/django-compressor-1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-compressor/django-compressor-1.3.ebuild,v 1.1 2013/05/29 11:54:23 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+DESCRIPTION="Allows to define regrouped/postcompiled content 'on the fly' inside of django template"
+HOMEPAGE="http://pypi.python.org/pypi/django_compressor/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+LICENSE="MIT"
+SLOT="0"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+RDEPEND=">=dev-python/django-1.1.4[${PYTHON_USEDEP}]
+	>=dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/versiontools[${PYTHON_USEDEP}]
+	test? ( dev-python/twill[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	export SECRET_KEY="green"
+	local test
+	for test in compressor/tests/test_*.py
+	do
+		if "${PYTHON}" -c \
+			"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" ${test}
+		then
+			einfo "Test ${test} completed under ${EPYTHON}"
+		else
+			die "${test} failed with Python ${EPYTHON}"
+		fi
+	done
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}