gentoo resync : 29.12.2022

3 files changed, 38 insertions, 3 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index beda1e375b57..f6039e2bf19b 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,4 @@
+AUX libgit2-1.4.3-test.patch 1230 BLAKE2B 155f958aab27ec7d941ac0303e8d65d87ea82b22e592060e4ca67e865aac519901c6509d2f57c36285864b0d15c94bed8357ca616c8e4838cf09e97156ecf541 SHA512 a6fcb8acc119634ad1f1f9290da0c72076233a1af63f4a66346a0bb37beedd079c72be1ca48746bfeb75c2e94b4e48f6b3881adcb2cbf90b186c86ef384da066
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
 DIST libgit2-1.3.1.tar.gz 5602265 BLAKE2B ecf1fb30fbc40b09edcd3862d0831bc7d4d1da1aa8e738c78cf77bda5a0bd5d9c6a60fe7ce9827e058c04ac88d89a7d6c05c54c01bd77d1a8b0b091495bbf871 SHA512 012ffda7e8b9557923758fdbe68869875977d419bfa60b61f90adadc056600e2b1cc2db1c2a003315ea0e193c0145c1f431054f7bd960c5e6e14fa541e46cba3
 DIST libgit2-1.4.2.tar.gz 5629585 BLAKE2B 61e269fd08beb9579838a13b661b4270f1e8d2d3d1e67f6b8357e92a5ee4aaccbe637644dc87cc8b04d9c181e37808352077b75fed8753a4b2d8868eaf248b62 SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
@@ -6,5 +7,5 @@ EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a
 EBUILD libgit2-1.3.1.ebuild 1704 BLAKE2B 6e01d5495917e853b232f06e34c20d9bda631e706262aeb19d4db991065817f30852290247aa13dbdc581cb007b559bb644b5dd66adfcf758fa940e7a9539a6f SHA512 3eff6e6deebf5f2aea88d1b971a00db1b54fcbea98f722576f66736076255115dd588d8efe9dbb7985ec3b63a6bb680ffa4dc03897013f56fa7f40e436fa4fdb
 EBUILD libgit2-1.4.2-r1.ebuild 1654 BLAKE2B e3f7bd625d0b8b0907419152e36efb41fa741ceb86b0a1054e5f46051e3738e7824d1c256b180b08d46035211b4b9bc17c1c8ff0af81aaaa47e3a5ed1bb5a0c9 SHA512 c37e36aee1b72ddf33bf190b4e7ee39d80b20e5e8d3297185aabe4af1db35a6de97e5eb7c3ac3c79437b493371e1001f798ecbae6fd7da10ee5131e8a482873d
 EBUILD libgit2-1.4.2.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
-EBUILD libgit2-1.4.3.ebuild 1661 BLAKE2B c96b1c5fe64fefe7cad34acb93e5d782052823687c394785b3b58cc4671839f883ddefced357d29a1f28cc0278ee9b98b0689beee210af43cbd74f2a669e9327 SHA512 73659ea3404950f2e82cb09e9547e97e34d2973f8f2c3fa5a2caf0c268f04758d6f2c0363ed5ad40b2e13d3907a3b1da76629d93ec57479974cd464c2722535d
+EBUILD libgit2-1.4.3.ebuild 1699 BLAKE2B 23f3196cbf11b5dd91af8231344989e917f3f81502821c15a61bb4d0b19991bfafc9a217498112e0ff943b7244ae261bd2b5d045129173d1df6f8a0585f62f34 SHA512 28af72c276b82ed0a2bdd5f80f3fff5d107f50f379668d3261ee1d58ac128dc2ceef1e107c142c11544eeb00e3438b172b0df2cdae97b50fad03c7cd25990b05
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/files/libgit2-1.4.3-test.patch b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
new file mode 100644
index 000000000000..23349e6307ef
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
@@ -0,0 +1,30 @@
+From c013fca6b091e36805659ebb26ccaaffae8806dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlosmn@github.com>
+Date: Tue, 3 May 2022 09:28:43 +0200
+Subject: [PATCH] revparse: adjust reflog test as we move away from the dates
+
+The dates we use in `refs::revparse::date` has just passed the ten years, so
+now everything is beyond ten years, leading to an unexpected commit being
+returned.
+
+Adjust it to 11 years so it all looks fine again.
+---
+ tests/refs/revparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c
+index 0bd2ae5bc..93d7ce6db 100644
+--- a/tests/refs/revparse.c
++++ b/tests/refs/revparse.c
+@@ -399,7 +399,7 @@ void test_refs_revparse__date(void)
+ 	 * a65fedf HEAD@{1335806603 -0900}: commit:
+ 	 * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour
+ 	 */
+-	test_object("HEAD@{10 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
++	test_object("HEAD@{11 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ 
+ 	test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ 	test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+-- 
+2.35.1
+
diff --git a/dev-libs/libgit2/libgit2-1.4.3.ebuild b/dev-libs/libgit2/libgit2-1.4.3.ebuild
index 55dbaa51683d..a957a5adafb3 100644
--- a/dev-libs/libgit2/libgit2-1.4.3.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1
 
 DESCRIPTION="A linkable library for Git"
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# relying on forked http-parser to support some obscure URI form