summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-04-10 01:20:18 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-04-10 01:20:18 +0200
commit143dda37b357fa949abd681742f465d8cb5f981e (patch)
treed706ab243865d9a6c6f157b796ef4cb9fc20eb9c /dev-libs/libzip
parentapp-office/skrooge: 2.22.1 version bump (diff)
downloadgentoo-143dda37b357fa949abd681742f465d8cb5f981e.tar.gz
gentoo-143dda37b357fa949abd681742f465d8cb5f981e.tar.bz2
gentoo-143dda37b357fa949abd681742f465d8cb5f981e.zip
dev-libs/libzip: Drop 1.5.2-r2
Package-Manager: Portage-2.3.98, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs/libzip')
-rw-r--r--dev-libs/libzip/Manifest1
-rw-r--r--dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch23
-rw-r--r--dev-libs/libzip/libzip-1.5.2-r2.ebuild109
3 files changed, 0 insertions, 133 deletions
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 0056bff2e49e..1f8806b18038 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,2 +1 @@
-DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
diff --git a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch b/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
deleted file mode 100644
index 564cc9b79f1d..000000000000
--- a/dev-libs/libzip/files/libzip-1.5.2-mbedtls.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e34b2ed6116ba5e6d3c25cd504d91bb680db92e8 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <tk@giga.or.at>
-Date: Tue, 2 Apr 2019 15:26:06 +0200
-Subject: [PATCH] mbedtls: link against the correct library
-
-Inspired by https://github.com/nih-at/libzip/pull/88
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3f252b3f7..f8eb16eeb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -42,7 +42,7 @@ ELSE()
- ENDIF()
- IF(ENABLE_MBEDTLS)
- FIND_PATH(MBEDTLS_INCLUDE_DIR mbedtls/aes.h)
-- FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedtls)
-+ FIND_LIBRARY(MBEDTLS_LIBRARIES NAMES mbedcrypto)
- ELSE()
- SET(MBEDTLS_LIBRARIES FALSE)
- ENDIF()
diff --git a/dev-libs/libzip/libzip-1.5.2-r2.ebuild b/dev-libs/libzip/libzip-1.5.2-r2.ebuild
deleted file mode 100644
index 7f74994f024f..000000000000
--- a/dev-libs/libzip/libzip-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 doc gnutls libressl mbedtls ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- ssl? (
- gnutls? (
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.6.5:=
- )
- !gnutls? (
- mbedtls? ( net-libs/mbedtls:= )
- !mbedtls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-mbedtls.patch" ) # bug 680820
-
-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
- 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() {
- [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-}
-
-src_install() {
- multibuild_foreach_variant cmake_src_install
-}