From 61f10f985e19dfe20a4d9552902625edd5b6eabb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 21 Jun 2021 17:32:00 +0100
Subject: gentoo resync : 21.06.2021

---
 dev-libs/libzip/Manifest               |   4 +-
 dev-libs/libzip/libzip-1.7.3-r1.ebuild |   6 +-
 dev-libs/libzip/libzip-1.8.0.ebuild    | 114 +++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dev-libs/libzip/libzip-1.8.0.ebuild

(limited to 'dev-libs/libzip')

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 3827560efde3..0e8c256b8326 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,4 +1,6 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
-EBUILD libzip-1.7.3-r1.ebuild 2362 BLAKE2B a6abf14b651094f901fec91e009d8bee5929eb9e9559c5bc3fd1c7a7f76549ce79308c33043bbddc6b93085268e39970a454dbd50ef2cc09c5fe0291fffee0fa SHA512 47bd0d59f32c3c6cd45f1230ce9f312d69d9625ad7cad6791bac76fef69e28349f6e3b674170c593100b78f9a7b6bb581a64f52893f9f8615b5998a61e2202b9
+DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
+EBUILD libzip-1.7.3-r1.ebuild 2420 BLAKE2B a2ddb2e1d5ef8c9e15d09bf99914092cd209ecf7123aa61683ddbc6b8dfcd280c5b6bbcb0c8aab8ad07f3e1eeec7c3640033350c8c65c0ff432e016ef754d4fe SHA512 637dc2793f2e54383221bfa2048e0c26df8788e62f9d1f078ecf7cd5a0878cb1bfea67f8e37b6913bf496778c8aa1a90b6ee6c78218eac99358fb9ca731f5957
+EBUILD libzip-1.8.0.ebuild 2361 BLAKE2B def152e6e6bde5bbe9fd78b6ad9a552c5890aa944e28817da2b1be0667e852625a369d2db190e351de094c4afb9f96f846fce2f9c5c2cf7cb9a2ae9688d1c7a3 SHA512 b20271f5aac03fd1388c7695dd62ffe860daf0807b2067cd4e340d63170c4e531e0e3a32f854e30662d04b2cebc78e3ac41636d4422c76b39d01c8a26cb0838c
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
index 4426e7855d14..889bec7371ec 100644
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
@@ -104,7 +104,11 @@ src_compile() {
 }
 
 src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
 }
 
 src_install() {
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
new file mode 100644
index 000000000000..858fde7ef4d3
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multibuild flag-o-matic
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
+REQUIRED_USE="test? ( tools )"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/xz-utils )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? ( dev-libs/openssl:0= )
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	append-lfs-flags
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=ON
+				-DBUILD_REGRESS=$(usex test)
+				-DBUILD_TOOLS=$(usex tools)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	run_tests() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+	}
+
+	multibuild_foreach_variant run_tests
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
-- 
cgit v1.2.3