Version bump dev-vcs/mercurial to 1.5.2.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 131 insertions, 3 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 3f5e1d9c41ed..92880de4dfc5 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2010/04/16 15:24:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.8 2010/05/02 09:23:31 djc Exp $
+
+*mercurial-1.5.2 (02 May 2010)
+
+  02 May 2010; Dirkjan Ochtman <djc@gentoo.org> mercurial-1.5.1.ebuild,
+  +mercurial-1.5.2.ebuild:
+  Version bump to 1.5.2.
 
   16 Apr 2010; Brent Baude <ranger@gentoo.org> mercurial-1.5.ebuild:
   stable ppc, bug 314945
diff --git a/dev-vcs/mercurial/mercurial-1.5.1.ebuild b/dev-vcs/mercurial/mercurial-1.5.1.ebuild
index cb635912bd97..9b3a2811f6ed 100644
--- a/dev-vcs/mercurial/mercurial-1.5.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5.1.ebuild,v 1.2 2010/04/07 19:41:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.5.1.ebuild,v 1.3 2010/05/02 09:23:31 djc Exp $
 
 EAPI=2
 
@@ -99,7 +99,7 @@ src_test() {
 	local testdir="${T}/tests"
 	rm -rf "${testdir}"
 	einfo "Running Mercurial tests ..."
-	python run-tests.py --tmpdir="${testdir}" test-mq-qdelete || die "test failed"
+	python run-tests.py --tmpdir="${testdir}" || die "test failed"
 }
 
 pkg_postinst() {
diff --git a/dev-vcs/mercurial/mercurial-1.5.2.ebuild b/dev-vcs/mercurial/mercurial-1.5.2.ebuild
new file mode 100644
index 000000000000..34bf2726bb2f
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-1.5.2.ebuild
@@ -0,0 +1,122 @@
+# 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.5.2.ebuild,v 1.1 2010/05/02 09:23:31 djc Exp $
+
+EAPI=2
+
+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"
+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 "${D}"/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 "${D}"/usr/share/doc/${PF}/
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG=/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
+	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-util/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
+}