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

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

4 files changed, 54 insertions, 53 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/Manifest b/dev-python/django-debug-toolbar/Manifest
index 1fd43d2bfc2e..a1f91353f7a7 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX django-debug-toolbar-0.9.4-fix-with-py2.5.patch 445 SHA256 b4abfac91fe846bd73e6f0ba753f2029fb31037e8c388e0d72d26943265ffe0c SHA512 859e04baa6ccd37c4dc56c69e5fe80afd192a1d4573ef2d3d91e53dbe25b7fe6dc1e429826dee82071fe1c9df0fad1cefd85a3e9be1468ac84098ab2eb5e36b0 WHIRLPOOL 46b9caafb09190813ba97d469b5413c1cc186367d83460a8bfe96da22153a410c90d97de6025cef4ad18a9c22477d6c687111dd005071c29151f5efbb2918ded
 DIST django-debug-toolbar-0.9.4.tar.gz 150062 SHA256 d6bc217b672ddf0e729f76da2df1d4a50d45f1c934239851f7f7ae6a51201f4b SHA512 340d481bc57c77eb04f7058f39fa4d3b42186582e750ace11ef492e7e658d3dca08029343b6172cb07c935b4cd0e74e410d5eca92e9a0970d5bea9658e62a390 WHIRLPOOL f0e5753bed013b5c0b20b271c99838fed24783d86253bc12a056a48567e7ea5abd4066e292b8bb123b519224837094b2cf8331361338e1d689c6e13d7c0b37c0
-EBUILD django-debug-toolbar-0.9.4.ebuild 1170 SHA256 95e958ff6a5a4ca1a46eae099dde203276a71330485d8f7daa74d970a03b4664 SHA512 d76e0a7c3ca74d2fce2ffd560e513edfb4991e7530374b9f6e4bc17faf261310c7669675c324be50e2091185d0cbd5289e706e19572202eb49063ab05730a7c1 WHIRLPOOL eea9531f68d103ea7fda14cece6e05974887ca54aa7d773b32fd5eb7bd18db0af92c015c4320938a52dcc2ec127e9de2702e0b6cfd06f94229ec85d6061a4e62
-MISC ChangeLog 882 SHA256 710eac84a3ec99865d164c723473b6ec4dc1ec477cb4c335c62d3ac1781dfed0 SHA512 bf224f8a835f46a4d9b429ff6fa50aa4a9284ccd673a0047dc811d01f4ef58593d5f93b0a8ca8542e5de38b87f970faa82e673b5116ab89e49c11b72589ef70d WHIRLPOOL e5881b2b8facd8ba8ad8bb68b4d63a83fa2a0b80c9ace2bfcf817c30d93b57948e8199f6f8dde6fa9607e59b04e8a04db4e6ce0576a877ee74f1130c10ad0352
+EBUILD django-debug-toolbar-0.9.4-r1.ebuild 1246 SHA256 eaf322ab13a02f62644bee6c01e8b616c58cc143f5a09b1c8478ee14df16652f SHA512 7d7300f3032f6e62cfefc3f3f790db67d9b53c0ea124daf96afe4c65b9c06d3eb8d4f699d786c6af8918a1061b0b40ec8708516de5378d969c0680a7342ead00 WHIRLPOOL f6d6fcc195a521f3bd2215f6093aa271d4eba9eb5c2c5c401eeff5e4e93e13b75edc8e5f7cd733f6f49fda9377e2ea52e2944204d0f774ad3ad7bd11a8c7b6ee
+MISC ChangeLog 1125 SHA256 594579bbc7d73583bb5ef127bfd7c855335efa19f1325b5651c810fc03c42559 SHA512 e18ec633e7088a3acf7510cb32a4db98f7ccb4bd96b1e0a049c6b22f4edec94e6e8225478ad4845c6cf5af785ac5888453b4744925258f62d1835a72a12124c4 WHIRLPOOL f8f8878cd10c6f5310ba8ba40169c8348ab79efa4d139cc04d63edce11d8264c71fe6fced23e6eaed6b2cb159f6c3e080db9cb5c1c8e19bcf8115690e5811e89
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDuDm0ACgkQso7CE7gHKw0zkQCcCJaWXzaa3KtK65J+X+i2I8SI
-IVYAn3GIYkid75+qIQtx8wgA+8diTMY6
-=QANA
+iEYEAREIAAYFAlGbh2UACgkQso7CE7gHKw1kzwCgxO/25X6lPtahIoxjWj7fyinT
+9DwAoIBL9FqgiO4GA9EjWFThZIFmEukX
+=wKO4
 -----END PGP SIGNATURE-----
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
-}