Version bump mercurial to 3.3.3

Package-Manager: portage-2.2.15/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 86052be843e0..083901ce4c65 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.177 2015/03/31 07:58:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.178 2015/04/04 07:54:19 djc Exp $
+
+*mercurial-3.3.3 (04 Apr 2015)
+
+  04 Apr 2015; Dirkjan Ochtman <djc@gentoo.org> +mercurial-3.3.3.ebuild:
+  Version bump mercurial to 3.3.3
 
   31 Mar 2015; Agostino Sarubbo <ago@gentoo.org> mercurial-3.3.2.ebuild:
   Stable for ppc64, wrt bug #544332
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 55d3ef0908bd..8c91ecf0667e 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -6,25 +6,27 @@ AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0
 AUX mercurial-3.0.1-po_fixes.patch 1396 SHA256 e111e7e609edec0cb13be1d89d6558bc41785c48266b3f1aca9bc6572c0d884e SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7 WHIRLPOOL e9ed6368f9a633fcb919c9466b9a613f5f4db62fbed3ac9427e2628ad882320415e851620d609b5ba5c3ee1d96f3d191bc579fdb645765e65f83043b2355bbc8
 DIST mercurial-3.2.3.tar.gz 4078011 SHA256 c4369320e276d78aada1b5936e96c7bbbbb8154cfba725ef4e8757dcedeaf1ef SHA512 eba8e9a1f807132614d2229a6ed38840aa55a80859a504c8fa7c500572e73a1b8a33d4a26ec0e1b9c0202f5ec592d29bf4b6bd1d95f069d2ecda342d28e31569 WHIRLPOOL 586743d7960673f97cf88232a529528ce0a6e3fd2a94256ba5b528a292669111d06a9f3ecc95f10ad590374691dbdb18538f927e7b6510c3b965973646585837
 DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c
+DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b
 EBUILD mercurial-3.2.3.ebuild 3779 SHA256 7967a094b810435e35bd546c42bf42922419b59c370e82525264300e2c873054 SHA512 80f52e4d4028159d1d27acb9965dfbd25102b27eeea2339f4d4d5ca7b1dce21ab95ac287645058a55ece003f721ea2815f68199b82837bfba5404a4ac970bd18 WHIRLPOOL 7a8d3db018084a69e137664197643fdc84bf5db2a187d7630029d5fee27d7284037bc11af91651156cce7974feba2ae4de538a3a236e470bece5a6d412f88aeb
 EBUILD mercurial-3.3.2.ebuild 3778 SHA256 737da0d813571e19d864e009aa98fff1ae73652733f6687e8f11f232160531c1 SHA512 17f577986694029dd603a2460c3ab4bfe4c559ef7db1a3a37302b61bd1426d28f13cc3232a8121fbf4a3f534a2465a8ecd08782e442f3a605c0cc53a63f81241 WHIRLPOOL cc0c5990a291cccaa83088cb76ac2fff771a576f5917f2a5f9fdb3fe7c8da8e877da7a06798cf6eabdc27baa1e417019ef52f68f1036e75364af96b8f7fd6f7f
+EBUILD mercurial-3.3.3.ebuild 3782 SHA256 033343da379d79b33d4ed439ae3d21ad06ec9ea71d9b63fdb8086bb795c10d0c SHA512 bdad55a94d16b32f3360354058c31767873f4a245decfbd763c4b48de8badc433a33122932a38ae94e38494543b8155ce97fc846a69a6a2dd81cdbe865ce8d57 WHIRLPOOL d3f96d08f3ddc21b04c25b3e5edd205895bec6363227336051c59c8770cae33a93db61873da744670cbceb772fb26d8efd4532eddf4930dd668339ce4b44c43c
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 42556 SHA256 68fd78a1edd1aa9b13c8114fde68bdfb8c4794c8664aa78b0b70d4109f283ab2 SHA512 447f8dbd81bbe376da19389697ce3c1ba1f42a96cbeb15396558e1204d50e6b9936bf285346f5ba541b884807d156f6f24ba73b62f0aab40c980dafe2be64a3f WHIRLPOOL c75a0e2a8ca4083c5bfb28cdba45f8a1723513e0266fba16a37b9c6b9174ee8efe5daf786a60118e72d4b80cd33e710f745f01de018fee08b7fd362dbb304c29
+MISC ChangeLog 42696 SHA256 51a794ac61cc8f98533f7d82783c5773452734a876d4fa9cefd511c17788d181 SHA512 2819651d653e60aeb0b86767ba93d14785a3a89ae62cd28a598cdd4e26296153ecd6d32b03d872932087cd128c83754e828ee01496ef401fed2cecf98efc83ee WHIRLPOOL 181aa6398b864bd8500cc7f23413231e13f3fced68d150ca0f967c66e948d5e36f8ad95b9f057eefce7e32b93dca348f18157dad988572d2eaf392e31c432a9b
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVGlOkAAoJELp701BxlEWfTocQAJX23DG0+1j9CkxEvzMV73KA
-7QxXXizaOBX8Aj8Xr5cbk4q3yCF/k+Lwo6e1njcNHZvl+GYlEXEDUNzqKxdmsR8M
-N8T3VslSUf332cQMEF5s9sXwdWuZPRpPCRXtUC2glvGAB0eZM3bYAGdAP5ysEmKj
-UDxpX9gdnfHF8EqRjJYiUlStrNWmRzoCf9SoVeYCQMOiCKsOi8g5lN9LIrZT2cXM
-YzDG7dg+JmmjgWDOyDVDXqd0ZnePyfTbE27TjgRPMaI4H8eeI+R1ot6Kq+BATG/y
-SImaKEz48c2ZgyPoJ6Pr+XdgEVylNib0jU9/LUlSKt7LsTbSBz1Asu4O0lqibOlr
-uS2BoV0vm8y1MZBX7CW08lzglVgzVusFsGB/H4pIk9qeJQAghDSQbb5QEW4m/ffc
-rBNblfdsFVXyOqW6QJtuMb/szj8hqt4+6VDXyMEdPS7JO3scOey8SYx2YvqF5Q4a
-zOd/iXAzAlNFCWmRFLn6LShfCM6GefH65DzAotvhwZrj+L5ijd/4WwAsdfYYNogr
-P1hpXkxxIoj/spdjDdAFCMmpzOpCY+1i9tkSx5FdjNMWF2acOwvKSZNtruAjZSK2
-MJ1vqwgUlXJwe0eCnOHyntcWnFXUMjcVmp2Q9AD6zrQQ8ypslSqJw8sbRA70qXMy
-Q/V6c6+qhvoPnPq2PBpO
-=S2ZV
+iQIcBAEBCAAGBQJVH5l1AAoJEJ+WuSkwOAOBC0kP/21YF8pdGhHNfpCaEOtQ29jG
+kW7S7yNTeD/sqViVwZIWZ3fjVtVn5oV041wo69abq0CaLQP1zcUHSqC7l6l9ctpm
+cYCjkHOmGImIdrBOb2BvpjmWSvmSA0HY2LFGTIP1jwhaeWqku3IxwKOb1RWPJ2N+
+sSpJGRgcjK1qMIRn8WzqJj+YRhPmINhVDtBuiuZt4QTG3pFwaiPN2WTq1qzzyXz0
+dFin3rp6vK3ZlBxbHXfjvbkl+lUVPWX80yIckT+8bPULjZpJNf2YemYIq2X3Yk3t
+1LwMC7EcEmCMReJBtLnJQCF/5xcMEaRNcokOeQnhY6i0A3sDfS81IYe17DSjqqdZ
+LiYOKEAVdExphCD+ahIZeut+2b/IKFIF6rDzu4SilDN12DzAgfBrNtQXcOsCJQos
+dYpQnIqdVs0VR7+K74aogB2wxhJTuNqntmP1UG+L+pAvP6xnWJL+ibTL0C/p3wua
+utV6g+swTw2RTm4rO4DT05fJJDn4d81Vb2YW9QCt3WDVMbDkK6idgRS8p+KG6tUC
+cQf+DwdvykFX008CqneNFpNvrNDlbhRZYeGJXpv704K/gTbuAWMVKpoDu5X+YrV6
+++DoL1TII3j8vVS/1eNsELbyqWytT89f+9anGbfnpkiBa83QNN0qx1xs8qzyierf
+RBqyIgVk3P2m9RaNijcz
+=Shnf
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.3.3.ebuild b/dev-vcs/mercurial/mercurial-3.3.3.ebuild
new file mode 100644
index 000000000000..a18e4a838b81
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.3.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.3.ebuild,v 1.1 2015/04/04 07:54:19 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
+}