Version bump mercurial to 2.0.

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

3 files changed, 151 insertions, 5 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index df45852a4fde..6879499f629b 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.53 2011/10/11 14:52:09 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.54 2011/11/02 08:30:26 djc Exp $
+
+*mercurial-2.0 (02 Nov 2011)
+
+  02 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.0.ebuild:
+  Version bump to 2.0.
 
   11 Oct 2011; Dirkjan Ochtman <djc@gentoo.org> -mercurial-1.8.2.ebuild,
   -mercurial-1.8.3.ebuild, -mercurial-1.9.ebuild, -mercurial-1.9.1.ebuild:
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 42795fc60644..256920e8da63 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,16 +5,18 @@ AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
 DIST mercurial-1.9.2.tar.gz 2972849 RMD160 fa5824a16481dd612aafc59ca99903375470b994 SHA1 3eabcaa265d2497fa0fdd6751a73061fcaeb4200 SHA256 481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa
 DIST mercurial-1.9.3.tar.gz 2977205 RMD160 badc314f0a364c3e64131247665ebbc63d1533a9 SHA1 6be1b85d7cfd67283f4c76ed64570110b99a3fe1 SHA256 53d8390379b81371f60729decd15f0961777b52ed7514d29c66c1873b918d685
+DIST mercurial-2.0.tar.gz 3090977 RMD160 f0c5f143eabff4a6c06d512cecd718bf594d06b1 SHA1 5ede1b3f54d3be2af0657901e7013dde7c19b7c5 SHA256 affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
 EBUILD mercurial-1.9.2.ebuild 3780 RMD160 250e1ef235579cfd10a4f155f55537b0badd1519 SHA1 568775dc62be89b9974cc83a13ef17b49cb17c07 SHA256 98f8c0d9a1cebbf0473c49d7a87f7192e1d68dfa65035c09fad326ded360750a
 EBUILD mercurial-1.9.3.ebuild 3777 RMD160 ad890696b0d2b645ff31466023d3f472189ad9b1 SHA1 60dfc7545cf600759a15371826ae8120ea5a83c9 SHA256 41dad8336e07fb72b5dc9076ddc2e0e548543f0c5488d57fdebf5bad167f60f0
+EBUILD mercurial-2.0.ebuild 3775 RMD160 df15b0b35185f2e7fc63f15b29481cf4cabd469a SHA1 87808c1638d6ed7a78cdcbfadca38636fe4ec36a SHA256 e2475596bdd9f5273c0584f811659eeae4eb29f8e1ed9d7a8fc9a7b39528ade1
 EBUILD mercurial-9999.ebuild 3400 RMD160 da98241f4ac161e92e1bd2edf1d376e3fa8287cc SHA1 868f8eeec559b0187e823f5de9778ca2f3f7c10f SHA256 5d2c3e7445864f34459c1cf74783ff2518cf6a3c675705ce18c515b535e094b0
-MISC ChangeLog 25489 RMD160 7e5532be003c8d471e953b3f45334bd55b3689b4 SHA1 385323771e2d83c9161eb26908c1b94f615e6090 SHA256 27060d4ccfb992c241a8800e2089665f3f739d552a8b2cbc8832e414c63369fc
+MISC ChangeLog 25614 RMD160 9d0f299d58f5422d4cafd73896620c8c459685e9 SHA1 2d070dd41a6385bad8cbf1dcd474fd0b92d7ed4c SHA256 9f444577bc6edef7141a21da5b3adf0aa52efb181a00972b98b92e46bdfe0ff7
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk6UWCIACgkQxeMuLWsGW/tHLACfRtbq9Gup9VNGOYMAz7ZOmSQV
-C7UAoKD6fozZLa2V62rGbIU/UQ0Yn3Vn
-=D6L/
+iEYEAREKAAYFAk6w/64ACgkQxeMuLWsGW/vjFQCfYO83V8OEUNz6tFJddRi1kRaX
+GJEAoLSTjbIpC+3VCzGcinK77mNqHep4
+=ZO9I
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.0.ebuild b/dev-vcs/mercurial/mercurial-2.0.ebuild
new file mode 100644
index 000000000000..a18185ded9d3
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.0.ebuild,v 1.1 2011/11/02 08:30:26 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+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
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+
+	rm -rf contrib/{win32,macosx}
+}
+
+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
+	fi
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/
+
+	dobin hgeditor
+	dobin contrib/hgk
+	dobin contrib/hg-ssh
+
+	rm -f contrib/hgk contrib/hg-ssh
+
+	rm -f contrib/bash_completion
+	cp -r contrib "${ED}"/usr/share/doc/${PF}/
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	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/"
+	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
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-command-template	# Test is broken when run as root
+		rm -f test-convert			# Test is broken when run as root
+		rm -f test-lock-badness		# Test is broken when run as root
+		rm -f test-permissions		# Test is broken when run as root
+		rm -f test-pull-permission	# Test is broken when run as root
+		rm -f test-clone-failure
+		rm -f test-journal-exists
+		rm -f test-repair-strip
+	fi
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}"
+		"$(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
+}