Version bump mercurial to 2.1.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 158 insertions, 2 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 1a17b9987e92..02af55428dc0 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.65 2012/02/01 19:57:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.66 2012/02/02 03:38:21 djc Exp $
+
+*mercurial-2.1 (02 Feb 2012)
+
+  02 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.1.ebuild:
+  Version bump to 2.1.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> mercurial-2.0.ebuild:
   Marking mercurial-2.0 ppc for bug 393265
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index f19ae35ea71a..b17d600eed71 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
 DIST mercurial-2.0.1.tar.gz 3128233 RMD160 1c2e84fb5ac1eef3dbdd64f16e76e99fdf34fc98 SHA1 7983f564c06aef598fcfd7f8c1c33f4669362760 SHA256 6b9e6870e21e7161bb2e44c09e078e622ad7dd46bf5a122d3155319919dc1b38
 DIST mercurial-2.0.2.tar.gz 3134016 RMD160 5d5da2c17994da77340de6527108fb4a38c216eb SHA1 aedcb4e41c5b49188d9d34d12c343b2ec099c61b SHA256 ca8b8fb93f2e3e8c3cdf2f81d87e92592f5f20c5bfcaaeb6a75550d4a69572c9
 DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b1 SHA1 5ede1b3f54d3be2af0657901e7013dde7c19b7c5 SHA256 affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
+DIST mercurial-2.1.tar.gz 3308300 RMD160 4d89616c7a2dff4d8c05cf9d8ee8b13bda1c9e23 SHA1 f649a0b33e0cafb3e5867a2e970f41eb887d3fab SHA256 cb37f90807e99dd4508cac70c098aa433b26adb7a3ab064c0b1626dc9a094383
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
 EBUILD mercurial-2.0.1.ebuild 4004 RMD160 befdda02423006766c38e5183f38cae7d7919014 SHA1 ecf51cdcce5b7970032e018264a11820b233a5cc SHA256 cd98be5ccec551516d3d3a7072e467629a2f36e1fb7df1ef34ad3e44d21dad40
 EBUILD mercurial-2.0.2.ebuild 4009 RMD160 7bf0d33dd874c6b39550625b71b7ff8a0fdb7eb2 SHA1 5ddb00ac3cdaf489a1f717a39c43afd06e837a3b SHA256 85fc393ffda66655c1dab45e55526cb686b375b5bd9424c3f897fea3ce7120f5
 EBUILD mercurial-2.0.ebuild 3770 RMD160 1370dec46a325a0b7f267e048c5839c2bad5a4a6 SHA1 19cd09f41fb5043e2c50cc2f36d6ed8c1503113a SHA256 1402852a5230611459fa2ca63095c2ac58b887b285bf2b5653704ce02d4885c2
+EBUILD mercurial-2.1.ebuild 4009 RMD160 9e00a373f27522925920d3abca88c3a04c7f6c2d SHA1 70ee453628b67383eed5f254a0504ed07f484117 SHA256 b401fcfa6e69db33b0b660fc1690dc0d71e7399f9934ed947861779ab81a1850
 EBUILD mercurial-9999.ebuild 3481 RMD160 d3ec02624bdfb07c18592d80ad9d551dacac0fa9 SHA1 873d500f9aa3a340eb33ec6ee088bd8ec6a219b1 SHA256 dd57034ed361dd3a731647170075ecc95c0d5cf3e267a36bbe39b11978cac4ba
-MISC ChangeLog 26907 RMD160 1ad60f44fd6a6d42b094be2f51da0a26fb5b5f44 SHA1 cac9d03efd6b8bdf3555e21cd4123ebb776aef6a SHA256 db07abf65fb67c70e84ae469cdd149d73443f4370ec8853f3f2b096e6dba73f7
+MISC ChangeLog 27029 RMD160 50558f0a0b194526dcf756a5c3e91dcb4807c0b9 SHA1 c33e392316140d51c3cf7871338e904ffe344325 SHA256 e3196d0fc4860521406adf99d8ee936874daa32f9839c909d63b1eb26b29d600
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk8qBTgACgkQxeMuLWsGW/spFwCgn0LNW9G7aQTikvs2N/vdpjKh
+tJoAoL2r3ZUPXLzS/td2n0fUA5OYnI7y
+=9wOt
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.1.ebuild b/dev-vcs/mercurial/mercurial-2.1.ebuild
new file mode 100644
index 000000000000..8f4aef6de6cf
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.1.ebuild,v 1.1 2012/02/02 03:38:21 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython *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 ~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 )"
+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
+
+	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
+}
+
+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
+	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
+}