Version bump. Added myself to the list of maintainers

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

4 files changed, 169 insertions, 7 deletions

diff --git a/dev-vcs/mercurial/ChangeLog b/dev-vcs/mercurial/ChangeLog
index 220a85412492..33fce5deee24 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.89 2012/12/04 07:54:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.90 2012/12/07 13:31:54 polynomial-c Exp $
+
+*mercurial-2.4.1 (07 Dec 2012)
+
+  07 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> +mercurial-2.4.1.ebuild,
+  metadata.xml:
+  Version bump. Added myself to the list of maintainers.
 
   04 Dec 2012; Fabian Groffen <grobian@gentoo.org> mercurial-2.4-r1.ebuild:
   Fix shebang of hg-ssh, since it only works with Python 2.x, bug #445842
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index c0ff34449f1c..1c60f8c6cabf 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -5,17 +5,29 @@ AUX 70mercurial-gentoo.el 76 SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d74412
 AUX mercurial-2.4-dont_grep_indefinitely.patch 1276 SHA256 5cee3bf5297e33656e7d61b83de185a31f30315aa6e2fa5aeef2b145d8b136a1 SHA512 34cf5f4fed8c7a723529338d2c3b194027b5622b33de408c19051e46e40aa36b65e2bde4e4c91f6e45c4346e68d05c579b74a6d52f6bb04468cc398def273c00 WHIRLPOOL 683e89d5184300dd46e570faf5d3e16b7aa6fab90621d0579611298fda8f888989b25ad4f5651eb8a31f567109236d46ceda87831759989427312e4bf5644f48
 DIST mercurial-2.1.1.tar.gz 3313261 SHA256 0f8ec2b29f1121c6cb73c17509281eb1391ddbfad757b1f720d7e06de0a25dfd SHA512 046d8f9f9510727e4c08bbcaeb7e402544b6ce5d240f44d71f73768304072f2ed1e1b856c848143ed1ccd55fc6b109a0281be305e0adad84aa0a6583bb72ddc9 WHIRLPOOL a32516377c5018ae00c241d92d693594404569bed1972c68c517d972d4ca8f8e645e9900e303406a903f6ed488add271f677c17698d386e5f8af2d985fa65ee3
 DIST mercurial-2.3.2.tar.gz 3559562 SHA256 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2 SHA512 3661be0fc6e90134b781b3709d7ea33ed6f81502c9980a7d3f6ab4b0c30e14ee75406207ab8a213c46906f27a4a015bde7b6ce6583238aec4b240763d8a3d9ae WHIRLPOOL 91d7f2fd59021180550aba0218b4c20df06aefba2fcc0dab22683075a7ca1b4cf6c2cbef9d5d2bffc6dfdfc33de39c98464cd7302e7652610e7fad3d76dee2e8
+DIST mercurial-2.4.1.tar.gz 3609245 SHA256 d18c8a139fc20bd38584e87d09878b61e4311a5ba67bf36f7fa915068722cf8c SHA512 78be51e205487967d8951d2b5b64e958cdaa0e73a86c0cb7b402ae4a82e16c6af0bdd1aff65de66d7bb8920a81f8693a3a25133847b480641eb56786a76ac254 WHIRLPOOL bf7388c73b6f6d019f42e16d85e810c53dfc7837c720844112ad0a00e3f3007b69fec82dd18f8419c946996fdbb3e676319ed3534c815f78955219d54cfd4466
 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.3.2.ebuild 4027 SHA256 ead916ab309ac555c7f497ecef9b4eeb150bf2c3961ea4610f71af60cb03480f SHA512 54c08f9f45f398a7aa33ac6c84d2e3ff54e692cee406b2bfa89edfeeba45d3bfceaadb23e827a69a3cf52ccedd690323c00a816559c5abbd7c26f0567f4a85d9 WHIRLPOOL 998e7b543c366201eae8896518a1bc3b21442b58a891ad415c75a6a752212ce3c6c848b58c57591be7d440f2fa113561d44175efe425c51e50ba0264c01a4c0a
 EBUILD mercurial-2.4-r1.ebuild 4184 SHA256 dc0182c84e69271a2a59e245b7869b80f7c896107d2435c79c5b926ff9195464 SHA512 cde0e2dee845bcbdb61063f254621db1afbed084648f469d7af220425a7a231ee13e1147de2f80592cc168e3030270d4f24c554bd360391a10fa92f765f6eed6 WHIRLPOOL d7293e650d4d8981cdf526de4f6d8bb0a1a317d0beced65a3cf1e0bef0687597089fc7b223ed21cd11083ef3f3ff9d81587f649e0892ffe7c52d9c605080844d
+EBUILD mercurial-2.4.1.ebuild 4078 SHA256 c2bca49dd214d3930dd9d925b4d807afb1cdff8bc6cf994757e736a83bee34c2 SHA512 c8f614c8e60cf8c7050539580b7198691d62947527346698e4dcbb14a85d60f7e67ee93113ce38aca54d044da9e08fd6ed61943b02b8a9c4191758561721219a WHIRLPOOL ff6ade51a5578fb3a0ca9af4a13c7c783b3292f103d88db6df42351f7d73c69a97e200b642802107af6a370f24cc9d2d0cb4c217c48978775a63e3f3458f218f
 EBUILD mercurial-9999.ebuild 3496 SHA256 e863b3dcced3f63a981489c5216344c9cfb0f676c51a4ca625b7225570923385 SHA512 d5387af6004d5708aec5cc960ea0233d7309cee74c9b2debd77d04df61f07d000ede0c2d610befb48262080a45a42310a7d48393dc8b89b1bc0dfa100794c52d WHIRLPOOL f209f457dfff49e8ca16c5fa28f9da52891b3380022a5f782deb92b3df1cac286373183c7026ce975c0d8b03706e6b4e4358ecdee4cbe594ba86c11150826061
-MISC ChangeLog 30322 SHA256 2db336f963128af1b66b3f0af1b291803bef7e39a28cd874a7a3a2f0dfc45764 SHA512 c3f9e0ce8c0b3d6b83d7d6aa854a7f42b2b197696474a8ca243912cbb8a93cbe28b3d65ca0a9883d0b99d7ee74622ad67f46e875c6259d90195c9cf95322e432 WHIRLPOOL ca3484aa307d35033f6bcc7740a13dfc3ccf6aab5fcd29eb691a4b22e21127670d8ba790d00c7b918a81fa9be99ba8667aebe804545c507f60f1bd09ec07a4f6
-MISC metadata.xml 537 SHA256 41fac9bbf087e7bcf85d6ae1a1892c8b0e650e85e44346287f1215e1831948f2 SHA512 fbcff598f7a9f66bd6e21ab27073326bc5774fb66af3afa7f7b264e687a07591fd13a7a0f544f37c4abfb18889d660f80530b92e63ad572c822177189d98366b WHIRLPOOL 32cc38e3e5318978a078fb801cdb406b93f1c68ce7b9ab4e88c88b8b2be228031da44d0a27a8bba9b050a4feab5d8c4beddb14eed289b38d904928946b94f800
+MISC ChangeLog 30512 SHA256 b7e48f06572f0dc5b02bd532733be5a493320f974cca960c13daef05d553cb9e SHA512 dee02fdb46dbf59053fcfe00e86dbf031362cc838923b16f33bd437d94c8565859e618faba394b303af69a4641aefd8ac4d0c13a53421c99b6e17d936ced4f93 WHIRLPOOL 8cd83a23d0467015ad4790c65ba1501f47ba48876a5ff271b99497e14370bf507b0b6d1b6e2afa50fb95eb709c226017529d81fdaeab54e18fee02fb3bb29df6
+MISC metadata.xml 641 SHA256 3ed6b991e4796acecc529abc3f7475bd424ce98776cac3759c4c79fe60dd3b32 SHA512 36887bd46e6ac2e913defa6760b730f80ea14e8ce49aff6ac9046d0b55c12861bda4aec1eda12dad8ca13279510a94b1c67f98c373e3a54f2b253fad78d801ac WHIRLPOOL 150e9e23ed72f6917a98fbf13647551d0256d9de425cc5b367bb025a49bcccd1c639fd7c99e9f2b24b05be99a8b164289cec653739244a7e191c1e07caa8b4cd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC9rDUACgkQX3X2B8XHTom5pACgjjg/rX3dgQOAhY0r4ne2w04h
-V0cAnAvlkmjtO33dT6HTwWFLfDkocL5U
-=wDgo
+iQIcBAEBCAAGBQJQwe/MAAoJEPiazRVxLXTFT8EQAK/kc9EG0OaHRC9NEqpr9s7k
+TPmL085I7itmqj8N3Rh0CauN+zzX807+PKlnTschFjstVhFMxFgOX29SvlPq27BP
+4ssNJf+RClkYTAUbPbURUIslbXvx10UfQ0+k3vb8dLE+7u3jtKIgaABMHra+03nu
+PkbIGc5Jls2NNr1Xt+0SzCnLx9OGTAmpT3roc434jf6VybjJP8OoOQZJgABg+0D0
+cp3zfO7+R8N/zK9CO9a+4aYcb0j17B+4FkmNcxGvcfA5edS7n+xBM+huQId4h11m
+SUN1TsQ9bfU6HTfTmRfzjd1nH1k6Vh2ybbtmTZ2jU4eklwK+CXUnmN1n8I3pIQ5n
+CD3H89xJU6SskOjIKrqdWgAQ3WZb8yTf5ZLVQrOmIhopYl3jAEkYP/4dCey+JB3S
+JOTvapxFeeO4ftWIQMh9AziJfVavIMR60mqYqed8Y6hHbht3FB7+b/VSyiRk793Z
+ezsDmJST9abpahL96OX7mwaHRy3cbb3qNoNWII04SaM1tNGFR15q9fMPty7ULRLb
+VwQ57++tzE9ZBS2T163Bjl22iibKPYt2aTK0OQKBMRvD7E64OdYJ9scmGm79gAjK
+V+A61skn6gV5Hci43f5bj29GuyywQFO7lesi7PvzKqoAE3eexjLYNiDNjGYVb9w+
+7B4dizlCjfBF0grMsQuv
+=3GKI
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mercurial/mercurial-2.4.1.ebuild b/dev-vcs/mercurial/mercurial-2.4.1.ebuild
new file mode 100644
index 000000000000..7e2ddb2525aa
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-2.4.1.ebuild
@@ -0,0 +1,140 @@
+# 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.4.1.ebuild,v 1.1 2012/12/07 13:31:54 polynomial-c 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 ~amd64-fbsd ~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
+	python_convert_shebangs 2 contrib/hg-ssh
+
+	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/metadata.xml b/dev-vcs/mercurial/metadata.xml
index 25123d99dbb2..4318ebc8e585 100644
--- a/dev-vcs/mercurial/metadata.xml
+++ b/dev-vcs/mercurial/metadata.xml
@@ -9,6 +9,10 @@
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
   <use>
     <flag name="bugzilla">Support bugzilla integration.</flag>
     <flag name="gpg">Support signing with GnuPG.</flag>