dev-libs/libzip: 1.5.2 version bump, add USE mbedtls

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 396290996fdd341c7c05c2e82e67149738728589..b8f03031b8292d17aab4d809bd7a308f614caedf 100644 (file)
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,2 +1,3 @@
 DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
+DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643

diff --git a/dev-libs/libzip/libzip-1.5.2.ebuild b/dev-libs/libzip/libzip-1.5.2.ebuild
new file mode 100644 (file)
index 0000000..261eb19
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.5.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multibuild
+
+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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test"
+
+DEPEND="
+       sys-libs/zlib
+       bzip2? ( app-arch/bzip2 )
+       ssl? (
+               gnutls? ( net-libs/gnutls:= )
+               !gnutls? (
+                       mbedtls? ( net-libs/mbedtls:= )
+                       !mbedtls? (
+                               !libressl? ( dev-libs/openssl:0= )
+                               libressl? ( dev-libs/libressl: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() {
+       myconfigure() {
+               local mycmakeargs=(
+                       -DBUILD_EXAMPLES=OFF # nothing is installed
+                       -DENABLE_COMMONCRYPTO=OFF # not in tree
+                       -DENABLE_BZIP2=$(usex bzip2)
+               )
+               if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+                       mycmakeargs+=(
+                               -DBUILD_DOC=OFF
+                               -DBUILD_EXAMPLES=OFF
+                               -DBUILD_SHARED_LIBS=OFF
+                               -DBUILD_TOOLS=OFF
+                       )
+               else
+                       mycmakeargs+=(
+                               -DBUILD_DOC=$(usex doc)
+                               -DBUILD_REGRESS=$(usex test)
+                       )
+               fi
+
+               if use ssl; then
+                       mycmakeargs+=(
+                               -DENABLE_GNUTLS=$(usex gnutls)
+                               -DENABLE_MBEDTLS=$(usex mbedtls)
+                               -DENABLE_OPENSSL=$(usex !gnutls)
+                       )
+               else
+                       mycmakeargs+=(
+                               -DENABLE_GNUTLS=OFF
+                               -DENABLE_MBEDTLS=OFF
+                               -DENABLE_OPENSSL=OFF
+                       )
+               fi
+               cmake-utils_src_configure
+       }
+
+       multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+       multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+       [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+       multibuild_foreach_variant cmake-utils_src_install
+}

diff --git a/dev-libs/libzip/metadata.xml b/dev-libs/libzip/metadata.xml
index 12dd2df42ad5555dd86abc8aa7cd34727d54f3e5..87a5b99d4f347f73aea6fb058e580bfebfdd2b6b 100644 (file)
--- a/dev-libs/libzip/metadata.xml
+++ b/dev-libs/libzip/metadata.xml
@@ -9,4 +9,7 @@
        <email>kde@gentoo.org</email>
        <name>Gentoo KDE Project</name>
 </maintainer>
+<use>
+       <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
+</use>
 </pkgmetadata>