Version bump. Removed old.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 24 insertions, 149 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index d86ea42b01bf..752d52589e62 100644
--- a/dev-vcs/mercurial/ChangeLog
+++ b/dev-vcs/mercurial/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2012/10/02 08:09:06 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.87 2012/11/11 18:04:43 polynomial-c Exp $
+
+*mercurial-2.4 (11 Nov 2012)
+
+  11 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> -mercurial-2.2.3.ebuild,
+  -mercurial-2.3.1.ebuild, +mercurial-2.4.ebuild:
+  Version bump. Removed old.
 
 *mercurial-2.3.2 (02 Oct 2012)
 
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 3e57a9c940cc..d91cd4751d84 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -3,20 +3,28 @@ Hash: SHA256
 
 AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab SHA512 2efb67d5f595842ccdb9b9ea0c6b6fbc3a28a77955d7255817309486fac19e7550ee0a545d5824e3f9acaf586d93533e90ccd05e15d76884d6493f50fb390a44 WHIRLPOOL f4e8fa6a0400bf04314569f3d6e26e464ebf3c7a693508250e2b150919ad5e34a534af86b1b5847ff13f2964d23db531b1a77cc8bdd24e550c7f9e885c6f1682
 DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd SHA512 046d8f9f9510727e4c08bbcaeb7e402544b6ce5d240f44d71f73768304072f2ed1e1b856c848143ed1ccd55fc6b109a0281be305e0adad84aa0a6583bb72ddc9 WHIRLPOOL a32516377c5018ae00c241d92d693594404569bed1972c68c517d972d4ca8f8e645e9900e303406a903f6ed488add271f677c17698d386e5f8af2d985fa65ee3
-DIST mercurial-2.2.3.tar.gz 3441501 SHA256 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b SHA512 aee5e50f3e7d97e2ec94f1d505c342108b387af9006570c06ca1ad250479fc7af83f3a1cac07792cd34872768540b6a5e8a00f1c1066fd46974fa3c63bfd12ce WHIRLPOOL f209906530a14294859e34706266a476994368c00cc92910e77a0e58521c5b7e2af644e6d67c1e633fc6252c2e02fec5f26470b20750cb31cd0fe6074f83092d
-DIST mercurial-2.3.1.tar.gz 3558058 SHA256 ef587fdd3b062e08eb4012e7870f4d0a00fd834f11578bfba80313b10f808541 SHA512 026772f5b48cc6bcf50fe2ec5c1bfbcda96f8cc31e89f9cc8de6a76c736f820617ff15b61612ae6c7729693dbba088273d8a2a613a8015a66c6d5c76ac364af9 WHIRLPOOL 772b48389cec5c99e6f107b510b0b6e1aac1c76d0676802dffddbc0c6f5dfce1d6a217a808966da88476c6fe371060eaa76919f608fde38678d2c02a6c4c09bd
 DIST mercurial-2.3.2.tar.gz 3559562 SHA256 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2 SHA512 3661be0fc6e90134b781b3709d7ea33ed6f81502c9980a7d3f6ab4b0c30e14ee75406207ab8a213c46906f27a4a015bde7b6ce6583238aec4b240763d8a3d9ae WHIRLPOOL 91d7f2fd59021180550aba0218b4c20df06aefba2fcc0dab22683075a7ca1b4cf6c2cbef9d5d2bffc6dfdfc33de39c98464cd7302e7652610e7fad3d76dee2e8
+DIST mercurial-2.4.tar.gz 3607276 SHA256 388785358881ceb4409baa1b8180c2c84d5f354ea8cef18923dd49100cd52103 SHA512 52d1127de2208aaae693d16fef10ffc9b8663081bece83b7597d65706e9568af3b9e56bd211878774e1ebed92e21365ee9c49602a0ff5e48f89f12244d79c161 WHIRLPOOL ded5dd8c9b6ac49c4e4ee0acaccd1288f57bdcef093bc454d7aee64e41d64bfa7a1a8951d6d5f07bae7b8e628e5274014be1856dccd82ab2787da6e91f18b4ae
 EBUILD mercurial-2.1.1.ebuild 4010 SHA256 46c93140e3a84505502e5d78f703d07313daacc838a50d192901ed3a1eb47555 SHA512 bfd876d876621d745a82446cdabcee1b96c5f0c356777bcab121f5ef718a6a5797e479c56d9bebc97e34f92c58a2903d8ea9cef9d54b2c9d61d55544bb66f62d WHIRLPOOL 9cb1a7ffd2a82db0f43c01afaef8fe7d746c99af13e52ffb57d0811f0be8f9b17e9b399b70bd7de56f4385d2bdf43a5370fd6d3caddf5a3d05de3a426a3aa482
-EBUILD mercurial-2.2.3.ebuild 4015 SHA256 288a29ff780d9a6aab0fe0a69553dad18318ed41df4ef484632cd99923290e62 SHA512 a3c5e96340b35c5685430b0c5441945cb4fdf5d7d045f83a54c83caec6650b250b843880a107532c0d4e0d751c99ee5bea6af178c864e730a6ad192b5e2f372d WHIRLPOOL 0fef1cc2f667ae7e4953c8ae513d6d82be748fab3f1ab9d7998946bc12dcbc0bca4a30fc36ce83cdcb993cc015ae45fa0a6e8a76fd994d3bb878d71bda2976e1
-EBUILD mercurial-2.3.1.ebuild 4032 SHA256 3f4faa1b3cfddd62f218ce19b95c016daec49b95bfdc3b9f3d2cbc6083664ad8 SHA512 b013e06fae8af3b4c3fa5817bc35727313d978186e4be54d4896c7cc1fb2fc66fc8f06f2f9dbd0e0a8f82eec1f0c1aa66f696a1e2770c9bb52fa2d9241f221b2 WHIRLPOOL 9ed4a98e977693853e3fa157b6f5f364b9177867e7481fab39ec45b3fe440ac702bb87f978d80272b8b440f766b5e7620ca5bf30265adf1db2883ca0283b1c24
 EBUILD mercurial-2.3.2.ebuild 4027 SHA256 ead916ab309ac555c7f497ecef9b4eeb150bf2c3961ea4610f71af60cb03480f SHA512 54c08f9f45f398a7aa33ac6c84d2e3ff54e692cee406b2bfa89edfeeba45d3bfceaadb23e827a69a3cf52ccedd690323c00a816559c5abbd7c26f0567f4a85d9 WHIRLPOOL 998e7b543c366201eae8896518a1bc3b21442b58a891ad415c75a6a752212ce3c6c848b58c57591be7d440f2fa113561d44175efe425c51e50ba0264c01a4c0a
+EBUILD mercurial-2.4.ebuild 4034 SHA256 093d445695074c8118c1c065246ece32ee294bc4f479c856c21c46d4c9d44c32 SHA512 fda558157a3364286c446af240da6ba2941b0864097020870523b36a2896306b85619e36d48fe0312407c268fe7c502975de7383e9964475c146bcd588ac9305 WHIRLPOOL 52f4eb02528646f9cb10b77ead8ab3bacb57da7ff183f28a0903f1729efbde5b42c352b3559ecbe051fa9c1047ac041fea9f4211171e490d292e252a4ed3dff9
 EBUILD mercurial-9999.ebuild 3496 SHA256 e863b3dcced3f63a981489c5216344c9cfb0f676c51a4ca625b7225570923385 SHA512 d5387af6004d5708aec5cc960ea0233d7309cee74c9b2debd77d04df61f07d000ede0c2d610befb48262080a45a42310a7d48393dc8b89b1bc0dfa100794c52d WHIRLPOOL f209f457dfff49e8ca16c5fa28f9da52891b3380022a5f782deb92b3df1cac286373183c7026ce975c0d8b03706e6b4e4358ecdee4cbe594ba86c11150826061
-MISC ChangeLog 29700 SHA256 7fe2c8f631aeb0b7335cd0f572668e28021583fcc2fe2fb446aac7387f9100a6 SHA512 37de2d91a8072ee3a4c33d940276ce5aa2a3d58b741ae5c84d37186874fe748ac172b472e789bed7b533d5de02af76b993575c050cffe19eb0d397865862225f WHIRLPOOL f69f160d9f23d7e242c5051796f881d4060564634b60b08c384c11e53bfa38bb3af99c020fa65e201117fd55c619f93afce944f3ab69be430851460596e21e7a
+MISC ChangeLog 29898 SHA256 225fa566df018bb32a85ebb6b56d1b5e8ec78e96278b57648b14304b9002eced SHA512 71789581e3dec8f6697db4b1ad7be25855ab4cd253f0afb270b7ebe6f18f8f94427e995fb94fb6226484b908bea82bdce458c20110067ed90d9708a24668ad0b WHIRLPOOL d2692155207bcd584ca8f977f9fb3ea56a10114ce18a384f3f1304aab09450946551148214e708283a625018eb44c004061ca54df16de5897a627cc36d76aa86
 MISC metadata.xml 537 SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2 SHA512 fbcff598f7a9f66bd6e21ab27073326bc5774fb66af3afa7f7b264e687a07591fd13a7a0f544f37c4abfb18889d660f80530b92e63ad572c822177189d98366b WHIRLPOOL 32cc38e3e5318978a078fb801cdb406b93f1c68ce7b9ab4e88c88b8b2be228031da44d0a27a8bba9b050a4feab5d8c4beddb14eed289b38d904928946b94f800
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBqqe0ACgkQxeMuLWsGW/u7UQCeJFWl7LndZV9890ByB1ciQnZ8
-LYwAnirEBo/lOBQMJo8aK7qOiYBnwwIA
-=WAtp
+iQIcBAEBCAAGBQJQn+i8AAoJEPiazRVxLXTFpv0QAKdT82kK9qK4D1n1A84P2uQy
+vnRw6m9QpzkKXwo8AGwuaI7lRtPUcXhrAHWpqTeSjZvsXPWlZqqFI16qHJWGUPLN
+oZshnOVq2lTkYbiweFNGYF9elbd5WXx/5jZYyAyKE/yWD8YWAN90VDq/ATeDohaY
+leM3wDRBAHjvxYRWyASdz6oZ8CWx6ou0zaBrFseD/G+EJsWZKj55NVCeIj39k/ns
+i3pTb5NxB6c8ulyUjcQ11gx3e/hLMGu5dV06yo/rPBQ1VXWl6feY9+5sOW7EtZ45
+9VmJrhZRQ6K2Or91XXbbExeYeVGhb8XjdKdwqb+tvhdo3cVxTebDb5Ttv4NTj5pd
+KcJZ3EZYo/rIWc11B17tT7TiiG5aNYdMn+nK8Ajij8wH/QiCtQZfIQgGHAGxpl+C
+//Pzcfhai8tihxyyPhLpSXJwP42qT6TUn+ph8iNabj1CBjy2jVkpWz4J8ZzFtQm5
+erFL5I/upQ3AJk1iibzEQI55WILJ5Llyh/P8nsCkXz5eLgWDAlFG39YZyXew1tz4
++ZC0C2c6SiRHePHIJs25uqsxMk7nwE15SGHfmTIi/SgDJAa0pVVeuBVt2ZjKjgnL
+t6MOSJvZc5HwJroQ5lUxRhHPHpdntZVfQlg7cE5CVc5jEJtPQyeIJQ8ZHYfvzsTe
+HYHEytpsxSwKSQ+aLj+h
+=Ltel
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.2.3.ebuild b/dev-vcs/mercurial/mercurial-2.2.3.ebuild
deleted file mode 100644
index 4d3fe756ad7f..000000000000
--- a/dev-vcs/mercurial/mercurial-2.2.3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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
-}
diff --git a/dev-vcs/mercurial/mercurial-2.3.1.ebuild b/dev-vcs/mercurial/mercurial-2.4.ebuild
index 6386799dda1d..1d755cfa9616 100644
--- a/dev-vcs/mercurial/mercurial-2.3.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-2.4.ebuild
@@ -1,6 +1,6 @@
 # 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.3.1.ebuild,v 1.2 2012/09/20 13:01:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.ebuild,v 1.1 2012/11/11 18:04:43 polynomial-c Exp $
 
 EAPI=3
 PYTHON_DEPEND="2"