gentoo auto-resync : 22:03:2024 - 19:00:48

4 files changed, 9 insertions, 77 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4a647e34b9fc..d1cd8c2283bb 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,7 +1,5 @@
-DIST libgit2-1.7.1.tar.gz 7548081 BLAKE2B 9c50d3c25d1cc58e5fab60b4c438c91479dd57138a14a48a8b692bb6b43733f59759172043c94198df63fa1e4eb40c548bb78c94bc57fb99682059be57a5c3e2 SHA512 08e60dde0cdf57006cf0c5f27a82220aba8d701bf7d6d709ffe312975ffa5dbef009ccb1e7cbe570b9502f4361d06ace44dbfd9a5f5f8ad08e9b0ca05bef765e
 DIST libgit2-1.7.2.tar.gz 7548186 BLAKE2B c27870124c7e63a37794014a802a6fce46c577313f3b6081580f920fa842a65305b5bc56aa6ab02cf87c533d6052afdc37317f96aa1fd67387b07f52415ccbe3 SHA512 825737e4a1991fba50ea535f15b0e560ebe76ead752e04aeba36925b944d0da77fe9826a70980a1aa3d0bf9afbedfab79dd92e799c9252931384c89ebec9b012
 DIST libgit2-1.8.0.tar.gz 7590126 BLAKE2B f3cc5259a5804bb1e319633269a8c488d7195683e39c178fbe5dc43278736bf15f706c1ca8f72b519ef647033ed11426ea40ceb0dd3ffddae3a35839493d6c54 SHA512 e5634267bd9c6a594c9a954d09c657e7b8aadf213609bf7dd83b99863d0d0c7109a5277617dd508abc2da54ea3f12c2af1908d1aeb73c000e94056e2f3653144
-EBUILD libgit2-1.7.1.ebuild 1503 BLAKE2B 2fa1e1a22c3b4ebb872636e1673cad8737cc827d7acb45cd4bc87777544e1603c1bdf47206f16a98b9d21558a3fc8ede712782fd532dd150d7dcfd8d7d908157 SHA512 6441acfd4661b5aa8d62259f7336324354e88f845fb1b4391c0e00f8daa8f56877cf8ef341aa0f435258bf10961dc4f6a9a30d3dc3f4bcc4cdc4f58c095fa351
-EBUILD libgit2-1.7.2.ebuild 1506 BLAKE2B 0ec8bab4d93f46585e5c5ddb20fd06c0788008cc1e9534139b6056af6fea8e26985ea5497f4d11f5b5894b33f8ef4aa35b3810edbb5344bdbf54b5a64eda8e90 SHA512 37e159c4a3772e8291fc3e02f781e5618c3ec6fae32b4767d5c47b87a7332ecd64d0f324606b6013c8e7a8d4ecccd5c1d6c0279d4e065a9c7500affbc0ac8841
-EBUILD libgit2-1.8.0.ebuild 1510 BLAKE2B 78e7ca4e05f30777c26e31e0fd5aed6bfcc1b4e2bb10602f3fed3a89ac4219f1e334c67687ab1390686f7ecf44fad5a066c56e420d69a19d6ff4f876db60e544 SHA512 d34b995d0ebfff6f373da340c2c1a87c633841817b33d6defc6d1214e41c5cdbee9289ce4019097aa412a6019667537673393a59b57a3d71e54585cca32ba422
+EBUILD libgit2-1.7.2.ebuild 1568 BLAKE2B eafca2aee9687d9715807b376570d46bb6df8b36aed7f0b7fc2c85157cb80b6216e6ad2ff4c6ae18a02907154f2f4136f0a7db0bc4d7cdd5c003f67c30b2d627 SHA512 6d2127a7ba7da6020ed803668c7e9a172212b8a05f8a7bce412dcde40c1fa1a1bb47ce2ff57e798b00c81f7e14ab65a178ea91885de878a4afd9aeb75145efcc
+EBUILD libgit2-1.8.0.ebuild 1575 BLAKE2B 35e535443f417dedc6e5f2b84ec0a6693452fef9cb252970770dd38659a1a9c381d0bf205fc0570487f0fb8b6ac723bd86090d504d64d6d14a7ea59fd144c971 SHA512 c697054bba1b522547e8d06178fbdbbc763cd552fba5927076aea2624e67e5c381e1ee28212fe2edcc7185ffbeb14b98f94d0be725d7dbbe3b088a63c8943bca
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.7.1.ebuild b/dev-libs/libgit2/libgit2-1.7.1.ebuild
deleted file mode 100644
index 390e34381522..000000000000
--- a/dev-libs/libgit2/libgit2-1.7.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
-IUSE="examples gssapi +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre2:=
-	net-libs/http-parser:=
-	sys-libs/zlib
-	dev-libs/openssl:0=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-DUSE_SSH=$(usex ssh)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_HTTP_PARSER=system
-		-DREGEX_BACKEND=pcre2
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-libs/libgit2/libgit2-1.7.2.ebuild b/dev-libs/libgit2/libgit2-1.7.2.ebuild
index 1efddddfb2f3..0189210875a8 100644
--- a/dev-libs/libgit2/libgit2-1.7.2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-any-r1
+inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.org/"
@@ -16,7 +16,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,8 @@ src_configure() {
 		-DUSE_HTTP_PARSER=system
 		-DREGEX_BACKEND=pcre2
 	)
+	# https://bugs.gentoo.org/925207
+	append-lfs-flags
 	cmake_src_configure
 }
 
diff --git a/dev-libs/libgit2/libgit2-1.8.0.ebuild b/dev-libs/libgit2/libgit2-1.8.0.ebuild
index ad67fc2de444..9f21956dbf5b 100644
--- a/dev-libs/libgit2/libgit2-1.8.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.8.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake python-any-r1
+inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.org/"
@@ -44,6 +44,8 @@ src_configure() {
 		-DUSE_HTTP_PARSER=system
 		-DREGEX_BACKEND=pcre2
 	)
+	# https://bugs.gentoo.org/925207
+	append-lfs-flags
 	cmake_src_configure
 }