Version bump mercurial to 1.9.1.

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

3 files changed, 153 insertions, 6 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 7027d299ccfd..65bdb7c207ea 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.48 2011/08/02 06:05:58 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.49 2011/08/09 08:25:24 djc Exp $
+
+*mercurial-1.9.1 (09 Aug 2011)
+
+  09 Aug 2011; Dirkjan Ochtman <djc@gentoo.org> +mercurial-1.9.1.ebuild:
+  Version bump to 1.9.1.
 
   02 Aug 2011; Matt Turner <mattst88@gentoo.org> mercurial-1.8.3.ebuild,
   mercurial-1.9.ebuild:
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 73e3ddbc4cb3..c790b201f58c 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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-1.8.2.tar.gz 2547027 RMD160 6a18f5e56928e1fbea7ac1821bdde77066f5c6b0 SHA1 394e95b3ddfb9b725368b81ad60dc39382fb9e12 SHA256 d326be6a5d8d9d39bfab1cadd4d8fd64937ba7c217dfbcba1f83e5026c57b041
 DIST mercurial-1.8.3.tar.gz 2550988 RMD160 5c1ac5e28014b78e1ad589acf97103d024a0890c SHA1 2a8b09e3c203f276204d93706db0582c112e6657 SHA256 a23ba5065606f798db6a8614a648af3a1b556ed7a7b3c20dad1b2b8dc9e3a824
+DIST mercurial-1.9.1.tar.gz 2970705 RMD160 13d3212e3b9ffb4a4b20108241b676611bab718a SHA1 555fc13756c8e9a75b653a5337791e8ebf1319cd SHA256 f379140cfa51252845d272e5774e8cf61cb6483f3071650518fcb4fc0254c50f
 DIST mercurial-1.9.tar.gz 2964382 RMD160 f533234095f2028ef742dce96a23751ee023a7f1 SHA1 e7d80abf520849e1327ad5e7606a09628f646584 SHA256 711e4b1cd2924a7a88499d6c431a9122390183bf554d4e153edbb3b2f30123e0
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
 EBUILD mercurial-1.8.2.ebuild 3800 RMD160 1b345cbd9217e7a61bd1b0eed7e50db57a1a8874 SHA1 39f2aab67f01cf9d195538fb32382e3ab9b6ba44 SHA256 a5f4327e1c5bdc4580fd68cf44c0dcc9407b91061579d928c8d863c240aba95b
 EBUILD mercurial-1.8.3.ebuild 3807 RMD160 7d97525c86a7ff10cf65d0859b8ce43c114c12d1 SHA1 900375fe3ddc77a4065373654d3e9bc6f9a99672 SHA256 4462640da5f77549dccee68bf8a71e45486a0e4c0c01c2495643abf5778d61b2
+EBUILD mercurial-1.9.1.ebuild 3802 RMD160 20a6f33e4c8e035e2a6d3464978fc68a5c94c306 SHA1 13d9b5c781a64a8a4b2401fa03905f984a855be4 SHA256 0a44fbf448a5662dda357d121c8981a21fed84df580adb551523a06bc98c48bc
 EBUILD mercurial-1.9.ebuild 3805 RMD160 1cecc44be8513860c993483260ca3b716de320e7 SHA1 181e3df4f17a773a193d07c16c428ac09608fbb0 SHA256 1b771e28c99aa4fea2d5eb52e3c2e6480bfc6cf2baab083ec41eab3d9c9412e9
 EBUILD mercurial-9999.ebuild 3426 RMD160 91f6483efac5eae0d216212c8c9c7805138bf603 SHA1 dc24d5db8e80f75f5680599ff9c9b889cee68d43 SHA256 3861ce259f51eeac801e1e49ff22eb6a422efa82d6ae890e7e903188e60a8239
-MISC ChangeLog 24703 RMD160 d99012a80cb5be16a330183dbbe347f5f85b4ea1 SHA1 0d84d9767367c6bb1dff9f0b868b04886fa9b0bc SHA256 2ba6172c6ef8f1cd7f2c0ffb37b2ffcce09e5595768bc2e6955cce0989d69d3b
+MISC ChangeLog 24829 RMD160 0f99bae7dd8bcebbbba8f462fe31202ca88140f3 SHA1 b132f799b3fe6b527057bffbdb5f1de8eba970bd SHA256 9caed5f9691d5151bb172c4260fe9d8e26139baad219ce111ce8b794a4bf3d01
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43k8sACgkQTVUdg23rv53cLACeO2gC8OJV4raZB+pDUviU8IUq
-bgQAn0HZ5at/VHzpkP8RiBB5uqtPvz/4
-=hQl7
+iEYEAREKAAYFAk5A7v8ACgkQxeMuLWsGW/t/PgCgi42Rp9fTxKvIGHzASBfstK5A
+zpIAn3RhiIgrvbL6QnsTnXAOtbRK74mS
+=mtrQ
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-1.9.1.ebuild b/dev-vcs/mercurial/mercurial-1.9.1.ebuild
new file mode 100644
index 000000000000..1507429d56a7
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-1.9.1.ebuild
@@ -0,0 +1,140 @@
+# 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-1.9.1.ebuild,v 1.1 2011/08/09 08:25:24 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit bash-completion 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
+
+	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
+
+	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
+	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-vcs/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}