commit: 66f38b2cd49e9131ddb3dbb3d5e4a4e65dd5bdfa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 06:23:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 06:23:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f38b2c
dev-libs/libzip: Drop 1.7.3-r1
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libzip/Manifest | 1 -
.../libzip/files/libzip-1.7.3-missing-header.patch | 43 --------
dev-libs/libzip/libzip-1.7.3-r1.ebuild | 116 ---------------------
3 files changed, 160 deletions(-)
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index cfd516e3bb7..38df1804412 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,2 +1 @@
-DIST libzip-1.7.3.tar.xz 747372 BLAKE2B
c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d
SHA512
488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
DIST libzip-1.8.0.tar.xz 760604 BLAKE2B
7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1
SHA512
fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
deleted file mode 100644
index bebe3802841..00000000000
--- a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=98rjan=20Malde?= <r...@foxi.me>
-Date: Wed, 15 Jul 2020 12:16:16 +0200
-Subject: [PATCH] Include limits.h for INT_MAX
-
----
- lib/zip_crypto_openssl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c
-index 1cb00479..60f92758 100644
---- a/lib/zip_crypto_openssl.c
-+++ b/lib/zip_crypto_openssl.c
-@@ -38,6 +38,7 @@
- #include "zip_crypto.h"
-
- #include <openssl/rand.h>
-+#include <limits.h>
-
- #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
- #define USE_OPENSSL_1_0_API
-
-From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <t...@giga.or.at>
-Date: Wed, 15 Jul 2020 12:38:07 +0200
-Subject: [PATCH] Include limits.h for INT_MAX.
-
----
- lib/zip_crypto_mbedtls.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c
-index c348ad2a..7063c6b6 100644
---- a/lib/zip_crypto_mbedtls.c
-+++ b/lib/zip_crypto_mbedtls.c
-@@ -41,6 +41,7 @@
- #include <mbedtls/entropy.h>
- #include <mbedtls/pkcs5.h>
-
-+#include <limits.h>
-
- _zip_crypto_aes_t *
- _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size,
zip_error_t *error) {
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
deleted file mode 100644
index 4d7fa7066ed..00000000000
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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}"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326
-
-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
-}
