Improve pysqlite dependencies (bug #334801).

Package-Manager: portage-2.2_rc86_p1/cvs/Linux x86_64

5 files changed, 27 insertions, 41 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 0642a90c993d..c43605968e6e 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.50 2010/09/22 19:38:29 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.51 2010/09/22 19:48:23 arfrever Exp $
+
+  22 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  django-1.0.4.ebuild, django-1.1.2.ebuild, django-9999.ebuild:
+  Improve pysqlite dependencies (bug #334801).
 
 *django-1.2.3 (22 Sep 2010)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ed17d64a4ec7..167aaba04ee2 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,9 +2,9 @@ AUX django-1.2.3-fix_tests.patch 2323 RMD160 44b1cebe3bbc662be547464b2363b2097ef
 DIST Django-1.0.4.tar.gz 5088869 RMD160 9f61455bc4cc0277ddfe4a957863d5995f8c23f3 SHA1 a8b9f33adb007146b8b57f22f0f38467f0d2693a SHA256 a9388a047814bbe356c43d3d2e3afff42b1f93190c86aa4ac72f828a5ef107eb
 DIST Django-1.1.2.tar.gz 5748420 RMD160 234ed051b4b0424f8bbd06b7021aaf94c4d185ff SHA1 1d3df9f1f7bbd5ba6334cb3503791a2b290af96e SHA256 5ccea372454536148e603b1a7c010711c25a991ffaf3b2d6ab2034ad05e1ec25
 DIST Django-1.2.3.tar.gz 6306760 RMD160 f412f42c1ab6c4829a7768b988e2db1adc9adb5c SHA1 f65146218ab61bf5efe715db3fc3a177a24fba0d SHA256 cb830f6038b78037647150d977f6cd5cf2bfd731f1788ecf8758a03c213a0f84
-EBUILD django-1.0.4.ebuild 2798 RMD160 d651fb7b3cd6e4c910fe715c5b8231f55e073b00 SHA1 ed3ffa0d87f92a53632fabe7264fb5a1996cbb17 SHA256 80a8f064e2e2db5bc871dc450ce178a1c157cba844754c268e8ceb27f7497a10
-EBUILD django-1.1.2.ebuild 2834 RMD160 51d9b0481344fbfba27ddc9876265e763d25785a SHA1 2921239cf43232fb46f0f92dfa5067c81b0be3b5 SHA256 1d4d3d844a2897daa4b0190654240cdb85376e4148ab096534d099e17553ab50
+EBUILD django-1.0.4.ebuild 2846 RMD160 4c6294acaa9fa608822f87be4f15a4072e79cbb7 SHA1 a57e2e6ffa777b0a2830f1226341d4b01bed8238 SHA256 e01b57fd4aa2bb9880ef91234c53cae2219ff5c917a685b8c9abbf53d33dba5b
+EBUILD django-1.1.2.ebuild 2885 RMD160 caeb3097b2d2ddff52cea323151eaa12956d952d SHA1 a64096171957afe5d8dd132b4236463f1452c8cc SHA256 04baaf39d6ca1631c523724fa2a619180bfc0be7972a8f14cf66300bbcd5caed
 EBUILD django-1.2.3.ebuild 2847 RMD160 6b11cdb82edf416daa0c1531d3ccf96c40d100ca SHA1 cc27d5da46e03daf10ba30dce41f36e9bc24d82c SHA256 eb9f5e1305359cee65bae3aeb7bababd36f2ea0fed273eb4c12a4b1421998dc5
-EBUILD django-9999.ebuild 2560 RMD160 137785a0c204bed0cfd77b40c7f9372c76f78499 SHA1 3236c16920a3524cb6122f224700f7e8ceab8888 SHA256 804a66b112878a0fd291530bc2f858a03d76da28a41694c3a5e89f8ae244bbfe
-MISC ChangeLog 7823 RMD160 aa869d5a564262fbd7cfcaa26ee6723f85fc36c5 SHA1 4d076a034256d500f7505ed7452e1cce5a01b212 SHA256 959915d84f23a21e3e74c073d9c596e1dcde7aabb5830f2d7bb991c007f14c72
+EBUILD django-9999.ebuild 2608 RMD160 8e6086c8322b9e53d109afc0da9f23b101a5446e SHA1 a32603f8985d40a48ce6459239aa2ed313f4b34d SHA256 1ae9d563db7b5bcb47e4f959f35092deecca01fb8c1b627ad41c02f27379d1f4
+MISC ChangeLog 8008 RMD160 aa9da90baea26dde0251f67e497971a727d267d1 SHA1 4f46c7e1647503b201c14cfd6c56faa68917cc86 SHA256 85f38050330ab45511c8579bdedfeed83426f381ea38721469a3a540ece7828a
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.0.4.ebuild b/dev-python/django/django-1.0.4.ebuild
index 60f16adfb477..1475c2f40a9e 100644
--- a/dev-python/django/django-1.0.4.ebuild
+++ b/dev-python/django/django-1.0.4.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.2 2010/05/26 17:58:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.3 2010/09/22 19:48:23 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit bash-completion distutils webapp
 
 MY_P="Django-${PV}"
 
-DESCRIPTION="High-level python web framework"
+DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
 SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
 
@@ -20,19 +21,12 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
-	sqlite? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )
+	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
 	postgres? ( dev-python/psycopg )
 	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.3 )
-	test? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )"
-RESTRICT_PYTHON_ABIS="3.*"
+	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,8 +42,8 @@ src_compile() {
 	distutils_src_compile
 
 	if use doc; then
-		pushd docs > /dev/null
 		einfo "Generation of documentation"
+		pushd docs > /dev/null
 		emake html || die "Generation of documentation failed"
 		popd > /dev/null
 	fi
diff --git a/dev-python/django/django-1.1.2.ebuild b/dev-python/django/django-1.1.2.ebuild
index 0da86bd2430c..0b6f140c2ecd 100644
--- a/dev-python/django/django-1.1.2.ebuild
+++ b/dev-python/django/django-1.1.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v 1.4 2010/07/11 12:38:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v 1.5 2010/09/22 19:48:23 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit bash-completion distutils versionator webapp
 
 MY_P="Django-${PV}"
 
-DESCRIPTION="High-level python web framework"
+DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
 SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
@@ -20,19 +21,12 @@ KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
-	sqlite? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )
+	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
 	postgres? ( dev-python/psycopg )
 	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.3 )
-	test? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )"
-RESTRICT_PYTHON_ABIS="3.*"
+	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,8 +42,8 @@ src_compile() {
 	distutils_src_compile
 
 	if use doc; then
-		pushd docs > /dev/null
 		einfo "Generation of documentation"
+		pushd docs > /dev/null
 		emake html || die "Generation of documentation failed"
 		popd > /dev/null
 	fi
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index ccbd2fc4b23c..ecd83634e5fc 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.7 2010/07/06 13:28:19 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.8 2010/09/22 19:48:23 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit bash-completion distutils subversion webapp
 
-DESCRIPTION="High-level python web framework"
+DESCRIPTION="High-level Python web framework"
 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
 SRC_URI=""
 
@@ -18,19 +19,12 @@ KEYWORDS=""
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
-	sqlite? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )
+	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
 	postgres? ( dev-python/psycopg )
 	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.3 )
-	test? ( || (
-		>=dev-lang/python-2.5[sqlite]
-		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
-	) )"
-RESTRICT_PYTHON_ABIS="3.*"
+	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
 
 S="${WORKDIR}"
 
@@ -48,8 +42,8 @@ src_compile() {
 	distutils_src_compile
 
 	if use doc; then
-		pushd docs > /dev/null
 		einfo "Generation of documentation"
+		pushd docs > /dev/null
 		emake html || die "Generation of documentation failed"
 		popd > /dev/null
 	fi