Synchronize mercurial ebuilds some more.

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

4 files changed, 25 insertions, 18 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index f75584c8b3f1..72a9adbdd30f 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.95 2012/12/31 07:52:12 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.96 2012/12/31 08:11:55 djc Exp $
+
+  31 Dec 2012; Dirkjan Ochtman <djc@gentoo.org> mercurial-2.4.1-r2.ebuild,
+  mercurial-9999.ebuild:
+  Synchronize ebuilds some more.
 
 *mercurial-2.4.1-r2 (31 Dec 2012)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a8eda3f69d1e..c3e76ae8dcce 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -12,15 +12,15 @@ EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daac
 EBUILD mercurial-2.3.2.ebuild 4027 SHA256 ead916ab309ac555c7f497ecef9b4eeb150bf2c3961ea4610f71af60cb03480f SHA512 54c08f9f45f398a7aa33ac6c84d2e3ff54e692cee406b2bfa89edfeeba45d3bfceaadb23e827a69a3cf52ccedd690323c00a816559c5abbd7c26f0567f4a85d9 WHIRLPOOL 998e7b543c366201eae8896518a1bc3b21442b58a891ad415c75a6a752212ce3c6c848b58c57591be7d440f2fa113561d44175efe425c51e50ba0264c01a4c0a
 EBUILD mercurial-2.4-r1.ebuild 4184 SHA256 dc0182c84e69271a2a59e245b7869b80f7c896107d2435c79c5b926ff9195464 SHA512 cde0e2dee845bcbdb61063f254621db1afbed084648f469d7af220425a7a231ee13e1147de2f80592cc168e3030270d4f24c554bd360391a10fa92f765f6eed6 WHIRLPOOL d7293e650d4d8981cdf526de4f6d8bb0a1a317d0beced65a3cf1e0bef0687597089fc7b223ed21cd11083ef3f3ff9d81587f649e0892ffe7c52d9c605080844d
 EBUILD mercurial-2.4.1-r1.ebuild 4203 SHA256 abd0fbb8769e7de4bb97dbbbf11fc2d3b96e7feb226f833f9eedacda293902a6 SHA512 1e58312057bbb8f05c9d46be47c5bad6f809fbeb89002c8a0c345130493800a6c01f290150cb4fae1f0dad50dd8c09e7391c0b3eb2cebe423780dda29938cd1c WHIRLPOOL c7286deff1f741ac7f865f0702f73fd270f57aa3185ac16460b86a4b291e5409b093ed6d7cc57432e197db779fe1d93f8c0d61f619fb319b8425f97950d9731a
-EBUILD mercurial-2.4.1-r2.ebuild 4261 SHA256 220d8e5d18e6322d002d2c4dab6de77ee0c9a54ef7bb1fd72551a282ae1c6174 SHA512 453ac362d02043c99d1fc75a402c9ff600096cebc1c82bf6971d3359e78a35b0d6053469d1d587e20b9d22ca7899d6b42da33021424c904197ed861696b48229 WHIRLPOOL 97b8bce5a2b6a03a256467866dbd949d0e36f5d34e836c7bb7664afbaccfff3a14adf9c83252f9447edd0c42bcafcf407ba714002d3247698cc4cf8f13596b47
+EBUILD mercurial-2.4.1-r2.ebuild 4261 SHA256 aa631bac3dd8c765d8485d32b4a2789ee5242a86692b8799eeb5c2ab8e76783d SHA512 6339958d6b9db64d2afc21fd22aa51d86b6b20cfb2904ae2cc068f18c82db74a5af1a103943303529755c9c8f45b5edc828ed821026e379da3d428107b837d2b WHIRLPOOL c487a6f04b786eeb9a4b83d4768797e2db16689552680b1135a40842df5a34073fa80a3aa80a454abf7023b33d32bfccf43e14698cbb552c84eba6cdebc34055
 EBUILD mercurial-2.4.1.ebuild 4078 SHA256 c2bca49dd214d3930dd9d925b4d807afb1cdff8bc6cf994757e736a83bee34c2 SHA512 c8f614c8e60cf8c7050539580b7198691d62947527346698e4dcbb14a85d60f7e67ee93113ce38aca54d044da9e08fd6ed61943b02b8a9c4191758561721219a WHIRLPOOL ff6ade51a5578fb3a0ca9af4a13c7c783b3292f103d88db6df42351f7d73c69a97e200b642802107af6a370f24cc9d2d0cb4c217c48978775a63e3f3458f218f
-EBUILD mercurial-9999.ebuild 3970 SHA256 eb156d5294b82b01ce6dfe5c375defa3b07562b8ef33f7c8249ee46e983fc770 SHA512 c07a3e7156ef749a06a158bbc5189fb7523103ea4d15e96043b7037351a160b09aaa9a3b62d875ea052bcf155bbcbb9da7996c93759af7282f2540b5c6c607b8 WHIRLPOOL dab08937ca9e29b34f76d239666ee560a8011efe025c48bcffedc695f6d6724974dbf24375e6aacfc96f04ae53e0a5be35c13b0a4ee7037b5980e507b1a1eb9b
-MISC ChangeLog 31250 SHA256 7d8274e45f0d2a34a00c021c9950cb6d2fc13909ed4039351f0b1a16e8abe435 SHA512 e581cf7fcd36c16d2ece06b3d196b6fb8b955ab6420a7a8af233c5c92ba2b8a00379741e16bba622dd895758cd31ee98ce369818d2c9ab7d9d6273e266e7c7e2 WHIRLPOOL 22429c0434fe528bc7bd20df626a8ab187b86c19890ddfbc2bf5a7b3b9b6e161461adde811a95c0656909d05c2e3d38a4a65f7f2f0de60ac567ebe09089d43ec
+EBUILD mercurial-9999.ebuild 4028 SHA256 af9359d5f361cae92b0c490a0bb1cd7ad1fefb406e02312ab18a3a85ed78bc96 SHA512 23747b06720061bf1c1c03f301278b881fa3df3818960590e5f5d81f1d75aaabc893aa67e8eb404d3c94f146b8e641d5cf7ddb32ea1c2e2e87e43d39528cdfc4 WHIRLPOOL 6179d9670164e58c9c098d5e124d05c3548ca53b5ba10fb08c71190123c03f322a0536587a9b2a7ceec8a52b6e9383ef33984d45112288b8c11212fdc6f2f8a3
+MISC ChangeLog 31384 SHA256 1cfecc9d01d65dd0f08f1b9820d312ff1012b693e48250a04a11d91534e08ece SHA512 53e2c4fb86dda7f4a902bc6e68ff268f94d788455f53014ead69841a71ea7c4805ac610c022223dd6a78db305a712898dd8665bd55b6864f4ab7fec70c4ef809 WHIRLPOOL 4c0e32720ca78f8a84efede866aa4379ba1c71280adabeafa1788e00fd53572421050c4a68111f86f43bceb5dc67c555826a25cc85062634fd7f4dfc86218125
 MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDhRxwACgkQxeMuLWsGW/tIEgCfYJTceI+kLnCatyJWhkP3uLzc
-39AAoI/s/fsbNgm3vxgLIpZ7cAlizHl7
-=ROzy
+iEYEAREIAAYFAlDhSNcACgkQxeMuLWsGW/ukSACeNai3KUiRGP8Sz96grAiJZior
+9QkAnRLlrrd0kU3ASyDsGvKGTsM5JS1N
+=POhO
 -----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 ff02ac832885..f21be40a6cfb 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
 # 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.1 2012/12/31 07:52:12 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.2 2012/12/31 08:11:55 djc Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"
@@ -104,18 +104,18 @@ src_test() {
 	rm -rf *svn* || die					# Subversion tests fail with 1.5
 	rm -f test-archive || die			# Fails due to verbose tar output changes
 	rm -f test-convert-baz* || die		# GNU Arch baz
-	rm -f test-convert-cvs*	|| die		# CVS
+	rm -f test-convert-cvs* || die		# CVS
 	rm -f test-convert-darcs* || die	# Darcs
 	rm -f test-convert-git* || die		# git
-	rm -f test-convert-mtn*	|| die		# monotone
-	rm -f test-convert-tla*	|| die		# GNU Arch tla
+	rm -f test-convert-mtn* || die		# monotone
+	rm -f test-convert-tla* || die		# GNU Arch tla
 	rm -f test-doctest* || die			# doctest always fails with python 2.5.x
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-command-template || die	# Test is broken when run as root
 		rm -f test-convert || die			# Test is broken when run as root
-		rm -f test-lock-badness	|| die		# Test is broken when run as root
-		rm -f test-permissions	|| die		# Test is broken when run as root
+		rm -f test-lock-badness || die		# Test is broken when run as root
+		rm -f test-permissions || die		# Test is broken when run as root
 		rm -f test-pull-permission || die	# Test is broken when run as root
 		rm -f test-clone-failure || die
 		rm -f test-journal-exists || die
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 376808750b4d..a0b01a745a16 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.14 2012/12/30 15:46:31 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.15 2012/12/31 08:11:55 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 emacs gpg test tk zsh-completion"
+IUSE="bugzilla doc emacs gpg test tk zsh-completion"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python )
 	gpg? ( app-crypt/gnupg )
@@ -27,7 +27,8 @@ RDEPEND="bugzilla? ( dev-python/mysql-python )
 DEPEND="emacs? ( virtual/emacs )
 	test? ( app-arch/unzip
 		dev-python/pygments )
-	app-text/asciidoc"
+	doc? ( app-text/asciidoc
+		dev-python/docutils )"
 
 PYTHON_CFLAGS=(
 	"2.* + -fno-strict-aliasing"
@@ -39,7 +40,6 @@ SITEFILE="70${PN}-gentoo.el"
 
 src_prepare() {
 	distutils_src_prepare
-
 	# fix up logic that won't work in Gentoo Prefix (also won't outside in
 	# certain cases), bug #362891
 	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
@@ -48,13 +48,16 @@ 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
-	make doc || die
 }
 
 src_install() {