revbump, drop pypy to match django, edit recaptcha-fields patch to import added missing source file, add nose for test phase, drop old

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

10 files changed, 70 insertions, 131 deletions

diff --git a/dev-python/django-recaptcha/ChangeLog b/dev-python/django-recaptcha/ChangeLog
index 684e0e61e134..d9e89339ed67 100644
--- a/dev-python/django-recaptcha/ChangeLog
+++ b/dev-python/django-recaptcha/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/django-recaptcha
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-recaptcha/ChangeLog,v 1.5 2013/03/06 19:13:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-recaptcha/ChangeLog,v 1.6 2013/06/01 15:49:15 idella4 Exp $
+
+*django-recaptcha-0.0.6-r2 (01 Jun 2013)
+
+  01 Jun 2013; Ian Delaney <idella4@gentoo.org>
+  +django-recaptcha-0.0.6-r2.ebuild, +files/test_settings.py,
+  -django-recaptcha-0.0.4.ebuild, -django-recaptcha-0.0.5.ebuild,
+  -django-recaptcha-0.0.6-r1.ebuild, -django-recaptcha-0.0.6.ebuild,
+  files/django-recaptcha-fields.patch, files/django-recaptcha-settings.patch:
+  revbump, drop pypy to match django, edit recaptcha-fields patch to import
+  added missing source file, add nose for test phase, drop old
 
 *django-recaptcha-0.0.6-r1 (06 Mar 2013)
 
diff --git a/dev-python/django-recaptcha/Manifest b/dev-python/django-recaptcha/Manifest
index 25447b51443a..f35dd912ef8e 100644
--- a/dev-python/django-recaptcha/Manifest
+++ b/dev-python/django-recaptcha/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX django-recaptcha-fields.patch 585 SHA256 ba93ec47b26895179cd1647dbc9f21732186a3c82772d6821f2da2d6b7e324e3 SHA512 7d19256431ad70c037bf291d74d1c901b9582cbec392e8aadb055828508f0403f671c54df7ebae25b0170ea11ca73fe8b3ff355345a12f80dd5b8de5fbdbbdf4 WHIRLPOOL bfaa64a4f8b280778751e176ba7134161a479e0ca015f587bfdfabce0a2e411f7dca128b027ae7531b1e4029ece1afe8f4dbb8279ec0f2fd4d3d565144901891
-AUX django-recaptcha-settings.patch 284 SHA256 8ee75b3f25a180fbd528de02c2e40b8484abe73c83abf02c48740adfe91e0005 SHA512 25bb10cdf697922e114180709bdd6da2e34bc659aa63b9005bc8ba0af433f0a0a1a3a111d8647d7bea2e8275c7f6c64167c88c2462b93aee33d3d7b5704b83f5 WHIRLPOOL 1cacf0b55f01c52a56a72893264ce3270c7bb7fd93fbcbb1c259dbc59afc1d4429413d3f88bc6f4b613356f97dfd2117ad688a7bcfea940d3c27cb0365db2d12
-DIST django-recaptcha-0.0.4.tar.gz 8081 SHA256 09c095129107068f588f3689e0130d63d1c8e35cfe1f4dadb1a8cbfd5bdb9602 SHA512 e45bfd2609ccec3cf29e2cbc4e630c3e8b60a218d707e70a7d2ea2869d055fe0fedddd6fc9cb06e700bf5e0c03a2902987fc98418a0c2ac8f8babad243c68c8a WHIRLPOOL 94a3f07acb2357cad4e5f9bb8cb3fdf718965d92ed82e2038a3d3ba8b07da2bc9151d1d45664a00de4412db58dbfae23923f802b7ffc33b36fe3984f3ba2dd1b
-DIST django-recaptcha-0.0.5.tar.gz 7398 SHA256 d64fbb9125fa6ee99dffc6c6003b7e2266684d4af7dfa2a283c2c8c0c220086b SHA512 6bc315a4adfe7dadae67e19c3c16e4d3bcfe5893c1190e8c59c57593a5e657a9b22d4663bca7879f8221f6a6f072a2ad2788e78da17a9a5d50096cb87e62f1ab WHIRLPOOL f12b176c4c36caca84a3e45a80cd46d721f4fc5dd555f9458923f1bf994342cf37232e91fd0060c186e1bef1a93cfb66978b1abf589eeeb9e2672d3b89f25376
+AUX django-recaptcha-fields.patch 602 SHA256 4ef9666f69296a652e5758d36f624802555b2eda072fd93ca7b78a8288716cbf SHA512 fbaee993b0bdf572e3d96e1f87ef33276dba3b9d4d4f5e6736d808402d5d71077a9b7d47752e3b2332b80df45d8b376d3103aead8ce9d442ac41895ebc4bdf82 WHIRLPOOL f95af9ee906b5aebbf11e060e0a355314d831f5bbb253918e30f0ec004bbca7c21d10d73b783757b012b088e9b17e3285959f5e05b1215a9ee89a16b97dbbe09
+AUX django-recaptcha-settings.patch 283 SHA256 2e9ec0842424f5347e906101ebe6e1def490c76b8b45fbed49b44bd2a444abbd SHA512 cfa960e6c372724bb0c691da3e574927ae51db7d7b3f056547188ee115a915719a926b6c1d366c0df3696db49ff28cefcd06aad090f387aee90effbcf68956b2 WHIRLPOOL 577feebd158cb8d7fb7cf1e04b5cce4fed4add409f9e7d05de6dff59c2f55b091081075c9d87eff9da419465f16d633021eea6dca27572e18aea74bf526ded62
+AUX test_settings.py 314 SHA256 fc4e2ef008cb73b83a9856fd884df7992b48c5c3d7114c24d9727bc2fe09d46f SHA512 044f557d5dcfdb11d55cd55aec6830b9763ff40d7a33407fe55b86820a5a8ecb6b57fc1c121655bd86f0d369e64194b6a4aa87bddb4476d22656c48349609f32 WHIRLPOOL 2035bc6d304417be63a71352de62c4a9e3a2d636092e6e9015fb4c38e98bad2a67fb5b18e8b12e2484d0bdafc605ac00ef66ede0e43aa679bd5e7e5bfb59cc1c
 DIST django-recaptcha-0.0.6.tar.gz 7614 SHA256 15e17c331a9a6ac7c8159c2866fb6b58d9561a55db3694393e3cbad9e2494202 SHA512 152a62c914a10ff511a17c4e0a5accffac6f5043ee6516b81c5fe69d9271e7982f5df7cf96d4e1668fbfaa47600ed95cae818037a25756786092f4a9e9301ae2 WHIRLPOOL bbc4de11b0384b067343f6a7e8f06627b781ccc91cb43adbff3a399983eabeeea1596d7552d35791b0b80ccf31582bf3e83e38b4fdd885b1dfa2087750eb9483
-EBUILD django-recaptcha-0.0.4.ebuild 798 SHA256 6acea632e243ac0ffc87986253c0a5389e0ff7e5ae967ece86d6a9d2e6cac426 SHA512 45a952e3470d89a808c686f04b7126da8fb601d54944efa2e066713cd07ffde045d3bc3589c04306bf9ca971333521ad366ef4f8b6f06385e62c09c1178a8eae WHIRLPOOL 93af6c1871ac35668a13723171d629f69b52085d4ee0d9c10c9c80a0253ff9ef8b61337119abd2cce28f277dddb7d73aeb58c3119a0ffea6ec80ded0ae4b3007
-EBUILD django-recaptcha-0.0.5.ebuild 765 SHA256 a64b382c54dd7493ba60b7dcfee5cb6f27e3190b4227beb5884e3d25a9f1b7d0 SHA512 17e1c52630a877eb555b3cac57b9c5e8645dacb595a400c1176ce9003ed197a9ead5dfd1a99a6b47f045c17514198f3c359ccb8e1cb1762dca33e3db60ccf4f9 WHIRLPOOL d33414ac0894df3927af65cc925c603a651b57711d99f21dfbad94b3ed659fa24e67505c0dbf238ab3bdfb08b223e8804c549bb28adcef66599eb32edbecec37
-EBUILD django-recaptcha-0.0.6-r1.ebuild 966 SHA256 468636d568689c916fd88cf312f6fdbe99510ac4cddcef420a78018f6358557a SHA512 4a55203bf5d53664db523ae118a8e5fd5bfe38d685463bd48b76ef9d8a585d4cb5c15ab8b0063f36fd0262201922ba65b0345219f4f76a94f4df21df6691d4ad WHIRLPOOL f31d1f259f43e7f993d9f035f928c09bd4da39146617a3a7cb022087016bb2917e0db5a86870b2d06517377333494a38f8a7d13586ead3e47f850736c6a84114
-EBUILD django-recaptcha-0.0.6.ebuild 765 SHA256 70bf12d5cac967184764af6e0138f0716047279a808f8303db766c4e3f4ce91a SHA512 b27c2f7bbc7c40d07500ad83cc41f9fcd18230b42b8352e5b2583789efd75c69ec7a98500659ddff39f9d12235fd13f1cbfe20a3e77043752199c0fa356645a6 WHIRLPOOL 45ef6c034d1c291b43f76d20e1d1717a4854a8d8fd73d3658b7cec9d4ca52331555116e4e49f5aeb8e323e6a3d6aef52f08aabbed3683c976242ef278f110b44
-MISC ChangeLog 1030 SHA256 567f14ae96b8e8cabf51956158be6970ddd1034346b827be6eb63805c11c0bc3 SHA512 9eab87800a6b1f4f6b6f4ef568280c6a1f13f621dc936e0056c026ae583e9bbbcd9528e91075dab4b14e22ecd5c7a2944af6724611a39621867e91808e2bfae6 WHIRLPOOL cf668c92da7f6ba7dd2192df6da6aba1bff4507dc7176b54ddb2a660f3184a3364b9d8efb1fff5edc97aa4499a58d45c491d0152f45e29394fc5bdb8b9afec2f
+EBUILD django-recaptcha-0.0.6-r2.ebuild 1240 SHA256 2cef0a33292b3079fb0de0789843231c187ad8593d3ab3420c5d4d05dee45cb8 SHA512 f231e6b48c9e4a276e7719b9874f3e7359f04c9a66570fb63716eed2a54d776b1dd0910593e5fd7f839edf965a5d7facc871355e4a73988c080f439d57ae19db WHIRLPOOL f1f8ef3cf5a136b8ad60d33c44e2993bce42bfd1f8e5a7955d08b2ac21849a5fab480d358d4af187e2a2611e6bdffe838dc23c767f39e0f6e17ef36a75653049
+MISC ChangeLog 1535 SHA256 7a0bc117684d257e52d00cae96296074454938b2fe4551595cbdb6d032a369cf SHA512 8f5a36e39848fe86a40e4bb35b2c0331e4abb2d37df424032e2a038c85e587506690bb69397400a31a8d63a8a40683a2e080789e55d35ad15d9cf22c3e6c02d7 WHIRLPOOL 0c9c6a8f591e258016432df55a2d225dd9cf6df34305d8a4e1d27a995ce44ed67895caf58f68c7e6b4345c649d8b86d32b6f618518ef0cedb106c7bb343a7e5f
 MISC metadata.xml 398 SHA256 726a69b3a26d657bec539c2d0ceede1892a86c8379a850d695d519de8b59685e SHA512 2b51360c43e278b84ca58dd1a145ef809d5df1755dd90dfe50c51e17ba9a8a0b18f75464688cde15d4f00ee31a233b0ab6630eebfcd2f69a178c782b7ad40775 WHIRLPOOL 9f000d0820394a020a6be5da0ef91689e275e577ed5c74d942f839597d9c7d95b53d70b21a5cf5ed03e80b18761d7de8e51cb239e10bf271788225a2513c8dba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlE3lbIACgkQso7CE7gHKw3nrQCcCYrmoNNheO8Q3gizlvcB0pRO
-PuAAoL76GZzKRijGCkHG2hoopeWf/OOj
-=w00u
+iEYEAREIAAYFAlGqGBoACgkQso7CE7gHKw2FRQCgqsJX0sLJSGw974D11VkxbExa
+ViAAoLMhd/w9sPJotvasnID4kt64Fedq
+=HFtO
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-recaptcha/django-recaptcha-0.0.4.ebuild b/dev-python/django-recaptcha/django-recaptcha-0.0.4.ebuild
deleted file mode 100644
index 406207b02f74..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-0.0.4.ebuild
+++ /dev/null
@@ -1,29 +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/django-recaptcha/django-recaptcha-0.0.4.ebuild,v 1.1 2012/08/02 17:17:47 iksaif Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="captcha"
-
-inherit distutils
-
-DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		dev-python/django-registration
-		dev-python/setuptools"
-
-# Test not supported, missing dependency
-# test? ( >=dev-python/django-setuptest-0.0.6 )
diff --git a/dev-python/django-recaptcha/django-recaptcha-0.0.5.ebuild b/dev-python/django-recaptcha/django-recaptcha-0.0.5.ebuild
deleted file mode 100644
index a9418cda0e3f..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-0.0.5.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/django-recaptcha/django-recaptcha-0.0.5.ebuild,v 1.1 2012/10/25 10:55:11 iksaif Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="captcha"
-
-inherit distutils
-
-DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-
-# Test not supported, missing dependency
-# test? ( >=dev-python/django-setuptest-0.0.6 )
diff --git a/dev-python/django-recaptcha/django-recaptcha-0.0.6-r1.ebuild b/dev-python/django-recaptcha/django-recaptcha-0.0.6-r1.ebuild
deleted file mode 100644
index 57fad45bf7c8..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,32 +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-recaptcha/django-recaptcha-0.0.6-r1.ebuild,v 1.1 2013/03/06 19:13:49 idella4 Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
-inherit distutils-r1 eutils
-
-DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		dev-python/setuptools
-	test? ( >=dev-python/django-setuptest-0.0.6 )"
-
-# set variables for testsuite
-PATCHES=( "${FILESDIR}"/${PN}-fields.patch
-	  "${FILESDIR}"/${PN}-settings.patch )
-
-python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	"${PYTHON}" captcha/tests.py && einfo "tests passed with ${PYTHON}" \
-		|| die "Tests failed"
-}
diff --git a/dev-python/django-recaptcha/django-recaptcha-0.0.6-r2.ebuild b/dev-python/django-recaptcha/django-recaptcha-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..228ace0036f2
--- /dev/null
+++ b/dev-python/django-recaptcha/django-recaptcha-0.0.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-recaptcha/django-recaptcha-0.0.6-r2.ebuild,v 1.1 2013/06/01 15:49:15 idella4 Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1
+
+DESCRIPTION="Django recaptcha form field/widget app"
+HOMEPAGE="http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/praekelt/${PN}/archive/0.0.6.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/django-setuptest-0.0.6[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Add missing source file rather than make our own
+	cp -r "${FILESDIR}"/test_settings.py captcha || die
+	local PATCHES=( "${FILESDIR}"/${PN}-fields.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Use of nosetests gives confirmation that tests are run, "${PYTHON}" doesn't
+	nosetests captcha/tests.py || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/django-recaptcha/django-recaptcha-0.0.6.ebuild b/dev-python/django-recaptcha/django-recaptcha-0.0.6.ebuild
deleted file mode 100644
index 96d2793bb27f..000000000000
--- a/dev-python/django-recaptcha/django-recaptcha-0.0.6.ebuild
+++ /dev/null
@@ -1,27 +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-recaptcha/django-recaptcha-0.0.6.ebuild,v 1.2 2013/03/06 19:13:49 idella4 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-PYTHON_MODNAME="captcha"
-
-inherit distutils
-
-DESCRIPTION="Django recaptcha form field/widget app"
-HOMEPAGE="http://github.com/praekelt/django-recaptcha http://pypi.python.org/pypi/django-recaptcha"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-		dev-python/setuptools"
-# Test not supported, missing dependency
-# test? ( >=dev-python/django-setuptest-0.0.6 )
diff --git a/dev-python/django-recaptcha/files/django-recaptcha-fields.patch b/dev-python/django-recaptcha/files/django-recaptcha-fields.patch
index c4e722245434..2bd0d32c967e 100644
--- a/dev-python/django-recaptcha/files/django-recaptcha-fields.patch
+++ b/dev-python/django-recaptcha/files/django-recaptcha-fields.patch
@@ -12,7 +12,7 @@ diff -ur django-recaptcha-0.0.6.orig/captcha/fields.py django-recaptcha-0.0.6/ca
  from captcha import client
  from captcha.widgets import ReCaptcha
 -
-+from captcha import settings
++from captcha import test_settings as settings
  
  class ReCaptchaField(forms.CharField):
      default_error_messages = {
diff --git a/dev-python/django-recaptcha/files/django-recaptcha-settings.patch b/dev-python/django-recaptcha/files/django-recaptcha-settings.patch
index 8cc2f979a5bc..c28694ee4d1a 100644
--- a/dev-python/django-recaptcha/files/django-recaptcha-settings.patch
+++ b/dev-python/django-recaptcha/files/django-recaptcha-settings.patch
@@ -4,4 +4,3 @@
 +RECAPTCHA_PUBLIC_KEY='76wtgdfsjhsydt7r5FFGFhgsdfytd656sad75fgh'
 +RECAPTCHA_PRIVATE_KEY='98dfg6df7g56df6gdfgdfg65JHJH656565GFGFGs'
 +RECAPTCHA_USE_SSL='True'
-
diff --git a/dev-python/django-recaptcha/files/test_settings.py b/dev-python/django-recaptcha/files/test_settings.py
new file mode 100644
index 000000000000..5e66d9e454a2
--- /dev/null
+++ b/dev-python/django-recaptcha/files/test_settings.py
@@ -0,0 +1,14 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'test.sqlite',
+    }
+}
+
+INSTALLED_APPS = [
+    'captcha',
+]
+
+RECAPTCHA_PRIVATE_KEY = '98dfg6df7g56df6gdfgdfg65JHJH656565GFGFGs'
+RECAPTCHA_PUBLIC_KEY = '76wtgdfsjhsydt7r5FFGFhgsdfytd656sad75fgh'
+RECAPTCHA_USE_SSL='True'