Added pygments to DEPEND when doc USE is set, thanks to Jan-Matthias

Braun, #219991. Added RESTRICT="test" until someone finds a neat way to
fix them.
Package-Manager: portage-2.1.5_rc10

3 files changed, 22 insertions, 14 deletions

diff --git a/dev-python/pastedeploy/ChangeLog b/dev-python/pastedeploy/ChangeLog
index b0dcb583fa0b..eb5652037766 100644
--- a/dev-python/pastedeploy/ChangeLog
+++ b/dev-python/pastedeploy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pastedeploy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.3 2008/04/18 13:09:14 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.4 2008/05/13 11:45:44 hawking Exp $
+
+  13 May 2008; Ali Polatel <hawking@gentoo.org> pastedeploy-1.3.1.ebuild:
+  Added pygments to DEPEND when doc USE is set, thanks to Jan-Matthias
+  Braun, #219991. Added RESTRICT="test" until someone finds a neat way to
+  fix them.
 
 *pastedeploy-1.3.1 (18 Apr 2008)
 
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 026765e032fb..401bc0f8d342 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST PasteDeploy-1.3.1.tar.gz 27397 RMD160 72ce5acb08f889a9c0c694e1344bdb24067864ae SHA1 84cdb077618db0b0c03b91298e91f8db70082547 SHA256 71c81f5aa60af8238189bf85477d85e926d435df3a28b623842e83406f4a81a8
-EBUILD pastedeploy-1.3.1.ebuild 1431 RMD160 d8401112f3150091792413a55e8e26c2626253d7 SHA1 b88dcf61c0fc54a66e1d13f495774213863daa39 SHA256 5f00886c3beaaf4c9e5cc726bac2794906cb4c852ca08df08921c548da06ecc9
-MISC ChangeLog 650 RMD160 1f5def40bfa3ece812a5388f0861474df04829d2 SHA1 1bf0ccefbf914bbb72ae8541af14aa9bed0ba4ff SHA256 c7d7aeb4a0f43511bed0ab495c6af95cd92b4a6156e479a11dc3e904dfcec27b
+EBUILD pastedeploy-1.3.1.ebuild 1551 RMD160 da9bbad2b4ce857ee7aa7f402c12e900eceef2d3 SHA1 be4e06f3f686fed27c040d7dc7a9b825b26ce203 SHA256 2cb98f66dc0cad1c3675502e4a31d38a031a54bf84cd5317a8abb80ba8f554db
+MISC ChangeLog 882 RMD160 a0af7d0c9ba4046967fff4f0d5b591e2b316009b SHA1 d536455402069a6981d551ed548704181209c1b9 SHA256 7a8eac754d368a6df57718f72cb4602a91bf3ff658fedacb8fcb0f21fddb6635
 MISC metadata.xml 657 RMD160 dd09bcd9b74c23178b0e8db55e36c29979ac9864 SHA1 8c7b1695eb3f342dd673858763eea87282fbea79 SHA256 e4f4a1b913c8ab000ef26d3723646b6fde9cf053ab058bfe1fac6fd43cf136ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgInYAACgkQQU4yORhF8iCvvQCbBTTo0NFOwkTtZjO1i9T8lSrs
-XlQAoLdupeJLeEk5d5WBCXOb127PCh+a
-=gEg0
+iEYEARECAAYFAkgpf20ACgkQQU4yORhF8iD7rQCghnNQSaHarsXO0mj+QyjrOJFD
+jCQAoJD5FK6+toDSNdG7CkDG1hdoayxm
+=4Djq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild b/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild
index 09507476c15f..0df960a4cde6 100644
--- a/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild,v 1.1 2008/04/18 13:09:14 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.1.ebuild,v 1.2 2008/05/13 11:45:44 hawking Exp $
 
 NEED_PYTHON=2.4
 
@@ -21,12 +21,13 @@ IUSE="doc test"
 RDEPEND="dev-python/paste"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
-	doc? ( dev-python/pudge dev-python/buildutils )
+	doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )
 	test? ( dev-python/nose dev-python/py )"
 
 S=${WORKDIR}/${MY_P}
 
 PYTHON_MODNAME="paste/deploy"
+RESTRICT="test"
 
 src_compile() {
 	distutils_src_compile
@@ -42,12 +43,14 @@ src_install() {
 }
 
 src_test() {
-	# Tests can't import paste from site-packages
-	# so we copy them over.
-	# The files that will be installed are already copied to build/lib
-	# so this shouldn't generate any collisions.
 	distutils_python_version
-	cp -pPR /usr/$(get_libdir)/python${PYVER}/site-packages/paste/* paste/
 
-	PYTHONPATH=. "${python}" setup.py nosetests || die "tests failed"
+	# Tests can't import paste from site-packages
+	# So we copy pastedeploy and paste under T.
+	# FIXME This doesn't work. Couldn't figure out why -hawking.
+	cp -pPR build/lib/paste "${T}" || die "couldn't copy pastedeploy."
+	cp -pPR /usr/$(get_libdir)/python${PYVER}/site-packages/paste/* \
+		"${T}"/paste/ || die "couldn't copy paste."
+
+	PYTHONPATH="${T}" "${python}" setup.py nosetests || die "tests failed"
 }