Version bump, fixes bug 249688, which blocks the python 2.6 tracker bug 230205.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-hh7 i686

3 files changed, 128 insertions, 12 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index 8cdfdfa12082..9c1793ecb0a6 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/mercurial
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.85 2008/10/17 08:04:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.86 2008/12/29 13:19:17 yngwin Exp $
+
+*mercurial-1.1.1 (29 Dec 2008)
+
+  29 Dec 2008; Ben de Groot <yngwin@gentoo.org> +mercurial-1.1.1.ebuild:
+  Version bump, fixes bug 249688, which blocks the python 2.6 tracker bug
+  230205.
 
   17 Oct 2008; Alexis Ballier <aballier@gentoo.org> mercurial-1.0.2.ebuild:
   keyword ~x86-fbsd
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index afa40e0709ab..fe9837347d6b 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 AUX mercurial-1.0.1-87c704ac92d4-git-patch.patch 1739 RMD160 96394fb2bccc19c5115897a26336694d56a9f86c SHA1 032e3f0e7f52cb2801caf41c8df048c1418c562b SHA256 abdecd689f58d0b5ed43cf1b190bf46b01adceeaa415c9cbbd55130de973e0e0
 DIST mercurial-1.0.1.tar.gz 809348 RMD160 f451ab56660f46a51b4588de966ec0718f38cd7b SHA1 ada3e6d2128283efeefb7b44f9a1e0dfc22d62f1 SHA256 f6206a982d8268aa972290c69929f2a3067d0ee36249d0c2f3aa781d13c58d9e
 DIST mercurial-1.0.2.tar.gz 815530 RMD160 0f163d19a12bbe7dcfc45f10cdab07f5b16e7b3a SHA1 6d5be655276770192b889cee279bdcc0aee977e3 SHA256 f96d985c04b57848cc142c206a22c2118941ff81e660824c29a859b5a652423a
+DIST mercurial-1.1.1.tar.gz 950399 RMD160 ed4db64c2a45c030c3a949c51c1c468511eb3540 SHA1 42a26a29414dee2c8eb7ce32e4fc6fe447bccc0a SHA256 bd4d64b1e41427dd21da9d7fd355607e72ecbb761c98fa89facaaf03a12f1af1
 EBUILD mercurial-1.0.1-r2.ebuild 2288 RMD160 ab4d59956eed3e05af8a546e0781a469527a4b5b SHA1 2ffb259ebd1a4ced322780b20361d54b60281b24 SHA256 4ddc11044bef1c2bf217506df7e2d4c5bad245abd3bff65cf491b5a8af14f074
 EBUILD mercurial-1.0.1-r3.ebuild 2766 RMD160 a02a449e3d694e03e07d7a30a602e46102c01f81 SHA1 e7781f9b3887dbd7446256236ee6b2cbbcf1ad3a SHA256 e5cb8fd600d2fb8dc7e68a7be489f231dd15311e9fd55f4eab198e617d4521ca
 EBUILD mercurial-1.0.2.ebuild 3226 RMD160 743d444c471c607972c0cedb0da2599574b6672a SHA1 a29c432f1335a05cdf26aba60ccbb62e17540f5f SHA256 0f1b83d61da1f559d97d934c7c21601015cb8a622ece49344af3bc0294cca507
-MISC ChangeLog 12713 RMD160 eefebd511f57e8c5dced7a787805682308eb798f SHA1 b0606acbeecbf346d165176d21accea70cb076c3 SHA256 96ef8628ec2e58c1b9eaa541ef0319db068e365c97538e3f8ea06975c2a86b72
+EBUILD mercurial-1.1.1.ebuild 3231 RMD160 2389768b701f738a672f5b9232f110cb472c59a7 SHA1 47b493c055b9d942e677b555d73aeae1aa23d97c SHA256 03eba252d7a0f73d622da0affb616a9c0e480533e2a04869884b639d08741cab
+MISC ChangeLog 12901 RMD160 01285daeb248a73b30fc9d4c0e006c4b8c8d0ff8 SHA1 be6d243f1810d268fa157f15c1976cf532bf9657 SHA256 5b77152408cd2b9ebaa3e53165966a9a779de8c976c55d4c2424bb908b47cd6d
 MISC metadata.xml 645 RMD160 2a33b3987960796da78558e671c4e5e0c6f10241 SHA1 6cd04e19dc7796b53afe98a9831e128c4c96f3ca SHA256 e0b05e42345698eda32c513e3a8f14d8bf42d5344dcd804b1f2234da327524e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkj4RyAACgkQvFcC4BYPU0quCwCdG3Sntk/urayfngTlM03Sb4Im
-UQoAoJspEPy7r1XROY3toUKgshOgVijk
-=b1+h
------END PGP SIGNATURE-----
diff --git a/dev-util/mercurial/mercurial-1.1.1.ebuild b/dev-util/mercurial/mercurial-1.1.1.ebuild
new file mode 100644
index 000000000000..2d21860bbaa2
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.1.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.1.1.ebuild,v 1.1 2008/12/29 13:19:17 yngwin 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 zsh-completion"
+
+CDEPEND=">=dev-lang/python-2.3"
+RDEPEND="${CDEPEND}
+	bugzilla? ( dev-python/mysql-python )
+	gpg? ( app-crypt/gnupg )
+	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 -f *svn*		# Subversion tests fail with 1.5
+	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
+}