Version bump mercurial to 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 3f0269c5e90f..843b0552b018 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.171 2015/01/11 09:36:42 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.172 2015/02/02 10:04:06 djc Exp $
+
+*mercurial-3.3 (02 Feb 2015)
+
+  02 Feb 2015; Dirkjan Ochtman <djc@gentoo.org> +mercurial-3.3.ebuild:
+  Version bump mercurial to 3.3
 
 *mercurial-3.2.4 (11 Jan 2015)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 9acd20d4a552..1389f47582bc 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.2.4.tar.gz 4078698 SHA256 08d4169d02fd24819a7b3203ba85ccf5037dc646e082eb1b21b3c87ed576f6bc SHA512 20f39489ca8c3a619f86e9a4c81908fe38890d55908d8194f61ea697770cbe48425b5aedf5483fa08a5297c52a746c8efde524930fb45c4f8fd778d8278557c9 WHIRLPOOL a4472a0611b427269391cdb62902d41559910146857ba6c4a63a3574cff61823ef5f99f71096469e1151bf2804f09ac04f1cb1fb3712c302c14af41f86e9cc79
+DIST mercurial-3.3.tar.gz 4162147 SHA256 306a084b166ab3d01a0d8a2e1b80208fd7c7f71dc46d485d47a9c5c021e9dc77 SHA512 96d3ad32b51d3a32a0610e36d410b5370b06c7f0746cee3d3b119c2faf864e0cc089b0e0992c6dd4c660a727e22b9e13ce94fcc98ab9b2a57b8e521d8e4a678e WHIRLPOOL fcde79dea587923e94235bc297c13bfdf0947554af9d14e67b76ac2343c548f8a7b16a15ac2977590b5dbb5b62c7901789f1bda1ef964622daaaa2e6d1a5e1a3
 EBUILD mercurial-3.2.3.ebuild 3779 SHA256 7967a094b810435e35bd546c42bf42922419b59c370e82525264300e2c873054 SHA512 80f52e4d4028159d1d27acb9965dfbd25102b27eeea2339f4d4d5ca7b1dce21ab95ac287645058a55ece003f721ea2815f68199b82837bfba5404a4ac970bd18 WHIRLPOOL 7a8d3db018084a69e137664197643fdc84bf5db2a187d7630029d5fee27d7284037bc11af91651156cce7974feba2ae4de538a3a236e470bece5a6d412f88aeb
 EBUILD mercurial-3.2.4.ebuild 3782 SHA256 5378f97e29167f5c244f68ccf565ec21e624213ac728ecfbdd79dff6a2e671e7 SHA512 dab38f2aea8cf99b833848883eee033823c386e6f090eec962bf3fd4ede75464a6213cafdaacd5a63c169f6ab1b5202911e113de9e55906dcb05790f21dab41a WHIRLPOOL 2a9af1d2c1fb3908fd2a034ee61908f679f27bd44c3780564a286d3b0cf67eddcc3facf551e4f2c8cdb5d3b043d9b02d6f984702c0f42323c4a8c2bcdd7feb94
+EBUILD mercurial-3.3.ebuild 3780 SHA256 dc8ec1e32220f2d75ca64395b238f8993e334513df641d2223a1b17e3492d44f SHA512 e52f60c4adb92bb79e0634747c9903d7dc3796e0d328d31d8017b3c6fe0bf381afce216238c12538ec3a0ce6bf964e93ded0c2aa21dca02d49614010715b196d WHIRLPOOL 9f50a7e38c2019825e57effe31fe501627eac8f79d304211fc46673e346b0998051c61af8ec41a5d4600f1bffb44e905f0e43328eadbc4601f61d931a400eea3
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 41783 SHA256 c299b3cd5c1a9ca635f611f566699ff3bf391611da488c008b4000c116e83a93 SHA512 5b3a8dd74ff8987d821058d9eac8340832b190136234903caa073c3a4ac72a7ff351bfb9654de5c4baacdfe0de4dc26a5fbadbd0a56852628184369567ab105c WHIRLPOOL 83ba86352b1aae0363721837b9e4c01bfc533dba75315668f22179c2cf1be98fa5e7d2a9fbe691c1b57263614c6838f147dcddafc30461564061324962013efe
+MISC ChangeLog 41917 SHA256 821551331b18749f71903ec27d82284b825b33030fb080ee5c548aaa7fc20c20 SHA512 349c8ed7dc5f7dc72721940e568961670f5f33b2518cd1b997e70d5a0b4f2da6e766efc03d71cf1dfcef279962cfc0e961b765a2537784ea7b3f8703622c3ce7 WHIRLPOOL 245e48e58e2ba61b8238c0c65465129ef26f79643ac4d20a1d27109d646dc1d1008995b094066ac186131873cc5d6ebe166626a2cdae11d85be69a3bcc8d7958
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUskWrAAoJEJ+WuSkwOAOBxXIP/0TzRNHbz7u7+Owdk4vw/RKz
-gqb0GS0ZZdvu6IGTyKVr69ZfbpvWvO7SEeNWHxy1iK0/2NkjxsW5+y2r+30wvCnG
-6xqbPJ/Qmzlk3FKV6ULeDKfX2/1LBV2WPe8BxQwAMtP6yiR7HB0ziYY/DN5W1G3P
-OiPw1etSJS0NENlt20pY3VV+hekzwdfStE+ekcnuw8QqLjfQIgybEeYx5XTGdnyp
-KGc7AIqPRKLkYb7wVJDRd+xW3ri9uJlotWmpmuQcACaRjGH2p7hOt6M24Wo9Rymf
-Urqg/NmPEO2Q60kWAcqqMmtxCck2Pj8shYbzEpEK8lq2tAjSxw0yj1aP0yRyricb
-0V5cirXE8Vu5H+EOgZUu7ji2Zdl3kE9Hd2fSFPdhPPZZn5tqSVpDThkZSKch4kVm
-1gATCXNgKPg8tNnrvXT64S9o5ERs541kyQ6gziE/VrsHfv8gO0We2TM4U88ko2H9
-Jur/hax3AvfeLhPJFLxQe9nZLsggQPamisvpNiFwmAFTffBlgjQBBqE5PiGTKARt
-QL8byDvtp98Xv3TQyOUbcBJrW2c61WOQJlZ9ZuJAdnh5fyUlhN+iQjBBoTbCwcDZ
-k3R2r29ljQBpHhGPlO8yw25DjWHXQ47wz/6RHk6f7BglTekST9wir+M2+lHx/+dw
-8y0MvkJ6x8bq+LXsvTsn
-=6LCK
+iQIcBAEBCAAGBQJUz0uvAAoJEJ+WuSkwOAOB5VgP/jG8esOQ2DEOddXmlkDg47oj
+H6lEq4yKofL5JufeRBhpzqTdecn+yMxJS6MQ93bKQAZC43wBTnf5iwh4uDAMkzHm
+zuhb3sRs7Je+4e0Za46Oim6Sn+uLK6fQ9nHMAkGY6Vz9X6rBB4XYEJvIff/6dqNv
+eCR2QoilKOveCim0bot0jEI+VxTQZncJVuKOXo6I6SzqBrp8l8HQS/q77NCQXpWu
+69TwUR4xdGiwptPmRaNS/PrwUXDJMnKqbSn8oU56WcBIXyxFSdCfvUbFbF5/zhOq
+IyKq9JCwc7ZCagjdivsz4KO7uFf7BSLD7pmfh5wuY5XwXT5VxIL/lCc6WBEAixFP
+JY0/hipKqLFjbAFDiCgBVCPvaDH+r9GSuAHRJp8MfKCDgOKsFnT2+rYanahjCnXB
+yn4jqWfvw63pfHbm3hW1cpwZdM7vJNahetyFVaPrwTclljYtWiGvKTuT3/sdBVZy
+8r935vxobekmRL/E7hWQjLdrbCx3RGGvPDP/jzIOv+TzqHjfr4V7GpnR9w18iA5J
+bo/zbBtGEvVzzBn1e9eKDD2uiUr/bdyIdtGsnNJFaZ9g1Q9kGbjIVEM+OeIgtHun
+2APYndvy8VOV/cCP3SY+BwlLg9usuSbzeafNt2vrNr2HQJKyjWsP12XNgy+KNO2V
+pII5gS/3HYnZli78GAaO
+=o3KQ
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.3.ebuild b/dev-vcs/mercurial/mercurial-3.3.ebuild
new file mode 100644
index 000000000000..c0c6644b5b44
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-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.ebuild,v 1.1 2015/02/02 10:04:06 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
+}