Make USE=doc build work (fix dependencies) and USE=-doc not build the docs, fix a sandbox issue with the tests.

(Portage version: 2660-svn)

4 files changed, 61 insertions, 19 deletions

diff --git a/dev-python/pysqlite/ChangeLog b/dev-python/pysqlite/ChangeLog
index 5bb5114f2bcd..331ceaf3f662 100644
--- a/dev-python/pysqlite/ChangeLog
+++ b/dev-python/pysqlite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pysqlite
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.44 2006/02/05 23:42:56 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.45 2006/02/06 22:01:13 marienz Exp $
+
+  06 Feb 2006; Marien Zwart <marienz@gentoo.org>
+  +files/pysqlite-2.0.7-setup.py-doc-fixes.patch, pysqlite-2.0.7.ebuild:
+  Make USE=doc build work (fix dependencies) and USE=-doc not build the docs,
+  fix a sandbox issue with the tests.
 
   05 Feb 2006; Marien Zwart <marienz@gentoo.org> pysqlite-2.0.7.ebuild:
   Drop keywords on the (package.masked) 2.0.7 to ~amd64 ~x86 because of
diff --git a/dev-python/pysqlite/Manifest b/dev-python/pysqlite/Manifest
index f7486f7acd3e..26b975d260e0 100644
--- a/dev-python/pysqlite/Manifest
+++ b/dev-python/pysqlite/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 dc465d0f117b07095ddc785c6c40398c ChangeLog 5604
 RMD160 35300b012f2c66fea83f426e831e651ed5e5dfde ChangeLog 5604
 SHA256 4b91407d6ee8e3ae905ee85fd89d9013b58750c2bf58c2656eee5544c3ed4d0b ChangeLog 5604
@@ -16,6 +13,9 @@ SHA256 a6fd9ee4d7bf8bac775d89bc040f821507b7d465b39fdcb0809b1ae5cd8c01c6 files/di
 MD5 e925645fada24044815e72fe5b779f7d files/digest-pysqlite-2.0.7 244
 RMD160 27f21b3e2a73917d507d015f8981ec0ae0b3f26f files/digest-pysqlite-2.0.7 244
 SHA256 c188ddc09e5aa83dbd394d42e57649284a20c2731ad7c61b61abac6c532ad956 files/digest-pysqlite-2.0.7 244
+MD5 1317339e75f7cf1f8a4f2f1eacf6903b files/pysqlite-2.0.7-setup.py-doc-fixes.patch 623
+RMD160 f8aa303e93ccaaf3597faf5f84c35d3a7f21783f files/pysqlite-2.0.7-setup.py-doc-fixes.patch 623
+SHA256 aff2daf8e78bb49fa54b0ff98ad2f4e65c226ab407771a3c5bbcf333920a06e1 files/pysqlite-2.0.7-setup.py-doc-fixes.patch 623
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
@@ -28,13 +28,6 @@ SHA256 72ac403c9443bfc4e569b8ce85d8ece2a584c8b17daef0f81354bfc963bba347 pysqlite
 MD5 6cce3f61a9712de9997c225dda511143 pysqlite-2.0.5.ebuild 1026
 RMD160 3e3a9c88895c6e161eed6a18889efa1410fb7123 pysqlite-2.0.5.ebuild 1026
 SHA256 377e6a7c54095625234d7ce386b2f2a5006b74b0a6a22ea1f64c240b86d11207 pysqlite-2.0.5.ebuild 1026
-MD5 a8a3cae45ebed7315343f1e898335004 pysqlite-2.0.7.ebuild 1406
-RMD160 9e8cae4c0a09271b7a26fb81127a503bc39f8a91 pysqlite-2.0.7.ebuild 1406
-SHA256 08f309c2358ef4e5371b3a97baf18190ad8542edbb9b243566a1da86c652cd72 pysqlite-2.0.7.ebuild 1406
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD5o2qW78445TWHXcRAiwQAJ9Xod0qWDvCiooGEAlrDt8SCZ+WiQCeIQZq
-4Oj/oICOBJgQr5uSVkZLY2k=
-=1PWy
------END PGP SIGNATURE-----
+MD5 8043984f525366e30d0ad4fa11fbbd7b pysqlite-2.0.7.ebuild 1833
+RMD160 a9eea935e2f9e5d51966d068fe7c6aab992d9a83 pysqlite-2.0.7.ebuild 1833
+SHA256 9b41852b44904431c4aa7a43cd476b1b3038417af5d6ce9fdca79df7d7cce04a pysqlite-2.0.7.ebuild 1833
diff --git a/dev-python/pysqlite/files/pysqlite-2.0.7-setup.py-doc-fixes.patch b/dev-python/pysqlite/files/pysqlite-2.0.7-setup.py-doc-fixes.patch
new file mode 100644
index 000000000000..a2fed614cf73
--- /dev/null
+++ b/dev-python/pysqlite/files/pysqlite-2.0.7-setup.py-doc-fixes.patch
@@ -0,0 +1,22 @@
+=== modified file 'setup.py'
+--- setup.py	
++++ setup.py	
+@@ -89,7 +89,8 @@
+     os.chdir("..")
+ 
+ def main():
+-    build_docs()
++    if "NODOCS" not in os.environ:
++        build_docs()
+     data_files = [("pysqlite2-doc",
+                         glob.glob("doc/*.html") \
+                       + glob.glob("doc/*.txt") \
+@@ -119,7 +120,6 @@
+             package_dir = {"pysqlite2": "lib"},
+             packages = ["pysqlite2", "pysqlite2.test"],
+             scripts=[],
+-            data_files = data_files,
+             package_data = package_data,
+ 
+             ext_modules = [Extension( name="pysqlite2._sqlite",
+
diff --git a/dev-python/pysqlite/pysqlite-2.0.7.ebuild b/dev-python/pysqlite/pysqlite-2.0.7.ebuild
index 44879bf3c6e7..f6f5050a6eae 100644
--- a/dev-python/pysqlite/pysqlite-2.0.7.ebuild
+++ b/dev-python/pysqlite/pysqlite-2.0.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.0.7.ebuild,v 1.2 2006/02/05 23:42:56 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.0.7.ebuild,v 1.3 2006/02/06 22:01:13 marienz Exp $
 
-inherit distutils
+inherit distutils eutils
 
 IUSE="doc"
 DESCRIPTION="Python wrapper for the local database Sqlite"
@@ -15,14 +15,36 @@ SLOT="2"
 
 DEPEND=">=dev-lang/python-2.3
 	>=dev-db/sqlite-3.1
-	>=dev-python/setuptools-0.6_alpha9"
+	>=dev-python/setuptools-0.6_alpha9
+	doc? (
+		dev-python/docutils
+		app-text/silvercity
+		!=app-text/silvercity-0.9.6
+	)"
 
 src_unpack() {
 	unpack ${A}
-	sed -i -e "s:data_files = data_files,:data_files = [],:" ${S}/setup.py
+	cd "${S}"
+
+	# make setup.py not compile docs if NODOCS is set and not install them
+	epatch "${FILESDIR}/${P}-setup.py-doc-fixes.patch"
+
+	# use a nonexistant test file in ${T} instead of / to prevent
+	# sandbox problems
+	sed -i -e 's:/foo/bar/:${T}/foo/bar/:' lib/test/dbapi.py
+}
+
+src_compile() {
+	if ! use doc; then
+		export NODOCS=1
+	fi
+	distutils_src_compile
 }
 
 src_install() {
+	if ! use doc; then
+		export NODOCS=1
+	fi
 	${python} setup.py install --root=${D} --no-compile \
 		--single-version-externally-managed "$@" || die
 
@@ -45,5 +67,5 @@ src_install() {
 
 src_test() {
 	cd build/lib*
-	PYTHONPATH=. python ../../scripts/test-pysqlite || die "test failed"
+	PYTHONPATH=. ${python} ../../scripts/test-pysqlite || die "test failed"
 }