gentoo resync : 14.12.2020

20 files changed, 157 insertions, 66 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 18361962bcf0..6b29c898a41b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cssc/Manifest b/dev-vcs/cssc/Manifest
index 4c85de9673e4..0832f76eefd6 100644
--- a/dev-vcs/cssc/Manifest
+++ b/dev-vcs/cssc/Manifest
@@ -6,5 +6,5 @@ AUX cssc-1.4.1-m4.patch 351 BLAKE2B dde4c1f2876f8e84587ad531a094431d1854652f901a
 DIST CSSC-1.4.0.tar.gz 2012122 BLAKE2B c38bf9f50e372559c87d318780973a28fd2fec384cffd0c077c556b321f9f3e68324f59f26900e63c9235f30c564a60783c5a48b515b9b878977fe10266cd0be SHA512 7abb38ecfb5120e807d1f09d16ce81306b3eb16746e44da5029f626feba67dfb46db20bd2b89daffb2e3cdc51ffadc51cd666eef7d1b94e56b4c7dc24f93ea76
 DIST CSSC-1.4.1.tar.gz 2269725 BLAKE2B 264e996280ff23818332dda62d80adc61fd6a2e924af26a044168bf136c22b22bb591d37157030dbe8e2360a2687b0dcbf843f3af8683b08593fded4ef982739 SHA512 b843bd636b15830b2751c423ff2f2e7292e0942d750ca57425d9674b74c7291fe34db33cbbc4b87d27f80d3b54b0074207ceda612faa651b6f01486e0b2485d5
 EBUILD cssc-1.4.0.ebuild 1031 BLAKE2B 83508c5b50db4bd923dba328a108ac29b1a7e14e73aa5eb06991c5ed8ced9390dda2ed44c7a693666003253153e052a94678409d8974432abf12f4da692af001 SHA512 9e83758ca2c372dbc65adfe69f8e9565462c89db5d7cf541d015642a0f8298676ff42f91a15d58f1f058087dbc3320aaf42e008c896975d248fb758037916464
-EBUILD cssc-1.4.1.ebuild 869 BLAKE2B d2430404b911b378706957c6bb852203f5abc362425b561546aa1802caf6e1f5c4978c8d1a98196be6b217ba606775f9d9b405fa3f0aaf17ae9e0b62a9ec92f7 SHA512 1204ab4cb70d538dcc4dd388842e14c6b45a3652371c9df8dec518cdc08549645053e9795125b468eafee179b7b9d17352cb39175145a7868212c6ae12dd6328
+EBUILD cssc-1.4.1.ebuild 868 BLAKE2B aef4433a6e2261225cf05f3c01ee0e3ada945f5bdb0dfa654c119d76d57eb0c125e92fb3dad040d2a4a7f09500fbb3a5d4b1b1573e970d70a57068f4a43e7278 SHA512 5e6f66da6a476c098ef3a9189fd58c1037b5cab9bdc39b215724f67a3e769021f941797f60bb597cff30762d8c273fda02d55dd52ad6917e6c40e6a369cc0661
 MISC metadata.xml 262 BLAKE2B 10958c4700f56d8e765427a12ff0618d4ed03e63bf90adcaf326b5ecddb97825d5996d9f90d91120a6fef3b38828bdfa654184d22abead68a52a9eb382387def SHA512 a1dfa0890289178f9b0d6b0b9669718c428f7c73bbf07f8f420072c9638fdb19198ff9135d0d8853e9eb63536bd0384575f7f7b65ffc54edbf0d425863251959
diff --git a/dev-vcs/cssc/cssc-1.4.1.ebuild b/dev-vcs/cssc/cssc-1.4.1.ebuild
index 39514fabd0b8..0a3f9485a090 100644
--- a/dev-vcs/cssc/cssc-1.4.1.ebuild
+++ b/dev-vcs/cssc/cssc-1.4.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${CSSC_P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/cssc/"
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 IUSE="test valgrind"
 RESTRICT="!test? ( test )"
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 5f0ecfe55d12..db8d1aa8503a 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,5 +1,7 @@
 AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
-EBUILD git-cola-3.5-r1.ebuild 2455 BLAKE2B 9ac9c777e9d95380f63b15b45797da4034546b39d3f4eb0134225a6b2f7fc9d816919c4cc1990358a10cc186300d82baae5a3e204c207c71a737def42ac61059 SHA512 ddaf4bfcfcf0d91bb4449234f54c43c4c13bb5d97760a62b045e37d074e5a3732aba6376efc422e1b743e894afae20ab46574069c6ec50705bf779bf41c9aa48
-MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
+DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
+EBUILD git-cola-3.5-r1.ebuild 2528 BLAKE2B 6b1054847474f44db0a2c794c5e8abc795677b6bccb30aff2413f774df7d9889a5134fa4502ac5daf02cb34c35c4c177f6a653a4df906aa0987af0d805143d53 SHA512 099c6027561d80beeca7cffc09fc3196d4561ea0953bce82d953cf37cd0a227069dcc147540325f478c1e00da3012818d1c5b2758aa4a209d3314b683292ef98
+EBUILD git-cola-3.8.ebuild 2527 BLAKE2B cdc2bfb801db6cdca9a47fb9d62fa6aa2b6facfa92b6a6eb2dab2866b852ea8d36e1c976e9f1b1106550024d092cca31a6c08ffd3e4e442d887c5e2be508007f SHA512 1ee2043174cc1bf055de8c160e3b9665deac31553512ba2410e7cb616604e852a9a4ccbab4d5f7cca9bc1ce3ca4f2740a5ff51a7a08c832f3c00f2a4765493e0
+MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 2626644a02d9..0c0122bcd5b6 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
 		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
 	')
@@ -73,6 +74,7 @@ python_compile_all() {
 }
 
 python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
 	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
 	virtx nosetests --verbose --with-id --with-doctest \
 		--exclude=sphinxtogithub
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
new file mode 100644
index 000000000000..7180c6fb6684
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[network,${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git
+"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs --no-private-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	GIT_CONFIG_NOSYSTEM=true \
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	# remove empty bin folder
+	rm -R "${ED}"/usr/share/git-cola/bin
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 3ae0e4fb1473..4f507e2ec3d4 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">git-cola/git-cola</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>me@bearsh.org</email>
+		<name>Martin Gysel</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">git-cola/git-cola</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 78f1224dc381..5a6c99c2dcff 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -38,9 +38,9 @@ EBUILD git-2.25.4.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea8841
 EBUILD git-2.26.2.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
 EBUILD git-2.27.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
 EBUILD git-2.28.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
-EBUILD git-2.29.2.ebuild 18516 BLAKE2B 7614edc4976d2690f80e509930ea637ec321b2d6a7e260c14229c85ec0ccc45d04c4004900376ba33e63ba02542f5384effdc17331012d155b0d41d5d08a0f09 SHA512 80efb496de57435b7ef210563165b5a351015882e7c5428ede7f017cb0d9294894e0a225cadffb0565af5e422745ca4dea928ca76718922e81b765472873d20a
-EBUILD git-9999-r1.ebuild 18516 BLAKE2B 7614edc4976d2690f80e509930ea637ec321b2d6a7e260c14229c85ec0ccc45d04c4004900376ba33e63ba02542f5384effdc17331012d155b0d41d5d08a0f09 SHA512 80efb496de57435b7ef210563165b5a351015882e7c5428ede7f017cb0d9294894e0a225cadffb0565af5e422745ca4dea928ca76718922e81b765472873d20a
-EBUILD git-9999-r2.ebuild 18516 BLAKE2B 7614edc4976d2690f80e509930ea637ec321b2d6a7e260c14229c85ec0ccc45d04c4004900376ba33e63ba02542f5384effdc17331012d155b0d41d5d08a0f09 SHA512 80efb496de57435b7ef210563165b5a351015882e7c5428ede7f017cb0d9294894e0a225cadffb0565af5e422745ca4dea928ca76718922e81b765472873d20a
-EBUILD git-9999-r3.ebuild 18516 BLAKE2B 7614edc4976d2690f80e509930ea637ec321b2d6a7e260c14229c85ec0ccc45d04c4004900376ba33e63ba02542f5384effdc17331012d155b0d41d5d08a0f09 SHA512 80efb496de57435b7ef210563165b5a351015882e7c5428ede7f017cb0d9294894e0a225cadffb0565af5e422745ca4dea928ca76718922e81b765472873d20a
-EBUILD git-9999.ebuild 18516 BLAKE2B 7614edc4976d2690f80e509930ea637ec321b2d6a7e260c14229c85ec0ccc45d04c4004900376ba33e63ba02542f5384effdc17331012d155b0d41d5d08a0f09 SHA512 80efb496de57435b7ef210563165b5a351015882e7c5428ede7f017cb0d9294894e0a225cadffb0565af5e422745ca4dea928ca76718922e81b765472873d20a
+EBUILD git-2.29.2.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
+EBUILD git-9999-r1.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
+EBUILD git-9999-r2.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
+EBUILD git-9999-r3.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
+EBUILD git-9999.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
 MISC metadata.xml 2277 BLAKE2B 49819fd1ea6ca2a1cf2043fde6d4cd9197db5ef44543fae528475524a35ee52d31a04f20c638b892a6d8c4dd757d302bfd43efb41242e98351d01db7654c2a05 SHA512 65b8ef639ddbec202cc7bcbed31c109d8f6fc64e52d47522eb38955401bea86a846390cfddbebd946f5f5941be83c401a1028d6721e12c6317f92a63568b56cb
diff --git a/dev-vcs/git/git-2.29.2.ebuild b/dev-vcs/git/git-2.29.2.ebuild
index 6e5c5a74a12c..ce04e5f8d0eb 100644
--- a/dev-vcs/git/git-2.29.2.ebuild
+++ b/dev-vcs/git/git-2.29.2.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
 		dev-perl/Error
 		dev-perl/MailTools
 		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
 		cgi? (
 			dev-perl/CGI
 			highlight? ( app-text/highlight )
@@ -341,7 +342,7 @@ src_compile() {
 			|| die "emake gitweb (cgi) failed"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		pushd contrib/credential/osxkeychain &>/dev/null || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
@@ -391,7 +392,7 @@ src_compile() {
 src_install() {
 	git_emake install || die "make install failed"
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 6e5c5a74a12c..464313d7a4d5 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
 		dev-perl/Error
 		dev-perl/MailTools
 		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
 		cgi? (
 			dev-perl/CGI
 			highlight? ( app-text/highlight )
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 6e5c5a74a12c..464313d7a4d5 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
 		dev-perl/Error
 		dev-perl/MailTools
 		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
 		cgi? (
 			dev-perl/CGI
 			highlight? ( app-text/highlight )
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 6e5c5a74a12c..ce04e5f8d0eb 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
 		dev-perl/Error
 		dev-perl/MailTools
 		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
 		cgi? (
 			dev-perl/CGI
 			highlight? ( app-text/highlight )
@@ -341,7 +342,7 @@ src_compile() {
 			|| die "emake gitweb (cgi) failed"
 	fi
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		pushd contrib/credential/osxkeychain &>/dev/null || die
 		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
 			|| die "emake credential-osxkeychain"
@@ -391,7 +392,7 @@ src_compile() {
 src_install() {
 	git_emake install || die "make install failed"
 
-	if [[ ${CHOST} == *-darwin* ]]; then
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
 		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
 	fi
 
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 6e5c5a74a12c..464313d7a4d5 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -79,6 +79,7 @@ RDEPEND="${DEPEND}
 		dev-perl/Error
 		dev-perl/MailTools
 		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
 		cgi? (
 			dev-perl/CGI
 			highlight? ( app-text/highlight )
diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index fbaa13128cff..c04075d8988b 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -105,6 +105,6 @@ EBUILD mercurial-5.2.2-r2.ebuild 4076 BLAKE2B 5dc2c7e4a7008a046481c9142b86464e83
 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 6388 BLAKE2B d203735bbc11719c33aa88dbc9c6bed69cc34e64020f00731a16d828f079d088dde211bd4b395ef6332e217c7200f5083a9852e24e0104308fee023e16f05a80 SHA512 89564dfa54391d16c96336474d84c2db019b8df2aad062edcada5f482bf9b303889e9726b48dc8065b8be32a5cb73fab8503ecc8844e863d4bc24eafca61ef02
+EBUILD mercurial-5.6.ebuild 6459 BLAKE2B 67d8d8b485e2a7dec31b4c0c8a5fbc2efd1d9f2f64c473488a7ad9bd2a745de7e3b8cb9024823dfdf3b5c1e44b734ec3fe1931fbd5bb349cfee7113188881919 SHA512 251819d859323b24aabfdb9005eaedcbcc851d9b8fbda8e7716a49d6d58af60a4b66c065c23b2716849f8fd390337fea4ecdbf68717eaf7580c5ca7cc950ffe5
 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.6.ebuild b/dev-vcs/mercurial/mercurial-5.6.ebuild
index 2ee7d30d0613..b8aef9cdbb7f 100644
--- a/dev-vcs/mercurial/mercurial-5.6.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.6.ebuild
@@ -149,6 +149,7 @@ 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 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
 	# Use absolute import for zstd
 	sed -i -e 's/from \.* import zstd/import zstd/' \
 		mercurial/utils/compression.py \
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index aa5e9dcd32a6..5669decce8f9 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -4,5 +4,5 @@ AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.0.tar.bz2 8497531 BLAKE2B 261f1401a96b181ccbdea9ab6e1dde301aa2c67296a0dc458a1d7e544530411b656d0d5335f985c9222c2d44fc8f962b1a960b81e4ff4883d373cb4405af2461 SHA512 af6b706fdc91f7ab292fce9d9de582da306fd11e92767dc852687e71a6a8b65bb867fa70d5afd7f76a46005acb1b3c2d3193e690def48cd26875b3a7851cd13b
-EBUILD subversion-1.14.0-r1.ebuild 12643 BLAKE2B 73d02379a059f18e2d3a059f6d919b824332936ce222af290414f95824791bf02c60ff4ceeaefae345078cf284df2920bc84077e759bd969ef1466a1f080f4b1 SHA512 4a5560b1441282169001a402a6525578080c7f47b03b128228ffbeb323a30840fd367500db34e4448445557f677e17213c4b3b108fce08cb2c43f29a4b166c25
+EBUILD subversion-1.14.0-r1.ebuild 12643 BLAKE2B 39fe450db8b49865f54cfc96195668e1476416f29c48f6084a5a8c905863ffa3f226d844603072d93943684fcc4b4edb931d663606099808658fa2735478129a SHA512 68bb271c2f3723c9a8a33562788816bd0a1c2aa8201c3aacfa50e2a6466ae4061f9e7e12b3567df88408f3ce9395a1e134f4ab831accae3c4b1091f36d847b12
 MISC metadata.xml 560 BLAKE2B b6b78084ae0792c458969a47b6d1a13cf330c2b410582f39c207b585a47692a7ae86b1b8c86c77da4f289331dbec2ad114b86cc9edebb3423c7ce144458e71e7 SHA512 d10e6922066c5579a7cebb53e328ba02fd92e7919cafe96e89dfa49c6d5d40e4e9247f95c987bab16e90803b54dbb9c4229afb219428f254e7850802d0d4fce1
diff --git a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
index b3e20ec4f609..4287afb96797 100644
--- a/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.0-r1.ebuild
@@ -29,8 +29,8 @@ COMMON_DEPEND="
 	app-arch/bzip2
 	app-arch/lz4
 	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
+	>=dev-libs/apr-1.5:1
+	>=dev-libs/apr-util-1.5:1
 	dev-libs/expat
 	dev-libs/libutf8proc:=
 	>=net-libs/serf-1.3.4
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index 5585436477a5..b6b20ab1009a 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,7 +1,3 @@
-DIST svneverever-1.3.2.tar.gz 7160 BLAKE2B 0791451740b1b08efe320488067929e856fb2cb20ee82c3dbf666e37bee1835a1e1532f12cef666668f6da1c91a42ce80080625ee0d3760c8a02786ec1995c92 SHA512 cd43f18220b6a7adde3c7f451d9177b76f1c5f42384a0bf21719bb6d2dd56c51c278b81d8275328ec0ea9c3835cebc5d79be20a72294c5e14b3c339cba60ec8b
-DIST svneverever-1.4.2.tar.gz 7741 BLAKE2B f43a2e1d63065bf1f453f67d4cd4e6bc6a6f990c66eef0fd510e7f118bd84f10756a3066e3b6bc82b98155cb39be86e9139eb918a53d015fd1c79645d85a9f51 SHA512 fdf799bab23aa19861013ed40c513aece12df22051013e7110b1508fc1f4055faf32406c0c942651a31a6bd5cfecf972b64652ce5f211c41a6a144311f64124f
 DIST svneverever-1.5.0.tar.gz 9286 BLAKE2B 8400e202f191131b494a894b112c92f4cf5977396fa8d1c11f5e17a309159dbab2df4d84bc24c88e0dd41d306b171c1eaeb679c900e94fdb3aee542d819f43e0 SHA512 b47e367b6c180ff92f24d70efaa5fd6697e266c28d05abf2555a59a4e34a603b97d70a045163b6cd6ab786f4ec5d9f5dc59277e79d98b70770c7d2ce672f9a8d
-EBUILD svneverever-1.3.2.ebuild 476 BLAKE2B 5c5a88fffdc5e40e253a70eba285e68f05091b36e9684afa44a34ad11eaa9f50841aa552ccd73ae67bfcd9d64e6d532e1a07f583865ff69f7c591250f6410d51 SHA512 2562eee5fc47defa18b7a8c4a5c6ccb4f9e75fdc19c169df29dcecda01daf8cabc2200264526c9acd5a881fd64023a077ef8354903f77a5722d8d38d6f078146
-EBUILD svneverever-1.4.2.ebuild 476 BLAKE2B 5c5a88fffdc5e40e253a70eba285e68f05091b36e9684afa44a34ad11eaa9f50841aa552ccd73ae67bfcd9d64e6d532e1a07f583865ff69f7c591250f6410d51 SHA512 2562eee5fc47defa18b7a8c4a5c6ccb4f9e75fdc19c169df29dcecda01daf8cabc2200264526c9acd5a881fd64023a077ef8354903f77a5722d8d38d6f078146
 EBUILD svneverever-1.5.0.ebuild 516 BLAKE2B ce48d969c0cfc0e2d93448cf919f4365a5ebcb4e6d6d1b40ff68783f6cffaa84972a77470931fb2e96b47a8722e28bff90d754c4bb537215a9164c002aa22561 SHA512 9b6270ecd41e1759edfbfb6b0eeba6d4a417ebcb8a79dc8a8999611c6ea15a9c459ed3058552ca8ff8f954a4f0b853ba8d8bd7ea99719070608cddea8fbb3337
 MISC metadata.xml 334 BLAKE2B 8d3ce38a8ae3289ed55ea0daa72adcbfa8ea7cfaea7bbae2f7afded9c79cf3d41658ccc0bdc324db4640e73f3fd902be86bec29927f73582d860f697564a9f6d SHA512 d50e4630b891664dd365e38a57ed146acdcca6d645994d010b58b46b70adb77c3bad5f0ab5088302dd8f21adb33e8b478ac31426dd8bfcf94b1f82fe2613b446
diff --git a/dev-vcs/svneverever/svneverever-1.3.2.ebuild b/dev-vcs/svneverever/svneverever-1.3.2.ebuild
deleted file mode 100644
index 50dbc6439b2c..000000000000
--- a/dev-vcs/svneverever/svneverever-1.3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Tool collecting path entries across SVN history"
-HOMEPAGE="https://github.com/hartwork/svneverever"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/svneverever/svneverever-1.4.2.ebuild b/dev-vcs/svneverever/svneverever-1.4.2.ebuild
deleted file mode 100644
index 50dbc6439b2c..000000000000
--- a/dev-vcs/svneverever/svneverever-1.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Tool collecting path entries across SVN history"
-HOMEPAGE="https://github.com/hartwork/svneverever"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/pysvn[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"