gentoo resync : 03.09.2021

4 files changed, 34 insertions, 3 deletions

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 410449df5f0b..5bce54cce7ce 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,6 +4,7 @@ AUX git-2.21.0-quiet-submodules-testcase.patch 1233 BLAKE2B 45a9660d584e0bf928df
 AUX git-2.22.0_rc0-optional-cvs.patch 14182 BLAKE2B ec4273646e5b45dc8877e0e41e03be4a2e6f1591f90834e5521f4322abcd9ebd75021ada8992fe90a3572dce7b87b4c8cfef772367cab8a49df67369a7d2638d SHA512 ce155bf2b1515ba59f4186265d679acb0975b4e3e658de80e03776308d00e508b0776af3a946ebc19c963e455206ba54b68f60d94e491570966581db3d94d28e
 AUX git-2.31.0-darwin-prefix-gettext.patch 893 BLAKE2B d350b752473346991e1ed38a39ffa06dc828e180b49e47a4c0c23e9e152d6f9ae85e3c6975d4f23a86a1c11e08496e4017dfaa6458099dee2ffd81ee4499c45d SHA512 66950d46383dd91addda04bf675b81755f13d60c419798858acd56045b470abe6c19116308d382e12b5a860b332e926a2d11ec6cf333fa35a6fbbd5e44c62af0
 AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6ba4c01fcc0341c2ed37756a8fd7edeea7760be9455ec5ed695f76debee3cea894ced0a988b4baac80e14cbc918106be36dc7a SHA512 35221088fe49254d9fa9186d12b40c58b20f58289a119e64071cf20d0952c52238f546bac4d16e634a768559587f0acc6567a546bd79c9f709dc9b158938c81f
+AUX git-2.32.0-r1-test-t5582.patch 754 BLAKE2B 6bd9fc93cea8f565ef7b5bd7d45770c5bdfae297b596a8a34451677c06cff24ddaa5b8a6f632849b3816e07d070efb6fdc0e9629ff98671fcbcba7897bca5430 SHA512 fb6a41d51bdbad862426cf5bbb70c08c722da807a462dfb0f2b069fc10801b53478bbcd8253b3ca3631737b448b3eeecffd1b523df3fabfe9ddf08db2a1a187b
 AUX git-2.33.0_rc0-optional-cvs.patch 14216 BLAKE2B a4179e0269917dd75b3e5b63fc70e931e42da3e6e170b5950efc20df89ac90eba1a18793eaa431150c8d8acb3fe1e3967a90075e9c940eae22f8b9a4fe158723 SHA512 ffdce5cca99b9c3196855316799470431e1ab064b7a8c739e7fc5b38029fd2bbceb415533d4b0000278eba3252f89e1fb2cdb52ae140668701d28bb88c07541b
 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be
 AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f
@@ -39,8 +40,8 @@ EBUILD git-2.28.1.ebuild 19118 BLAKE2B c71bfb6eda842ceaf6e752e911e09c602997987d5
 EBUILD git-2.29.3.ebuild 18175 BLAKE2B badfec96e42d4cfbf8327298313c381ae526efbaff3b145abe8c8aa4afdab824175b6db015f28f8f9bd8d3bf4cad99c46a3594901ebaf3859df367dc73804c62 SHA512 825c386bfbae0b51358924c7ee1d232a59e45155e792c485b543e9ecde77fea6870de66f2144d0787c5a084166756e01666db27cbc1055de10a093c781a8f1a5
 EBUILD git-2.30.2.ebuild 18176 BLAKE2B 693b6d1f83be107234f2922a55993b66b41fb987cc2dc62f076c3a16b2d387374f44cc55c2ef3210583e4972b0783d32d1e49802fd4b5f8fc7d54a5e6d5c70e9 SHA512 5fe5ebbebef55cc29e23984ecda3c3e8814bf8c17ef4329960ff561a857058e998ee5c5f9bdb3b26e7dfe7d408dd0fce772074f17bbaf0f3a9fbbb776e3b6242
 EBUILD git-2.31.1.ebuild 18058 BLAKE2B 9c9c7530527ace419f1191e6aa671dfb0d4dcf25760ad30658ebd83889ac0df396021030d0e0499b497340c47a1a3e8b7b12575f2817fb9231c11dd5652d7bc6 SHA512 e5ae923aed189506a97512be5e87492098cdd876645f837f28035875c46745a2b2a03e7374e8d05276b7d0a76a9d47df117329dbae175386cb5ce5d0d96e4c51
-EBUILD git-2.32.0-r1.ebuild 18069 BLAKE2B f636176829d6e43596d5b76f2a8b68e92238b44cd9005e0b8119dbd37bec0fe5b32a2b14c43a515135cc8920b2f1fb071e6362c849f278db8bcc4df22b70c137 SHA512 91ead5663e2f7759983e9755c42d0e9cd360a7763643b1b9cf18dfe12822e318c4169d1d7ef311d554e43f4d4233785556ef2adfba23eaf71cada70c4f5a2f70
-EBUILD git-2.33.0-r1.ebuild 18069 BLAKE2B cf5d0c8f508d3a0c5543f80492ce443ae10d022a141025dd5653b53341fb9591a94933860e80c4d2cfe2cf1f10547c3914afd66b64e2967182d3d220a098ce31 SHA512 c2bc38df9a29091d0c58f3d99c369c31c6debc7ac379273f548f7de7050ae5b8a90d5f56fac605d479a420eefdd6ae67b4d601907ca2d9919cfa914d0d517f41
+EBUILD git-2.32.0-r1.ebuild 18178 BLAKE2B b03768a03012044d6260d73944b0deeb68e42b16a192996bc9d382b441bde91e097254b3c6f3d92db7f5ad67a490072cf2d6c8dddde3593981707614c59cffc0 SHA512 62f37a4fae9890878ed2ef65b4ba1a17071a6a731c813c14735afa11dce35701ad37d325a4e96b8a9a3190d0d81cf57c5fab1bad4b4c3db5ed133f1ad274366d
+EBUILD git-2.33.0-r1.ebuild 18182 BLAKE2B 2156858a01b4f819f5a36375b91375c8a3da26a8729c9900f20ee73d80bbf595e3c4f82fba83d1f91d38f679f9330d5ddc5811e0fe34eccb85c4c83596ce7e15 SHA512 863ec5b8a7c3d247818bbeb171ad9c1debb660d4fa7b67c417661eb92c3337ce5e1daa24159485969acd17cc3524aacff679c679ad61f6fb2f3f1baac21132f9
 EBUILD git-9999-r1.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r2.ebuild 18041 BLAKE2B 3f44b8a8b41778e9673e3e0597ce758dbfefdb5786b3a70836de72148e2cbd641a66a9861a380bfe6b4456a5ef9eb3f89eb14fc908e2ddee407c4068daa76f59 SHA512 346e28ce1c418b2e2b89e402ba050f4b0f6847ba37614f3847b4a58eebc4e9fa8b6a8b122b4f45907568aeb3ccd5cd0000415a37a27686b0dc05dfbc50479c43
 EBUILD git-9999-r3.ebuild 18071 BLAKE2B 4f7571d39e8cd836fd71117a34df82a092417f9543f6d165121359230e1f2b6fce8b925345d205512d372e56459c7ad4983a79da2785139b99dacba6bbac0a3f SHA512 901412cd7d3d71e67f66e0a37d2e5f9032cede4c944a04455de962fb6f681cad941839d0e60a77dc6959fbd616aac7afa556a2aab24aaaf9cd7f95802c5dcbd3
diff --git a/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
new file mode 100644
index 000000000000..fc6072bf7334
--- /dev/null
+++ b/dev-vcs/git/files/git-2.32.0-r1-test-t5582.patch
@@ -0,0 +1,22 @@
+https://www.spinics.net/lists/git/msg417169.html
+https://bugs.gentoo.org/751907
+
+The test fails when ${D} is exported in the environment. It actually _shouldn't_
+be exported in src_test anyway, but Portage isn't yet fixed for this because
+it'll break misbehaving ebuilds (see e.g. pkgcheck's VariableScope warnings).
+
+Upstream are currently discussing other patches and work to find other cases
+of environment contamination.
+--- a/t/t5582-fetch-negative-refspec.sh
++++ b/t/t5582-fetch-negative-refspec.sh
+@@ -105,7 +105,6 @@ test_expect_success "fetch with negative pattern refspec does not expand prefix"
+ '
+
+ test_expect_success "fetch with negative refspec avoids duplicate conflict" '
+-	cd "$D" &&
+ 	(
+ 		cd one &&
+ 		git branch dups/a &&
+--
+2.30.2
+
diff --git a/dev-vcs/git/git-2.32.0-r1.ebuild b/dev-vcs/git/git-2.32.0-r1.ebuild
index 46eab6b9e4a7..ee45f0ab47ab 100644
--- a/dev-vcs/git/git-2.32.0-r1.ebuild
+++ b/dev-vcs/git/git-2.32.0-r1.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
@@ -145,6 +145,10 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+
+	# See bug #751907
+	# Test fails due to exported ${D} in src_test
+	"${FILESDIR}"/git-2.32.0-r1-test-t5582.patch
 )
 
 pkg_setup() {
diff --git a/dev-vcs/git/git-2.33.0-r1.ebuild b/dev-vcs/git/git-2.33.0-r1.ebuild
index b3f952ce377e..776695e8922a 100644
--- a/dev-vcs/git/git-2.33.0-r1.ebuild
+++ b/dev-vcs/git/git-2.33.0-r1.ebuild
@@ -145,6 +145,10 @@ PATCHES=(
 
 	# Make submodule output quiet
 	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+
+	# See bug #751907
+	# Test fails due to exported ${D} in src_test
+	"${FILESDIR}"/git-2.32.0-r1-test-t5582.patch
 )
 
 pkg_setup() {