Fix building of documentation (bug #300788).

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

diff --git a/dev-python/buildutils/ChangeLog b/dev-python/buildutils/ChangeLog
index d70561c6d2626ee76172a6ea618e1dc73d07acf4..99b4555ff91c9c76227b80725960d912a6f51fbe 100644 (file)
--- a/dev-python/buildutils/ChangeLog
+++ b/dev-python/buildutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/buildutils
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/ChangeLog,v 1.7 2009/10/10 11:58:20 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/ChangeLog,v 1.8 2010/04/04 16:41:05 arfrever Exp $
+
+  04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  buildutils-0.3.ebuild:
+  Fix building of documentation (bug #300788).
 
   10 Oct 2009; Fabian Groffen <grobian@gentoo.org> buildutils-0.3.ebuild:
   Merge from Prefix

diff --git a/dev-python/buildutils/Manifest b/dev-python/buildutils/Manifest
index 830d7fcb084ccf76408b4ff112b57bd4a8ac1daf..669d11e47b004047cdad01d0dfe8f08538fe95b9 100644 (file)
--- a/dev-python/buildutils/Manifest
+++ b/dev-python/buildutils/Manifest
@@ -1,5 +1,5 @@
 AUX buildutils-0.3-pudge_addcommand.patch 237 RMD160 488c6604e52333c3194fbbc23e631cba69d99647 SHA1 b6d949b61eca54dddf2963f89fe489c8b40bd486 SHA256 6dd1328aaa871e112017a040078311e14154590f18b5b566298ac0ba0ca56f9b
 DIST buildutils-0.3.tar.gz 47868 RMD160 90c2b570f060f78c8ac2ee104769a8efa8bceb79 SHA1 c8213d19ba9b41ddeda04f252350de12bd653f86 SHA256 8f9921cf145a1879986b4028db0af4f028f65fe6eae29936490174037ba7dfc5
-EBUILD buildutils-0.3.ebuild 1127 RMD160 d580b7109cec7917be6459301059dae7bcae83f4 SHA1 c5970a60062c890822966d7be03b90d87c2664b7 SHA256 49f3af4f5cc234597d97652425a23d174b09bfc160e302aecc6176c13ce1f2be
-MISC ChangeLog 1193 RMD160 8eea36a5446402d9fbbcc8b2601ebcc21e62e5ee SHA1 bdb8836b33cbfda6d997d1d793afc17bd9c57a54 SHA256 a57260474db6756e42c641ccede8656db8af9182dd7dd8b8e8ba8387f3e85457
+EBUILD buildutils-0.3.ebuild 1268 RMD160 7ee78bfa06efe0a522e74bac56ba2de3d14ac612 SHA1 ec846d18a7e7b0fc4fd8f376dca979086d63e943 SHA256 4462250a99bdb657aa8deafaf854ec99f478b33e0dc0e8f2d0c93132ad0327c8
+MISC ChangeLog 1340 RMD160 aa4a240ccef6b51411757051b7ab485e09a3ddbc SHA1 85931b66f18a9108e26cbdf054279a48eb2e0cdd SHA256 ff632827182c208926d29f7233ca92fab6fa73938fa1af866f1ddb3c2846e814
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4

diff --git a/dev-python/buildutils/buildutils-0.3.ebuild b/dev-python/buildutils/buildutils-0.3.ebuild
index 817344e6e5edc9cfba68d7e44d2f576a02b32715..88830f315df6780a343a2eedcfd74ccbcaa2fb2d 100644 (file)
--- a/dev-python/buildutils/buildutils-0.3.ebuild
+++ b/dev-python/buildutils/buildutils-0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/buildutils-0.3.ebuild,v 1.4 2010/02/06 14:39:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/buildutils/buildutils-0.3.ebuild,v 1.5 2010/04/04 16:41:05 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 
@@ -25,12 +25,15 @@ RESTRICT_PYTHON_ABIS="3.*"
 src_prepare() {
        distutils_src_prepare
 
-       # pudge command is disabled by default, enable it.
+       # Enable pudge command.
        epatch "${FILESDIR}/${P}-pudge_addcommand.patch"
+
+       sed -e "s/buildutils.command.publish/buildutils.publish_command.publish/" -i buildutils/test/test_publish.py || die "sed failed"
 }
 
 src_compile() {
        distutils_src_compile
+
        if use doc; then
                einfo "Generation of documentation"
                "$(PYTHON -f)" setup.py pudge || die "Generation of documentation failed"
@@ -39,5 +42,8 @@ src_compile() {
 
 src_install() {
        distutils_src_install
-       use doc && dohtml -r doc/html/*
+
+       if use doc; then
+               dohtml -r doc/html/* || die "dohtml failed"
+       fi
 }

diff --git a/dev-python/pudge/Manifest b/dev-python/pudge/Manifest
index 32242ab2de5d29ed6252d3b5dc8121012ecdd755..bf137883e570847b2a0253227fa6ce3ca35a6526 100644 (file)
--- a/dev-python/pudge/Manifest
+++ b/dev-python/pudge/Manifest
@@ -1,4 +1,4 @@
 DIST pudge-0.1.3.tar.gz 62396 RMD160 a4de884df061c7d1daa259c9a01e9cd1b40a10a3 SHA1 32401a9110dca65aac29f454f7b60d96b5511dfc SHA256 d01c32923be4ded09eb6ca936b01f7d60ad50112ea4515f9e70f1d1f8135adf6
-EBUILD pudge-0.1.3.ebuild 1019 RMD160 a8a68893a84df5c9d650df60a88a3c0de7f0fc88 SHA1 a6d71573a61839b9ace38f95646c11a2191d784e SHA256 70e20a7b29f428eb5d24e40fcec25cc6871d4408424d9967920c3a72fc2c3213
+EBUILD pudge-0.1.3.ebuild 1057 RMD160 32eedd9717d9ffabb31d9deca35be50e918fd944 SHA1 efeae7cde20f62f2a43b2bda557a91bd1d48c18a SHA256 8a03513ec75e863961d10749a1b47f1f5f5fc5dfb2d6d229113ae30ea5aee061
 MISC ChangeLog 1113 RMD160 401171e5f16b8888d276b2a340c0fd4d62fc8859 SHA1 92cb7e7a3de404d1ce8576b08030e8b404ecee28 SHA256 c60eaa162a1156c05e13224c37c957f718a339a3151e803652129ed95bd1a93c
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4