add pypy support, update ebuilds to suit

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

4 files changed, 25 insertions, 18 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 6b2f3e5dcb68..42653133b4a6 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.129 2014/05/03 01:57:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.130 2014/05/12 06:44:52 idella4 Exp $
+
+  12 May 2014; Ian Delaney <idella4@gentoo.org> django-1.5.7.ebuild,
+  django-1.6.4.ebuild:
+  add pypy support, update ebuilds to suit
 
 *django-1.5.7 (03 May 2014)
 *django-1.6.4 (03 May 2014)
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8d677e1e2f75..fd7c995b572b 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -15,16 +15,16 @@ DIST Django-1.6.4.tar.gz 6630474 SHA256 ceee0beea79b1926c767aaa837e1b9e621e5f6b7
 EBUILD django-1.4.11.ebuild 2561 SHA256 522ae454973aa474dfae22f82d8334ef5f460ada5bb994068336c58d20ffbafb SHA512 a8de7f60eaa5362fc58af6b09fda508b662f2ed4c035cb4c965ad99acfb064c9c218f52aa3667e2cbbd697934e954ef9b8c896205f8ed8d8c16146f54d451b78 WHIRLPOOL bfdf7fbbda7ed06c086db9ba741a77f8a31b17ef790527ef911e442d1b4a1b19b099ba49deb2d4291f1e32ce3736e895e57bcf77d9ffe7ddd1f837671e94d239
 EBUILD django-1.4.12.ebuild 2563 SHA256 c261171e541fbefade7a2eabe42c8d38c30efa7d0feba125412daf7987d0d335 SHA512 f642cc8ababa8d963b3209d9248b3cc6f1bbbe7ebdbeea0948acf010182625859759d824138f01f12cbd2a853c9606d5df7b2d38c33d33938ac2fafc96fab0f4 WHIRLPOOL c6b516c1f4203fe7e38135b3ba4740b0f5aa9c001dc900807839849ac8fc99de2a295165a1886f23313dbfed429950e1fb37e0770f6c3a32aa3ba994e1ada81a
 EBUILD django-1.5.6.ebuild 2456 SHA256 6bc5017cd0fa4f6e0d4e6897d384ceadb1b3335dbee975183225d2e47ad9953c SHA512 104e7973ede62bd86022525d0c2fcbdf47e0fffaa23aa0303fae0a1f1d3408ebdd5328c1c94811331b385c5bc7ac3511a5f37559dde6be3c4d1967b5a093c5e6 WHIRLPOOL 4e62f03b4e851808bf74bb3d8d17affd928fe99061fc4156b353a355418c62d3678742f34d8714fd9d6be8317027d7caa2cfd618b7287911b493802759753ab3
-EBUILD django-1.5.7.ebuild 2452 SHA256 ba28fb3d43f0fd38452eb64aa35b1747386b8cc6f08af90b3e754f70c1875ed5 SHA512 2a0f78c622d5b0d08f5573e5dbbe5f19e98265216b6936d908642cdd8d2cd6dc0d4f505c596d6b2c81409b789a4d3b9a21aba9fbbac05cf9a3ca2b3423c97807 WHIRLPOOL 5f27dbe74da5fc76c38b64bf9936696c36be1628144f0f133b40426e0a54884ba505358c796310528535e8e3be0a1f72d85e8fc70759958a446ab440f1c8b5e9
+EBUILD django-1.5.7.ebuild 2582 SHA256 306ebc1312703e02d6adb730c29b758fe3ede40517f5d5385b9f3067570a8a3f SHA512 90cd736325efeca23b4a0208a8244e7d8cfe843973e913b76e723ff3173ddc307a76bd158ed80326973adc0a0e4d97f51b4bf6efb5ee7111236d0a4c9273b5b5 WHIRLPOOL 9f11e2f7e54771e07bad6bdf41d0da634aed4b322e4814d9110c37d1dc15defb916ab113155d3b26a354267965dd32b55b01808b31b1b4343e963b675e6b29b7
 EBUILD django-1.6.3.ebuild 2825 SHA256 75be77e0affe902d5f8b3fc334f3293252785626c41f5e678d1bdbdd8d9516a3 SHA512 3039521ce2b5cfff563186136d43f2a6d316fec6d1a7a5eacf6c55687dc045daedc18b12532767a8c0bf18368ff291521d4950cb142895ee2dcafdc43b49b219 WHIRLPOOL a082a3a58638525c7db7a5d196775b4d9826fd059c69132886c9de7b5ba7fdaaea73709ccd7fe26a0ab1cb5927625bc2644b1fd5cb2dd4f2098c2dd1f8aac6ac
-EBUILD django-1.6.4.ebuild 2821 SHA256 d8435f9cd57d3d34099723b63c81cfd0b016238466e756fbfcc6bfa1e2e04f0e SHA512 fbda316b6c7c13f54b725abc83dbb6db78b7a04366fc41e5125cc20f57cdd36a81d810c126801f7ffdbd5748cad5ff51387e428baa8e079ca89cc875885b7839 WHIRLPOOL bfe4381f50c3a93e2e24d3d29c28e8bb594a71520940d148bd4a7594dcccc08733dfe786cd388fd78af381f7fb7ff476cb050a4f43de768b187199781097988b
+EBUILD django-1.6.4.ebuild 2951 SHA256 5a022046ff023053f83f1a6fa315347604d582e0e94a7cc05a06b81e541dbeba SHA512 9dc15e00f1f03dbe8eb4e0fd42e5bd4776093d67110c004137670dafb0cbf8675a52defb6e63856fbf1999bc78cb960ee0e730a7d034cdc59d1e140651940304 WHIRLPOOL a0d9e2a416b63d299eefd0a1bc68ab8afef32a86689cf9dc31ad62527876d52abb9235b454c6410404f8515fca9087ce5506f4d35eb3d1cceb9c6dca6687d269
 EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
-MISC ChangeLog 19969 SHA256 57b7b894b2106f733cb588280625bf6e130d492200601042cbf5aab49dbbbdde SHA512 ce28842711e8c8acd6a99674fcf97b55dc46c2bd1eaa89bb952f53b7a82bb1e8eb632425f59e8b2d870e3d6a273ecbc30e1aeae2d8b4880bdd362ec518c1a965 WHIRLPOOL 33b17205b99c04899f119424035e49396aaf14410905cf22efe938dc805a57e02fbf7d259fbb9af5c91cde589d87cea8559b488502f9e120207f3630964bd707
+MISC ChangeLog 20105 SHA256 32a48f9bf6458edad9f1aa1fa165922761e892904f52157cd7295e6666ec55e6 SHA512 741eff6870e4721469d8d7bc2052064a5da4ec6a420ddb8f914de546a4713fe7af54429536a21b781f35d5f000b6f030275d9369427921a3c600c1f3c46f8bdb WHIRLPOOL bf917c449a753d16f2b11f9c84a631f3dcdd3184c09027cc6bbe806c3b30bd34c3c784bcc8dc552603792ed43038647d58836b4ee22fbec2e868ca93f063cb7d
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNkS18ACgkQso7CE7gHKw3IXwCggY8t4COktbJ5zLITfW9DpOZt
-w7UAniccJyNgGaILKhSKj6H7OHntrmmb
-=bwr+
+iEYEAREIAAYFAlNwbCIACgkQso7CE7gHKw2rYACfcJ/eIZI651nVl6z5m3Qeo6lK
+ROkAmwVT3qckQa33zQypUCqzInk7Az6h
+=+74I
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.5.7.ebuild b/dev-python/django/django-1.5.7.ebuild
index bd12637af0b1..b0dc20be2f03 100644
--- a/dev-python/django/django-1.5.7.ebuild
+++ b/dev-python/django/django-1.5.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.7.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.7.ebuild,v 1.2 2014/05/12 06:44:52 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy )
 PYTHON_REQ_USE='sqlite?'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
@@ -20,16 +20,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc mysql postgres sqlite test"
 
-PY2_USEDEP=$(python_gen_usedep 'python2*')
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PY23_USEDEP}] )
 	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
 
-REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
-
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )
+		postgres? ( || ( $(python_gen_useflags 'python{2_7,3_3,3_4}') ) )"
 S="${WORKDIR}/${MY_P}"
 
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/dev-python/django/django-1.6.4.ebuild b/dev-python/django/django-1.6.4.ebuild
index deb9bd118165..b24e8b0a2eba 100644
--- a/dev-python/django/django-1.6.4.ebuild
+++ b/dev-python/django/django-1.6.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.4.ebuild,v 1.1 2014/05/03 01:57:47 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.4.ebuild,v 1.2 2014/05/12 06:44:52 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 PYTHON_REQ_USE='sqlite?'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
@@ -20,15 +20,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc mysql postgres sqlite test"
 
-PY2_USEDEP=$(python_gen_usedep 'python2*')
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PY23_USEDEP}] )
 	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
 
-REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags python2_7) ) )
+		postgres? ( || ( $(python_gen_useflags 'python{2_7,3_3,3_4}') ) )"
 
 S="${WORKDIR}/${MY_P}"