Bump and minor cleanups

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64

5 files changed, 69 insertions, 46 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
-}
diff --git a/dev-python/Djblets/Manifest b/dev-python/Djblets/Manifest
index 3de4e260c1a9..00d4a27f03a4 100644
--- a/dev-python/Djblets/Manifest
+++ b/dev-python/Djblets/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX sample.rss 5949 SHA256 9290b6309bcbc3d0f2270bc1b972e22643f4134ac7ab730148334aba3c21e872 SHA512 8588b33407e8d6b885d522218bd3635aa078b99756b28a141292acb8746236d517693eabbd375a0918734a913fa8ef60855df199ad0fad4bdfc22e602b186a1b WHIRLPOOL 19fc35c451807ba7ad0006feba0209abbbfb7d325f3a6f9f335093b2623c85e0f1d34d4bc69c7db84490289fbf5dab7ed6184a372fee388acad157f6a996ee48
 DIST Djblets-0.6.22.tar.gz 282291 SHA256 bf4ac722cbf27228be3fee7a943b90e15786249f664832faa0b907a27dea2a0d SHA512 00818b9f2189ca1289be1c2c7b8e2a5ac250acba2ce6dfec26df90dd2e3322da14a2b6c0755749e8bc225e2c50093740a1c6903d0a9bda6c8c0e787d06265199 WHIRLPOOL 9f4790e6a006983258304df06c1d71c127295b9812be14db79ccf22d1ed8afef0d73617c9f7bb939091a4176a9a7b32f134afe935400db0724e92fd6db6430cb
-DIST Djblets-0.7.tar.gz 570180 SHA256 edde9c4e59e88a522bc1e9dc5338c4621d4691c3c87750af1156d7de867f62d1 SHA512 9498b1f49a64e37203bbc6dec620ded0f30089b8d6325218bcc01bdcdf206070bc8b6f004504612ab9c0afbbe8e5fa97ade86f7d00ea8a1fd566f730b967f5b6 WHIRLPOOL 22ab2bbf28737b17bf616a3e0085295c6f472cf4a338f200a0aceade5cf3de427e03e6cf6f94dd92633bf904cda84428aa7777ccc4b0aa8259318110f5e66c70
-EBUILD Djblets-0.6.22.ebuild 1527 SHA256 22156e1d9f9db0fb39b361c3d5387fa7886eba7014bbbc7622a46a712d7ba738 SHA512 a1862a99c749e150fe834f1bcbc8cd4b3ca3d7341b156bc20433e3682d02535dfc487ede712980f5a207a1fa343fb2a3caeee1f226e74cfca0fc42c4f4fc70a9 WHIRLPOOL ebb058d75a0e5f0b2d8dbcb754a99f50f69aef7a6c1a0180141125a65631ec4b9c3ab78466b687cab343918b7de551104a9157b4a6b7740b15cc56a053b4cbaa
-EBUILD Djblets-0.7.ebuild 691 SHA256 daf84cd237c67ee1b76b6bafc8a3f084c28c4a19013e60e82bd4c0dc07322a5a SHA512 1703b9f5a31b73454c8e69a7d0f52e139d281fefb6e1b3655954bcdf40c5f4f881b0e6cad8cfefc7c480e22ebea166245cf59a0bf993363390ead1216d523215 WHIRLPOOL 1576e8c63a6066a580a4e1fe7e5a6397912df28446aa65bc20f1eef8e7d08cef5c36cb819408e7f3c35412982cd4b4867e5d84a9ac64eab08f062b060cffa79c
-MISC ChangeLog 2451 SHA256 cf422ecf483c78d1ff56445ea205a00be67d782581a3edc5731c09d176ea84a5 SHA512 332611c0703199b97e76185b1379a6831218548a83e7ec2b176a107b9e00219499875c8dc50f8eb6f8c7f6d8126e3a567c4c379b3ed536b2659f47dbb132f042 WHIRLPOOL 6b57f7bf5bc9c0f422c51458876a560d28f92da724c3bffc02901a42ba1ac18402188c7318d1cc9dbe3c8fe1133e552266f9513f265f6ee80aba5407e5bd96cc
-MISC Djblets-0.6.22.ebuild.orig 680 SHA256 aedd74fab9e05049114a5fcbcb8f1c4b9b7f790625de223c4b7106b7903d6cdf SHA512 c21373cb19c7d9c776a23172feff6aa6850615bcce6c245630e97a41e61def3b1e1d37884b2316cfd4a7cef5332897b2af870c9fdd13dde66d39c89fae9fccc5 WHIRLPOOL 3e5e6c1ae73d6f772e033f0f9e75b5a9f949f6b0d10a995810e608d8863cfcc9b6b7c0cb7949f233a884b009f0bb936fb81b3ba905833d4a12e33f3559a9aacc
+DIST Djblets-0.7.14.tar.gz 437782 SHA256 4ce081030e07ddfac2fd65c745d5d644b46aae708734ebdfa2f59a2be81657c9 SHA512 9d7880fccbcaf67bb441776da0820a884a07ba51e3e542b198e67bb0a07d527ecb8a24eb792b1f0f75b17f013dbc3c6e85f252f7bfb047a4076ce0cbb8c17690 WHIRLPOOL 1033cf306e045b1277d6e007e0dc2707d162cdb85859949570b7979090917378ab714d64d8eef6178c66324382e10063345dbae210b989ca7fcb1984ec28be7a
+EBUILD Djblets-0.6.22.ebuild 1529 SHA256 b96eed9ef5be497209041b2b79368fcbb56d19b64484ac530d44ef44a012ad8f SHA512 21681fe989e2eaf238cb7165b9bb648c23de4dcda5dea805e8fa61b4d51dd216f1e16d66fcf22faa1b91d58a82599a6039e1bc2af1744144be8a2f72e3cc6d61 WHIRLPOOL 64b0438c78495c6e0899bc17eb5da624913cb4531d0846dbccf32f9146ac33942e4531ddcdf87d1614690113fac6048ea55ca3728578caa9d2a22420a9ff0a9e
+EBUILD Djblets-0.7.14.ebuild 1528 SHA256 63407aaa94f56da8aba5c2eeaae87d6af3e50595a3995a6dafe8b9a4c9ba3f6a SHA512 9df5b5f14564a2e8cc46c9ff5e25c2bcbe973f555bee858953cf905da067e403f001767b1464912ed31879061302682b50c34179343dd8959bfeae19ac2945e9 WHIRLPOOL 80a0de21b6411ee4323e854a2f150c49abef40ee3aa95a00d32e7f367c4e0c6d668ee084b1d89e3f0cafdbbbc5e9feff490b989bd5c4d672ef6c3ca207a0a4c2
+MISC ChangeLog 2629 SHA256 132d846ac857f7790581aa1b9791e20cb7c42eb2ca26d3a199e173a15f725109 SHA512 c2d0007be8635e10865b1e1e68bb5d5f50fe5a71cf71ad6ad32eeeba49a4d7d0273433a09c7f2b3888250ac25e4d7dfa12a4fb67c8e6b342b07f8eed262ce82d WHIRLPOOL a257761c60f3a5b5ffa81ea02675155d6796d100a2cdbc91d79133a53a6ab31cbf43099259073ac1e2c552d199c1570439a21a4c714ae4578049982bf9ca06f6
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDzjrQACgkQso7CE7gHKw2u4QCeJVXBh2fQBokdm8koc0yFMjnO
-hKgAnjDCBhnqWpawUd3H75CNEmOZ5mms
-=7hH0
------END PGP SIGNATURE-----