gentoo resync : 03.03.2021

3 files changed, 14 insertions, 13 deletions

diff --git a/dev-python/GitPython/GitPython-3.1.12.ebuild b/dev-python/GitPython/GitPython-3.1.12.ebuild
index 16fbe5bbcec6..9e290b1a5529 100644
--- a/dev-python/GitPython/GitPython-3.1.12.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.12.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/GitPython-3.1.11.ebuild b/dev-python/GitPython/GitPython-3.1.14.ebuild
index ebe82cd545a3..f1e63e903be0 100644
--- a/dev-python/GitPython/GitPython-3.1.11.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 TEST_P=GitPython-${PV}
-GITDB_P=gitdb-4.0.5
+GITDB_P=gitdb-4.0.5-r1
 SMMAP_P=smmap-3.0.4
 
 DESCRIPTION="Library used to interact with Git repositories"
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
@@ -36,8 +36,8 @@ BDEPEND="
 distutils_enable_tests unittest
 
 src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
 
 	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
 	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
@@ -46,13 +46,14 @@ src_test() {
 		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
 
 	cd "${T}"/test || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
 	rm -r test/performance || die
 	# tests requiring network access
 	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
 	rm test/test_installation.py || die
-	# broken apparently (also fails in git clone)
-	sed -e 's:test_rev_parse:_&:' \
-		-i test/test_repo.py || die
+	# broken with git 2.30+
+	sed -i -e 's:test_index_file_diffing:_&:' test/test_index.py || die
 
 	distutils-r1_src_test
 }
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index c82a94550899..3cd7a67745e0 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,13 +1,13 @@
-DIST GitPython-3.1.11.gitbundle 4421698 BLAKE2B 96a4be2b12149c34f0e81580cb8906920a107f9856da585779f8d13590fb14c838a5e73d8831692ea81dd0ed73e17cdab1020b50cb49c7f193d54c1e838d9385 SHA512 64a443e0c517627045d98f7a60b6cdd817f6af3d12f5619cca7c4e24f9ce42018c2aca427365d633e4aaeb5e99d99a944d85b2286c34be1c17e85e441d9693c3
-DIST GitPython-3.1.11.tar.gz 170908 BLAKE2B b327f38bbe9d92caf8b5ba6f3c1e353ad00bad2c3e7b3ae59991eaee5a5dd9f228fd80b86fd7e908fa71563e369d7340070ddc0e093549bfc8378cdf20ba9723 SHA512 fe4baf9c8b3668f29fbc476ec2ba0a8d58a50ffe596b9f3037ddb4cb5c0c7faf0d34c6efac7567074f1b28b866e42dad19c91a5381eef606d3b3ff74b77649de
 DIST GitPython-3.1.12.gitbundle 8721154 BLAKE2B d00ba18e53797ebc2067de8422506db0fafc27860cd3f99a36ad4740956518cfcab98d8211d595e1347c22df3d0ac13557881f471829c429db1527099f53438e SHA512 c84c76668bbc593998cf834d18d0207ae282cf0fd6fd22e5491435884855bb2b6699b61e51b35e6bbcfc4cd2f3c15aa9b435115fe5b0957ab4c63c7aa640ed6b
 DIST GitPython-3.1.12.tar.gz 171126 BLAKE2B e74a613f5269893f29f41add6f39c34497613b728b14c4c65c5fcbd52bee52a2ef53c4db3bc63f843ce4ec1e63f3988029852e9195677db32b704d0429480130 SHA512 4a2915991831fcf0dc0326d9e9be0f06fba1e93560d07c19fad5cbcb9ff04262e7d2225c5174a8c2f55e4c44b1c027bec4ff61d7dc137d8bf110ab96026742cc
 DIST GitPython-3.1.13.gitbundle 4434559 BLAKE2B d8a2478d40f908d7913d08a3a5e98bea3a50366659838a8d3ec335ce7864e7ddbe290de0581b7c4315c83f1cd9ed517af06a7b9232378ee299090accde0b595e SHA512 6d62488a3c9ff66b4f25dd3f1419835591379736ca3faf57055121a8ccb5b8da933e3b37836a6da59de29cb62b03ebef6c38d7387c86dc95da2206024c58f289
 DIST GitPython-3.1.13.tar.gz 171249 BLAKE2B ec653a40654e42d93ba552e1b0a40c5241cd7f86a110f1a0570d6a3ca35cb7522955650a171a8a4113248e508f84a4f5cd021edf941fb41057aec01ef6f30194 SHA512 9618be674e592e3653eb8f59e5878f72b3583d2052184f6321d24130e4cdd16236c9ee4823ee38036c2361685d78ab7ed79660746506a8f98285ab776e1c98b0
+DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e877bf3dedde61665754c1d4b14b98d0ddc863666ff1dceb313174a908f8fbacbda0586e53e874a1397e6eeb562cf1ddf1f SHA512 ecd570bdb85dfa64f42ce447bf381868d584eb56897954d893ba1f1ee193fa4e45f3847fe842a67276da0cf155a2501ed4c25d34d300a9776b0f068b659ba014
+DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675
 DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
 DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df28b0439d355ce2eecbdcc5dc94382883510c57142e7e4b6ba7cd8e82b1140eca538b45692dbe8c55bce32e1b5b4f SHA512 2c55a8e402a61ebcc362a8aee4a6154705d8ff2f5e582d13c855562dd074427681f4147641fe76681b76c99ec46040c7577dfca8bbfd575fc52772a9a6f17326
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
-EBUILD GitPython-3.1.11.ebuild 1591 BLAKE2B e6f92dc504aab3c0dd9fbd04b7d47d233dff59cbca6f8189f899d6c3c9ecfbc715e5584a417a82132f9f103c974cccc226a437eae1ecbec49e749007d79babf7 SHA512 dcf70c3db925e29177cdf0f6bf45766fe0a2e4765cf197cf2f875b5f7c557f0eb79677136cd8d067372bec47e0fb7c2364dcaf02edfdecd5f986c97b42158030
-EBUILD GitPython-3.1.12.ebuild 1683 BLAKE2B a7ed728bf5e20b0f02ce2c1e5924b09e85bc5292c90cbc28b95dace511202287a2dc96c1e0c0a79120171ad921161e4795176b0cc03943acda735bcd203c8485 SHA512 57e550000fcb7c22895766e9d0944d1c5396572a9794683691cce2a51f3e3f336f5293141cd88bf78186ae16b4cc8b4b8ba08f74c2bb2832c61d72c96b1387b5
+EBUILD GitPython-3.1.12.ebuild 1680 BLAKE2B efd292f601d6f32ceed82c3c0c05f4c4a20682e2e41ffa1b2acdbe9965c2fe6678981527bedeb75ad82a1d1ba8d30dce9fbec219938d7c127236a559a05b7cab SHA512 e308352b1cac84b55de08c8b9ac5726d5c3c24f04deac6e1c48bdec8452ebb1a7846a19e29480219ac185813dadebfd536844d67b35f4d2d78ab2163bc08e036
 EBUILD GitPython-3.1.13.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
+EBUILD GitPython-3.1.14.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a