Version bump mercurial to 1.8.3 (bug 366837).

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

3 files changed, 153 insertions, 6 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index f2e18f3656a7..17ecba7377f5 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.44 2011/05/04 09:04:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.45 2011/05/13 07:19:08 djc Exp $
+
+*mercurial-1.8.3 (13 May 2011)
+
+  13 May 2011; Dirkjan Ochtman <djc@gentoo.org> +mercurial-1.8.3.ebuild:
+  Version bump to 1.8.3 (bug 366837).
 
   04 May 2011; Fabian Groffen <grobian@gentoo.org> mercurial-1.8.2.ebuild:
   Marked ~x64-freebsd
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 8804e385edf1..f52a537d3b3b 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,18 +5,20 @@ AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA
 DIST mercurial-1.7.5.tar.gz 2486207 RMD160 83b3d68d2d68419f81da8aa63085206646141dae SHA1 3b2dad1415e8bde00d2248b7d8c4255e9f0d79aa SHA256 dfadcf883d30a923c7164ed0f3b8ee72e63030627668707f954dd12d8a4d0491
 DIST mercurial-1.7.tar.gz 2468587 RMD160 1103d8033309a69ed76a29d40823f45877dee5b9 SHA1 54f5f58365c79dd897e0e490043a5b52aa50aae1 SHA256 19125eb6497c3aeb90a7ad9d5ed7ac2499935c1df796611b017646512f38ba5a
 DIST mercurial-1.8.2.tar.gz 2547027 RMD160 6a18f5e56928e1fbea7ac1821bdde77066f5c6b0 SHA1 394e95b3ddfb9b725368b81ad60dc39382fb9e12 SHA256 d326be6a5d8d9d39bfab1cadd4d8fd64937ba7c217dfbcba1f83e5026c57b041
+DIST mercurial-1.8.3.tar.gz 2550988 RMD160 5c1ac5e28014b78e1ad589acf97103d024a0890c SHA1 2a8b09e3c203f276204d93706db0582c112e6657 SHA256 a23ba5065606f798db6a8614a648af3a1b556ed7a7b3c20dad1b2b8dc9e3a824
 DIST mercurial-1.8.tar.gz 2528310 RMD160 ed428f767c624e935173487c110515f66a6b2c9a SHA1 51e335638996e614c8a1c251d4cadb9524ed9ad0 SHA256 421d19151f754d8452b5cf0817e0bbac2f74d93a4f76f9de41fc7a7f33c5db93
 EBUILD mercurial-1.7.5.ebuild 3582 RMD160 716f0696b5bd01366c06ba768eb58fc444fbd13d SHA1 85bf12abd853d329ef405694e7d91feb7eef5807 SHA256 985324180629a83c64dfad7202d0d993b3d7f0d6ebf92eea70602027e301f093
 EBUILD mercurial-1.7.ebuild 3572 RMD160 b554405532f747c724d60a0a621951679f0107e3 SHA1 25537aece6845e32bd7d07f01684f92266fa63ab SHA256 d54a330388d1d1c3437c0f9a39f6a10ba62b358c740f8b3f2d24284dbaf3cae2
 EBUILD mercurial-1.8.2.ebuild 3800 RMD160 1b345cbd9217e7a61bd1b0eed7e50db57a1a8874 SHA1 39f2aab67f01cf9d195538fb32382e3ab9b6ba44 SHA256 a5f4327e1c5bdc4580fd68cf44c0dcc9407b91061579d928c8d863c240aba95b
+EBUILD mercurial-1.8.3.ebuild 3796 RMD160 1e8406a079f4d9856632f803f30c2ff014903bf5 SHA1 26b42c74abb218df06127239425041f5a09b989a SHA256 00a98b45048afb5f8b9c8baf799f0fd558df4e7cc2da3f947e1c56ccca44ec08
 EBUILD mercurial-1.8.ebuild 3580 RMD160 4aef4db5d053a8570d5f6e3678cde91effd9fd97 SHA1 f3be66c0477f5a304f4755a6f66b080f8e5ce330 SHA256 f31a08147b435632b2db9faa7c6fb8fe3f97986631a35a4127a21186560af059
 EBUILD mercurial-9999.ebuild 3426 RMD160 91f6483efac5eae0d216212c8c9c7805138bf603 SHA1 dc24d5db8e80f75f5680599ff9c9b889cee68d43 SHA256 3861ce259f51eeac801e1e49ff22eb6a422efa82d6ae890e7e903188e60a8239
-MISC ChangeLog 24199 RMD160 b1c8e3393455bbdfaee3dd13384a6ace992efc12 SHA1 21b9d87abc2ef245f3268366a7535ed7c17d3c46 SHA256 b4d3768fa28e70143c77d715930fe30a094b74bb47154ba0956630b693800632
+MISC ChangeLog 24339 RMD160 4cc749fb490e47b6d7d46df38334abeacf0232ba SHA1 04bac54b9b215c235464f667a91aad344263b890 SHA256 d39e9490a77d438a27c59d1f7183276f89a257467159a9f0f340d88486a0164c
 MISC metadata.xml 560 RMD160 d2c84db005e2bb001ecb78da10c1e732ca39849e SHA1 18dde8a3194320ab1fce68aada7c2bcc177c675a SHA256 279657b5c4f96eab16e370c3cabe306f2421447f0afe5ab981232bf9da83774b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (SunOS)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3BFpYACgkQX3X2B8XHTomvwQCeNIXCWI4MVbtzsDKJ7W1erps8
-2ZUAoIEqDKOR2JSiMDe6iHKZ26S4/sy9
-=BuDd
+iEYEARECAAYFAk3M23YACgkQxeMuLWsGW/sVTACfV88i/YxDwiBIhMjmBTbLtB5H
+TZkAnRPGm/1dn+K9FnRUn6M6GGwX1O+e
+=5Sx1
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-1.8.3.ebuild b/dev-vcs/mercurial/mercurial-1.8.3.ebuild
new file mode 100644
index 000000000000..1dd4de34b5ac
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-1.8.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-1.8.3.ebuild,v 1.1 2011/05/13 07:19:08 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit bash-completion elisp-common 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 ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bugzilla emacs gpg test tk zsh-completion"
+
+RDEPEND="bugzilla? ( dev-python/mysql-python )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments )"
+
+PYTHON_CFLAGS=(
+	"2.* + -fno-strict-aliasing"
+	"* - -ftracer -ftree-vectorize"
+)
+
+PYTHON_MODNAME="${PN} hgext"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+}
+
+src_compile() {
+	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 "${ED}"/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 "${ED}"/usr/share/doc/${PF}/
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/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
+		rm -f test-clone-failure
+		rm -f test-journal-exists
+		rm -f test-repair-strip
+	fi
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}"
+		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
+	}
+	python_execute_function testing
+}
+
+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-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}