gentoo resync : 05.02.2020

7 files changed, 253 insertions, 65 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index 8150a1b8d50c..be818b3590a1 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -7,10 +7,12 @@ DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61
 DIST mercurial-4.9.tar.gz 7075692 BLAKE2B ed11442e0cd5b27f47394ed1c15016930556d5cdc59ab18f1e0d5371e434eb752b68d3d9f6dd34ed9c63df62a646223e86c6c5178775d9b856eed5df65677900 SHA512 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb
 DIST mercurial-5.0.2.tar.gz 7202797 BLAKE2B 7059efa2cf80c433ec25748c7c49ae0caa688363f5ef2983e0adf39a0a691ea99aaf4a090ebeda11b89e74263c548289cca3f82f40d77efbf925e12231b341cc SHA512 8b328e2e5a2896b690492d75c055bb13cd76df6efb087ef770f60ead86e30f7d952cb3ca82a696c0c5ce7039c319bd0fc9b448a52c079653622760317d5bb315
 DIST mercurial-5.1.2.tar.gz 7286238 BLAKE2B 0dcb2556e568e222da628bcfeceba56df8ab04f123f79add1953ce13bbf51e5cb0733fa72d5cff00250aaf0e3bfae5c52cc5cd72c1b6aa1fccb6820fce5a7018 SHA512 a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408
-EBUILD mercurial-4.6.2.ebuild 3572 BLAKE2B a778503a0d44cabc9905fa1caad2eb3587431086752fec8b02dd23f8d8db3a7ccef63a8022f671d56cbe457775f45065b2cb19d6a4d63eb59f62fbe9eb644ce0 SHA512 68cf4d34c9bafe70191d86806173c85eaf57a92337644da72f06cbc37ad5265e09c354ecfd0998c47e439504faff422deaf4d5e3409cb5984629c1135b9bf7d4
-EBUILD mercurial-4.9-r2.ebuild 3958 BLAKE2B 4d794d785df0866fb1edefdf96b9eff6433c830d2b0df59a17346ec029aa218bac431a77b2231c99c833cecdb46d34f483162fa00a3aefeb97f7d2d3ecaf425e SHA512 4d962e6dbbf2f657070a185d4ab9140e0cd837321e33b4654b4a5a036d2760219a8cf2a60f39113e7dd94baa8fb2a5f9038ee78153716c28e098f8c008575f47
+DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
+EBUILD mercurial-4.6.2.ebuild 3573 BLAKE2B 1d8b75759f9e14cbc847e6ac2a693b4dad67ed08044b0836537c2db0f1661fa1ae89d79aef29d5372868705d6b11059ef69e99757d4a96322e798d8ee8f82f38 SHA512 3251d338787121d15e900853efc0addc5d1ba5b8b928be8a1e91d8fc80ca3f1527431963ec6675dd470e7704e2632a787d26e5b2c1a078df9d06e665ba28ddfc
+EBUILD mercurial-4.9-r2.ebuild 3959 BLAKE2B a1a5b8c374be038543980591a7518b2c84c1a8ae08ed0b6f40ad4f1062c1db2a9260bda0c5951ad1078ea3e34bb59d8e378a9eb8045d178c9c1a0141ecf07c24 SHA512 c6bb1988e1ee6bd63d714b6d54c6da48358522e327666c4d43225c2eb43fb3d5e01cb46ea01d3dfad5bb42631d6f691bcf3b76f8841d9000cccb11efa2870fb5
 EBUILD mercurial-4.9.1.ebuild 3968 BLAKE2B f08b6484565bfb45caeb82104f6e4c947a6d11b36747b723ef51606139caae49f6e0d8e2c076e9f64eae9c122ba3c5645230d1b1847e6b3149d3b615eb9fd510 SHA512 2355751f9e2b52ca4ba54df7c7ddf7c44fff5092842a00341bb9c686abdd3967ca256cd607bfc862d3137b6abf97f99e706e97ffa7770dbe8dfb38872f00ee1b
 EBUILD mercurial-5.0.2.ebuild 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
-EBUILD mercurial-5.1.2.ebuild 3964 BLAKE2B a03add4df62dc635fca9671af74a4738f69ca9b3b230a2cffc7d41e36935c2ff00173707044430eed646ff220ae7f9c13e9d1b8cdf110462ce6053563276a409 SHA512 ca085e487b6589a4624ecb02e4ab059524a5d7ee46c2616d4abb59ee54bb1b280a0eaf599ea7b65b955cde3e60421cb97da11170f4d1c6510f1e74abe42e45ab
-EBUILD mercurial-9999.ebuild 4334 BLAKE2B 87bfebc02e9a47d384c71ee89ac4656cbfc70a50c720f82a1c18af36335f96f28fe2b03d0d357b0e5246b4e57e0a91c7972c9c2a8e9a67fe7464d38fe0044658 SHA512 4c2715f8d1fc12728fc6b96a3c61def70603f055ae9b933c546df1bb0ca331a7cc87eeafa8d9d1e1300c6a9b2f1b67e91f598edb01687d4b5c471035da4d7dee
-MISC metadata.xml 435 BLAKE2B 4a66c0cf836f306eca99c5a3f1144f76cce278100d8dbc817624b9a7fba203311aa39a8c46d3e2fd18646865ea9bf458d439084ddb0552b24083950480bfeeaa SHA512 a45d2794e3f041b0165244006952d164953b6638fa81e6899e1d4199c336b94490839a13b43b398bc4d5adad4faa47e8e8e79ea5b884d425db4c91fe3533c96c
+EBUILD mercurial-5.1.2.ebuild 4057 BLAKE2B a6dbbdfbd7ef5edc1aaec295bc38f1fb2dc088750cf2a54c644c641ea945cc6d6952033350a3c4d9f3366aa084b1aceec7462c7add7870683ea438bd1676f666 SHA512 40a882d2b8ab49e4a2722b4424d667503e8b2f39686767f863560d1e194ad1999cbaccc2a8aa692af69645342b9ff4bfbf967e11d416eb4ecab2bacd496cc59b
+EBUILD mercurial-5.2.2-r1.ebuild 4267 BLAKE2B 350f850282cfe4c9ca409dfae80f0cd20a8699d29c1938927dbd94242e3f9aed966e9908b5d7389722e9482cf3298500b78de259b25189272a88038fe88d05b2 SHA512 d1ec042f2919f86a3f500753846d66e541bbff4ec7b620e58c4c6d60838552071dfa1c712206491fbb238f943a412e5f9b4bda1ac23b758a72561e1afab793e4
+EBUILD mercurial-9999.ebuild 4227 BLAKE2B b52d73328c251fe849cf053bc147a1e49cf77903e284648a7404fe1d5f342c1b199d003456e43c2cbf4b26ce53414b1fc43d6fbc88ea55eb1bca7718517797d8 SHA512 06349897b9a018ce9432a597a7d48b3e84b5d8086f570d79f4975a6c6a3b48f4bf7afc97cec5ca18fe25d78da542689575578a1ca98d34d4cbf2bb9a8fb738a7
+MISC metadata.xml 544 BLAKE2B a95ef3aa49d289113a878ea473a975ac0e836684ec6950f362ed2ef110f6ab461c746bd99177e6c315707f987338d137509b3e286d7637084ac3cdec4aaf774b SHA512 24d33ff3094877d2365fd0fb04d21ae242a6dc5dc64ed3f09c9cd6fe39f637fa6ef5eaffedcd91e63fcb9382831cf14d18e01ae2a222ac8caf41dae623418738
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
index 621ffb624f22..0f14591a2bd5 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"
 
 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index 62fbdaf07e1a..fec507f335c9 100644
--- a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg bugzilla emacs gpg test tk"
 
 RDEPEND="app-misc/ca-certificates
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
index c3f5137de8f6..7ae34dee8a9e 100644
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -151,6 +151,9 @@ pkg_postinst() {
 	elog "  dev-vcs/git"
 	elog "  dev-vcs/monotone"
 	elog "  dev-vcs/subversion"
+
+	elog "If you want to use bugzilla extension"
+	elog "please install dev-python/mysqlclient"
 }
 
 pkg_postrm() {
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
new file mode 100644
index 000000000000..7d67135fc8ab
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+chg emacs gpg test tk zsh-completion"
+
+BROKEN_PYTHON="
+	!~dev-python/python-3.5.0
+	!~dev-python/python-3.5.1
+	!~dev-python/python-3.5.2
+	!~dev-python/python-3.6.0
+	!~dev-python/python-3.6.1"
+
+BDEPEND="${BROKEN_PYTHON}"
+
+RDEPEND="${BROKEN_PYTHON}
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )
+	zsh-completion? ( app-shells/zsh )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? ( app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}] )"
+
+SITEFILE="70${PN}-gentoo.el"
+
+# Too many tests fail #608720
+RESTRICT="test"
+
+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
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	strip-flags -ftracer -ftree-vectorize
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
+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
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+	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 plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	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-largefiles*		# tends to time out
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || 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
+}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 4715bed5111f..8c12d545eb87 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -1,32 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python2_7 python3_{6..7} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
 
 DESCRIPTION="Scalable distributed SCM"
 HOMEPAGE="https://www.mercurial-scm.org/"
-EHG_REPO_URI="http://selenic.com/repo/hg"
-EHG_REVISION="@"
+EHG_REPO_URI="https://www.mercurial-scm.org/repo/hg"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="+chg bugzilla emacs gpg test tk zsh-completion"
 
-RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+BROKEN_PYTHON="
+	!~dev-python/python-3.5.0
+	!~dev-python/python-3.5.1
+	!~dev-python/python-3.5.2
+	!~dev-python/python-3.6.0
+	!~dev-python/python-3.6.1"
+
+BDEPEND="${BROKEN_PYTHON}
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+RDEPEND="${BROKEN_PYTHON}
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
-	zsh-completion? ( app-shells/zsh )
-	app-misc/ca-certificates"
+	zsh-completion? ( app-shells/zsh )"
+
 DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	test? ( app-arch/unzip
-		dev-python/pygments[${PYTHON_USEDEP}] )
-	dev-python/docutils[${PYTHON_USEDEP}]"
+		dev-python/pygments[${PYTHON_USEDEP}] )"
 
 SITEFILE="70${PN}-gentoo.el"
 
@@ -37,20 +47,23 @@ 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
+	sed -i -e '/    hgenv =/a\' -e '    hgenv.pop("PYTHONPATH", None)' setup.py || die
+	# Use absolute import for zstd
+	sed -i -e 's/from \.* import zstd/import zstd/' \
+		mercurial/utils/compression.py \
+		mercurial/wireprotoframing.py || die
 
 	distutils-r1_python_prepare_all
 }
 
-python_configure_all() {
+python_compile() {
 	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_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile build_ext --no-zstd
 }
 
 python_compile_all() {
-	rm -r contrib/{win32,macosx} || die
+	rm -r contrib/win32 || die
 	emake doc
 	if use chg; then
 		emake -C contrib/chg
@@ -61,6 +74,10 @@ python_compile_all() {
 	fi
 }
 
+python_install() {
+	distutils-r1_python_install build_ext --no-zstd
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -71,12 +88,10 @@ python_install_all() {
 		newins contrib/zsh_completion _hg
 	fi
 
-	rm -f doc/*.?.txt || die
-	dodoc CONTRIBUTORS doc/*.txt
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
-
 	dobin hgeditor
-	dobin contrib/hgk
+	if use tk; then
+		dobin contrib/hgk
+	fi
 	python_foreach_impl python_doscript contrib/hg-ssh
 
 	if use emacs; then
@@ -84,8 +99,7 @@ python_install_all() {
 		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 	fi
 
-	local RM_CONTRIB=(hgk hg-ssh bash_completion zsh_completion wix buildrpm plan9
-	                  *.el mercurial.spec)
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
 
 	if use chg; then
 		dobin contrib/chg/chg
@@ -94,47 +108,40 @@ python_install_all() {
 	fi
 
 	for f in ${RM_CONTRIB[@]}; do
-		rm -rf contrib/$f || die
+		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"
+	dodoc CONTRIBUTORS hgweb.cgi
 
 	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
+	pushd tests &>/dev/null || die
+	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-largefiles*		# 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
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
 	fi
 
-	cd .. || die
+	popd &>/dev/null || die
 	distutils-r1_src_test
 }
 
diff --git a/dev-vcs/mercurial/metadata.xml b/dev-vcs/mercurial/metadata.xml
index 37d1b32ccb33..d868ce0a9583 100644
--- a/dev-vcs/mercurial/metadata.xml
+++ b/dev-vcs/mercurial/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="chg">Support Mercurial command server client</flag>
-    <flag name="bugzilla">Support bugzilla integration.</flag>
-    <flag name="gpg">Support signing with GnuPG.</flag>
-    <flag name="tk">Install dev-lang/tk for hgk script.</flag>
-  </use>
+	<maintainer type="person">
+		<email>cedk@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="chg">Support Mercurial command server client</flag>
+		<flag name="bugzilla">Support bugzilla integration.</flag>
+		<flag name="gpg">Support signing with GnuPG.</flag>
+		<flag name="tk">Install dev-lang/tk for hgk script.</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">mercurial</remote-id>
+	</upstream>
 </pkgmetadata>