Version bump dev-vcs/mercurial to 1.6.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 134 insertions, 2 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 46701a5b0cb0..57cf51fe4e48 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.18 2010/06/25 17:13:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.19 2010/07/01 19:27:44 djc Exp $
+
+*mercurial-1.6 (01 Jul 2010)
+
+  01 Jul 2010; Dirkjan Ochtman <djc@gentoo.org> +mercurial-1.6.ebuild:
+  Version bump to 1.6.
 
   25 Jun 2010; Raúl Porcel <armin76@gentoo.org> mercurial-1.5.ebuild:
   alpha/arm/ia64/sparc stable wrt #314945
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index ca1d30fd16ff..237803fcca05 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -4,11 +4,13 @@ DIST mercurial-1.5.2.tar.gz 2022729 RMD160 941a36fb4c18540f1bebe346360ad66109389
 DIST mercurial-1.5.3.tar.gz 2026151 RMD160 c08e160ca2bd8668d09d480e9e95d6274e33eb90 SHA1 bbf52fb4e8ff797bbf6ab4d32e6d82720a23107d SHA256 975bf56770762ebf7ab88c2666a1e1e70c90d25e5193682650a322239af6c1c1
 DIST mercurial-1.5.4.tar.gz 2038613 RMD160 3452d96ebc8405fb4393dc5f9a09a1562a41f3e3 SHA1 1ff675bc4ec5d1b19f16427df12df691507c2b54 SHA256 472a74bab92dd0c691088eafa9d2e7b0e2e5b5affd22a99aa25ab2ecbfb6c4a9
 DIST mercurial-1.5.tar.gz 2017153 RMD160 adc1bca311ecac8afd13424613fc95a3777f1011 SHA1 f4e5ff53be661a8bd1422c70ae76337aafbffa56 SHA256 83608427415700b79f0ce1c9088700e5e07812e0ce55bb839b670b0f31402c9c
+DIST mercurial-1.6.tar.gz 2192032 RMD160 1c1994f4747cd01712d8b72d8e33310df74ddce4 SHA1 53ffa5d267fcf220e9fd303da0ba477673fd412b SHA256 f7dc9c6bea57170d2505b41af2a4c50a02db49dba3261e6557e10e7dc37a640e
 EBUILD mercurial-1.4.1.ebuild 3275 RMD160 68324367da90bbf246a37cbe647f20c61455d3fb SHA1 8a38ebd9e274109da1b451dd0ec1857744e10deb SHA256 670e3f04145541c7049b0c87d2bf7f3f83173eadf7ca53d56fdb83b5e3bf60ac
 EBUILD mercurial-1.5.2.ebuild 3364 RMD160 85508c79eb23acfdb71a1ce28778b42831408386 SHA1 81f1bab751e83dc14a4b314f16beccf4fb7b78bb SHA256 2b750bc862f62e5e74ac4938d5574f8276d0135fc4e7719a764a8b4c58adcfe6
 EBUILD mercurial-1.5.3.ebuild 3506 RMD160 9dcd66d8ef6d6f4a8aacda0bb9e0675f6a45cada SHA1 22b50121787644509486328a651f384b9ec89df7 SHA256 751fe355099cf9ba42c46d1f55f5ccbb1aeced968854d9d7a7a92ef36952692f
 EBUILD mercurial-1.5.4.ebuild 3506 RMD160 0d1e5fc1f557aec21137732d5db34e3e081bbaee SHA1 4c39cabd321a0ab9e3045d69bc03aeffb24238d8 SHA256 18c993c2f88f2b7a56f6221f9c161bda57980bf459700c8d86c97e3457acd522
 EBUILD mercurial-1.5.ebuild 3355 RMD160 4efa3563786f0c9e9d2f34f4dbbddd28207f219b SHA1 f88b5abbc1c06077d25d9acdba6c026d846104fd SHA256 6acb4c5ba85b12ca5b7ec736990eae0e1297ef27a7cc5193639fb070c38cf761
+EBUILD mercurial-1.6.ebuild 3500 RMD160 b801da03ec0b7502051072235563a72b36bd926f SHA1 f3268de362ec0af830fc452412c6cf38e790701d SHA256 c3545e281beef20c06a66a36ab1f6538923e2a76952e7df9c3b5a5364d21d870
 EBUILD mercurial-9999.ebuild 3345 RMD160 19935d4e95741ca014228b6c6008097a12a14e41 SHA1 d7a1e15c8581bc9d0bb4d5d8db9f1dd63f5a325c SHA256 c650c3561f179b59acc8f578fed0e7036ffc6424643bb54102c7b31f6dde6069
-MISC ChangeLog 20638 RMD160 50bc4d01817fb1a10ac07dff5fe81ffe790ded2e SHA1 34a620c7c9e499a55c163d2c49dfb458d3a23b6d SHA256 3ca3b22625e69c1c73237379e5a102f4bf4edebec91608d72519fd5e976eec7b
+MISC ChangeLog 20759 RMD160 0e8b547250a117ba6f851ffd6bd186d2513d9cde SHA1 bc9caf0021b52510d05bfd9dc4f20cc9280226c9 SHA256 0c1c1b4b9e128b9337f182674e0a4a826631a1acbe68d5138b32b7f5d95f9378
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
diff --git a/dev-vcs/mercurial/mercurial-1.6.ebuild b/dev-vcs/mercurial/mercurial-1.6.ebuild
new file mode 100644
index 000000000000..0c2b646bcfb9
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-1.6.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.6.ebuild,v 1.1 2010/07/01 19:27:44 djc Exp $
+
+EAPI=3
+
+inherit bash-completion elisp-common flag-o-matic 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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~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"
+
+CDEPEND=">=dev-lang/python-2.4[threads]"
+RDEPEND="${CDEPEND}
+	bugzilla? ( dev-python/mysql-python )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${CDEPEND}
+	emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments )"
+
+PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
+
+src_compile() {
+	filter-flags -ftracer -ftree-vectorize
+
+	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
+
+	dobashcompletion contrib/bash_completion ${PN}
+
+	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
+	local testdir="${T}/tests"
+	rm -rf "${testdir}"
+	einfo "Running Mercurial tests ..."
+	python run-tests.py --tmpdir="${testdir}" || die "test failed"
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+
+	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-util/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}