revbump, migrate -> distutils-r1, correct deps, test phase, drop old ebuild

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

3 files changed, 55 insertions, 50 deletions

diff --git a/dev-python/django-endless-pagination/ChangeLog b/dev-python/django-endless-pagination/ChangeLog
index dca3a18644ca..2b015973b239 100644
--- a/dev-python/django-endless-pagination/ChangeLog
+++ b/dev-python/django-endless-pagination/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/django-endless-pagination
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/ChangeLog,v 1.2 2013/01/09 09:02:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/ChangeLog,v 1.3 2013/05/21 15:51:11 idella4 Exp $
+
+*django-endless-pagination-1.1-r1 (21 May 2013)
+
+  21 May 2013; Ian Delaney <idella4@gentoo.org>
+  +django-endless-pagination-1.1-r1.ebuild,
+  -django-endless-pagination-1.1.ebuild:
+  revbump, migrate -> distutils-r1, correct deps, test phase, drop old ebuild
 
   10 Jan 2013; Ian Delaney <idella4@gentoo.org>
   django-endless-pagination-1.1.ebuild:
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild
new file mode 100644
index 000000000000..6838d10ff7d8
--- /dev/null
+++ b/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-endless-pagination/django-endless-pagination-1.1-r1.ebuild,v 1.1 2013/05/21 15:51:10 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination"
+HOMEPAGE="http://code.google.com/p/django-endless-pagination/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	export SECRET_KEY='green'
+	if ! "${PYTHON}" -c \
+		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
+		-d tests/runtests.py; then
+		die "Tests failed under python2.7"
+	else
+		einfo "Tests passed under python2.7"
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}"/doc/_build/html/. )
+
+	#rm all OSX fork files, Bug #450842
+	pushd "${ED}" > /dev/null
+	rm -f $(find . -name "._*")
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-1.1.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-1.1.ebuild
deleted file mode 100644
index 360a268488da..000000000000
--- a/dev-python/django-endless-pagination/django-endless-pagination-1.1.ebuild
+++ /dev/null
@@ -1,49 +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-endless-pagination/django-endless-pagination-1.1.ebuild,v 1.2 2013/01/09 09:02:48 idella4 Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_TESTS_RESTRICTED_ABIS="2.7-pypy-1.*"
-inherit distutils
-
-DESCRIPTION="Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination"
-HOMEPAGE="http://code.google.com/p/django-endless-pagination/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-PYTHON_MODNAME="endless_pagination"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C doc html
-}
-
-src_test() {
-	testing() {
-		pushd build-"${PYTHON_ABI}"/lib > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -d "${S}"/tests/runtests.py
-		popd > /dev/null
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r doc/_build/html/
-
-	#rm all OSX fork files, Bug #450842
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-	popd  > /dev/null
-}