libgit2, revbump/rename old, add new version (#11410)

2026-04-22 19:50:05 +02:00 · 2024-12-04 18:59:33 +01:00
parent 4e503bfd4c
commit 7a2d42a7a4
3 changed files with 163 additions and 14 deletions
--- a/dev-libs/libgit2/libgit2_0.25-0.25.1.recipe
+++ b/dev-libs/libgit2/libgit2_0.25-0.25.1.recipe
@@ -15,7 +15,7 @@ DESCRIPTION="The library provides:
 HOMEPAGE="http://libgit2.github.com/"
 COPYRIGHT="2005-2017 libgit2 project"
 LICENSE="GNU LGPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="465c7c0a3d9b3edf151d4ada31597f2805b7c2e80b92c03062a6345e03ef8c7b"
 SOURCE_DIR="libgit2-$portVersion"
@@ -23,9 +23,12 @@ SOURCE_DIR="libgit2-$portVersion"
 ARCHITECTURES="all !x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="?x86"

+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
 PROVIDES="
-	libgit2_25$secondaryArchSuffix = $portVersion
-	lib:libgit2$secondaryArchSuffix = 0.25.1 compat >= 0.25
+	libgit2_0.25$secondaryArchSuffix = $portVersion
+	lib:libgit2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -34,13 +37,19 @@ REQUIRES="
 	lib:libssh2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+REPLACES="
+	libgit2_25$secondaryArchSuffix
+	"

 PROVIDES_devel="
-	libgit2_25${secondaryArchSuffix}_devel = $portVersion
-	devel:libgit2$secondaryArchSuffix = 0.25.1 compat >= 0.25
+	libgit2_0.25${secondaryArchSuffix}_devel = $portVersion
+	devel:libgit2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libgit2_25$secondaryArchSuffix == $portVersion base
+	libgit2_0.25$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libgit2_1.5${secondaryArchSuffix}_devel
 	"

 BUILD_REQUIRES="
@@ -70,7 +79,8 @@ BUILD()
 		-DLIB_INSTALL_DIR:PATH=$libDir \
 		-DBUILD_CLAR=OFF \
 		-DBUILD_EXAMPLES=OFF \
-		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_TESTS=OFF

 	make $jobArgs
 }
--- a/dev-libs/libgit2/libgit2_1.5-1.5.0.recipe
+++ b/dev-libs/libgit2/libgit2_1.5-1.5.0.recipe
@@ -19,6 +19,7 @@ REVISION="3"
 SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e"
 SOURCE_FILENAME="libgit2-$portVersion.tar.gz"
+SOURCE_DIR="libgit2-$portVersion"
 PATCHES="libgit2-$portVersion.patchset"

 ARCHITECTURES="all !x86_gcc2"
@@ -35,7 +36,7 @@ libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%.*}"

 PROVIDES="
-	libgit2$secondaryArchSuffix = $portVersion
+	libgit2_1.5$secondaryArchSuffix = $portVersion
 	lib:libgit2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -47,21 +48,27 @@ REQUIRES="
 	lib:libssh2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+REPLACES="
+	libgit2$secondaryArchSuffix
+	"

 PROVIDES_devel="
-	libgit2${secondaryArchSuffix}_devel = $portVersion
+	libgit2_1.5${secondaryArchSuffix}_devel = $portVersion
 	devel:libgit2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
-	libgit2$secondaryArchSuffix == $portVersion base
+	libgit2_1.5$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libgit2_1.8${secondaryArchSuffix}_devel
 	"

 PROVIDES_tools="
-	libgit2${secondaryArchSuffix}_tools
+	libgit2_1.5${secondaryArchSuffix}_tools
 	cmd:git2_cli$commandSuffix = $portVersion
 	"
 REQUIRES_tools="
-	libgit2$secondaryArchSuffix == $portVersion base
+	libgit2_1.5$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
@@ -69,6 +76,9 @@ REQUIRES_tools="
 	lib:libssh2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
+CONFLICTS_tools="
+	libgit2_1.8${secondaryArchSuffix}_tools
+	"

 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
@@ -89,7 +99,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"

-defineDebugInfoPackage libgit2$secondaryArchSuffix \
+defineDebugInfoPackage libgit2_1.5$secondaryArchSuffix \
 	"$libDir"/libgit2.so.$libVersion

 BUILD()
@@ -101,7 +111,8 @@ BUILD()
 		-DBUILD_CLAR=OFF \
 		-DUSE_ICONV=ON \
 		-DUSE_SSH=ON \
-		-DBUILD_EXAMPLES=OFF
+		-DBUILD_EXAMPLES=OFF \
+		-DBUILD_TESTS=OFF

 	make -C build $jobArgs
 }
--- a/dev-libs/libgit2/libgit2_1.8-1.8.4.recipe
+++ b/dev-libs/libgit2/libgit2_1.8-1.8.4.recipe
@@ -0,0 +1,128 @@
+SUMMARY="A portable, pure C implementation of the Git core methods"
+DESCRIPTION="The library provides:
+* SHA conversions, formatting and shortening
+* abstracted ODB backend system
+* commit, tag, tree and blob parsing, editing, and write-back
+* tree traversal
+* revision walking
+* index file (staging area) manipulation
+* reference management (including packed references)
+* config file management
+* high level repository management
+* thread safety and reentrancy
+* descriptive and detailed error messages
+* ...and more (over 175 different API calls)"
+HOMEPAGE="https://libgit2.github.com/"
+COPYRIGHT="2005-2024 libgit2 project"
+LICENSE="GNU LGPL v2"
+REVISION="1"
+SOURCE_URI="https://github.com/libgit2/libgit2/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="49d0fc50ab931816f6bfc1ac68f8d74b760450eebdb5374e803ee36550f26774"
+SOURCE_FILENAME="libgit2-$portVersion.tar.gz"
+SOURCE_DIR="libgit2-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
+PROVIDES="
+	libgit2_1.8$secondaryArchSuffix = $portVersion
+	lib:libgit2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libssh2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libgit2_1.8${secondaryArchSuffix}_devel = $portVersion
+	devel:libgit2$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libgit2_1.8$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	libgit2_1.8${secondaryArchSuffix}_tools
+	cmd:git2_cli$commandSuffix = $portVersion
+	"
+REQUIRES_tools="
+	libgit2_1.8$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
+	lib:libssh2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix >= 3
+	devel:libcurl$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
+	devel:libssh2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:curl_config$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:python3
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage libgit2_1.8$secondaryArchSuffix \
+	"$libDir"/libgit2.so.$libVersion
+
+BUILD()
+{
+	cmake -B build -S. \
+		$cmakeDirArgs \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
+		-DBUILD_CLAR=OFF \
+		-DUSE_ICONV=ON \
+		-DUSE_SSH=ON \
+		-DBUILD_EXAMPLES=OFF \
+		-DBUILD_TESTS=OFF
+
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	prepareInstalledDevelLib \
+		libgit2
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+
+	packageEntries tools \
+		$commandBinDir
+}
+
+TEST()
+{
+	make VERBOSE=1 test -C build
+}