Version bump mercurial to 3.1.2

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 162 insertions, 15 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 1339058193bf..daa49ed6154f 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.154 2014/09/13 19:55:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.155 2014/10/12 12:19:25 djc Exp $
+
+*mercurial-3.1.2 (12 Oct 2014)
+
+  12 Oct 2014; Dirkjan Ochtman <djc@gentoo.org> +mercurial-3.1.2.ebuild:
+  Version bump mercurial to 3.1.2
 
 *mercurial-3.1.1 (13 Sep 2014)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 944bf17c9b78..989e9daa592e 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -9,30 +9,32 @@ DIST mercurial-2.8.2.tar.gz 3839304 SHA256 c8a5baa21140c6cd6749c3b52b5e5e4a14b6b
 DIST mercurial-2.9.2.tar.gz 3855689 SHA256 86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53 SHA512 60148bb953069228c1ccb043fdf6abb6f96b127bb0be8c2de6b32ca356140b7c3426f1c2ee09882e714672f6f1ba2dba4ee0622928896e9d4b79383ed50c347a WHIRLPOOL 0bf46c6f36bb886f8c2d66e30d5efddf2c1353a11db8251497fb1e9f29fe4d2e18245000ddf5f18a0416c947364520f52640ab785de23579cf90396466896def
 DIST mercurial-3.0.2.tar.gz 3907502 SHA256 ed387cc0e9754ec59bd4a390639b5a4ea11698ae4413243f8b4a2d6d48b3b7d6 SHA512 3ccd2c8cbe42f929dbaa2921989c2686d60b6961d6ad32471a4fbc91f5594a2398df913dce0c12bac5f7dd81036442a044c0e2247025cd010ab5e3e2265d9926 WHIRLPOOL f39d5c64443436953cbb29f69c333eaa177dbe45262f01eb8b3588d50dd1f5bd7826af868b97386c6113ebd8f03ddfd4cf8141735bcc500715368ec85185572e
 DIST mercurial-3.1.1.tar.gz 3982765 SHA256 c7e8289840462d6787fab3ad83f317592cf345bf13b86ae30b4461d6f75398d9 SHA512 4407e280e2b3c26cf8f304dbfaab71a97642308e32eb5fe27249d16575c6dd9e4274679458e24032036b94d263e3324506642b90876274468aac66d25a5a3588 WHIRLPOOL 9199bfdb6b69d8f17a63b75ea0e3cdee3948b22a99b80bccb89a85b0ed93c1baf3e081a9c65b469715e7ed2305cd7e387bedaf217513ed79c8b1bdac5c0a4787
+DIST mercurial-3.1.2.tar.gz 3983825 SHA256 5dbe5ceb3707e378528dc9346af280919760aa1a8bcc27be12c1fe2bafa78d3a SHA512 883c39b2e3063283585fc279a0709a95c6e5ab9af2df6777319678db05af43d61120659e631a3cc239d951f0ea57e583ac74ad56b779b343dd1feb2e2f077ec2 WHIRLPOOL 41999193869306fc90cb0401b65e01697c8838ea8d3ed2e53b24634d53b7b6c367078294078665ef3c9f18fbe9c40be354102e0ca93e8eec3f911862e2a470ba
 DIST mercurial-3.1.tar.gz 3963443 SHA256 f1ddc279ac2f69f012f38a7a4f1e75dc8f2a8cf97b6029b0bef418a4666fd0e4 SHA512 1ee2fe7a241bf81087e55d9e4ee8fa986f41bb0655d4828d244322c18f3958a1f3111506e2df15aefcf86100b4fe530fcab2d4c041b5945599ed3b3a889d50f5 WHIRLPOOL aaa7defc67bca0ffcf4eb932f4db10b7c55ea9f2fd07ec48f1f1f53207baa2698c91d1e507e114bf1d21475e0a9d78c94894491d2a977b766de910aeab8f7749
 EBUILD mercurial-2.4.2.ebuild 4211 SHA256 e9d9b07b93b06ae53566f32f603660718ee65ccc65a28396bf7c7b59346032e0 SHA512 9f38469f2f2ed21c35c4d69b1efc3430cee27b924de36e8ada008939fd888af446f1bb08ced85306debd17acf947913a60ed1daca8c4391b9e2df574c1c3694d WHIRLPOOL b7d23ebb35d194389c6764e4eebc5861ba6561254357c035bdec5e6ef0cf1d7597d026f2989bed654d8c6842bf2a9648eb077e3b33e18d19ea0127b935f90c91
 EBUILD mercurial-2.8.2.ebuild 4393 SHA256 8a829f42cf38ce075176d40c971b0c79ef0d8d2ab9e0716f753e81fac4a50079 SHA512 0b47355580751aefdae565566bf1d03188c825e551bb108245448460eb44be4abab8dc8c309b8fa131d4acedbaa9a35d7926ac9edec9eccc9a33fb9c2e9344df WHIRLPOOL 1b4ae989364d2e7aa581ff58708f98d03a1f27129d6df6b0f44d632ec520f48272e4457da8bb97d3228c36438357badace107b2c761de11f5fdc7b5bd23465b7
 EBUILD mercurial-2.9.2.ebuild 3728 SHA256 beaa6b88aa037a2434af5df3c2873e41a7b30b6e77da3c76260be62ccc9f29b7 SHA512 0f815e3181feee757a37fc974057748d7108bf5aea55424f747cb990a60a807cada22c66eef5c2843dcb48b5327170f553ab1027c5595beb042b8ffceaea3427 WHIRLPOOL 00ced547773677783d64350201dcaf28d8ff4084b174cf1a20aac39b27d0e4353001f763ee4ba397f2ba185038478a4e0fa6a0dc5fcc96c7cdb41af1839c13ef
 EBUILD mercurial-3.0.2.ebuild 3784 SHA256 b9d3b72a4f2431185cced5deeaa5f0eb85a52746cb759030f0260dcf03a909c2 SHA512 e649f7f091e61c44098e2ce9beadbf46effd0183731795923c675f3d2bc439c671b5c82b779372dad06343540bef4a8e887ec99256c1dc4ba7524fd6c66faee3 WHIRLPOOL aff48e5ad889ae296f17b10bcd8f6890af18878fbb8c096d663902d4b9aee63ca431aade0357a6cc6076ed3f5dcaa13b656533bf270eda9533f296b6bfb7ccd6
 EBUILD mercurial-3.1.1.ebuild 3791 SHA256 3cd0bdec81a4f2a880894ee8ae630e813210d4ad1ae9088bddfdcd66543a864e SHA512 5d05fd777d7253013a575999ebe8aa6292721620fe45d38161669eff19000ca8582e97c42960ed58efde528b3708de06f3d6cb582cf273de8507abc837712de9 WHIRLPOOL f522e68a7971e61723c7e0bcc7a6b12ecd9f32418d59666bf33d71b6fb034356a6070df264d176f78ee03e5e944c228ad9febb56d5ed9097fb329c905c75cff9
+EBUILD mercurial-3.1.2.ebuild 3782 SHA256 b6b216ccd642933cd5ebe1167c5e32ada088f402909728fba540c19a5d48c42c SHA512 5a5c2b98603d532a88fc68c1b4aed0d62398be2d39da2d8dc28df7165b819aeef88bdab0f2ac149e9aed336212ff2fc715f8d5686ec820841b6ed2517c3202d6 WHIRLPOOL 0e5d168f631131cebaeda573ae5191cd44805b6cdec7059619d90016991d9747144cbac70985b136a010222a240f2c14307cecfa2cc66540eae40d01abec78d2
 EBUILD mercurial-3.1.ebuild 3789 SHA256 05c6371f95a58bb2625f70a13cd31b5b1aa63fa0a8477956162540a1dd86334d SHA512 662ced36d4b0ffde857cffd508b1234e35d4171876bc576d155b64cd4f52315f31852479599b81ec030e60bf41f5192f53a93b8582b233a21caf033962d920bd WHIRLPOOL 2fb97302b1638ca5863a2518e9fa672286de17f25e618d8f52f03ed850364d34f4f0c2db7ef2934845360ab634a001b7b3aa7b6041b55e5f3c8d491902581f7a
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 39552 SHA256 2ef3da0e09414e3e5d8ace3b88a47ef5abb8b27371712574e3006bcc88f4c39b SHA512 90ecdc614ce47681c47b8c3cbb981ed62318586d2aaccf0e13d81dd5fa19492de898ee8e717ef6f01d1f0682f234358c3bc3273aaa5f7cefd75886daa30c7e02 WHIRLPOOL 9bb371ecac0961d6bb13f8de3291398d414cbecb52b1210ca0f177c5b83782b2b9df9680d0ddbea25d1aed656de9bff2266b9b7509c121532127a8220fa0077a
+MISC ChangeLog 39683 SHA256 ffb9d34bb6efbfdb97b1b351f1d4683ee62088371ba659242da4a0c5ca280da7 SHA512 be9f05fdf6eb407d257b0096cc239136ec1394646f9934544aa4898bbab3c43a8dd28dce98f37df55322d7207936fed1f3ec2439db73bddacf7374683083eda8 WHIRLPOOL 9b20d722533939f5e6e84fc559e27480fd1410b64692f59c433472d007e96640cdb900d5004d514e5a2c0528f9595f0baeebf96b50d6439bd2dc7cd9491e2141
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUFKEzAAoJEPiazRVxLXTFDp0P+QEnNrxtz6utXhDe21gSi4I8
-9uRN/dixhH6Dw/+NF7IB6grF9x/ayQdFU84yBeZlAeIDASNOoLtCxYY8swsG76O8
-sjU/3yUl3i2qsb9eozXJylI693ygkkE2WWzi0Wx6cw1b9WmD5w4nSx6oeWC2f1Kn
-aNOS7NCi19gqlMdjeB9tqOQuB23+CFpjjvGsRTHBhsJRvHNC+9zMf9OhEty2Nptb
-0cExJ2/GCUxIoq9SmgEaU4uODM2O8zflPoHeH4MlTgosOnMqsef8krHdncheEnIQ
-7T8eKm6I6u8PKHxR5XrwkYC6UK6ZwjPD8gaMMpdVZ/aVPjjkamM/mGo+NQLssU9q
-1Y/DmRyuqhItROl5AtoB7mfwUFeXIPKJsNdd84h0ep7kq9CW2TASTSfuwRnDI09r
-20iDymjrCPyPn7l8MR550Bmday7FKZD3+8TlCTJMNWBldiXGk5MeMSuUJ3X5tYug
-sZXf2SF0CM51wYpRPBUZ5a0BgPBcyArzIiZH4zlw7wm8ro3z1g8Kt7kLxJdPacOx
-aJb0hDqFYwimQLqGyRZHymYUsiQbG5bAAxulu+RPJog7VPN/cbIx/rIm5qhn9qfL
-7QjYRyy+WVslQf1lS0qku4TAm6Y0oAWr5CBzT1NWTupBE7C6T0PE8j150M75cE27
-Atce6Rp9Vp5egOu1bUGe
-=M0mT
+iQIcBAEBCAAGBQJUOnKAAAoJEJ+WuSkwOAOBjHUP/1WwWXIQZWUu50cp/90zOyiI
+1Hqe2b/7c1v+jrA3lu+VSbn3MyLczQHnQ7/SfMay+nOKTC9FvAgC65/VcvWDfpIA
+P3fBytQN8dF7xJfXfHBrSbTf6YIgQ0JQfODAm7Fa9GGuRVVVQaITJJvR2mMmynFd
+4BPxSu1ydvuN1BsxmIGzH3uzLzYpYDjW/RkGpDP/6KanJcoC96rnxzUs6EIi4ZPi
+0qzRXQCfO79sAaCRv3TkxX6lphgPusy2QuXFJSgGogHOqdTJZ0ARfpvBpwilH4Oj
+rewIto2hlivqSXNzEnwECmX/ime06adxJe0bWETj1psr6WWviCL1X7BEkYL/Sx51
+JY9BSL32jKFYk5za0WFCpXcXpfJ0QyThdoxpOx4eSLgtT81C79bYr4n96LtBCGhE
+Tv/Mc3beBwDMchuKp5zrnEHaoYwh8nNbhGKJSbk6VYs/ph70+Ep2LRt3Q9Mjdy+F
+D7YqM3EolVqpYnht0aoDU9SdcJmH2RKkfDlOFFtrLhDHoJR5tsdEjdmja+avg5hy
+4KGsi5UmvC2eZk9KDPA666fQdfP+p+zfyqOSHs9R9uaSWKpH5EhAAwa33sGjgtzU
+mX0ZTc5cILssZ/PpInrvhw7xuyrZhgSu1c5mYiz5Y0p1ZGV5th5THmYyN4wHVwnN
+c15S3rzgi8WaOtDN5SNZ
+=54Fi
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.1.2.ebuild b/dev-vcs/mercurial/mercurial-3.1.2.ebuild
new file mode 100644
index 000000000000..ac6ab054436e
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.1.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.1.2.ebuild,v 1.1 2014/10/12 12:19:25 djc Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://mercurial.selenic.com/"
+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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
+
+python_prepare_all() {
+	# 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -r contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	#rm -f test-doctest*		# doctest always fails with python 2.5.x
+	rm -f test-largefiles*		# tends to time out
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}