Fix up mercurial docs brokenness (bug 449434).

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

4 files changed, 23 insertions, 32 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 8849b4fa082d..1e306b383af1 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/mercurial
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.98 2012/12/31 08:20:42 djc Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.99 2013/01/02 08:32:19 djc Exp $
+
+  02 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> mercurial-2.4.1-r2.ebuild,
+  mercurial-9999.ebuild:
+  Fix up docs brokenness (bug 449434).
 
   31 Dec 2012; Dirkjan Ochtman <djc@gentoo.org> -mercurial-2.3.2.ebuild,
   -mercurial-2.4-r1.ebuild:
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 76a23843669b..3b7d55261f5f 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,15 +8,15 @@ DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391dd
 DIST mercurial-2.4.1.tar.gz 3609245 SHA256 d18c8a139fc20bd38584e87d09878b61e4311a5ba67bf36f7fa915068722cf8c SHA512 78be51e205487967d8951d2b5b64e958cdaa0e73a86c0cb7b402ae4a82e16c6af0bdd1aff65de66d7bb8920a81f8693a3a25133847b480641eb56786a76ac254 WHIRLPOOL bf7388c73b6f6d019f42e16d85e810c53dfc7837c720844112ad0a00e3f3007b69fec82dd18f8419c946996fdbb3e676319ed3534c815f78955219d54cfd4466
 EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555 SHA512 bfd876d876621d745a82446cdabcee1b96c5f0c356777bcab121f5ef718a6a5797e479c56d9bebc97e34f92c58a2903d8ea9cef9d54b2c9d61d55544bb66f62d WHIRLPOOL 9cb1a7ffd2a82db0f43c01afaef8fe7d746c99af13e52ffb57d0811f0be8f9b17e9b399b70bd7de56f4385d2bdf43a5370fd6d3caddf5a3d05de3a426a3aa482
 EBUILD mercurial-2.4.1-r1.ebuild 4203 SHA256 abd0fbb8769e7de4bb97dbbbf11fc2d3b96e7feb226f833f9eedacda293902a6 SHA512 1e58312057bbb8f05c9d46be47c5bad6f809fbeb89002c8a0c345130493800a6c01f290150cb4fae1f0dad50dd8c09e7391c0b3eb2cebe423780dda29938cd1c WHIRLPOOL c7286deff1f741ac7f865f0702f73fd270f57aa3185ac16460b86a4b291e5409b093ed6d7cc57432e197db779fe1d93f8c0d61f619fb319b8425f97950d9731a
-EBUILD mercurial-2.4.1-r2.ebuild 4322 SHA256 98be0bb9d71f749b317c87eca4f3679003983c8b5f115f434ffbeb399bb9c82e SHA512 2d5e4714c9f80c088cc133798e3cca9508335b7515022cc28466fe053f227f67cd9e61c3be154065fefd635e53c7bed41edb2aa9dd1e608d88772d1607d0fc5a WHIRLPOOL f03b9ad9d8a9d3367108a58e5e89c9a88e18c1edf1ef00ac939bb99678cb9bfeae80ee160d65a2dc6d20527e11913b2b162d142ed2a27d90f72fb8a2a7110c9d
+EBUILD mercurial-2.4.1-r2.ebuild 4225 SHA256 6540466fdd047ac647f7a5a6481e3e27961509a3bd70c94211faeee29637dcf9 SHA512 6a70917a5ee6893c02fb94fd8503a24aeabd6e094dbd9881d091256b6023d06f72e2e2ab87b79e74d22b01efe7b83251213b38e63367587bac282c25a861a28e WHIRLPOOL da9c460d55103dacc8fd028e23637f47c45cdd33c5c31461464295c122d7796b4ead3aa6ffaec5b419184d53b74a113b087edbb95c9170d0dbe53eec2a93255f
 EBUILD mercurial-2.4.1.ebuild 4078 SHA256 c2bca49dd214d3930dd9d925b4d807afb1cdff8bc6cf994757e736a83bee34c2 SHA512 c8f614c8e60cf8c7050539580b7198691d62947527346698e4dcbb14a85d60f7e67ee93113ce38aca54d044da9e08fd6ed61943b02b8a9c4191758561721219a WHIRLPOOL ff6ade51a5578fb3a0ca9af4a13c7c783b3292f103d88db6df42351f7d73c69a97e200b642802107af6a370f24cc9d2d0cb4c217c48978775a63e3f3458f218f
-EBUILD mercurial-9999.ebuild 4089 SHA256 ff8fd6cce21e4d1addbb810ba47c43d47c54d5eb9780da772fdd2c9064caa4b5 SHA512 74c4edae3952e78c91784e1b2a53d40430e28cbca4c701f60ee98072c85a95f1592cbff46edeab662def0756aee43c32f7c549b47803f57a9ccca65c33fbaf70 WHIRLPOOL 7cfbb1969214a02ad7839e2eadb4008ebcb33b2683ebec5c1b29035074297340ac1d61c044a3fef1ddade7d0a3ecd997ead99126ab8503e456bac9b0ddc765c8
-MISC ChangeLog 31639 SHA256 ca9ec7fa54ed1c08844a84202a1f17918b37380d0741b0d5933ba9c812ba9aca SHA512 479d9f9d07a3ddca1d157c5fe85edbcebc0784fdc92ae6a85dc57f06699094676be0fc5f9c7c78882b43f2fb8b247c4e0fd5df52a3b5fcc33f69b80d2c7a7fa2 WHIRLPOOL 13c54b2cd45af60802b24ca36f7b0bf32beb053b67edfa603e82bd0dec12aef7ccd1a6a9755be3702d8778cc182b00cb2d5e6e887357247893ba1bc5664f4264
+EBUILD mercurial-9999.ebuild 4040 SHA256 14305b9a06deecfa1b9ff52361575e7733ee59da9788b4e087201175cb0026d2 SHA512 016dabe2a513c84e346e3898a15be4b1372905ab605f0bb7730966cc477e2a19e01f2ee5cefd64c743327ce862ef70c3646745038993942921546ac247afc22b WHIRLPOOL 8c3667549230153567dc0ad948ba9c223c6dd18165597c4e9f7126891dee5fbc995fd381f0b8d7dc2607239778d67f83e6dc0b295d8d23aa4bf64ecd4f7e1701
+MISC ChangeLog 31779 SHA256 8f75aaf86028ecfb7faa97df91aaa14eedc617fdb0879bbe05fea18c4455a384 SHA512 712c29bae8537bc46b5dc15ab124411749aa2add6850555ce06393f039a0890941b5147d0f0c983992db5a03820dbe2e0e2c1edb5e6f57f7c79fad590279ae41 WHIRLPOOL 53868e3c05f46066ded2375271cff90b3e5299d1b99134d64426ac2a6be47f5835f3b4fb8b49eac4e920c6a82a6aa3417423985bb607c3fff19764f3b4d6d11f
 MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDhS6EACgkQxeMuLWsGW/us+wCdEil16aPZHS7g9mT4yAN6G97/
-U6MAn1LypiEdaHnlBKXXxQ3/4hMUtyTv
-=ODMM
+iEYEAREIAAYFAlDj8J0ACgkQxeMuLWsGW/vZhACggTg6R8ZuTM2kkv8Lkz2guJsD
+4rAAmwddH+tMCZ98gkez9rKwMkIztqXu
+=xaDI
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild b/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild
index 3f6d2d788811..1bb9ce7382fe 100644
--- a/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.3 2012/12/31 08:16:12 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.4 2013/01/02 08:32:19 djc Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bugzilla doc emacs gpg test tk zsh-completion"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python )
 	gpg? ( app-crypt/gnupg )
@@ -26,9 +26,7 @@ RDEPEND="bugzilla? ( dev-python/mysql-python )
 	app-misc/ca-certificates"
 DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
-		dev-python/pygments )
-	doc? ( app-text/asciidoc
-		dev-python/docutils )"
+		dev-python/pygments )"
 
 PYTHON_CFLAGS=(
 	"2.* + -fno-strict-aliasing"
@@ -47,16 +45,10 @@ src_prepare() {
 
 src_compile() {
 	distutils_src_compile
-
-	if use doc; then
-		make doc || die
-	fi
-
 	if use emacs; then
 		cd "${S}"/contrib || die
 		elisp-compile mercurial.el || die "elisp-compile failed!"
 	fi
-
 	rm -rf contrib/{win32,macosx} || die
 }
 
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 0258a76cf8e2..adde60064d2c 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.16 2012/12/31 08:16:12 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.17 2013/01/02 08:32:19 djc Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ EHG_REPO_URI="http://selenic.com/repo/hg"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="bugzilla doc emacs gpg test tk zsh-completion"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python )
 	gpg? ( app-crypt/gnupg )
@@ -27,8 +27,8 @@ RDEPEND="bugzilla? ( dev-python/mysql-python )
 DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
 		dev-python/pygments )
-	doc? ( app-text/asciidoc
-		dev-python/docutils )"
+	app-text/asciidoc
+	dev-python/docutils"
 
 PYTHON_CFLAGS=(
 	"2.* + -fno-strict-aliasing"
@@ -47,16 +47,11 @@ src_prepare() {
 
 src_compile() {
 	distutils_src_compile
-
-	if use doc; then
-		make doc || die
-	fi
-
+	make doc || die
 	if use emacs; then
 		cd "${S}"/contrib || die
 		elisp-compile mercurial.el || die "elisp-compile failed!"
 	fi
-
 	rm -rf contrib/{win32,macosx} || die
 }
 
@@ -72,7 +67,7 @@ src_install() {
 	fi
 
 	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
+	dodoc CONTRIBUTORS README doc/*.txt || die
 	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
 
 	dobin hgeditor || die