revbump, migrate -> distutils-r1, drop old ebuild, fix to test phase

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

3 files changed, 49 insertions, 48 deletions

diff --git a/dev-python/django-debug-toolbar/ChangeLog b/dev-python/django-debug-toolbar/ChangeLog
index 45507cb6125f..7bd720870ce0 100644
--- a/dev-python/django-debug-toolbar/ChangeLog
+++ b/dev-python/django-debug-toolbar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/django-debug-toolbar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/ChangeLog,v 1.4 2013/01/09 08:44:01 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/ChangeLog,v 1.5 2013/05/21 14:40:24 idella4 Exp $
+
+*django-debug-toolbar-0.9.4-r1 (21 May 2013)
+
+  21 May 2013; Ian Delaney <idella4@gentoo.org>
+  +django-debug-toolbar-0.9.4-r1.ebuild, -django-debug-toolbar-0.9.4.ebuild:
+  revbump, migrate -> distutils-r1, drop old ebuild, fix to test phase
 
   10 Jan 2013; Ian Delaney <idella4@gentoo.org>
   django-debug-toolbar-0.9.4.ebuild:
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..55be975d8ae2
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4-r1.ebuild,v 1.1 2013/05/21 14:40:24 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+LICENSE="MIT"
+SLOT="0"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/dingus[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# To verify tests are run, simply add -v before -c
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	export SECRET_KEY='green'
+	if "${PYTHON}" -c \
+		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" -m tests.tests; then
+		einfo "Tests completed for ${EPYTHON}"
+	else
+		die "Tests failed for ${EPYTHON}"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	#rm all OSX fork files, Bug #450880
+	pushd "${ED}" > /dev/null
+	rm -f $(find . -name "._*")
+}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4.ebuild
deleted file mode 100644
index 8fdacdcb350e..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-0.9.4.ebuild
+++ /dev/null
@@ -1,47 +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-debug-toolbar/django-debug-toolbar-0.9.4.ebuild,v 1.3 2013/01/09 08:44:01 idella4 Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-LICENSE="MIT"
-SLOT="0"
-PYTHON_MODNAME="debug_toolbar"
-
-RDEPEND="dev-python/django"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? (	dev-python/dingus )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-with-py2.5.patch
-}
-
-src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	testing() {
-		PYTHONPATH=. "$(PYTHON)" -m tests.tests
-		einfo "Tests for python$(python_get_version) completed"
-		einfo ""
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	#rm all OSX fork files, Bug #450880
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-	popd  > /dev/null
-}