Version bump mercurial to 2.5.

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

3 files changed, 154 insertions, 5 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 73f0dd2a8399..0b52865c199c 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.100 2013/01/02 08:35:21 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.101 2013/02/03 14:37:47 djc Exp $
+
+*mercurial-2.5 (03 Feb 2013)
+
+  03 Feb 2013; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.5.ebuild:
+  Version bump mercurial to 2.5.
 
 *mercurial-2.4.2 (02 Jan 2013)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 18224e77156b..5cc4dbd1d90c 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,18 +7,20 @@ AUX mercurial-2.4-dont_grep_indefinitely.patch 1276 SHA256 5cee3bf5297e33656e7d6
 DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd SHA512 046d8f9f9510727e4c08bbcaeb7e402544b6ce5d240f44d71f73768304072f2ed1e1b856c848143ed1ccd55fc6b109a0281be305e0adad84aa0a6583bb72ddc9 WHIRLPOOL a32516377c5018ae00c241d92d693594404569bed1972c68c517d972d4ca8f8e645e9900e303406a903f6ed488add271f677c17698d386e5f8af2d985fa65ee3
 DIST mercurial-2.4.1.tar.gz 3609245 SHA256 d18c8a139fc20bd38584e87d09878b61e4311a5ba67bf36f7fa915068722cf8c SHA512 78be51e205487967d8951d2b5b64e958cdaa0e73a86c0cb7b402ae4a82e16c6af0bdd1aff65de66d7bb8920a81f8693a3a25133847b480641eb56786a76ac254 WHIRLPOOL bf7388c73b6f6d019f42e16d85e810c53dfc7837c720844112ad0a00e3f3007b69fec82dd18f8419c946996fdbb3e676319ed3534c815f78955219d54cfd4466
 DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 SHA512 642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625 WHIRLPOOL 64b7f5d620ed132849318e270bc97a0bed99f8be16d1c65da0a38dab47cf3f20bbe0f6b1b9ab145ca6df70c48ba70814df5c0c6c8fa07b271fcda251bb7c9ddf
+DIST mercurial-2.5.tar.gz 3669817 SHA256 63090f1b9f8494e029c00085d2a23d9ef1990f5f2c2ac2718adee4c9460d52e4 SHA512 8c710faf257bb51b1f0214b6562508045586787089b3dce6ccbe1bab7cb7bb7ffc88b4660b6d6e6b7a3c54536c08b367071c9f2316c4d4671519d64a1171457a WHIRLPOOL e52fb3d05ccc24b11c660402926d4b94974ce4af90c547831aa4d3ae3dae0b489f14f91a376ed474d53c3e15036d62f9f3761bc32b5b474ee80e5e49c7e2afc1
 EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555 SHA512 bfd876d876621d745a82446cdabcee1b96c5f0c356777bcab121f5ef718a6a5797e479c56d9bebc97e34f92c58a2903d8ea9cef9d54b2c9d61d55544bb66f62d WHIRLPOOL 9cb1a7ffd2a82db0f43c01afaef8fe7d746c99af13e52ffb57d0811f0be8f9b17e9b399b70bd7de56f4385d2bdf43a5370fd6d3caddf5a3d05de3a426a3aa482
 EBUILD mercurial-2.4.1-r1.ebuild 4203 SHA256 abd0fbb8769e7de4bb97dbbbf11fc2d3b96e7feb226f833f9eedacda293902a6 SHA512 1e58312057bbb8f05c9d46be47c5bad6f809fbeb89002c8a0c345130493800a6c01f290150cb4fae1f0dad50dd8c09e7391c0b3eb2cebe423780dda29938cd1c WHIRLPOOL c7286deff1f741ac7f865f0702f73fd270f57aa3185ac16460b86a4b291e5409b093ed6d7cc57432e197db779fe1d93f8c0d61f619fb319b8425f97950d9731a
 EBUILD mercurial-2.4.1-r2.ebuild 4225 SHA256 6540466fdd047ac647f7a5a6481e3e27961509a3bd70c94211faeee29637dcf9 SHA512 6a70917a5ee6893c02fb94fd8503a24aeabd6e094dbd9881d091256b6023d06f72e2e2ab87b79e74d22b01efe7b83251213b38e63367587bac282c25a861a28e WHIRLPOOL da9c460d55103dacc8fd028e23637f47c45cdd33c5c31461464295c122d7796b4ead3aa6ffaec5b419184d53b74a113b087edbb95c9170d0dbe53eec2a93255f
 EBUILD mercurial-2.4.1.ebuild 4078 SHA256 c2bca49dd214d3930dd9d925b4d807afb1cdff8bc6cf994757e736a83bee34c2 SHA512 c8f614c8e60cf8c7050539580b7198691d62947527346698e4dcbb14a85d60f7e67ee93113ce38aca54d044da9e08fd6ed61943b02b8a9c4191758561721219a WHIRLPOOL ff6ade51a5578fb3a0ca9af4a13c7c783b3292f103d88db6df42351f7d73c69a97e200b642802107af6a370f24cc9d2d0cb4c217c48978775a63e3f3458f218f
 EBUILD mercurial-2.4.2.ebuild 4222 SHA256 0bdaa555090183c35dd0074fa1c4ae2c3027a4ac8e98733f674ceb2efd7f7ae7 SHA512 433b40557902d8f4d9a64e5f304f197a4c99b575d969f08c502fd412c660cfbe2666822ff6efdf570ed34d52a981ac069c809a86e8f1f6251eba67d221774aa0 WHIRLPOOL 2f28314eae37a77351d7490bb4b593816604c2961aebeb59dff64327869f6f6e5bb94feab7595d33b0c2fd8ff5b8877200cc72c75ec188eff40d23c6597b0066
+EBUILD mercurial-2.5.ebuild 4220 SHA256 c99a21ce247293201609971c39ad0e4521e021d9750d6370cf25d2e41e401b82 SHA512 48b49de42743ce61dd7ff0aa31b63ac123c4e3b326da572bbbfb6ada5c1cd8e3ae35eb81f0f29be318c9f95d717e5e3037b831dde2116a5ae9400c5449b58342 WHIRLPOOL 01a46f66766621b420a48ed25bd6f25f7a3c8b807c7b6b80718ced058761c821bd1c09b19425f566d9cec9da87c35158c5bb32b2479906a8860b318fb947e5f4
 EBUILD mercurial-9999.ebuild 4040 SHA256 14305b9a06deecfa1b9ff52361575e7733ee59da9788b4e087201175cb0026d2 SHA512 016dabe2a513c84e346e3898a15be4b1372905ab605f0bb7730966cc477e2a19e01f2ee5cefd64c743327ce862ef70c3646745038993942921546ac247afc22b WHIRLPOOL 8c3667549230153567dc0ad948ba9c223c6dd18165597c4e9f7126891dee5fbc995fd381f0b8d7dc2607239778d67f83e6dc0b295d8d23aa4bf64ecd4f7e1701
-MISC ChangeLog 31911 SHA256 da90890d643cf9358189d04be26d22151be6d783426b506252985adb1587f783 SHA512 a8390d81c983e8b4107e735a557636332a1a19b1e7ddcfad696fd5ab30fb15f6fda15630985276c6014007377546f29d6058f0ed61f3805c2c4c3240a7b85795 WHIRLPOOL 1efc01bf61e2fe3bcfb5ce81b1bcb2db584322cf66f1d989ff41bff74b67cc12e134d9d28a29769559c8e89bd016efb4e7b7ccffa4b66cbd46fe9a77f8ddb86e
+MISC ChangeLog 32046 SHA256 4b087a57ef8108e3867ebcdcfc385c880b9c01a0d7eaff04c3d5851b7be74d1b SHA512 e21157461dc769b5cd005ddf764560ace73d793ec99f865fb4320a16f7b65637bb23fd3a5211f7208ed318823d08d262078138cdc8233f88d233a84377e3fc0f WHIRLPOOL 2170b52eeb71a8f387a1a6563eec261e692ab8ba11a4a8d7c6e061706b522419cad1f70b89e9d4e2fe29566c4c58a73e5842aecd95fbc1b4dd4a9aa9b91ed5fa
 MISC metadata.xml 537 SHA256 44b0f25f7c2d2559b289caa0f843be24585036650b1db7f88edc9febbf648146 SHA512 7a4e6a17557580cf7d74628da3b9788d1c94dc5100bb3eb86f1411f32859293c13949ece56359214bfcc6e2ced88be2f5627a516ad59d59e4134708de20e38cd WHIRLPOOL 1a94fcda312a2345dea0f47183abe5ec18fabcccbd1fb0599586d98c567a89898c2265fde58e7774dbb584ccb2cb2cb133df15b1f15327eba8e71ded6cd3da9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDj9gsACgkQxeMuLWsGW/t5KwCglrLUAg6qwV3cb/QOO9F/tNie
-B50An0fcaV13Lp7HGjCiUKVPj6WLSolo
-=XeIC
+iEYEAREIAAYFAlEOdmAACgkQxeMuLWsGW/uyoQCeOjDdF0WSh6gzl8UKke6+SG1o
+wsEAmwdZlzoBszvmqWlqE6E9f18GssBR
+=uScW
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.5.ebuild b/dev-vcs/mercurial/mercurial-2.5.ebuild
new file mode 100644
index 000000000000..8143bcf48abe
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.5.ebuild,v 1.1 2013/02/03 14:37:47 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit bash-completion-r1 elisp-common eutils distutils
+
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments )"
+
+PYTHON_CFLAGS=(
+	"2.* + -fno-strict-aliasing"
+	"* - -ftracer -ftree-vectorize"
+)
+
+PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	distutils_src_prepare
+	# 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
+}
+
+src_compile() {
+	distutils_src_compile
+	if use emacs; then
+		cd "${S}"/contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+	rm -rf contrib/{win32,macosx} || die
+}
+
+src_install() {
+	distutils_src_install
+	python_convert_shebangs 2 contrib/hg-ssh
+
+	newbashcomp contrib/bash_completion ${PN} || die
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg || die
+	fi
+
+	rm -f doc/*.?.txt || die
+	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor || die
+	dobin contrib/hgk || die
+	dobin contrib/hg-ssh || die
+
+	rm -f contrib/hgk contrib/hg-ssh || die
+
+	rm -f contrib/bash_completion || die
+	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
+	doman doc/*.? || die
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial" || die
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	cd "${S}/tests/" || die
+	rm -rf *svn* || die					# Subversion tests fail with 1.5
+	rm -f test-archive* || die			# Fails due to verbose tar output changes
+	rm -f test-convert-baz* || die		# GNU Arch baz
+	rm -f test-convert-cvs* || die		# CVS
+	rm -f test-convert-darcs* || die	# Darcs
+	rm -f test-convert-git* || die		# git
+	rm -f test-convert-mtn* || die		# monotone
+	rm -f test-convert-tla* || die		# GNU Arch tla
+	rm -f test-doctest* || die			# doctest always fails with python 2.5.x
+	rm -f test-largefiles* || die		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-command-template* || die	# Test is broken when run as root
+		rm -f test-convert* || die			# Test is broken when run as root
+		rm -f test-lock-badness* || die		# Test is broken when run as root
+		rm -f test-permissions* || die		# Test is broken when run as root
+		rm -f test-pull-permission* || die	# Test is broken when run as root
+		rm -f test-clone-failure* || die
+		rm -f test-journal-exists* || die
+		rm -f test-repair-strip* || die
+	fi
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}" || die
+		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_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() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}