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

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 59 insertions, 55 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/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
+}