Version bump mercurial to 2.2.3.

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

3 files changed, 151 insertions, 5 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 7911cb799c6e..f110733fda99 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.82 2012/07/02 07:54:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.83 2012/07/02 08:04:11 djc Exp $
+
+*mercurial-2.2.3 (02 Jul 2012)
+
+  02 Jul 2012; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.2.3.ebuild:
+  Version bump to 2.2.3.
 
   02 Jul 2012; Dirkjan Ochtman <djc@gentoo.org> -mercurial-2.0.ebuild,
   -mercurial-2.1.2.ebuild, -mercurial-2.2.1.ebuild:
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 6aa6485811bb..ce5837c72fa9 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -4,15 +4,17 @@ Hash: SHA512
 AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab
 DIST mercurial-2.1.1.tar.gz 3313261 RMD160 e17a995a069d1a7a46537a49189520df953acb6f SHA1 d6cc4b649b6705113732e62756788542897ba008 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd
 DIST mercurial-2.2.2.tar.gz 3430037 RMD160 f26a4eeff78a867d48c87e2b126e623b66232588 SHA1 72070531f173ccb4394b227914c45678c963ebaa SHA256 3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a
+DIST mercurial-2.2.3.tar.gz 3441501 RMD160 44a962017d63aaa5e586f2e3c9d772306be9e6eb SHA1 b754700c545c17f68e1ab36c942141d90c9b9b46 SHA256 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b
 EBUILD mercurial-2.1.1.ebuild 4010 RMD160 0cb47d9962fe16f59bfac5ee022cd167c1ba6731 SHA1 01d09f53ef32e50b443a07f89932015159b670bb SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555
 EBUILD mercurial-2.2.2.ebuild 4015 RMD160 85acc918d2dfd09de159ec90f0dd007ce0e4d80f SHA1 91258e12f04612c7fdf91880de46c0f146bfdf2c SHA256 a3e0d7778fc4cb3324a0448842b22de4b395c1d5b34203b34a5883b72065b124
+EBUILD mercurial-2.2.3.ebuild 4015 RMD160 72ba279d06ab250b71d70fa448d775084eecd09c SHA1 01aac4ffbd40257e020565f7c16dd863deeb7c9e SHA256 288a29ff780d9a6aab0fe0a69553dad18318ed41df4ef484632cd99923290e62
 EBUILD mercurial-9999.ebuild 3496 RMD160 4da1f57f6d21fb051f3eaed843f97f151ecae05a SHA1 03172b1d17645d237d668b50d88d7c950dfb8fe8 SHA256 e863b3dcced3f63a981489c5216344c9cfb0f676c51a4ca625b7225570923385
-MISC ChangeLog 29112 RMD160 c697abf709d518cda407e342380fd3743461517f SHA1 f2c0cfb512f5c538b3456e67b49be10e1b563a79 SHA256 d095cce3b1e4c4838da4cbb274a17738137b4f6df54f90306bc8074e64dac82f
+MISC ChangeLog 29243 RMD160 fbc23e8018ee24e559b15f56e79c3aaefc3f9fab SHA1 35b5980616a94e07198be0c7ad41d00eea67ccb8 SHA256 c9fc1a316ea88a0fe378bf90a18bc93c8f8ce4dbbebca887691c3f843d35809d
 MISC metadata.xml 537 RMD160 094da5d55adea235b0980078f03edbc1e2006af9 SHA1 f01f12737cceb293ad828c22c9b1a37a4b51306b SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk/xVIsACgkQxeMuLWsGW/t4xwCeJntzDZHEb6M4Rll0NMxxpwAC
-9kgAnAgiYWnM5glieP6qPfDxLEJZ3LHh
-=FOf3
+iEYEAREKAAYFAk/xVgcACgkQxeMuLWsGW/vD7wCgnmmhPr+8YW1GHDt7QKFx6TWN
+OVQAn0jjiw+LabDWJ2Fo05oe2tVHch8v
+=6yvf
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.2.3.ebuild b/dev-vcs/mercurial/mercurial-2.2.3.ebuild
new file mode 100644
index 000000000000..4d3fe756ad7f
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.2.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.2.3.ebuild,v 1.1 2012/07/02 08:04:11 djc Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="threads"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit bash-completion-r1 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 ~mips ~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 || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+
+	rm -rf contrib/{win32,macosx} || die
+}
+
+src_install() {
+	distutils_src_install
+
+	newbashcomp contrib/bash_completion ${PN} || die
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg || die
+	fi
+
+	rm -f doc/*.?.txt || die
+	dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor || die
+	dobin contrib/hgk || die
+	dobin contrib/hg-ssh || die
+
+	rm -f contrib/hgk contrib/hg-ssh || die
+
+	rm -f contrib/bash_completion || die
+	cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die
+	doman doc/*.? || die
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial" || die
+
+	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/" || die
+	rm -rf *svn* || die			# Subversion tests fail with 1.5
+	rm -f test-archive || die		# Fails due to verbose tar output changes
+	rm -f test-convert-baz* || die		# GNU Arch baz
+	rm -f test-convert-cvs*	|| die		# CVS
+	rm -f test-convert-darcs* || die	# Darcs
+	rm -f test-convert-git* || die		# git
+	rm -f test-convert-mtn*	|| die		# monotone
+	rm -f test-convert-tla*	|| die		# GNU Arch tla
+	rm -f test-doctest* || die		# 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 || die	# Test is broken when run as root
+		rm -f test-convert || die		# Test is broken when run as root
+		rm -f test-lock-badness	|| die		# Test is broken when run as root
+		rm -f test-permissions	|| die		# Test is broken when run as root
+		rm -f test-pull-permission || die	# Test is broken when run as root
+		rm -f test-clone-failure || die
+		rm -f test-journal-exists || die
+		rm -f test-repair-strip || die
+	fi
+
+	testing() {
+		local testdir="${T}/tests-${PYTHON_ABI}"
+		rm -rf "${testdir}" || die
+		"$(PYTHON)" run-tests.py --tmpdir="${testdir}"
+	}
+	python_execute_function testing
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+
+	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
+}