Version bump mercurial to 3.0.1

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

3 files changed, 160 insertions, 5 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 7f4112067d12..ba6cc9a50d2e 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.146 2014/05/18 23:21:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.147 2014/06/02 06:59:28 djc Exp $
+
+*mercurial-3.0.1 (02 Jun 2014)
+
+  02 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> +mercurial-3.0.1.ebuild:
+  Version bump mercurial to 3.0.1
 
   18 May 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Sync e-mail address with bugs.g.o.
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index bb5fa43069b2..af19f20da58d 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -6,18 +6,30 @@ AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0
 DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 SHA512 642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625 WHIRLPOOL 64b7f5d620ed132849318e270bc97a0bed99f8be16d1c65da0a38dab47cf3f20bbe0f6b1b9ab145ca6df70c48ba70814df5c0c6c8fa07b271fcda251bb7c9ddf
 DIST mercurial-2.8.2.tar.gz 3839304 SHA256 c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f SHA512 9db5a8ed7b38c95db8bafac3efffb1735619ceb80564342bf1eb25be124f10075b8238d38a62b5cf34786a0463237e30619750c06220e2ab025f8da933b28844 WHIRLPOOL 25af73e866046225f211db1651a1b64214287609ae15b19fe383ee55ee50313779219f5424386aff124d70a658612c653958c7a2f69e150557133f8abb4dd2b7
 DIST mercurial-2.9.2.tar.gz 3855689 SHA256 86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f53 SHA512 60148bb953069228c1ccb043fdf6abb6f96b127bb0be8c2de6b32ca356140b7c3426f1c2ee09882e714672f6f1ba2dba4ee0622928896e9d4b79383ed50c347a WHIRLPOOL 0bf46c6f36bb886f8c2d66e30d5efddf2c1353a11db8251497fb1e9f29fe4d2e18245000ddf5f18a0416c947364520f52640ab785de23579cf90396466896def
+DIST mercurial-3.0.1.tar.gz 3905354 SHA256 36e48b59a84ef5a222d06596971e955ac8217e56b076dfb94c8ce5a0c29fd705 SHA512 5995746848150b8caccedea72a4ebdfebf61360a7819ffac3870c7cbb4051389591833ada266b775ff9cf67a52ef02966b71c389773d72ea8411391a7b51f413 WHIRLPOOL a8e7e18ab10b3c5cb8f9ad195e432d48035a7b148da0d0fffbd12363a4edfd740a591ea953b8a43b497538c8e62891035e6847c42550bdf552b7bd5850a7ff01
 DIST mercurial-3.0.tar.gz 3903047 SHA256 640c96556a4524df2169c6706a4f68997c5bf5862b5971b3c2ee13ed4c349cfb SHA512 8cd387ea0d74d5ed01b58d5ef8e3fb408d4b05f7deb45a02e34fbb931fd920aafbfcb3a9b52a027ebcdb562837198637a0e51f2121c94e0fcf7f7d8c016f5342 WHIRLPOOL df03745c89f0bbb7fedab306697009bfa1fbbbf0c4ae59fd0c8b3d3033762194e47ff0ce03d227ba08046afe79431f6940e11a1401c83127eec8e96f0b813d0c
 EBUILD mercurial-2.4.2.ebuild 4211 SHA256 e9d9b07b93b06ae53566f32f603660718ee65ccc65a28396bf7c7b59346032e0 SHA512 9f38469f2f2ed21c35c4d69b1efc3430cee27b924de36e8ada008939fd888af446f1bb08ced85306debd17acf947913a60ed1daca8c4391b9e2df574c1c3694d WHIRLPOOL b7d23ebb35d194389c6764e4eebc5861ba6561254357c035bdec5e6ef0cf1d7597d026f2989bed654d8c6842bf2a9648eb077e3b33e18d19ea0127b935f90c91
 EBUILD mercurial-2.8.2.ebuild 4397 SHA256 214ae19b7d0371f3db4fb7778f63861b2b7c92f25706d530d95205c554ce4f71 SHA512 9263b32d3d9c9129bc008210332839f7b7a34fb129f87826cd36e8820ae096ce6aec93df6c24ec49eee92145620bfd1fd4de4fa233919def06373806a03e03e9 WHIRLPOOL 53307bcc3bf0c8f7a2aee9843849ff8aee62a7246d4aaaec1d887379ba600c2344593b6c95e1ef144df85d0d534e5f9bc3c29b931c10ace6fac7c98ab46a24ef
 EBUILD mercurial-2.9.2.ebuild 3728 SHA256 beaa6b88aa037a2434af5df3c2873e41a7b30b6e77da3c76260be62ccc9f29b7 SHA512 0f815e3181feee757a37fc974057748d7108bf5aea55424f747cb990a60a807cada22c66eef5c2843dcb48b5327170f553ab1027c5595beb042b8ffceaea3427 WHIRLPOOL 00ced547773677783d64350201dcaf28d8ff4084b174cf1a20aac39b27d0e4353001f763ee4ba397f2ba185038478a4e0fa6a0dc5fcc96c7cdb41af1839c13ef
+EBUILD mercurial-3.0.1.ebuild 3719 SHA256 18a4ff6fc17a8ec5a24d68aea5a77c08b96a43f972c40ec5d63d373c1558fb6c SHA512 a09c19c0dea882826d8ec18d642ebcf28e54d128959435260745964eba80dfc152404bfb8606ae8e71fdf8679e5a9bd8f1846f3fb79c5bef43584669f018d20c WHIRLPOOL 064401a42fb0c53febeedef729c4fd4f25dfd25d09581d801fe2fed799b749d33e150a845013f50f554513b0c137464a7af03a9b8f5edcd916bb627695e2aee4
 EBUILD mercurial-3.0.ebuild 3717 SHA256 8d429b6c4fbe65969a318f5003a14f90788683d4a7c42aeffdeb04af3c87ff55 SHA512 a13bcc34f97d6d30f67bab35d91fe0e9a6f427ceee46a55c075c7ea7c61bb0d5107c8ac9cd60c85920cf509dac7d757edca3f824d5cb1109f8cd5ad95902afee WHIRLPOOL 7da38ad9e79c2856aed0393481cc0eb036e8127896fcc0b02e6532616937d6fbd12d80a3e51ed5b52e9a339999d6019521c9b9bb2299ad8895e57bf19a94e603
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 38466 SHA256 d60e661e11b032a162f797387846b484de0ae474664cdc5353e4b4689691ef39 SHA512 8bb27acf692dbc90294672c59aa3490cfbbded0bc6ef7a86216df8b6f99ad57ff1a196f74a7f477ce5d22e1df22470e469efd3a79dc161a60fe03fbd11d043c6 WHIRLPOOL 606a552324a4ed76b0beb34b152f37b8f795e7a5d122af28231e6ca7f7203a1772dab40f61236a9a8725e9a99dbe0568f08d3f21b54378ac7c754253a6bfb0f3
+MISC ChangeLog 38606 SHA256 a9d254390772fc4242876cf8d4479d181a290e0baa6605244d7d8016b5e12e64 SHA512 e3966756b24662ddbde2fdc37136d4fb17fb135941f6eb7cfd51ba74e62b5fdde7201f7a8332beae746fa622d1861295324cb93a5602f02efd25838404a1fa32 WHIRLPOOL 312bb581ec7051adc958aac8868a33cf94f0bef3f74d80a9b7fdd51ef6dfd4f5a8c4575a68c9fa14b02eefb1dc75091a1dbefe5cc8eada5549dcc49d49af4388
 MISC metadata.xml 704 SHA256 480f335881782bc8d66eb715a3f36afd00ee91e815e01af3c2e0e04e132b8aa5 SHA512 c821612c8f09223e4d3790734040727872cfcdeffcea6afd6d3ce8245bb263aa5707a9d892a8e3308e05ab00c18a911f2c0a3549b350eab4a3a794051d974d0b WHIRLPOOL d0ca9e9a0db527bcf2e7bf41118ffe967015d740269ada1dfc1ae92118fe53e5588a824fedd2fb7bc77077902e9f1de5d50ca0366744bf6059486a62859f03d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN5QJYACgkQVWmRsqeSphNd+ACfV7uXB7ctOdKu7V9+KfKmdfsp
-880An0C85pP1BZ+gUHULHntNXST8oMNg
-=mm2i
+iQIcBAEBCAAGBQJTjCDeAAoJEJ+WuSkwOAOBhEwP+wXMCHUWzSu61ZJtiFfsy314
+JqlsaDko1ZiPBPX7Ml3pZVarzvHKTj65r8x95F6P8fcW5TXpfExI+RIsfiLlWkKe
+It7E+/hIu7xfgGIqIECvH7Q+JaOw3cWQNhxu6ev8hVS4PCSPPD+GvyMCZa2H9Z3v
+EmQiusKKRpi+fMQkKoqfPuH1ax7Q/D673m2vsjqrOGnryxbt5nAm/BuTq4/Pvf9y
+7Ci9RT04IMpZ6vR3oSWAsCGLa0UJGAKruFTfNYe3oS53p4x15jnKKnqrmlZvPwkT
+5ZmP7Blmd4absppNu3J/V6VF9yeTNLQbKEeqqRZZ3Rcoh9oxa0tOGmAQCtnmArTS
+4oVEye2L0aKvDaWsrO0WFl/xPxo6LKY8SVsZDgl54iN5xM3Fl0aXwJeO1pl0Dmau
+5jBfd5vAJFbYyh/0cZ4tCl+OfObjiitVYrpnJfEKaX+Awx4rr/7FgryVEizRUeY1
+33x0pwpRQNi1UYBp1Twx51dFGuWbKpyhJFWD5MmuhNXEqdn0VaFd9MeyqXH+AHBF
+U0IVHYyNMVymMXMv0TknXSbpu3DZGuZLPT0yy/9U7jOAuFbQn6H7ZeEyW0trDdpJ
+7wVYQPH/ZZwxox7W/EiSkKRHlwb/aU8biQ+7fmkFmBHHNvm0J7eEo9hr6806wzm7
+UM23Acio6OKTL7i4C6HA
+=4m9u
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-3.0.1.ebuild b/dev-vcs/mercurial/mercurial-3.0.1.ebuild
new file mode 100644
index 000000000000..87a6db650baf
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-3.0.1.ebuild
@@ -0,0 +1,138 @@
+# 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.0.1.ebuild,v 1.1 2014/06/02 06:59:28 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 ~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"
+
+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
+}