Bump and minor cleanups

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 65 insertions, 31 deletions

diff --git a/dev-python/Djblets/ChangeLog b/dev-python/Djblets/ChangeLog
index 6f2e9ec56c47..51d468742851 100644
--- a/dev-python/Djblets/ChangeLog
+++ b/dev-python/Djblets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/Djblets
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/ChangeLog,v 1.15 2013/01/14 04:50:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/ChangeLog,v 1.16 2013/05/10 04:25:05 patrick Exp $
+
+*Djblets-0.7.14 (10 May 2013)
+
+  10 May 2013; Patrick Lauer <patrick@gentoo.org> +Djblets-0.7.14.ebuild,
+  -Djblets-0.7.ebuild, Djblets-0.6.22.ebuild:
+  Bump and minor cleanups
 
   14 Jan 2013; Ian Delaney <idella4@gentoo.org> +files/sample.rss,
   Djblets-0.6.22.ebuild:
diff --git a/dev-python/Djblets/Djblets-0.6.22.ebuild b/dev-python/Djblets/Djblets-0.6.22.ebuild
index a1a87be0ea9b..69500454df08 100644
--- a/dev-python/Djblets/Djblets-0.6.22.ebuild
+++ b/dev-python/Djblets/Djblets-0.6.22.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/Djblets/Djblets-0.6.22.ebuild,v 1.2 2013/01/14 04:50:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/Djblets-0.6.22.ebuild,v 1.3 2013/05/10 04:25:05 patrick Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.6"
@@ -48,7 +48,7 @@ src_install() {
 
 	local msg="Remove un-needed tests and also avoid file collisions"
 	rmTests() {
-		rm -rf ${ED}/$(python_get_sitedir)/tests/ || die
+		rm -rf "${ED}"/$(python_get_sitedir)/tests/ || die
 	}
 	einfo $msg
 	einfo ""
diff --git a/dev-python/Djblets/Djblets-0.7.14.ebuild b/dev-python/Djblets/Djblets-0.7.14.ebuild
new file mode 100644
index 000000000000..5e658582713a
--- /dev/null
+++ b/dev-python/Djblets/Djblets-0.7.14.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Djblets/Djblets-0.7.14.ebuild,v 1.1 2013/05/10 04:25:05 patrick Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS=1
+# pypy included below to just a single test failure
+RESTRICT_PYTHON_ABIS="2.5 3.* *-jython 2.7-pypy-*"
+inherit distutils versionator
+
+DESCRIPTION="A collection of useful extensions for Django"
+HOMEPAGE="http://github.com/djblets/djblets"
+SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/django
+	dev-python/imaging"
+DEPEND="${RDEPEND}
+	dev-python/django-pipeline
+	test? ( dev-python/django-evolution
+		>=dev-python/django-1.4.1 )"
+
+PYTHON_MODNAME="djblets"
+
+src_prepare() {
+	# Easier to add the file since upstream (currently) unresponsive to request
+	# https://github.com/djblets/djblets/pull/6
+	mkdir djblets/feedview/testdata || die
+	cp "${FILESDIR}"/sample.rss djblets/feedview/testdata || die
+	distutils_src_prepare
+}
+
+src_test() {
+	export DJANGO_SETTINGS_MODULE="django.conf"
+	testing() {
+		PYTHONPATH="build/lib" "$(PYTHON)" -m tests.runtests
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	local msg="Remove un-needed tests and also avoid file collisions"
+	rmTests() {
+		rm -rf "${ED}"/$(python_get_sitedir)/tests/ || die
+	}
+	einfo $msg
+	einfo ""
+	python_execute_function rmTests
+}
diff --git a/dev-python/Djblets/Djblets-0.7.ebuild b/dev-python/Djblets/Djblets-0.7.ebuild
deleted file mode 100644
index 516894ff8b98..000000000000
--- a/dev-python/Djblets/Djblets-0.7.ebuild
+++ /dev/null
@@ -1,28 +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/Djblets/Djblets-0.7.ebuild,v 1.1 2012/08/03 08:03:20 xmw Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit distutils versionator
-
-DESCRIPTION="A collection of useful extensions for Django"
-HOMEPAGE="http://github.com/djblets/djblets"
-SRC_URI="http://downloads.reviewboard.org/releases/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-python/django-1.4.1
-	dev-python/imaging
-	dev-python/pytz"
-
-PYTHON_MODNAME="djblets"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}