Fix building with USE="doc".

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

diff --git a/dev-python/pastescript/ChangeLog b/dev-python/pastescript/ChangeLog
index 104b015e9374b338749ab274e072c0416f3773a3..1857d1cba174b48bdcba0856fe709e413aed370d 100644 (file)
--- a/dev-python/pastescript/ChangeLog
+++ b/dev-python/pastescript/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pastescript
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.8 2009/10/11 08:28:57 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.9 2010/06/27 22:59:32 arfrever Exp $
+
+  27 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pastescript-1.7.3.ebuild:
+  Fix building with USE="doc".
 
   11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pastescript-1.7.3.ebuild:
   Merge from Prefix

diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index c2e787bb03f7983130aca217b00d6a94a57d08d4..bfb33eaed5189360b2f74d3b0501a99bd0ae1a7e 100644 (file)
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,4 +1,4 @@
 DIST PasteScript-1.7.3.tar.gz 127667 RMD160 e8e89b9e7c69231156f4208ea7cfefc92c6b22ab SHA1 32c007a1d0b0916c30d02dae188bb0fcd04d0326 SHA256 a695b38001721a8a8a128b8566aa15566cb526d13015caa12a32384902179a16
-EBUILD pastescript-1.7.3.ebuild 1439 RMD160 42d13f683721215b8a89de9574aa27dcaabac979 SHA1 2348c2006254dfd52834de54dd9f8aba85bbf815 SHA256 135ddd27b216929ff4f2e2a1bbdadc4c96ca82d8606862f10611918ca60a3192
-MISC ChangeLog 1430 RMD160 a5736529f557403c51808fcb9f653b483ccfeaa5 SHA1 94fe388cd6aa61707b86307480071948a735baf5 SHA256 ce3bd84b69ec938551da16d9fad5210769a52f8305e38afbf3cd36d75b6a8031
+EBUILD pastescript-1.7.3.ebuild 1464 RMD160 b1774e3d3d69f2e446358b105784bdf5e94ca1da SHA1 9b115dfee9467148c5e39c5b7ff5a7a15ba404d1 SHA256 9a981ef8dd9dfac734e3eff76c45df4e7bd162776938cf6910dae6d674cbe536
+MISC ChangeLog 1564 RMD160 fe54346d06065f3c2d6f4b61b2055e72a2e743bd SHA1 8e1f63d0c19c54370507825ff9d76627f127c52b SHA256 20dbd0c7b370dfc63cad5974948b280deea6d046aa6ecf01b549441b75d9d974
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4

diff --git a/dev-python/pastescript/pastescript-1.7.3.ebuild b/dev-python/pastescript/pastescript-1.7.3.ebuild
index e3a85c6477fc69d775a0f204edad98d24d1694c2..d832a5703f8ca6fb888d75306efbb21f41dc0b13 100644 (file)
--- a/dev-python/pastescript/pastescript-1.7.3.ebuild
+++ b/dev-python/pastescript/pastescript-1.7.3.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.4 2010/02/06 15:40:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.5 2010/06/27 22:59:32 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils
 
@@ -19,39 +21,37 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc"
-#IUSE="doc test"
 
-RDEPEND="dev-python/paste
+RDEPEND=">=dev-python/paste-1.3
        dev-python/pastedeploy
        dev-python/cheetah"
 DEPEND="${RDEPEND}
        dev-python/setuptools
-       doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )"
-#      test? ( dev-python/nose )
-RESTRICT_PYTHON_ABIS="3.*"
+       doc? ( dev-python/pygments dev-python/sphinx )"
 
 # Tests are broken.
 RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
+
 PYTHON_MODNAME="paste/script"
 
 src_compile() {
        distutils_src_compile
+
        if use doc; then
-               einfo "Generating docs as requested..."
-               PYTHONPATH=. "$(PYTHON -f)" setup.py pudge || die "generating docs failed"
+               einfo "Generation of documentation"
+               PYTHONPATH="." "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
        fi
 }
 
-src_test() {
-       testing() {
-               PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests-${PYTHON_ABI}
-       }
-       python_execute_function testing
-}
-
 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
 }