Version bump mercurial to 3.2.1

Package-Manager: portage-2.2.14/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 bc9bbc286280..59c314a1dd13 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.157 2014/11/03 09:16:46 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.158 2014/11/16 10:18:22 djc Exp $
+
+*mercurial-3.2.1 (16 Nov 2014)
+
+  16 Nov 2014; Dirkjan Ochtman <djc@gentoo.org> +mercurial-3.2.1.ebuild:
+  Version bump mercurial to 3.2.1
 
 *mercurial-3.2 (03 Nov 2014)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a301fce105d3..9dcf0f51c1f5 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,29 +8,31 @@ DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6
 DIST mercurial-2.8.2.tar.gz 3839304 SHA256 c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f SHA512 9db5a8ed7b38c95db8bafac3efffb1735619ceb80564342bf1eb25be124f10075b8238d38a62b5cf34786a0463237e30619750c06220e2ab025f8da933b28844 WHIRLPOOL 25af73e866046225f211db1651a1b64214287609ae15b19fe383ee55ee50313779219f5424386aff124d70a658612c653958c7a2f69e150557133f8abb4dd2b7
 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.2.1.tar.gz 4072756 SHA256 26418276fbc36850782f1f4feb30da4a83800b48493082985c4d3ac29ad0ca0f SHA512 d104d8a3c4b78bd2416276e5ead0ff0e3d1af13fa1910f246e7fe9dfdd0fc074f67bd08cfffd9df2b9e9fe9ba7b924dae8c45ba5d20711162b7ef9d3dcaceaf7 WHIRLPOOL 8ebf7ff4daaafe07d5bc60ce078e30fe5e17cfe1adbbb0e62f98077df0faf8b6049c1926765fbc224e085f0d7bdb871b88bb4c5bd153dcd37e1e551142c3b0e2
 DIST mercurial-3.2.tar.gz 4071640 SHA256 d3a8cd7b46a6d1f934e461d99a9347475b16fbd73886c5a742b853570a66ce7f SHA512 1354957498efab44ea4eeecb15462499fa22028d01256a98a3519aec53ea144dbba25d7aa22f5fed4d4e71b32c2fe8fbedadff1a99071ee1b803269f1f6e74a3 WHIRLPOOL 2bbbe934311cf66cca5e60d37c2c970df41eff7674b661183d2ac6357e3bf05be02c1ff7aeb7e74063bbfeee3d70978c0645b2d07ccd07fd3ae662f5132e44f1
 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-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.2.1.ebuild 3782 SHA256 aa2db183152bf85294bc6ae3c691b894a935bd316f49888ee73d362d65dbece1 SHA512 35fb79b0d68dcf6b8c53603fa5f73c28f71f9ffe633a66ec501c32646be0471998227011d434d677a25db189e2ac1225d863e69596e457cad36d8ed8cfc84595 WHIRLPOOL 1ff5b11472075d16b8757d1335498b5d363dec23dbdbb204126494dcdb62526cfd14a03e864354aebe98290893807122272792f713d3695696806d2d9700b3b6
 EBUILD mercurial-3.2.ebuild 3780 SHA256 1229e1b5f73878299d901470def4674adb96dbc8d40189302fdb51dc753631b1 SHA512 a249e4782d6fd70f3863299ed1c0c98f705b02010249b9dc19c9953e494f884055858005bdbb20b9d96699ec7cd821a03101a69833251221fa6faa96506fe509 WHIRLPOOL 2ec5e8940838a18a2be93ba27725be4b93bafc292a506e7e5746f5fb0a05fbad3206ad4860ac5b85f6480b6f8fa83e1db550b19b63088515d30ddd1e7f5aebae
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 39976 SHA256 dc02c6c1f3d2c84b7b14a907ae0bf86f065a3473fc8d983311627905d900e667 SHA512 b56a17e9bcd22572916c1f50e5dfe250c6649d2906970d3104a95ea80318401accffb6c64671f9aa5bb456164d9546dca93690781aa3005a2a46f43bcdb1cff2 WHIRLPOOL 5223912d44870d558bfc084e65c11e17e17428e9b34fdbc79b944eafe048eb50d9b7433b059503172cda0313fae2635f61f719ce65b53b3d3578a20a0b3ba1cc
+MISC ChangeLog 40116 SHA256 622cb51a6b3457e4fc703c8ccff532c45710e06f4fc3fa7c98368ad23abc78e5 SHA512 95872c263eff574ffac786ead7cd8e7f44e22e6a6423fb1ff489484919fb4deb464a2a12c0df0aeea40c777ba5dcd4a68ab6d219b536129a521e2e63522e59d4 WHIRLPOOL 1c6447a5c182cedaf1c1c35872b02a784a9fac35d2ba0fe55d7d80e7533be93e68113e2ec25c141506ba202ea8af11b90c9482f5cdd6e11aba38613f74246e83
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUV0j1AAoJEJ+WuSkwOAOB9MoQAMIA13FDa+lT7943m4pNSehu
-adG+cKtA/Tv0fLAZSqm+DClOJKvXVUqHARtzrjyL4bR5c+dRJP1E7MbMYVNlqcRd
-BtqsME0ogNCO0eU5ivHtavBeEFXCm9e/oqXacEb5TLKO6ATOrcxOiDpxyv680fIF
-107LakroetM3aDZWz+QiNvwq77mHMu3uQmPo3cB+qdHGQYv7lQeIGiuQWFdTaWjh
-BWDEUBi2z9k+xhCy2U03z+b3sRsMtSCPUOhaN5rqJiVsE5vf4nhngrqKqsTiqJds
-n3zRMFEOg/3rE8RWYwgsVMAFqKK1PzW4LTNEBXRKGQvDX7mYijsfcGphIJ5TuTgZ
-ig0Pv9sa/Bh6oftkrAerSITmdrYV4p6Usxlnceiuc8Xfxg9lvsteQQYppS8at37f
-5QH7mP4LqbXYTd/Lf/B83hq1OH6qRoF0F/do4m2+AlcL2xe49F+1iksJxZujdvL8
-qnahpTXstTsjW99Jm4V/kFSm3+9POturYPSSUeCFA/0tMRpmYVG2VRSx70ymp1mB
-6qXqMDs2RjijCJVL/0vIxDvUev56e4PvBWWVu5QFSTRJdXVFhC5mvbhIS+UBFaM3
-RSz0SYSJK2uP2BX0IjIW1bN4Oaaft+DIJiJibwfICUuYskqVLbJkass4LssX0V2L
-IqRz3T1HRmWV1W/nA/1T
-=+qcC
+iQIcBAEBCAAGBQJUaHsKAAoJEJ+WuSkwOAOBuGUP/3BkTocOHKqCeJhJg0UHCl2M
+ut9c88j14iiZQfep1JPvd9q8qx56cthqjxL1xEHsrfLdetdM02FP1kpBYNrC/lnJ
+kSy2oykHwD6p81wLJkol/xDXIxCFiD9/y7F7evCyceg1PppPayFwzk/Kri5qvpcV
+65i2cVh5I1XzxkbWmyIdj6Idfw8HE79cxVAYpN7eQLf2cIfEwNq3sZgKucbB4Uvu
+d8rxAVwAsOlltWwO9DIBDbRC58YvErVgZSAhxcF2DZ3/NsEobjF/yiNLZXD6O3ys
+2uOlqyRPUbu0nWee2aAgbrGjEHKZ0G+yxGITL9+quudNqJApoYIstP49KrTWRZx2
+JI6pfqwcfYeIeYmp+TOIK024gRaZVncr7ZcXBOKvz7fwi90wjoPbzSIh41dJ61be
+Mshq8BECKlvX0a7UbcDidNmKoaeNfPUfdcpge3UP+qzjV1/o0re+Q9h1674+NNwi
+7GQEcZRqggcbE7jWryZx191cGnWp46grKsmnUNtVos7whrSG/CbFxZx2un/G8O9k
+GmVhHTnLajhRFcQd6G5RtoMM93M22h3DxtkQ9Ryndja5DdcQcpZaouIvSIs6weEm
+WRMGWtddGsmxokV3iVH+VslhmtOuJz8HdwQ8ylw1wYJ6P4XIuKnnvx4SkFZLcLuK
+galOms9TV2UT7Q7SduLP
+=GC/Q
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.2.1.ebuild b/dev-vcs/mercurial/mercurial-3.2.1.ebuild
new file mode 100644
index 000000000000..f13489262bcf
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.2.1.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.2.1.ebuild,v 1.1 2014/11/16 10:18:22 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
+}