Version bump.

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

3 files changed, 133 insertions, 5 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 1824ad6da35c..fb406e3a58a2 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.92 2009/03/09 20:50:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.93 2009/03/21 12:03:25 nelchael Exp $
+
+*mercurial-1.2.1 (21 Mar 2009)
+
+  21 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  +mercurial-1.2.1.ebuild:
+  Version bump.
 
   09 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org> mercurial-1.2.ebuild:
   Remove failing tests.
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index 291bccf55ffa..d9a04c41d768 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-1.0.2.tar.gz 815530 RMD160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a SHA1 6d5be655276770192b889cee279bdcc0aee977e3 SHA256 f96d985c04b57848cc142c206a22c2118941ff81e660824c29a859b5a652423a
+DIST mercurial-1.2.1.tar.gz 1269393 RMD160 37c94e5ef9cdc639fe23622ddaf97b2230ec2216 SHA1 f40282bbb17fedb08b16aa7a4eeb1da7b6a6f1cb SHA256 03187464bccfbd82b78d5c55d708447181745085a62f491a206f5143376eb47e
 DIST mercurial-1.2.tar.gz 1266559 RMD160 8625517941f64a636f0b8503891463fe16eda8ef SHA1 c6590f6b833cfed22c04aae34b7060fd3372e86e SHA256 d687a342bc789c14e48d8c2fee3c8a6e4d1ac7f5b4dff89b0cf59145ee8353ed
 EBUILD mercurial-1.0.2.ebuild 3226 RMD160 743d444c471c607972c0cedb0da2599574b6672a SHA1 a29c432f1335a05cdf26aba60ccbb62e17540f5f SHA256 0f1b83d61da1f559d97d934c7c21601015cb8a622ece49344af3bc0294cca507
+EBUILD mercurial-1.2.1.ebuild 3325 RMD160 aa4a4975c5a78a9373e3113e82f1083979258f9d SHA1 c367b6ff4f571dcad5b65ea0217ba7ed44871e38 SHA256 e1594b4bbf32bfbeab693181f1c127e244fe5e930c66bfbbc0e87231df5ae00f
 EBUILD mercurial-1.2.ebuild 3320 RMD160 861029da7f71ca49127292cabe53115884b540ac SHA1 6829b1713b15a727e17199f2091314827780435b SHA256 8bf1d5975f8ce25cf76fda30a51468a26142352ac835722f12ab486ca26ea0a0
 EBUILD mercurial-9999.ebuild 3165 RMD160 3ff5b21d844377548ad5dc68950c370b9f41ef9b SHA1 145c13ffe39e573123c4276970863d8a63219470 SHA256 0655699036124e8ab44d550bc61e7d1fef69a6634b24aa86e826be3f726fd4d5
-MISC ChangeLog 13886 RMD160 5831b7faab2bd186dcbab8ee2e494a59b68164d9 SHA1 a32e9ca4f5aa7058b42cfa48db1198c91e655aaa SHA256 661fdec468e766b532b77db0c61c886c97a086b8c345d340aa0b2576c3ab2eff
+MISC ChangeLog 14015 RMD160 2d6b91a8381a548a746cd6ddb909c409a4ec7591 SHA1 295b378afd5ba8d9189825c2ca24283611d5bb4c SHA256 64bf18410a1a294399cc4b63fd74401a75aed4e26e010d71bf52d50bf4a8449e
 MISC metadata.xml 539 RMD160 fbe167f52fa1a7d5f11906d4cf04996ef2a2a31b SHA1 f30c026001c6ee934469be3deb2d9da83e0b686c SHA256 7a03917e14d17d241edbf848f5c1c8481185c3a18c7e9534947ae285f9f04fa4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkm1gS8ACgkQgo/w9rxVVVHjFgCeLTdhuQcbyMIQ3Ky+Znl091gT
-Mi8AnRdUfqlPYbb5eq7NiQp7p/h4tBNv
-=vQQk
+iEYEARECAAYFAknE15MACgkQgo/w9rxVVVEgEQCfU+qzeJlYdv7A02rusB/oHbXV
+q/AAoIZ6kGLQhue7tUR/+JHjhYYDOMcc
+=Jkiu
 -----END PGP SIGNATURE-----
diff --git a/dev-util/mercurial/mercurial-1.2.1.ebuild b/dev-util/mercurial/mercurial-1.2.1.ebuild
new file mode 100644
index 000000000000..c66d5170b567
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.2.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.2.1.ebuild,v 1.1 2009/03/21 12:03:25 nelchael Exp $
+
+inherit bash-completion elisp-common flag-o-matic eutils distutils
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="http://www.selenic.com/mercurial/"
+SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+CDEPEND=">=dev-lang/python-2.3"
+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 contrib/hgk
+	dobin contrib/hg-relink
+	dobin contrib/hg-ssh
+
+	rm -f contrib/hgk contrib/hg-relink 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() {
+	local testdir="${T}/tests"
+	mkdir -p -m1777 "${testdir}" || die
+	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 ! has userpriv ${FEATURES}; 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
+	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-util/darcs"
+	elog "  dev-util/git"
+	elog "  dev-util/monotone"
+	elog "  dev-util/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}