1 |
commit: 66f38b2cd49e9131ddb3dbb3d5e4a4e65dd5bdfa |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 8 06:23:12 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 8 06:23:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66f38b2c |
7 |
|
8 |
dev-libs/libzip: Drop 1.7.3-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
dev-libs/libzip/Manifest | 1 - |
14 |
.../libzip/files/libzip-1.7.3-missing-header.patch | 43 -------- |
15 |
dev-libs/libzip/libzip-1.7.3-r1.ebuild | 116 --------------------- |
16 |
3 files changed, 160 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest |
19 |
index cfd516e3bb7..38df1804412 100644 |
20 |
--- a/dev-libs/libzip/Manifest |
21 |
+++ b/dev-libs/libzip/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870 |
24 |
DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e |
25 |
|
26 |
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 |
27 |
deleted file mode 100644 |
28 |
index bebe3802841..00000000000 |
29 |
--- a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch |
30 |
+++ /dev/null |
31 |
@@ -1,43 +0,0 @@ |
32 |
-From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001 |
33 |
-From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@××××.me> |
34 |
-Date: Wed, 15 Jul 2020 12:16:16 +0200 |
35 |
-Subject: [PATCH] Include limits.h for INT_MAX |
36 |
- |
37 |
---- |
38 |
- lib/zip_crypto_openssl.c | 1 + |
39 |
- 1 file changed, 1 insertion(+) |
40 |
- |
41 |
-diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c |
42 |
-index 1cb00479..60f92758 100644 |
43 |
---- a/lib/zip_crypto_openssl.c |
44 |
-+++ b/lib/zip_crypto_openssl.c |
45 |
-@@ -38,6 +38,7 @@ |
46 |
- #include "zip_crypto.h" |
47 |
- |
48 |
- #include <openssl/rand.h> |
49 |
-+#include <limits.h> |
50 |
- |
51 |
- #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER) |
52 |
- #define USE_OPENSSL_1_0_API |
53 |
- |
54 |
-From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001 |
55 |
-From: Thomas Klausner <tk@×××××××.at> |
56 |
-Date: Wed, 15 Jul 2020 12:38:07 +0200 |
57 |
-Subject: [PATCH] Include limits.h for INT_MAX. |
58 |
- |
59 |
---- |
60 |
- lib/zip_crypto_mbedtls.c | 1 + |
61 |
- 1 file changed, 1 insertion(+) |
62 |
- |
63 |
-diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c |
64 |
-index c348ad2a..7063c6b6 100644 |
65 |
---- a/lib/zip_crypto_mbedtls.c |
66 |
-+++ b/lib/zip_crypto_mbedtls.c |
67 |
-@@ -41,6 +41,7 @@ |
68 |
- #include <mbedtls/entropy.h> |
69 |
- #include <mbedtls/pkcs5.h> |
70 |
- |
71 |
-+#include <limits.h> |
72 |
- |
73 |
- _zip_crypto_aes_t * |
74 |
- _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) { |
75 |
|
76 |
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild |
77 |
deleted file mode 100644 |
78 |
index 4d7fa7066ed..00000000000 |
79 |
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,116 +0,0 @@ |
82 |
-# Copyright 1999-2021 Gentoo Authors |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
- |
85 |
-EAPI=7 |
86 |
- |
87 |
-inherit cmake multibuild flag-o-matic |
88 |
- |
89 |
-DESCRIPTION="Library for manipulating zip archives" |
90 |
-HOMEPAGE="https://nih.at/libzip/" |
91 |
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" |
92 |
- |
93 |
-LICENSE="BSD" |
94 |
-SLOT="0/5" |
95 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
96 |
-IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools" |
97 |
-REQUIRED_USE="test? ( tools )" |
98 |
- |
99 |
-RESTRICT="!test? ( test )" |
100 |
- |
101 |
-DEPEND=" |
102 |
- sys-libs/zlib |
103 |
- bzip2? ( app-arch/bzip2:= ) |
104 |
- lzma? ( app-arch/xz-utils ) |
105 |
- ssl? ( |
106 |
- gnutls? ( |
107 |
- dev-libs/nettle:0= |
108 |
- >=net-libs/gnutls-3.6.5:= |
109 |
- ) |
110 |
- !gnutls? ( |
111 |
- mbedtls? ( net-libs/mbedtls:= ) |
112 |
- !mbedtls? ( dev-libs/openssl:0= ) |
113 |
- ) |
114 |
- ) |
115 |
-" |
116 |
-RDEPEND="${DEPEND}" |
117 |
- |
118 |
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326 |
119 |
- |
120 |
-pkg_setup() { |
121 |
- # Upstream doesn't support building dynamic & static |
122 |
- # simultaneously: https://github.com/nih-at/libzip/issues/76 |
123 |
- MULTIBUILD_VARIANTS=( shared $(usev static-libs) ) |
124 |
-} |
125 |
- |
126 |
-src_configure() { |
127 |
- append-lfs-flags |
128 |
- myconfigure() { |
129 |
- local mycmakeargs=( |
130 |
- -DBUILD_EXAMPLES=OFF # nothing is installed |
131 |
- -DENABLE_COMMONCRYPTO=OFF # not in tree |
132 |
- -DENABLE_BZIP2=$(usex bzip2) |
133 |
- -DENABLE_LZMA=$(usex lzma) |
134 |
- ) |
135 |
- if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then |
136 |
- mycmakeargs+=( |
137 |
- -DBUILD_DOC=OFF |
138 |
- -DBUILD_EXAMPLES=OFF |
139 |
- -DBUILD_SHARED_LIBS=OFF |
140 |
- -DBUILD_TOOLS=OFF |
141 |
- ) |
142 |
- else |
143 |
- mycmakeargs+=( |
144 |
- -DBUILD_DOC=ON |
145 |
- -DBUILD_REGRESS=$(usex test) |
146 |
- -DBUILD_TOOLS=$(usex tools) |
147 |
- ) |
148 |
- fi |
149 |
- |
150 |
- if use ssl; then |
151 |
- if use gnutls; then |
152 |
- mycmakeargs+=( |
153 |
- -DENABLE_GNUTLS=$(usex gnutls) |
154 |
- -DENABLE_MBEDTLS=OFF |
155 |
- -DENABLE_OPENSSL=OFF |
156 |
- ) |
157 |
- elif use mbedtls; then |
158 |
- mycmakeargs+=( |
159 |
- -DENABLE_GNUTLS=OFF |
160 |
- -DENABLE_MBEDTLS=$(usex mbedtls) |
161 |
- -DENABLE_OPENSSL=OFF |
162 |
- ) |
163 |
- else |
164 |
- mycmakeargs+=( |
165 |
- -DENABLE_GNUTLS=OFF |
166 |
- -DENABLE_MBEDTLS=OFF |
167 |
- -DENABLE_OPENSSL=ON |
168 |
- ) |
169 |
- fi |
170 |
- else |
171 |
- mycmakeargs+=( |
172 |
- -DENABLE_GNUTLS=OFF |
173 |
- -DENABLE_MBEDTLS=OFF |
174 |
- -DENABLE_OPENSSL=OFF |
175 |
- ) |
176 |
- fi |
177 |
- cmake_src_configure |
178 |
- } |
179 |
- |
180 |
- multibuild_foreach_variant myconfigure |
181 |
-} |
182 |
- |
183 |
-src_compile() { |
184 |
- multibuild_foreach_variant cmake_src_compile |
185 |
-} |
186 |
- |
187 |
-src_test() { |
188 |
- run_tests() { |
189 |
- [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test |
190 |
- } |
191 |
- |
192 |
- multibuild_foreach_variant run_tests |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- multibuild_foreach_variant cmake_src_install |
197 |
-} |