From 508ff307056bea2715a8a3584d71bece5db94220 Mon Sep 17 00:00:00 2001
From: extrowerk <5569059+extrowerk@users.noreply.github.com>
Date: Thu, 24 Feb 2022 10:13:48 +0100
Subject: [PATCH] libzip: bump (#6642)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* libzip: bump
* Add test_req, disable optional deps
* remove old recipe
* suggestion from Begasus

Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
---
 ...ibzip-1.2.0.recipe => libzip-1.8.0.recipe} | 59 +++++++++++--------
 dev-libs/libzip/patches/libzip-1.8.0.patchset | 21 +++++++
 2 files changed, 57 insertions(+), 23 deletions(-)
 rename dev-libs/libzip/{libzip-1.2.0.recipe => libzip-1.8.0.recipe} (57%)
 create mode 100644 dev-libs/libzip/patches/libzip-1.8.0.patchset

diff --git a/dev-libs/libzip/libzip-1.2.0.recipe b/dev-libs/libzip/libzip-1.8.0.recipe
similarity index 57%
rename from dev-libs/libzip/libzip-1.2.0.recipe
rename to dev-libs/libzip/libzip-1.8.0.recipe
index db947137f..16b6194d2 100644
--- a/dev-libs/libzip/libzip-1.2.0.recipe
+++ b/dev-libs/libzip/libzip-1.8.0.recipe
@@ -2,11 +2,11 @@ SUMMARY="A C library for reading, creating, and modifying zip archives"
 DESCRIPTION="libzip is a C library for reading, creating, and modifying zip \
 archives."
 HOMEPAGE="http://www.nih.at/libzip/"
-COPYRIGHT="1999-2016 Dieter Baron and Thomas Klausner"
+COPYRIGHT="1999-2020 Dieter Baron and Thomas Klausner"
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://www.nih.at/libzip/libzip-$portVersion.tar.gz"
-CHECKSUM_SHA256="6cf9840e427db96ebf3936665430bab204c9ebbd0120c326459077ed9c907d9f"
+CHECKSUM_SHA256="30ee55868c0a698d3c600492f2bea4eb62c53849bcf696d21af5eb65f3f3839e"
 PATCHES="libzip-$portVersion.patchset"
 
 ARCHITECTURES="all"
@@ -26,7 +26,12 @@ fi
 
 REQUIRES="
 	haiku$secondaryArchSuffix
+#	lib:libbz2$secondaryArchSuffix
+#	lib:liblzma$secondaryArchSuffix
+#	lib:libnettle$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
+#	lib:libzstd$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -39,40 +44,47 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+#	devel:libbz2$secondaryArchSuffix
+#	devel:liblzma$secondaryArchSuffix
+#	devel:libnettle$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+#	devel:libzstd$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:automake
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
+	cmd:grep
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
 	"
 
-PATCH()
-{
-	sed -i -e 's/^LN=ln -f$/&rs/' man/Makefile.am
-}
+TEST_REQUIRES="
+	cmd:diff
+	cmd:find
+	"
 
 BUILD()
 {
-	autoreconf -vfi
-	runConfigure ./configure --disable-static
-	make $jobArgs
+	rm -rf build
+	cmake -B build -S . \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
+		-DDOCUMENTATION_FORMAT=man \
+		$cmakeDirArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
 
-	# Move zipconf.h from lib/libzip/include/ to develop/headers/
-	mv $libDir/libzip/include/zipconf.h $includeDir
-	rm -rf $libDir/libzip
-
-	rm $libDir/libzip.la
+	# Move zipconf.h from include/ to develop/headers/
+	mv $prefix/include/zipconf.h $includeDir
+	rm -rf $prefix/include
 
 	prepareInstalledDevelLibs libzip
 	fixPkgconfig
@@ -81,17 +93,18 @@ INSTALL()
 		maybe_manDir_man3=$manDir/man3
 	else
 		maybe_manDir_man3=
-		rm -rf $binDir
+		rm -rf $prefix/bin
 		rm -rf $documentationDir
 	fi
 
 	# devel package
 	packageEntries devel \
 		$developDir \
+		$libDir/cmake \
 		$maybe_manDir_man3
 }
 
 TEST()
 {
-	make check
+	make -C build check
 }
diff --git a/dev-libs/libzip/patches/libzip-1.8.0.patchset b/dev-libs/libzip/patches/libzip-1.8.0.patchset
new file mode 100644
index 000000000..a54e98c5b
--- /dev/null
+++ b/dev-libs/libzip/patches/libzip-1.8.0.patchset
@@ -0,0 +1,21 @@
+From cfede57da3bd091f08ab8810d4cae8c919b56ff0 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 21 May 2017 17:08:44 +0200
+Subject: fix path for libincludedir
+
+
+diff --git a/libzip.pc.in b/libzip.pc.in
+index 58b3dca..11923f9 100644
+--- a/libzip.pc.in
++++ b/libzip.pc.in
+@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ libdir=@libdir@
+ includedir=@includedir@
++libincludedir=@includedir@
+ 
+ zipcmp=@bindir@/zipcmp
+ 
+-- 
+2.30.2
+