bug 381731; fix doc generation

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

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 53be9c4117b6836e4e4c4e72e22e83f0e2a8adad..8899936e635c797314c02652d8aca70fb729d090 100644 (file)
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.121 2011/09/03 08:22:35 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.122 2011/09/05 20:18:28 ferringb Exp $
+
+*pkgcore-0.7.1-r1 (05 Sep 2011)
+
+  05 Sep 2011; Brian Harring <ferringb@gentoo.org> -pkgcore-0.7.1.ebuild,
+  +pkgcore-0.7.1-r1.ebuild:
+  bug 381731; fix USE=doc
 
 *pkgcore-0.7.1 (03 Sep 2011)
 

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 77b6d0aa3c0a518a6b476da79e6861b04904bafa..ea2fbd9f5e4889d26137c8292af9206446351003 100644 (file)
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -7,14 +7,14 @@ DIST pkgcore-0.6.6.tar.bz2 449308 RMD160 b8f6070740dc92739374d024243d08cc5a9a34c
 DIST pkgcore-0.7.1.tar.bz2 428999 RMD160 75afdc0158f3f3b90739a82947e8c3641cc44769 SHA1 a0f2a524c33c8d44aca3570dd4dacde15d61ae49 SHA256 1e6892d1c45f9c356f98e4bb13cb483fc7190909a76826e3723d1e191fa23a80
 EBUILD pkgcore-0.6.5-r1.ebuild 1917 RMD160 1bc7f518bd7ab9d26bea02d54043cd133d5394ac SHA1 b8d1497c1530ea6b514b3fe0a43eccea8acb6620 SHA256 dcedd6a74d324ed6bca895da31408e11ff868ad791b56211263aec6d201d2f83
 EBUILD pkgcore-0.6.6.ebuild 1818 RMD160 36204a5eda0797cd1a8243510239965d2e5d92c5 SHA1 a3294847bd4ff504969482b36a963d496085b3be SHA256 73923ea3f5a36ccefd2ce2c3a606f931acc8c9aeaa879dfd944489f1d41adf9a
-EBUILD pkgcore-0.7.1.ebuild 1748 RMD160 dd39e56e997fab696ef803c30315f4182c9c73bc SHA1 f7873a49b0bb74579411f13fb4dbce814e8891dd SHA256 a7faa9fdf1d94821fbc07934e6739cd29c5677bfaa27d894b3f70fa2617e71b9
+EBUILD pkgcore-0.7.1-r1.ebuild 1745 RMD160 59716811c1a2652ec7ab877fd1ce64ceb31b74c8 SHA1 e7a1bb651f082627f2c84a9b8d13f43522ac6d56 SHA256 c8f0838ececdb8d54f408a3c898940e215a6a20933bacc59e0b1ddb534e7049f
 EBUILD pkgcore-9999.ebuild 1762 RMD160 c1b6a21b4a5545972e093efa8777d68b049ebda3 SHA1 35f02e9dddc53d1895831fd993d4f7b203a31f1f SHA256 7b502abc3618f45aa33b4052d2db6291c86d43f026eb8037270b6103190a377a
-MISC ChangeLog 19752 RMD160 079a28ef93e8be3b7eabbc70138d35a84c045f29 SHA1 a5eeccd0be2296569f4ae24cb252d25e4438e6c3 SHA256 582c2ea9688977c124a793345675dfc396a903feee53fa5be939a15e7a34a0c0
+MISC ChangeLog 19914 RMD160 2d20c1a3e7059c0d5677e71e7b513304c396256f SHA1 f98b32d2b154c481a83dd15939826d833e6a5c4b SHA256 94aae8f18f24fe7e8a664ed6c955f62a80cbaba3e8e9c0f639a7c50138e00e61
 MISC metadata.xml 256 RMD160 1b8dd3fe357cfae2f83a8f7ef896da5abc1ac433 SHA1 97e6ce21c6ec742e813e75e85de0c547ef233381 SHA256 27d03d721a47cce85175bcb7759cd0ed4ceee7633a1f62fff6626948de395509
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5h49AACgkQsiLx3HvNzgcDEwCgvcjJmNTB5jcIn8QWTpiNSVxQ
-5ToAn20XukT2dRwxsqzbkMf6ugZg+Pbx
-=sHXI
+iEYEARECAAYFAk5lLpoACgkQsiLx3HvNzgeqKwCgloImtDRJcdIMk2EoDA17h4t5
+PpcAoJknY+TjM2ACA4Ox1UbD7KNC3k2O
+=WIVM
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/pkgcore/pkgcore-0.7.1.ebuild b/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild
similarity index 89%
rename from sys-apps/pkgcore/pkgcore-0.7.1.ebuild
rename to sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild
index d933ba7fe36ba60e21be6f1ae87616b5f8c9e55f..1ef53c1b7a24d300b57076713a87a3d780543a5d 100644 (file)
--- a/sys-apps/pkgcore/pkgcore-0.7.1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.1.ebuild,v 1.1 2011/09/03 08:22:35 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild,v 1.1 2011/09/05 20:18:28 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
@@ -14,14 +14,14 @@ SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
+IUSE="-doc"
 
 RDEPEND=">=dev-lang/python-2.4
        >=dev-python/snakeoil-0.4.2
        dev-python/pyparsing
        || ( >=dev-lang/python-2.5 dev-python/pycrypto )"
 DEPEND="${RDEPEND}
-       doc? ( >=dev-python/docutils-0.4 )"
+       doc? ( dev-python/sphinx )"
 
 DOCS="AUTHORS NEWS"
 
@@ -35,7 +35,7 @@ src_compile() {
        distutils_src_compile
 
        if use doc; then
-               ./build_docs.py || die "doc building failed"
+               python setup.py build_docs || die "doc building failed"
        fi
 }
 
@@ -43,8 +43,7 @@ src_install() {
        distutils_src_install
 
        if use doc; then
-               dohtml -r doc dev-notes
-               doman man/*.1
+               dohtml -r build/sphinx/html/*
        fi
 }