Rename "sqlite3" USE flag to "sqlite" (bug #251408).

Package-Manager: portage-13623-svn/cvs/Linux x86_64

4 files changed, 45 insertions, 43 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index fd8b6663d913..81966c90e4d2 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.32 2009/05/16 05:15:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.33 2009/05/18 14:58:48 arfrever Exp $
+
+  18 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  django-1.0.2-r1.ebuild:
+  Rename "sqlite3" USE flag to "sqlite" (bug #251408).
 
   16 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   django-1.0.2-r1.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index c2eaf67f69ba..58a25076c4dd 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,13 +1,6 @@
-AUX django-1.0-fields.py.patch 1281 RMD160 5660800f6487595aa6909f8dc6f28e0d7986ff86 SHA1 93a96a75f8f76dd9a51938460533e4c1823c7b60 SHA256 fe6788a219de6c04a901ee147a8e4f13901a23944c9245803ee8f9b3717cfc98
-DIST Django-0.96.1.tar.gz 1746455 RMD160 1bd8fcceab101f80560bb4aa8a4851c204f3918b SHA1 85270f857ff405983cae9a1ef76dfb3303ca6eec SHA256 4874134e9fc6bd08eb7e451e42038394668895c26b7cc867d4c3fdaf9d711085
-DIST Django-0.96.2.tar.gz 1637044 RMD160 29488b09cc6d8013716c8a7d190fe6bc9625e568 SHA1 2766d858b15d5d76da61e096fa6ffeb55b0469fb SHA256 8964023587331412aed118549c83cf0dcc106850833cc75573e8671b68ecf29c
 DIST Django-1.0.2-final.tar.gz 4649433 RMD160 0cfea620df0831310da4ef51ef6ee4ef1b65974e SHA1 f2d9088f17aff47ea17e5767740cab67b2a73b6b SHA256 50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
-DIST Django-1.0.tar.gz 4789634 RMD160 ace144c8d33fda35e29b6a07cd5645d2666c98d9 SHA1 e3875f5ebf6f956d93f8b9bac47e23c48631b798 SHA256 4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 DIST django-1.0.2-tests.tar.bz2 228757 RMD160 8d30a18aac7d8c7da2cc3b0a23fea2ff233a5661 SHA1 ca309850b35f81825b09994c95dd227c5e589e75 SHA256 dd4f6c551ac3398961609c43aa581741eb98b8cb59722c88ce776bb52a74ade0
-EBUILD django-0.96.2.ebuild 2248 RMD160 501513a32dc199187fe4462209612bb9a24782e4 SHA1 5e147c96e1a5f9c5edc5106fd4c8512b87481fb2 SHA256 38f1f1bd6335e8b47951383e000592ada427fc07ef5409e27a5c501462bf2516
-EBUILD django-1.0.2-r1.ebuild 2720 RMD160 0846c135b73a427434b7245ab73a6c62ce8ee417 SHA1 023ff1e529d37a311e6a487fb392fb5aa7b2ddaf SHA256 ba7a5d9ce5c4197b21d0e0f4c4849325da063117fb1e34230fa1980df8b8cfa3
-EBUILD django-1.0.2.ebuild 2737 RMD160 92fb2b296b1f4d1f1c2384caa4b6b29b87e3f2ee SHA1 e3bb0b3e5e56464f6ddbec7a4584898ec4f5361d SHA256 5f72ad26282952b12d17a5332987b19913ebba3b48a43f8af34f0d9108db462d
-EBUILD django-1.0.ebuild 1856 RMD160 510909b478cba449d32a772d41c194c74f6674bb SHA1 2ec91ab1a839683e3af1121cca609376d73b8470 SHA256 aff2ba752f57f78694cd94734e5557fa93c226df3c9430c018f7efb3a3b657e6
-EBUILD django-9999.ebuild 2058 RMD160 8d165e5a603c0f60cdce2f4a0e58673b9bd93403 SHA1 0e95cd5eda84aa7a72b8d5d6d6dbdca6b52680cb SHA256 629bc65a363bd4522b6c1675dddafb4dd833186a5f78efdcd9ab3ea4e4fb296e
-MISC ChangeLog 5247 RMD160 28d26cfd810a9ef0541f171075ad7bc5cf4d6999 SHA1 ad0138ff2fd0427b6671adce38cd8f909e695a76 SHA256 a6630646bd7d4fa6474bb070fc57ee7acaf660c12ff419b49f37fda3037d55fd
+EBUILD django-1.0.2-r1.ebuild 2768 RMD160 f76f6e63a684036647652cc41a198079ceab37db SHA1 828dc7400d87d0cb54c668d9eb8457172f192b03 SHA256 75a740438fa0ca24c9442fdb0d4cd78f74817b036b5bcc3ed8348834d4ddef12
+EBUILD django-9999.ebuild 2096 RMD160 7be3ccc63309f858015d3438556c92d3ab33f106 SHA1 e7df7c6f2b0d0e4a1bc4f366df06e782671aa3c1 SHA256 8699f3052387c8877a5a83cfabe8929ef1a348eb04e24cfee15ca633748cdaa1
+MISC ChangeLog 5402 RMD160 72b013d52a7206f758937181ce770a5db02e8a75 SHA1 56d8e620d6318556b5bc21a7328993d0ddbf58ad SHA256 9daef558db5ef0fee9089e995192a352d58f24c642a336ca01e787eff25d8487
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/django/django-1.0.2-r1.ebuild b/dev-python/django/django-1.0.2-r1.ebuild
index ce1423e22dc7..a614ee9aab45 100644
--- a/dev-python/django/django-1.0.2-r1.ebuild
+++ b/dev-python/django/django-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.2-r1.ebuild,v 1.3 2009/05/16 05:15:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.2-r1.ebuild,v 1.4 2009/05/18 14:58:48 arfrever Exp $
 
 EAPI="2"
 
@@ -18,19 +18,19 @@ SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples mysql postgres sqlite3 test"
+IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
-	sqlite3? ( || (
+	sqlite? ( || (
 		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
 		>=dev-lang/python-2.5[sqlite] ) )
 	test? ( || (
 		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
 		>=dev-lang/python-2.5[sqlite] ) )
 	postgres? ( dev-python/psycopg )
-	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )
+	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
+DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.3 )"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -38,10 +38,11 @@ DOCS="docs/* AUTHORS"
 
 src_compile() {
 	distutils_src_compile
+
 	if use doc ; then
-		pushd docs
-		emake html || die "docs failed"
-		popd
+		pushd docs > /dev/null
+		emake html || die "Generation of HTML documentation failed"
+		popd > /dev/null
 	fi
 }
 
@@ -52,8 +53,7 @@ DATABASE_ENGINE='sqlite3'
 ROOT_URLCONF='tests/urls.py'
 SITE_ID=1
 __EOF__
-	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 \
-		|| die "tests failed"
+	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
 }
 
 src_install() {
@@ -70,6 +70,7 @@ src_install() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
+
 	if use doc ; then
 		mv docs/_build/html/{_,.}sources
 		dohtml txt -r docs/_build/html/*
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index 77d34c40c061..0cf480f6c2c9 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,33 +1,48 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/10/06 18:42:46 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.3 2009/05/18 14:58:48 arfrever Exp $
+
+EAPI="2"
 
 ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
 
-inherit bash-completion distutils eutils versionator subversion
+inherit bash-completion distutils eutils subversion versionator
 
-DESCRIPTION="high-level python web framework"
+DESCRIPTION="High-level python web framework"
 HOMEPAGE="http://www.djangoproject.com/"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS=""
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
 	sqlite? ( || (
-		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
-		>=dev-lang/python-2.5 ) )
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5[sqlite] ) )
 	test? ( || (
-		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
-		>=dev-lang/python-2.5 ) )
+		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
+		>=dev-lang/python-2.5[sqlite] ) )
 	postgres? ( dev-python/psycopg )
 	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
+	doc? ( >=dev-python/sphinx-0.3 )"
 
 S="${WORKDIR}"
 
+DOCS="docs/*.txt AUTHORS"
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		pushd docs > /dev/null
+		emake html || die "Generation of HTML documentation failed"
+		popd > /dev/null
+	fi
+}
+
 src_test() {
+	einfo "Running tests."
 	cat >> tests/settings.py << __EOF__
 DATABASE_ENGINE='sqlite3'
 ROOT_URLCONF='tests/urls.py'
@@ -41,23 +56,12 @@ __EOF__
 	PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
 }
 
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		cd docs
-		emake html || die "generating html docs failed"
-	fi
-}
-
 src_install() {
 	distutils_python_version
-
-	site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/"
+	site_pkgs="$(python_get_sitedir)"
 	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
 	dodir ${site_pkgs}
 
-	DOCS="docs/*.txt AUTHORS"
 	distutils_src_install
 
 	dobin django/bin/{compile-messages,daily_cleanup,make-messages,unique-messages,profiling/gather_profile_stats}.py