Version bump dev-vcs/mercurial to 1.5.2.

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

4 files changed, 135 insertions, 5 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/Manifest b/dev-vcs/mercurial/Manifest
index a8292d780fe1..5127f2052555 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -3,12 +3,14 @@ DIST mercurial-1.4.1.tar.gz 1917284 RMD160 cee744f59785a15d9ffa1f8e5b0b5bcfa2332
 DIST mercurial-1.4.2.tar.gz 1922947 RMD160 05eb8a8932adb1a4a530a08970d6cffb52f2a10b SHA1 6bc5d33624dae7db5dedae2c676f40b28b945763 SHA256 6c8605d970255ae947031a2752d8c1d519eee714df15acadb10899d4aa81c329
 DIST mercurial-1.4.3.tar.gz 1925613 RMD160 7dee2f0752befcec85f2d6b7ab87e2603aa94d76 SHA1 26ed2726b4a8886bbc5a1b3e0823ad252a13b991 SHA256 9cc820baaca3c385d98d6d0c0f54ce6ee4c7af0ef6e8aa8c71da2a48fb7a2a24
 DIST mercurial-1.5.1.tar.gz 2013230 RMD160 ebde06987eff3f953b15b4f195b955861eb884f4 SHA1 a06a2a3adccfb2e9e843f8bf84eb85e126078e68 SHA256 5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569
+DIST mercurial-1.5.2.tar.gz 2022729 RMD160 941a36fb4c18540f1bebe346360ad66109389cbf SHA1 c0b2aea1bf30d1be09a300567376bc9628dc84b0 SHA256 c6244c49382edc515ba3115de688c4e84e4cf159cf6aa3d85c635dc21b778784
 DIST mercurial-1.5.tar.gz 2017153 RMD160 adc1bca311ecac8afd13424613fc95a3777f1011 SHA1 f4e5ff53be661a8bd1422c70ae76337aafbffa56 SHA256 83608427415700b79f0ce1c9088700e5e07812e0ce55bb839b670b0f31402c9c
 EBUILD mercurial-1.4.1.ebuild 3274 RMD160 5c948b2aacf12f35b1f258e01b23721a74322144 SHA1 5b3e4648fe4f1e85af461d048a6983cb5c6b8ea5 SHA256 60f03fef13c4762912fef58c47340e3ef818e76cbccd32e1fd1bca7319d057fd
 EBUILD mercurial-1.4.2.ebuild 3282 RMD160 e9a86588c0f5771f2a0ae207398dd643207937e0 SHA1 e926b9a47b848d6e09783dff1c3ad6a0a38eaa7d SHA256 4ba41f70b03183fbe1d440f4e3ce15abd1764879306d2f810478a4d60c9fd414
 EBUILD mercurial-1.4.3.ebuild 3282 RMD160 4bbe8e5ed398b36d7274a38401e6a01f0cc83cbf SHA1 7a25e9cc5d0f4ffa3ada503291c9b47954c6bd4c SHA256 d8e2af4b3a4be2096bda84c6c74acd33cc12d9464c0b8863a754a6799348ac50
-EBUILD mercurial-1.5.1.ebuild 3301 RMD160 b40e9ae6d9cd043e9f7dcbf9cdaf384e4de4656f SHA1 cf84e2d7dccd087a7b82bc37fcdff0cc8442aa36 SHA256 c3b1606677896a88c35f5294e1d5ef0feb78bf63a411c3e2eb751c66dea19057
+EBUILD mercurial-1.5.1.ebuild 3280 RMD160 e0a416c67226ea419d95678f50127abcd50d6807 SHA1 bc9d91a07ad4c2128b2bc3c9875f5bf67c465823 SHA256 21e88ad55c6f7c674c1fd909a948c4e8d9f4c640e88a14274a632ed7dc9be6c4
+EBUILD mercurial-1.5.2.ebuild 3280 RMD160 f1b14b4d5f4a42a096b3cbd432d4a80bc087898f SHA1 6bb49a4da162d8d58a406514726bae72dd06ccd9 SHA256 3339fe95547401ef4bab1b0d4efa057ee76b4daf5d24258afd29819eaa3c6f8c
 EBUILD mercurial-1.5.ebuild 3280 RMD160 514fe2c17fe3b185b77f0dc0e576c4484b5842af SHA1 cae31a1124a5292ea65b5494e1d7cbb281364dba SHA256 04e3ab1b77037a177e002f27c5d63bf87d30337436847aa1279ac5e15577706c
 EBUILD mercurial-9999.ebuild 3135 RMD160 ff2350be9f8387c9962bce24dddd9dda09f85778 SHA1 4b779702bb58649f3e446899652576b8304a2659 SHA256 3c6b2eeae19e4eea393a8425dad18dca09f04f40892a6f3d4cbdf949bdf3ca08
-MISC ChangeLog 18927 RMD160 ecd07a60994a0c271a3912a927899c0e1ef2952b SHA1 af6fb87eccc9766b450d73d1d93a685614dc1087 SHA256 11eb86fbb8a8e47953972394d483fe2c0aec0da4b7725eb20b77209e80464d6f
+MISC ChangeLog 19081 RMD160 e5d4de205a61b7f814c5d05182a1bbc6498fc790 SHA1 8f916e9395d298d30c181402f0da83e0489760ad SHA256 0eb02f126bb652803a825f9f99e133572295008b344c7fdaeb3599722bfab763
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
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
+}