Fix building with USE="doc" (bug #318759).

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/pastedeploy/ChangeLog b/dev-python/pastedeploy/ChangeLog
index 9d9b589e8c1d4378f5adf3a087da5ce2344cd37d..0173b8c583d77e96e8a4812b2ceb9018a3cbaf34 100644 (file)
--- a/dev-python/pastedeploy/ChangeLog
+++ b/dev-python/pastedeploy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pastedeploy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.8 2009/10/11 08:27:30 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.9 2010/06/26 04:41:35 arfrever Exp $
+
+  26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pastedeploy-1.3.3.ebuild:
+  Fix building with USE="doc" (bug #318759).
 
   11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pastedeploy-1.3.3.ebuild:
   Merge from Prefix

diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 2891f9ddec75023c1032b96824a6182eec13d8cc..1ff834668bab324207791458c7bfd2592bd047c7 100644 (file)
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,4 +1,4 @@
 DIST PasteDeploy-1.3.3.tar.gz 30675 RMD160 3a3afb0405d31b0158a4b94f33e091f94f971900 SHA1 dcb3d4cff75ccb284fb8c738f0abe27600ed8546 SHA256 58b32ea12045389a57f340f973827a325e39ea426608858307f0ae33e4c30fb0
-EBUILD pastedeploy-1.3.3.ebuild 1400 RMD160 3c838fb0ae90730a71ec300acef5d06b4f2ccd83 SHA1 25d246afd1a85533d5213f30a08ff88b4183d8b7 SHA256 b37180f5684c5e5002a24ae34a74e2adf7dc5fa29c8490a88a63bd773bedb48f
-MISC ChangeLog 1415 RMD160 911dec466de3d9b238038dbcfb75365b385fff4c SHA1 4223315483cc651c52b6d1dafc25f4b64f718934 SHA256 1937c599ce4f997333b3882a487fc63da8c76ea4efd6d52f04cbc1e92a8e9998
+EBUILD pastedeploy-1.3.3.ebuild 1452 RMD160 481bbc9aeb1ef9b379d0067637e1468d4b108f5c SHA1 0d17e5767e3d89da2f4287b22abbb57485996638 SHA256 3ac4526fd89a361e85eeeb07556ad84d68fa50b00b5a2eb42705031b9e1c7013
+MISC ChangeLog 1563 RMD160 806b6d38fd6003b5c2d99c79dfda23b5f8daf7ae SHA1 1c0d422c64ebc2d0f4c54381a2425513f8f655a5 SHA256 786b09389dfe527d367e442196111e407b082f7cc3d1af97796cae32f0b78bbb
 MISC metadata.xml 657 RMD160 dd09bcd9b74c23178b0e8db55e36c29979ac9864 SHA1 8c7b1695eb3f342dd673858763eea87282fbea79 SHA256 e4f4a1b913c8ab000ef26d3723646b6fde9cf053ab058bfe1fac6fd43cf136ac

diff --git a/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild b/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild
index adf1a39f55bdb29f545cd7049b4572c8511017b6..ff723541191c69930d5ae120b54719e8afe8b460 100644 (file)
--- a/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild,v 1.6 2010/02/06 15:38:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild,v 1.7 2010/06/26 04:41:35 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_SRC_TEST="nosetests"
 
 inherit eutils distutils multilib
 
@@ -22,33 +23,36 @@ IUSE="doc test"
 
 RDEPEND=""
 DEPEND="dev-python/setuptools
-       doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )
-       test? ( dev-python/nose dev-python/py )"
+       doc? ( dev-python/pygments dev-python/sphinx )"
 RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
 PYTHON_MODNAME="paste/deploy"
 
-src_compile() {
-       distutils_src_compile
-       if use doc; then
-               einfo "Generating docs as requested..."
-               PYTHONPATH=. "$(PYTHON -f)" setup.py pudge || die "Generation of documentation failed"
-       fi
-}
+src_prepare() {
+       distutils_src_prepare
 
-src_test() {
        # Delete broken test.
        rm -f tests/test_config_middleware.py
+}
+
+src_compile() {
+       distutils_src_compile
 
-       testing() {
-               PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests-${PYTHON_ABI}
-       }
-       python_execute_function testing
+       if use doc; then
+               einfo "Generation of documentation"
+               PYTHONPATH="." "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
+       fi
 }
 
 src_install() {
        distutils_src_install
-       use doc && dohtml -r docs/html/*
+
+       if use doc; then
+               pushd build/sphinx/html > /dev/null
+               docinto html
+               cp -R [a-z]*  _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
+               popd > /dev/null
+       fi
 }