Depend on python[threads] to fix #283882.

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

3 files changed, 131 insertions, 3 deletions

diff --git a/dev-util/mercurial/ChangeLog b/dev-util/mercurial/ChangeLog
index b63f4013864f..363dacc2f979 100644
--- a/dev-util/mercurial/ChangeLog
+++ b/dev-util/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2009/09/17 08:16:39 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/ChangeLog,v 1.105 2009/09/17 08:40:50 djc Exp $
+
+*mercurial-1.3.1-r1 (17 Sep 2009)
+
+  17 Sep 2009; <djc@gentoo.org> +mercurial-1.3.1-r1.ebuild:
+  Depend on python being built with USE=threads (bug #283882).
 
   17 Sep 2009; <djc@gentoo.org> metadata.xml:
   Add myself as a maintainer.
diff --git a/dev-util/mercurial/Manifest b/dev-util/mercurial/Manifest
index 7c654c1a6bd9..3edbd607aefb 100644
--- a/dev-util/mercurial/Manifest
+++ b/dev-util/mercurial/Manifest
@@ -3,8 +3,9 @@ DIST mercurial-1.2.1.tar.gz 1269393 RMD160 37c94e5ef9cdc639fe23622ddaf97b2230ec2
 DIST mercurial-1.3.1.tar.gz 1770585 RMD160 1e43d8697e4d269fdc065ee82c48e1cf132f6d6f SHA1 a9537fab7c7ead501a6414d1900f46e0ae3e48b8 SHA256 ff928b557f41374974171df1b0384e33161aff97c5fe1c856a7b91bf3b154a62
 DIST mercurial-1.3.tar.gz 1768227 RMD160 20032f18a2bbe1d60969567299bb9ca3392fe6d9 SHA1 af1bfc2817e0719124593e4ec03f0056a4b2870c SHA256 f25feec95586b60b939c60a1dfc0d20d69ebe0f1eca38dc3a8edbcba5b6dfd47
 EBUILD mercurial-1.2.1.ebuild 3310 RMD160 3abb4ed52612913b961359a6fc0daef44726989d SHA1 1afb3c50bc6ba54383a3117ce2a26b1bff3c8240 SHA256 e7965f3d9a24d67bc491d23bb758783c84560e31ac29f9a1adb1adf0f65f20b2
+EBUILD mercurial-1.3.1-r1.ebuild 3325 RMD160 e2de02dfd7cd39a2c40d471e798bcc1627c2cd57 SHA1 5481175656e2d9acccaec014eab31adf56ee9096 SHA256 9876a4a1bfd4beea2645128f65bbcf11940915ac36b4323bdb5d894799ffbd8a
 EBUILD mercurial-1.3.1.ebuild 3310 RMD160 ff90554a4b83c4b341ab7b3889d7d80223bd7e4f SHA1 029aa80d41cef979ea70298eddc8968d032c4de5 SHA256 189606fb0975cf2266ce821f097bbf7076ee4081943d003dc586d3db04f53b3d
 EBUILD mercurial-1.3.ebuild 3308 RMD160 c18b182062ecf27e936145abf392a3baf8cfc563 SHA1 a7526c11f0af1e3ff69c808a7004488a17976172 SHA256 4e4045dc7234350dee192814fcfe8760d8bcb64c181596bd8d11d117d01ee577
 EBUILD mercurial-9999.ebuild 3158 RMD160 d3c3b27602d614c5c23c5a189f53d85f7a45beb2 SHA1 5521bf960b2cc214d6ac63ce3f4297a9aaf4819a SHA256 f7ed1a3ef8cb45db9855a90951224e711dbb974e32eda883c98d7be8c79dc924
-MISC ChangeLog 15231 RMD160 d4a78b4bd06c7985049cf4262a897209e83292e4 SHA1 6126d0d7de1d4d3ec5504c3332072a13309c56fd SHA256 c9f01b404e2b4757a2e50cdc3db944239fbcad23e493823c6ababe9c456e03cd
-MISC metadata.xml 461 RMD160 c7d5ce1409c54b93f08c1f16f8638be06b8fab0a SHA1 b50d0d861e7194b1773675d23195c5401bb467b0 SHA256 18a58bd3447fa962bcff676587f3948f994c9f5b97118ab0efe0db6117c1a015
+MISC ChangeLog 15462 RMD160 43f55af0cd10f479cc1d9c21919443f6bf8d67ea SHA1 0e077d95e457d27aad524c7e9018c6bf569f80a4 SHA256 1fe519732f119130d589459f5c434f3bd5218f16ec6d75eba6d3020f4cd2ebd6
+MISC metadata.xml 559 RMD160 91e2d8be8351c35a2374bc06b20cdf7225050c1c SHA1 a64f9a2f4eda4463d453b2dcece61fd745a70932 SHA256 1cc655cef1ae81ba9147c29e6383215c043ea975db4c87213c7c9072173eae86
diff --git a/dev-util/mercurial/mercurial-1.3.1-r1.ebuild b/dev-util/mercurial/mercurial-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..0c4eff06be39
--- /dev/null
+++ b/dev-util/mercurial/mercurial-1.3.1-r1.ebuild
@@ -0,0 +1,122 @@
+# 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.3.1-r1.ebuild,v 1.1 2009/09/17 08:40:50 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 ~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 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 [[ ${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
+	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
+}