Improve pysqlite dependencies (bug #334801).

(Portage version: 2.2_rc86_p1/cvs/Linux x86_64)

4 files changed, 23 insertions, 37 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/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