Bring back 2.7.2 for hgsubversion (bug 506304).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 174 insertions, 15 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 4a91c9c3f439..ed3859cab6e3 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/mercurial
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.141 2014/03/30 20:16:17 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.142 2014/03/31 07:26:01 djc Exp $
+
+*mercurial-2.7.2 (31 Mar 2014)
+
+  31 Mar 2014; Dirkjan Ochtman <djc@gentoo.org> +mercurial-2.7.2.ebuild:
+  Bring back 2.7.2 for hgsubversion (bug 506304).
 
   30 Mar 2014; Dirkjan Ochtman <djc@gentoo.org> -mercurial-2.5.4.ebuild,
   -mercurial-2.6.3.ebuild, -mercurial-2.7.2.ebuild, -mercurial-2.9.ebuild:
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 52d8a8711055..c71eda8c438b 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -4,28 +4,30 @@ Hash: SHA256
 AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44 WHIRLPOOL f4e8fa6a0400bf04314569f3d6e26e464ebf3c7a693508250e2b150919ad5e34a534af86b1b5847ff13f2964d23db531b1a77cc8bdd24e550c7f9e885c6f1682
 AUX cacerts.rc 51 SHA256 3d7c7e238ab4db22d2457e039bb1afcb02c6ac3a6c9aee8448614b0a6f414774 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90 WHIRLPOOL 12c178cf03d7d31744311fd71200efd07a2c9ab3ab3bf1c08f254d113fbd0500848ac3bb76da2baa2c567666f2174026a605dd561a3b1bc96133f314e149f289
 DIST mercurial-2.4.2.tar.gz 3613392 SHA256 cc21083d7eab4caa8159b941e36c7229acbb6d41a26a7bed21a771b3f63dedf3 SHA512 642dbcc9de6662e563059cafadbd4a0f1b4d6cebad48b2bfc7160571fad950a0110456be52690f1aeef6b91a4f6ac1edf6fc3607d1f590337a60c4b2bcab4625 WHIRLPOOL 64b7f5d620ed132849318e270bc97a0bed99f8be16d1c65da0a38dab47cf3f20bbe0f6b1b9ab145ca6df70c48ba70814df5c0c6c8fa07b271fcda251bb7c9ddf
+DIST mercurial-2.7.2.tar.gz 3787955 SHA256 b3f067eaa9fdf6818cc78526d4815ab4332252ffa07a2488c8b6939ac6b37c0b SHA512 d27dfff0b4c9feb5049098117d20fb2be211418969177a76ece772b4fdcaf780bf3c03cc388b70eef1622f32cc32c3a642a9239d35a30129c123705132228f6c WHIRLPOOL 17b90cd30e3d8ee99ce441afbf14239e595bb56410856e1439be0cc32b729d99804eb485dbf4137af71b5799ac5d0a909d4879fd5dfb30e4b0749e78d3e92176
 DIST mercurial-2.8.2.tar.gz 3839304 SHA256 c8a5baa21140c6cd6749c3b52b5e5e4a14b6b8ee7c518d9d9de09b1952efbe6f SHA512 9db5a8ed7b38c95db8bafac3efffb1735619ceb80564342bf1eb25be124f10075b8238d38a62b5cf34786a0463237e30619750c06220e2ab025f8da933b28844 WHIRLPOOL 25af73e866046225f211db1651a1b64214287609ae15b19fe383ee55ee50313779219f5424386aff124d70a658612c653958c7a2f69e150557133f8abb4dd2b7
 DIST mercurial-2.9.1.tar.gz 3851747 SHA256 a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01a SHA512 a1734ff7228f02454fc3ae4a0ed95d11b44ac344702c55e5357b4d64c4e81a84fadfcecdc8f67bb1aa8ef1a5708181670626ac7a64dcc74f47b7842525091168 WHIRLPOOL 879c048e90f3e08b3100ad80e6f385a8f76d215b90b32e83e4cffccc48345584915a6ea7c56d85eff4dfd63bc9b51b9f2e2c3032e5b7d203269c4059eff91a1f
 EBUILD mercurial-2.4.2.ebuild 4211 SHA256 e9d9b07b93b06ae53566f32f603660718ee65ccc65a28396bf7c7b59346032e0 SHA512 9f38469f2f2ed21c35c4d69b1efc3430cee27b924de36e8ada008939fd888af446f1bb08ced85306debd17acf947913a60ed1daca8c4391b9e2df574c1c3694d WHIRLPOOL b7d23ebb35d194389c6764e4eebc5861ba6561254357c035bdec5e6ef0cf1d7597d026f2989bed654d8c6842bf2a9648eb077e3b33e18d19ea0127b935f90c91
+EBUILD mercurial-2.7.2.ebuild 4404 SHA256 e22ec8c840429b767ab48c196839fff84d2ed44bf9866e640f56d0509a57875e SHA512 0537799b0ea9d63ce1d5af1a8037a97bd46c72f675ba85012e4e80489e98383db5a0a4ae985f8c36ec9ecb8360ad0f43c07f1c91bcbaab56250eb67a565fd9f5 WHIRLPOOL 35a067370ee0f9829f2ca6a69de77d98d8d91a8f8e83cc9939483ad31742c6e88d39048d6a670c148b3d4bac76912e2dd2220fbd0067569d3efb6c43e340a26c
 EBUILD mercurial-2.8.2.ebuild 4397 SHA256 214ae19b7d0371f3db4fb7778f63861b2b7c92f25706d530d95205c554ce4f71 SHA512 9263b32d3d9c9129bc008210332839f7b7a34fb129f87826cd36e8820ae096ce6aec93df6c24ec49eee92145620bfd1fd4de4fa233919def06373806a03e03e9 WHIRLPOOL 53307bcc3bf0c8f7a2aee9843849ff8aee62a7246d4aaaec1d887379ba600c2344593b6c95e1ef144df85d0d534e5f9bc3c29b931c10ace6fac7c98ab46a24ef
 EBUILD mercurial-2.9.1.ebuild 3728 SHA256 fcca5e41ee29a055c10410e8ee980cd5fe8ae687c46f44c3e361b8bb1710a126 SHA512 2dfd32dfc0885d41fcf5f6da170f4bf308de5565f7691271f7ef562b0c71b5c8ce88f64187b9e6ea904f1ced7ff8386644fdccd28a44966a7315109f5ecd6b91 WHIRLPOOL f7e592051eada27de2ff183b462f67955eecc2860dc79f72e43487bd027a7a007f8c984c190427ba9e8f3f7cec590553efb8e8ece4de02fb94c2d7ed1b4b594b
 EBUILD mercurial-9999.ebuild 4250 SHA256 b35d261d682f3c0e399ed54809dc074fcdf3056a653b318023e8f2bcbacd4e67 SHA512 2a783f6345b2338e9073a0a562e48a97e517ce3865fc7c84768e6aa3b0ee9c1d97f3dbca42c29538b2c9d49206b16f680ca43ecdc1accbea32895be31e55c7ff WHIRLPOOL 7e9bdf8eed29d66fedc32ad929038e0334de6c5f608b8116854a5893e1b7f8ff41334caca61c23b8eef95e871376459a72d3bf0d5f4b62839674d47d13cc7900
-MISC ChangeLog 37813 SHA256 8841b68b45ec8cc4f8de732423df185964fa8bbe7bb0ae72dabea0796cbb8680 SHA512 bf94ff9ececc045d2e7e55bea2d829c5623c01ff54ffd006290b8fa49006d3823ef157f0b25f4336802891153cb5d0ebd2cfc0cebd38d826f942a14e40de96d7 WHIRLPOOL 74d35d9811f028383b5fdfb72d6f8276d180ae02079d94e15cb3cc3e9eb2a5645c8a98b6af4c97e2ce8e4edcf0205919c65d2fa212386f1014e4dd02ad45b1b3
+MISC ChangeLog 37969 SHA256 edf8b52f67657bada4ebcf52a34df05513d2191314a6785eff9f29ab20b84bc3 SHA512 58792bdb8cc73ca40a94ed6e267d5ee487d72ab65dca68cbee53e90a739525923f21bb282547780efa59e658e4398dfc69b96a37cb811af9982826c4f3823e85 WHIRLPOOL cd3a15745aa8f01cdd6e475580fbb62709a73b9e5e98cb7a1458f9f8d6695ae0109a29203d49efc1bfe488b0952697516f6cafffbf34c059f1db7b2a8cb723a1
 MISC metadata.xml 704 SHA256 76c0566b9a503099f6cf40750ffe09726dcf338e24378e780fb932cbebe1f0c1 SHA512 21a386ecca4b3d337c69019e750752df3f06137de8b8b27199b6218d4a5253bade522c5a9183340dfea61333bd783c14d60ff3f3e46cb58121c7100449722bfd WHIRLPOOL 7f64d01b4d31ae756e63e16be8add1bcba9a073961663ae481be883a5fcc6e3473d5da5f26d524502ade4eba0b2f3692934ed63f1e41bfa8d8b6a0a1532e11b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTOHuWAAoJEJ+WuSkwOAOB/lkP+wQp1V+dqnggpZmnQggBjph/
-JzN++xiyF4pfX7hbBFjp7dQCH/BbdrU40k0Lb1LZqOu0AFGf75SP7rHmOERqG+9H
-eJJe+JrXmXT6MkumQ7TSNAHPJdkLumua/6ppZnpuY2ZicHeRJIQLi5JnBdCpoMO/
-mwiyhHBOBUa7A0d27kFdiwwbcPW5f1SkDVi7Xwj672Cn7DKLLMCcK0j0HxzjF5wl
-zg/jSG+Y/K+8AVCR+1eV+lpsQwVVeK03rh/JyFsIJwlcjR9rPxRWzRT4cvUbq93W
-qfCa9rP3j2L1301M+/tPOhJyurPQDKea8/58yiO0ZNKAG3CXGIfp5VXRsPXU7KJs
-jnuS/ErogReGtWySwnT7oYeogawYzDSZupfcZo3oEdEJmKB2X3oem0kXZkzuQLRs
-PL1yvK/ZSvO8jnUtUyMzFedvNu/PxECayUDV5WwP8MWssVzvqjTj1BUGv/JjCT7u
-Vz5WW6QqqvtH5Np+8Kw9zV1859FXaxdd5EVEjKDApOaCCetgatFfUCmZhapaWeEl
-TzahfOx3k/BWGR78PT++tmj0+YYfQE7pPL+BZt5Pi0/Etyjjxd+TJo1xaPXu9mhk
-CqtJl1ADHMDEyuz/Tk1CR9XzlPT7UA96dSNb8VKD+fQ/wGjZIYB5skSYooj7D6dZ
-AF99IXtQXxA2OtH/NRQu
-=Mv4e
+iQIcBAEBCAAGBQJTORiPAAoJEJ+WuSkwOAOB4kIP/i3dffUP6EknlUIzB2XnpaCb
+LotS++3BCDsutGuPqyV1jQ0sz1uORcbm6OCmIJKRnmkveYaJUxM5R/cLJUmSsDXi
+MjqNelsIB4q4INhj0rPLQqIxaHan+FaYOcoZXvZPZEu3fVtOrjBua8UcV5/LMHOk
+et+FOAei7GZmVPLNzTe9whVpTNs5JT4UdMCC0SnumtE+IAy92R+Ucr2SYdEICMAH
+uECovXxhmYUUT9aZcsYVKIAXK4Rkn5E7BnwpSssh984fPwfnDrj70mXEuF5Ye6xI
+iNijypT70/jJ5v0T4zEHtlE9/NW9/xVJVtcBM8q7kshjV2LAwxgEEN5gbA2Qt8S5
+OgpbaxmQbWJYFOlNeISKLC7uAkB70iOeuetc8pSWg5v8xT9aTqR0I8umPVFipuBv
+WIcrNu1+sBZYHEfSvbeBdqlmjx0oNKBnQGvGZXvem1G/bso7yYY1i6DQ3ly413jk
+NduYNSkhWAyTWw44faAe5UxZW5ebQxmKc6UURgNkaW6Flqs4tI4U1y7txKYH/SPp
+z7pvPB5toowqRdFTaSyhCjKxRmnLd9W+zb5lEG5kC4mFLlxlSxX4ulQSY+0HgkwU
+KviCbhqERaXqy3oZbZUN98QLl7liGBnw8/NSgX2pEiPptngxjHZv3KemTMAdaMOV
+a1BFJte6adqfAng9y0Wu
+=UyOg
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.7.2.ebuild b/dev-vcs/mercurial/mercurial-2.7.2.ebuild
new file mode 100644
index 000000000000..cacef7f03674
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.7.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.7.2.ebuild,v 1.3 2014/03/31 07:26:01 djc Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+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 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-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[${PYTHON_USEDEP}] )
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )
+	app-misc/ca-certificates"
+DEPEND="emacs? ( virtual/emacs )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+python_prepare_all() {
+	# 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
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	strip-flags -ftracer -ftree-vectorize
+	# Note: make it impl-conditional if py3 is supported
+	append-flags -fno-strict-aliasing
+
+	"${PYTHON}" setup.py build_mo || die
+}
+
+python_compile_all() {
+	rm -r contrib/{win32,macosx} || die
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
+
+	rm -f doc/*.?.txt
+	dodoc CONTRIBUTORS
+	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+
+	dobin hgeditor
+	dobin contrib/hgk
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
+	                  *.el mercurial.spec)
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/$f || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+
+	cat > "${T}/80mercurial" <<-EOF
+HG="${EPREFIX}/usr/bin/hg"
+EOF
+	doenvd "${T}/80mercurial"
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	cd 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
+	rm -f test-largefiles* || die		# tends to time out
+	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
+
+	cd .. || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	rm -rf "${TMPDIR}"/test
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py --verbose \
+		--tmpdir="${TMPDIR}"/test \
+		--with-hg="${TEST_DIR}"/scripts/hg \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+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() {
+	use emacs && elisp-site-regen
+}