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

Package-Manager: portage-2660-svn

5 files changed, 67 insertions, 18 deletions

diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index d1a36e3a95b4..ac0119222a86 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 be6f29d73e85c1d2d186099c5d6c3364 ChangeLog 3876
+MD5 1a30448caa8433dac4678357c783df03 ChangeLog 4026
 MD5 5615c89423881b929da50b6ead828cda files/1.2.0-newdecimal.patch 1021
 MD5 88531e3c04872ef98f13969b2ef06c4f files/digest-mysql-python-1.2.0 70
 MD5 88531e3c04872ef98f13969b2ef06c4f files/digest-mysql-python-1.2.0-r1 70
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 3b1a24e6a4740e8d5dd3daa2794fe39d mysql-python-1.2.0-r1.ebuild 796
+MD5 282b28fbe757399bb1dd654bafd00fe7 mysql-python-1.2.0-r1.ebuild 802
 MD5 c0e4fad09c18c2eb14c442286ff0454e mysql-python-1.2.0.ebuild 701
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD58aY9ZFPrqoILX8RAn58AKDftwkIeyRCoEmXbkY/bOoIMRoylQCgiiQ/
-mHIxjT+4nGrucHMaRtbxcUw=
-=I4m/
------END PGP SIGNATURE-----
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 0484450dd59e..662a195f5cc4 100644
--- a/dev-python/pysqlite/Manifest
+++ b/dev-python/pysqlite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f1c7e9994eacad190899549bc4ebad81 ChangeLog 5843
 RMD160 c572a97bb059d548c2ad43d20b20b97d1ba71a1e ChangeLog 5843
 SHA256 4e012d9abb6f37468df4215ada6cce1bd57b6830fec3f05fcb01d1b15c6ae392 ChangeLog 5843
@@ -31,3 +34,10 @@ SHA256 377e6a7c54095625234d7ce386b2f2a5006b74b0a6a22ea1f64c240b86d11207 pysqlite
 MD5 a0de910cc43b362b0072dddaea2ce647 pysqlite-2.0.7.ebuild 1833
 RMD160 a2c0f76c7dd4468b66f44880a449cf701fa0db76 pysqlite-2.0.7.ebuild 1833
 SHA256 6ea51e999cca139209ad7f073f35b8c4a6c46845a418057c285fcee5dbfdb0eb pysqlite-2.0.7.ebuild 1833
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD58c4W78445TWHXcRAv1WAJ4xvCOp5BrsfRZ4srQxFLE64tXragCcCJA3
+kOJcTOhdtZlK7BMjkWXjcJw=
+=/zqJ
+-----END PGP SIGNATURE-----
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"
 }