gentoo Easter resync : 12.04.2020

8 files changed, 81 insertions, 47 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index a06d2ceab09f..4cb42bb5323c 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -2,17 +2,17 @@ AUX 70mercurial-gentoo.el 76 BLAKE2B 2b9488757b2516dc494ce4f38c89b63669886eefaeb
 AUX cacerts.rc 51 BLAKE2B 8b42b2f4514d938b051feb7e59c69e6b06d1ceabe6c5a252a3cb4033555bcccda9375ae1fa9a5607f07296bd094c425077f5788e2c9fbca9b22914da41ddf132 SHA512 39c40c6cc95c54dcae13effb5c23f541f49fd89e0f040e214673afd906c6d5140eb18801d55330f4455507b467f0fae011998e60932e9a2accf37a0e7a047b90
 AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd96edf31c858d05f0f5c29087a8122fefdd21546dea297709173d812e33774acadf8dada57d178c9ef9fafde560f4be4b SHA512 c696e0df1f6d149e8522123fe51585ded2955bbea782819d634eaf6edb0ddd189c68372692cb247bbd96d51c69801c2d8232e4b0b60093ff1f11b28010292cb7
 AUX mercurial-4.8.1-unbundle_zstd.patch 393 BLAKE2B 8556147baa6e493ee81aef1a68b2b6372ba094c6d5c73e97faa3f2da48179085ad475fe8d646916d3fb3294a166abec4a8b2a5b5e00cfd8fdaf55290a745ef2a SHA512 003844caff3dd4df15db8a6a084ee71d456026dc9222bf469f9489a9946a9205a57db274a26dabdc2d73fdff24cfd291f70b99141f2c9aad6e58d0fe1a1e7254
-DIST mercurial-4.6.2.tar.gz 6407989 BLAKE2B 22aa121b2544e3597f2ea4d3a7a80b3b8f5ca6f9de15326dbee555ca3d14b8a552042c4448aae17b1c015b4f302c3512c204f17a834b758f51fbcc2455ed4e6f SHA512 71afb9ed3f62b1b946563c55851dda1fc8b724afe82a4a253c7f4719ae9e1160d5f9644bed7fd27ee3a21d8e682352364fc9f47bafa552cd4cd7fac7c0d42bdd
 DIST mercurial-4.9.1.tar.gz 7076867 BLAKE2B 8cedc66a8ddffc543a8849bbc98ebfc9ed61055a2ad16506b8c1c9a932d6825ef01a63b31f5bdbdb25e8829badab72857f101d12576fb269572c3d03cb4e7abd SHA512 2265ab501e24a2d229ef29404ca35d318faf620db163ec33225348d53139f7b6cb121e935ce444ec697ced69697f43df57dd7199ad20c1ca6f0275d9744ce391
 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
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
-EBUILD mercurial-4.6.2.ebuild 3573 BLAKE2B 8146e9b23a2111f40be6db77d29d721afdceb1c9d4b041c4257d2ef41b8d50bb0b5aabda383c7aac47e0465b29d7772403264446cfac51e45ff432d45919d7ef SHA512 d58ac60e787e1e76e801a601f4b95b092dc0fa03cbda1f87ee3e15909fcf07027e8fcd89bd1cd4e7e212c615af97566857e4301729f5aafea3f0f140ce90ccdc
-EBUILD mercurial-4.9-r2.ebuild 3959 BLAKE2B d3dcf5e0460e3307108185ff99c2f47bc15d9887eb2268382aec1f8d7b57774e90578dcc641ec108337effc7afeb54c969d92954138dc014c99e290789c5dd36 SHA512 ec4087db8f1b7c60de1a5a661c6581214b3fceb463e6269badffc6899fd0d5becf0bcdaa28bd9a2b7f1ead7846d0c1b9adb41526d9722d12a57780035d515f75
-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 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
+DIST mercurial-5.3.1.tar.gz 7511733 BLAKE2B 713074092d29ee7e35dbed73e38e120d802477b55fcab7c497cf78a1c4b00fc5aaf9ab323c64d58660c39454b4d6d0d130a620b7afc08141b9a2016052f3a3b9 SHA512 3bc49ea96cb4ac0e777f667a3243917af495a001534b6b91141fc93b5c47a8eddc84331e1cb0b981fac1bf451dcfc91b8c538134983733466248fdc20afd39c6
+EBUILD mercurial-4.9-r2.ebuild 3961 BLAKE2B 0fb5cfe7292583bc8acb0f7e60b1b44ec68727967407efc1cfae4f7d4155ac10edb75f1d22696e7d3e13fedaf8172d133fe40f04f879cfe2e3a23af10b8b17b9 SHA512 25340e237aa4a2b5bef4d8086b0ca5d09127695ebcab2c0ca1a8d3f0356cf5f39871548e81a262e97ffede6ab5bb807f90619ad4877fbc5e7be5b8f4a6b52b12
+EBUILD mercurial-4.9.1.ebuild 3969 BLAKE2B 246e6bef7d7c9e26c5d196c35aa80791d391ec920afc6152311257de9236f189b1c9a500f4c284193ea6398df17d44eda1429811c7270f7ab9a305e1f9c2b2ce SHA512 bbf4bbd40196c26ead520275926f11a2a31fb727003a7d20a895578cbc51c884f5f06b9ef8381a7f2739592192d0f272d3f7dc05a941a48ef7b09103e93cce0e
+EBUILD mercurial-5.0.2.ebuild 3965 BLAKE2B d2e9fee79075cb1030953c1542c0e7dcd4991c3cee3d165d2b4bc300eabc05865a23519e4efbf2e80571baccb4376228ceb2dacf66dc82a9ab7a9c7e6748786b SHA512 a097d92609ee4f4b42b12d48848f3468b2ca7825a49d7084d5c59c302f703995f3ae00ad71e39e8e063dd0973c47a46c4a936ed5662e886ac14257ffaf5e5006
+EBUILD mercurial-5.1.2.ebuild 4058 BLAKE2B 48f0950af98f15279f0353a75b06def66a5603d9761ff6c94171647df2c2535b60457d66ace87a1eaac54e35334da03b49fd7f3fd5746800ce9bb115e25d236a SHA512 43a0f0de929d50a58ebb2809390f83ab873e0324c207e6fd300136db592b59dbd414e6fc49cb64966e1557205308ed80f7a959716f25dbd09f6755ce3d8b76f5
+EBUILD mercurial-5.2.2-r1.ebuild 4261 BLAKE2B 388b01f443f91b3a0f0fd37553cf775ccbfdb06b23a093ffc5c3568593246db2e73e2cf320f8392ae367e004264a655592f2c2265ddb738577fb7b63b4e7b4ad SHA512 a0ff28086d53f992e662bbb13688748229e61178abfed68cd51b74fca5ed2d6618f05fc3757414faae57cdd5822eea867660e99d8e546610b4c46d076ef67c11
+EBUILD mercurial-5.3.1.ebuild 4273 BLAKE2B 4f4406b42a28133842cf93d85f5fbf11a17ad2b90128f51544b83db8ae32a0c140e9083d3e3a93812cd97b1b591fba02db48d6f667147d12ad2072008d343fa8 SHA512 06639342b94328556a84c7b51fac33bfa1771e50668d50b29f23a3610a26fa39894efe9b14d1e3a60f0aacb3903b623edc5606d1a9fed64844374b8999812e85
+EBUILD mercurial-9999.ebuild 4219 BLAKE2B 567a43e6491cf5317dd96998a57a6d562d07583a9b45ff4f45d01f1f2e1b61243ac646356efb90d86da51dad6634d5ea9a574a348ed73f4a2acf484a2608083f SHA512 d4e0373b8374205a72141e1376b7b17a209cd0e83456e5a0f95d382fa8b20173274f65cac74151a7dd99afb56a50cddf1fe352007fa5e1d7e198b5a37529f3c1
 MISC metadata.xml 544 BLAKE2B a95ef3aa49d289113a878ea473a975ac0e836684ec6950f362ed2ef110f6ab461c746bd99177e6c315707f987338d137509b3e286d7637084ac3cdec4aaf774b SHA512 24d33ff3094877d2365fd0fb04d21ae242a6dc5dc64ed3f09c9cd6fe39f637fa6ef5eaffedcd91e63fcb9382831cf14d18e01ae2a222ac8caf41dae623418738
diff --git a/dev-vcs/mercurial/mercurial-4.9-r2.ebuild b/dev-vcs/mercurial/mercurial-4.9-r2.ebuild
index 2bb6186ecadb..3a5eb72d0e0e 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
@@ -49,7 +49,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	# Note: make it impl-conditional if py3 is supported
 	append-flags -fno-strict-aliasing
 
diff --git a/dev-vcs/mercurial/mercurial-4.9.1.ebuild b/dev-vcs/mercurial/mercurial-4.9.1.ebuild
index 6d3bef63979d..435caf12f6ea 100644
--- a/dev-vcs/mercurial/mercurial-4.9.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-4.9.1.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
@@ -49,7 +49,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	# Note: make it impl-conditional if py3 is supported
 	append-flags -fno-strict-aliasing
 
diff --git a/dev-vcs/mercurial/mercurial-5.0.2.ebuild b/dev-vcs/mercurial/mercurial-5.0.2.ebuild
index c3f5137de8f6..117dc6be168c 100644
--- a/dev-vcs/mercurial/mercurial-5.0.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.0.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
@@ -49,7 +49,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	# Note: make it impl-conditional if py3 is supported
 	append-flags -fno-strict-aliasing
 
diff --git a/dev-vcs/mercurial/mercurial-5.1.2.ebuild b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
index 7ae34dee8a9e..88464e063967 100644
--- a/dev-vcs/mercurial/mercurial-5.1.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.1.2.ebuild
@@ -49,7 +49,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	# Note: make it impl-conditional if py3 is supported
 	append-flags -fno-strict-aliasing
 
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
index 7d67135fc8ab..915d09bcf000 100644
--- a/dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.2.2-r1.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 emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="
@@ -55,7 +55,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile build_ext --no-zstd
 }
diff --git a/dev-vcs/mercurial/mercurial-4.6.2.ebuild b/dev-vcs/mercurial/mercurial-5.3.1.ebuild
index eb2b0fe3fdcd..e0eb454596bc 100644
--- a/dev-vcs/mercurial/mercurial-4.6.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
+PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 flag-o-matic
 
@@ -14,13 +14,25 @@ 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="bugzilla emacs gpg test tk"
+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"
 
-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}"
+
+RDEPEND="${BROKEN_PYTHON}
+	app-misc/ca-certificates
+	dev-python/zstandard[${PYTHON_USEDEP}]
 	gpg? ( app-crypt/gnupg )
 	tk? ( dev-lang/tk )
-	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}] )"
@@ -30,46 +42,53 @@ SITEFILE="70${PN}-gentoo.el"
 # Too many tests fail #608720
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-po_fixes.patch" )
-
 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_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() {
+	filter-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,macosx} || die
+	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
 
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh_completion _hg
-
-	rm -f doc/*.?.txt
-	dodoc CONTRIBUTORS
-	cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		newins contrib/zsh_completion _hg
+	fi
 
 	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
@@ -77,15 +96,22 @@ 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
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
 	for f in ${RM_CONTRIB[@]}; do
-		rm -r contrib/$f || die
+		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"
@@ -101,8 +127,16 @@ src_test() {
 	rm -f test-convert-git*		# git
 	rm -f test-convert-mtn*		# monotone
 	rm -f test-convert-tla*		# GNU Arch tla
-	#rm -f test-doctest*		# doctest always fails with python 2.5.x
 	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
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 8c12d545eb87..a62bf9062fdc 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..7} )
+PYTHON_COMPAT=( python2_7 python3_{6..8} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit bash-completion-r1 elisp-common eutils distutils-r1 mercurial flag-o-matic
@@ -15,7 +15,7 @@ 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"
+IUSE="+chg emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="
 	!~dev-python/python-3.5.0
@@ -57,7 +57,7 @@ python_prepare_all() {
 }
 
 python_compile() {
-	strip-flags -ftracer -ftree-vectorize
+	filter-flags -ftracer -ftree-vectorize
 	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile build_ext --no-zstd
 }