gentoo new year resync : 01.01.2021

6 files changed, 8 insertions, 173 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index c04075d8988b..108caeaf367d 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -40,7 +40,6 @@ DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d624
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST memoffset-0.5.6.crate 7382 BLAKE2B 42ebb93b567b339822201e31830971c32452b3d6681787c6969360c8db54912ae511580d8c899a3b9cb7f2fba98099c8df4c17534b97e4f4b1902d9251296527 SHA512 6df8952d41f60fa0993fbc85d112a15c1f6ecfef66da29ebdab71f40cd8ee8722400693b6ea023344f1b5dc351cbe828f465a8cabd150377a62948cedeb5db6b
-DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
 DIST mercurial-5.4.2.tar.gz 7730738 BLAKE2B 689a50e1675f678436bb805a5de1379646943f865734a85ef39187f4d90007125c33d6f8dfa6256510fc4214c82153060c671c601fe4b7810f1df77f5b542ed2 SHA512 92d730e330dcf333b2c8f6b784582e3a639759bcad594ac06b4e92f567a70c6938e33a3c322286d6b3ccccaedb634ad3febd2cf927702b3826013a76af2a9c15
 DIST mercurial-5.5.2.tar.gz 7761053 BLAKE2B af823bc80844a7a6f9b173caf73aa298c141638e4f3b6ee4d37c9472d77f1cd79c1e5f6875de699904037468815ae42fe32b5537e50eb94373258683f45e919a SHA512 e154592deed6168a32e7fd075fa034908ca72826ae49a92c84a6ad82b820753906578f064ac623018442d83d125a551eecc057179e66ac7217398a192e903629
@@ -101,10 +100,9 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.2.2-r2.ebuild 4076 BLAKE2B 5dc2c7e4a7008a046481c9142b86464e83755137c9be27b4c359a1a7f39ef34542d7a65359fdfa92cebe700447a1cbbfcda859ff71abe5f1964db2c7cfb46aef SHA512 8da37a2969d022783b9f007a85dd39dc65f903e6e8eadcf7fbda7b3a4d96d67b73fa6f7b1bf8b3643439a6f27a93075aaac07da99662c8c68878f69f1e01268e
-EBUILD mercurial-5.3.2-r1.ebuild 4081 BLAKE2B 9766dcf2ef42c8f5cae9d9a034144122154d55e07bb6009677e04b54ee9d9d745d38d447a646630fe4a8858708795aa3daeb3ae24d028484b5020480f9ecb0f5 SHA512 7dba69760db7ac54c811e7198ec890fba8a9abf246469c0959b8b308458a44acaf46fb9684da029910b45be89a527ab7a795354be035ced30ce8ac7e5728a6f1
-EBUILD mercurial-5.4.2-r1.ebuild 4090 BLAKE2B 3534615c4150cee4ba9cc29e7850a14122baa1d90ab558b9eda6b1a683243d06d741c8c8700a9ba477da15c1756261e9fd63a7eae8d75aae92c6c67e72589d38 SHA512 eb9248b7cd21e0516f3c83716863e6e32428cfe5fd153211c3954e025492d33c7d07cc221cc005ba7237d1b649a35a0aa761df7289c66ead215fac720246a287
-EBUILD mercurial-5.5.2.ebuild 4094 BLAKE2B c974b389acf7fec5ac7aa392920a7f10a81793eaa1472c4136a8440d740d51c8cb3672d1dbea01cac1115512f83bb52309d25eb7bb78a6b3d6ca0d5176ac30a6 SHA512 8349399623646b8f0a76a94afe37d43ce96e8a7cb5a97e9a95e3401d7bf86fb965062ba63ff89e3811479b40fdb8cd272f1380a79c2345763cf81d7d1b7a4a70
-EBUILD mercurial-5.6.ebuild 6459 BLAKE2B 67d8d8b485e2a7dec31b4c0c8a5fbc2efd1d9f2f64c473488a7ad9bd2a745de7e3b8cb9024823dfdf3b5c1e44b734ec3fe1931fbd5bb349cfee7113188881919 SHA512 251819d859323b24aabfdb9005eaedcbcc851d9b8fbda8e7716a49d6d58af60a4b66c065c23b2716849f8fd390337fea4ecdbf68717eaf7580c5ca7cc950ffe5
+EBUILD mercurial-5.3.2-r1.ebuild 4072 BLAKE2B 9414c83df4e7d7a4e0930abea611c433324990e6f52e7c914d9db806d17757ccb165acd231b07126b9de3f31354839639ea60ffecdc6e6772f49c032af711c15 SHA512 3b172157144bbe2fe89ac88f41c624dac5dea4597bbe530fe35e943d7615faf8a742ae86083d01ac80d474088a507cb3777d6bba4a7296e75157cb57c44dd7f2
+EBUILD mercurial-5.4.2-r1.ebuild 4081 BLAKE2B ad40c0b4611597ff7fb085c3fea64bde4e7ad6a2d69671b960457aa7f728fe0bdc854954bfda5abde773afa8ca44b3263cd127017e7cf317e6f06090ab71a7fc SHA512 0a2770e62099dbab1af3bd10b489be91fbc976a90b41e2c8ad7aa8b9d1b43e41f99253b8f5c0614b5dfb584cb941d0a145fd7ee69d68f623f8152a14e983cc19
+EBUILD mercurial-5.5.2.ebuild 4085 BLAKE2B da9d6a41b6322841a629dea9f4870d1d5104e2ef257170766ae87d4c24e03d1d906a5f8c00218c4ea1423b8f6052e131b28ea2060e6cc15f00447254f7274167 SHA512 61a610f0ad35c3bf4a6011910a818a8e6d0fa3560f30e0b3893a51560a9f02dfe2fb4bffa31bcfa11efeb77dfb13be7ba3d14bbba9236a86419a4f0795aba376
+EBUILD mercurial-5.6.ebuild 6450 BLAKE2B a24ee6981169effa85779c9f8e88b8798bd3d77f14dbe62e20960de9a79f385d2e7242806894051b52717c497ac89272d8b84bdbe4ea4aaaf105d2d94fcf42f1 SHA512 84f16ce17c7c6502b284142bcc327e952193d66f0704a3d71185ca9bf10aba39c326b40c6d405c4bb31a508ef30efc9743db13d1684af0b68f414bf6ecf38621
 EBUILD mercurial-9999.ebuild 4513 BLAKE2B 85b06df2426c259da319dc4a77769e4bf548bc214cbc82a8a1839c5f16a2f451482b9a00594f31481e060ffc0ed9f691dde17130fee4fa6d037b04a34e9915df SHA512 e546ab2e43ad77f09e21fcc56e694788e2b0131d25f04efab9201e5738912b6ee0ea31f69395d7775ecaa9bdd259ab3cdb4a88d7b01b65a3283a8d9799e61784
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.2.2-r2.ebuild b/dev-vcs/mercurial/mercurial-5.2.2-r2.ebuild
deleted file mode 100644
index f0d3fcb279b3..000000000000
--- a/dev-vcs/mercurial/mercurial-5.2.2-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-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 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="
-	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() {
-	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 || 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-5.3.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild
index 24329064dd1d..9af5663d506d 100644
--- a/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.2-r1.ebuild
@@ -15,7 +15,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 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 x86 ~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="
diff --git a/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild
index 3cfb838b9432..3ef8953a826d 100644
--- a/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.4.2-r1.ebuild
@@ -15,7 +15,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 ~riscv 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 ~riscv x86 ~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="
diff --git a/dev-vcs/mercurial/mercurial-5.5.2.ebuild b/dev-vcs/mercurial/mercurial-5.5.2.ebuild
index c8b9a55bc2f2..55e3867a5aeb 100644
--- a/dev-vcs/mercurial/mercurial-5.5.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.5.2.ebuild
@@ -15,7 +15,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 ~riscv ~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 ~riscv ~x86 ~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="
diff --git a/dev-vcs/mercurial/mercurial-5.6.ebuild b/dev-vcs/mercurial/mercurial-5.6.ebuild
index b8aef9cdbb7f..771b89bb678e 100644
--- a/dev-vcs/mercurial/mercurial-5.6.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.6.ebuild
@@ -117,7 +117,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
 LICENSE="GPL-2+
 	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk rust zsh-completion"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"