Drop -r2 to get master.zip off gentoo mirrors. Remove broken python_test function from -r1.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 7 insertions, 76 deletions

diff --git a/dev-python/django-registration/ChangeLog b/dev-python/django-registration/ChangeLog
index 74982e93598e..8e43a6b970a2 100644
--- a/dev-python/django-registration/ChangeLog
+++ b/dev-python/django-registration/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django-registration
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-registration/ChangeLog,v 1.5 2013/06/01 13:20:52 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-registration/ChangeLog,v 1.6 2013/06/01 17:27:54 floppym Exp $
+
+  01 Jun 2013; Mike Gilbert <floppym@gentoo.org>
+  -django-registration-0.8-r2.ebuild, django-registration-0.8-r1.ebuild:
+  Drop -r2 to get master.zip off gentoo mirrors. Remove broken python_test
+  function from -r1.
 
 *django-registration-0.8-r2 (01 Jun 2013)
 
diff --git a/dev-python/django-registration/django-registration-0.8-r1.ebuild b/dev-python/django-registration/django-registration-0.8-r1.ebuild
index c623c422dfc7..b023cb8dac55 100644
--- a/dev-python/django-registration/django-registration-0.8-r1.ebuild
+++ b/dev-python/django-registration/django-registration-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-registration/django-registration-0.8-r1.ebuild,v 1.1 2013/05/27 14:27:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-registration/django-registration-0.8-r1.ebuild,v 1.2 2013/06/01 17:27:54 floppym Exp $
 
 EAPI=5
 
@@ -19,20 +19,3 @@ IUSE=""
 
 DEPEND="dev-python/django[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
-
-python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY='green'
-	local test
-	for test in registration/tests/{backends.py,forms.py,models.py,urls.py,views.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"
-		fi
-	done
-	einfo "tests passed under ${EPYTHON}"
-}
diff --git a/dev-python/django-registration/django-registration-0.8-r2.ebuild b/dev-python/django-registration/django-registration-0.8-r2.ebuild
deleted file mode 100644
index 78107311b5b3..000000000000
--- a/dev-python/django-registration/django-registration-0.8-r2.ebuild
+++ /dev/null
@@ -1,57 +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-registration/django-registration-0.8-r2.ebuild,v 1.1 2013/06/01 13:20:52 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="An extensible user-registration application for Django"
-HOMEPAGE="http://www.bitbucket.org/ubernostrum/django-registration/wiki/ http://pypi.python.org/pypi/django-registration"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz https://github.com/nathanborror/django-registration/archive/master.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="dev-python/django[${PYTHON_USEDEP}]
-	app-arch/unzip
-	test? ( <=dev-python/django-1.4.5[$(python_gen_usedep python{2_6,2_7})] )"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	if use test; then
-		DISTUTILS_IN_SOURCE_BUILD=1
-		mv "${WORKDIR}"/${PN}-master/${PN#django-}/templates/ "${S}"/${PN#django-}/ || die
-		# Disable invalid test
-		sed -e 's:test_get_version:_&:' -i ${PN#django-}/tests/__init__.py || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use test; then
-		# Acquire a settings.py
-		django-admin.py-${EPYTHON} startproject regtest || die
-		sed -e "/^INSTALLED_APPS/a\    'registration'," \
-			-e 's/\(django.db.backends.\)/\1sqlite3/' \
-			-e "s/\(NAME': '\)/\1test.db/" \
-			-i regtest/regtest/settings.py || die "sed failed"
-		echo "SKIP_REGISTRATION_TESTS=False" >> regtest/regtest/settings.py
-		cd regtest || die
-		ln -fs ../registration/urls.py . && cd .. || die
-		touch regtest/__init__.py || die
-		cp ${PN#django-}/templates/${PN#django-}/base_registration.html \
-			${PN#django-}/templates/${PN#django-}/test_template_name.html || die
-		cp regtest/regtest/settings.py registration/ || die
-	fi
-}
-
-python_test() {
-	# NOTE: tests pass in py2.6 only if run alone
-	pushd "${BUILD_DIR}"/../ &> /dev/null
-	PYTHONPATH=. django-admin.py-"${EPYTHON}" test --setting=registration.settings registration || die "tests failed"
-}