1 |
commit: af203bc0ea910fb4d2603af4b0d7b8e9cbaf6916 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 15 16:03:23 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 15 16:07:25 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af203bc0 |
7 |
|
8 |
app-arch/libarchive: Clean old up |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-arch/libarchive/Manifest | 2 - |
13 |
.../files/libarchive-3.3.1-libressl.patch | 25 ---- |
14 |
.../files/libarchive-3.3.2-libressl.patch | 25 ---- |
15 |
app-arch/libarchive/libarchive-3.3.1.ebuild | 122 -------------------- |
16 |
app-arch/libarchive/libarchive-3.3.2.ebuild | 128 --------------------- |
17 |
5 files changed, 302 deletions(-) |
18 |
|
19 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
20 |
index a4e6b879695..3037624f545 100644 |
21 |
--- a/app-arch/libarchive/Manifest |
22 |
+++ b/app-arch/libarchive/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 |
25 |
-DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 |
26 |
DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 |
27 |
|
28 |
diff --git a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch |
29 |
deleted file mode 100644 |
30 |
index 7ee48d4e5f5..00000000000 |
31 |
--- a/app-arch/libarchive/files/libarchive-3.3.1-libressl.patch |
32 |
+++ /dev/null |
33 |
@@ -1,25 +0,0 @@ |
34 |
---- a/libarchive/archive_openssl_evp_private.h 2017-01-29 05:06:27.000000000 +0000 |
35 |
-+++ b/libarchive/archive_openssl_evp_private.h 2018-04-19 04:00:14.061922747 +0000 |
36 |
-@@ -28,7 +28,8 @@ |
37 |
- #include <openssl/evp.h> |
38 |
- #include <openssl/opensslv.h> |
39 |
- |
40 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
41 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
42 |
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
43 |
- #include <stdlib.h> /* malloc, free */ |
44 |
- #include <string.h> /* memset */ |
45 |
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void) |
46 |
- |
47 |
---- a/libarchive/archive_openssl_hmac_private.h 2017-01-29 05:06:27.000000000 +0000 |
48 |
-+++ b/libarchive/archive_openssl_hmac_private.h 2018-04-19 04:02:18.309167446 +0000 |
49 |
-@@ -28,7 +28,8 @@ |
50 |
- #include <openssl/hmac.h> |
51 |
- #include <openssl/opensslv.h> |
52 |
- |
53 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
54 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
55 |
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
56 |
- #include <stdlib.h> /* malloc, free */ |
57 |
- #include <string.h> /* memset */ |
58 |
- static inline HMAC_CTX *HMAC_CTX_new(void) |
59 |
|
60 |
diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch |
61 |
deleted file mode 100644 |
62 |
index e053a539fae..00000000000 |
63 |
--- a/app-arch/libarchive/files/libarchive-3.3.2-libressl.patch |
64 |
+++ /dev/null |
65 |
@@ -1,25 +0,0 @@ |
66 |
---- a/libarchive/archive_openssl_evp_private.h 2017-01-29 05:06:27.000000000 +0000 |
67 |
-+++ b/libarchive/archive_openssl_evp_private.h 2018-04-19 04:00:14.061922747 +0000 |
68 |
-@@ -28,7 +28,8 @@ |
69 |
- #include <openssl/evp.h> |
70 |
- #include <openssl/opensslv.h> |
71 |
- |
72 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
73 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
74 |
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
75 |
- #include <stdlib.h> /* malloc, free */ |
76 |
- #include <string.h> /* memset */ |
77 |
- static inline EVP_MD_CTX *EVP_MD_CTX_new(void) |
78 |
- |
79 |
---- a/libarchive/archive_openssl_hmac_private.h 2017-01-29 05:06:27.000000000 +0000 |
80 |
-+++ b/libarchive/archive_openssl_hmac_private.h 2018-04-19 04:02:18.309167446 +0000 |
81 |
-@@ -28,7 +28,8 @@ |
82 |
- #include <openssl/hmac.h> |
83 |
- #include <openssl/opensslv.h> |
84 |
- |
85 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
86 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
87 |
-+(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
88 |
- #include <stdlib.h> /* malloc, free */ |
89 |
- #include <string.h> /* memset */ |
90 |
- static inline HMAC_CTX *HMAC_CTX_new(void) |
91 |
|
92 |
diff --git a/app-arch/libarchive/libarchive-3.3.1.ebuild b/app-arch/libarchive/libarchive-3.3.1.ebuild |
93 |
deleted file mode 100644 |
94 |
index 5ccced536ae..00000000000 |
95 |
--- a/app-arch/libarchive/libarchive-3.3.1.ebuild |
96 |
+++ /dev/null |
97 |
@@ -1,122 +0,0 @@ |
98 |
-# Copyright 1999-2019 Gentoo Authors |
99 |
-# Distributed under the terms of the GNU General Public License v2 |
100 |
- |
101 |
-EAPI=6 |
102 |
-inherit eutils libtool multilib-minimal toolchain-funcs |
103 |
- |
104 |
-DESCRIPTION="Multi-format archive and compression library" |
105 |
-HOMEPAGE="https://www.libarchive.org/" |
106 |
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" |
107 |
- |
108 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
109 |
-SLOT="0/13" |
110 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
111 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" |
112 |
- |
113 |
-RDEPEND=" |
114 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
115 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
116 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
117 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
118 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
119 |
- kernel_linux? ( |
120 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
121 |
- ) |
122 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
123 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
124 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
125 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
126 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
127 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
128 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
129 |
-DEPEND="${RDEPEND} |
130 |
- kernel_linux? ( |
131 |
- virtual/os-headers |
132 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
133 |
- )" |
134 |
- |
135 |
-PATCHES=( |
136 |
- "${FILESDIR}"/${PN}-3.3.1-libressl.patch |
137 |
-) |
138 |
- |
139 |
-# Various test problems, starting with the fact that sandbox |
140 |
-# explodes on long paths. https://bugs.gentoo.org/598806 |
141 |
-RESTRICT="test" |
142 |
- |
143 |
-src_prepare() { |
144 |
- default |
145 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
146 |
-} |
147 |
- |
148 |
-multilib_src_configure() { |
149 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
150 |
- |
151 |
- local myconf=() |
152 |
- myconf=( |
153 |
- $(use_enable acl) |
154 |
- $(use_enable static-libs static) |
155 |
- $(use_enable xattr) |
156 |
- $(use_with bzip2 bz2lib) |
157 |
- $(use_with expat) |
158 |
- $(use_with !expat xml2) |
159 |
- $(use_with iconv) |
160 |
- $(use_with lz4) |
161 |
- $(use_with lzma) |
162 |
- $(use_with lzo lzo2) |
163 |
- $(use_with nettle) |
164 |
- $(use_with zlib) |
165 |
- ) |
166 |
- if multilib_is_native_abi ; then myconf+=( |
167 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
168 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
169 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
170 |
- ); else myconf+=( |
171 |
- --disable-bsdcat |
172 |
- --disable-bsdcpio |
173 |
- --disable-bsdtar |
174 |
- ); fi |
175 |
- |
176 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
177 |
-} |
178 |
- |
179 |
-multilib_src_compile() { |
180 |
- if multilib_is_native_abi ; then |
181 |
- emake |
182 |
- else |
183 |
- emake libarchive.la |
184 |
- fi |
185 |
-} |
186 |
- |
187 |
-multilib_src_test() { |
188 |
- # Replace the default src_test so that it builds tests in parallel |
189 |
- multilib_is_native_abi && emake check |
190 |
-} |
191 |
- |
192 |
-multilib_src_install() { |
193 |
- if multilib_is_native_abi ; then |
194 |
- emake DESTDIR="${D}" install |
195 |
- |
196 |
- # Create symlinks for FreeBSD |
197 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
198 |
- # Exclude cat for the time being #589876 |
199 |
- for bin in cpio tar; do |
200 |
- dosym bsd${bin} /usr/bin/${bin} |
201 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
202 |
- doman "${T}"/${bin}.1 |
203 |
- done |
204 |
- fi |
205 |
- else |
206 |
- emake DESTDIR="${D}" \ |
207 |
- install-includeHEADERS \ |
208 |
- install-libLTLIBRARIES \ |
209 |
- install-pkgconfigDATA |
210 |
- fi |
211 |
- |
212 |
- # Libs.private: should be used from libarchive.pc instead |
213 |
- prune_libtool_files |
214 |
-} |
215 |
- |
216 |
-multilib_src_install_all() { |
217 |
- cd "${S}" || die |
218 |
- einstalldocs |
219 |
-} |
220 |
|
221 |
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild |
222 |
deleted file mode 100644 |
223 |
index d53b773494c..00000000000 |
224 |
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild |
225 |
+++ /dev/null |
226 |
@@ -1,128 +0,0 @@ |
227 |
-# Copyright 1999-2019 Gentoo Authors |
228 |
-# Distributed under the terms of the GNU General Public License v2 |
229 |
- |
230 |
-EAPI=6 |
231 |
-inherit eutils libtool multilib-minimal toolchain-funcs |
232 |
- |
233 |
-DESCRIPTION="Multi-format archive and compression library" |
234 |
-HOMEPAGE="https://www.libarchive.org/" |
235 |
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" |
236 |
- |
237 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
238 |
-SLOT="0/13" |
239 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
240 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" |
241 |
- |
242 |
-RDEPEND=" |
243 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
244 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
245 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
246 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
247 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
248 |
- kernel_linux? ( |
249 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
250 |
- ) |
251 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
252 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
253 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
254 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
255 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
256 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
257 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
258 |
-DEPEND="${RDEPEND} |
259 |
- kernel_linux? ( |
260 |
- virtual/os-headers |
261 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
262 |
- )" |
263 |
- |
264 |
-PATCHES=( |
265 |
- "${FILESDIR}"/${PN}-3.3.2-libressl.patch |
266 |
-) |
267 |
- |
268 |
-# Various test problems, starting with the fact that sandbox |
269 |
-# explodes on long paths. https://bugs.gentoo.org/598806 |
270 |
-RESTRICT="test" |
271 |
- |
272 |
-src_prepare() { |
273 |
- default |
274 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
275 |
-} |
276 |
- |
277 |
-multilib_src_configure() { |
278 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
279 |
- |
280 |
- local myconf=() |
281 |
- myconf=( |
282 |
- $(use_enable acl) |
283 |
- $(use_enable static-libs static) |
284 |
- $(use_enable xattr) |
285 |
- $(use_with bzip2 bz2lib) |
286 |
- $(use_with expat) |
287 |
- $(use_with !expat xml2) |
288 |
- $(use_with iconv) |
289 |
- $(use_with lz4) |
290 |
- $(use_with lzma) |
291 |
- $(use_with lzo lzo2) |
292 |
- $(use_with nettle) |
293 |
- $(use_with zlib) |
294 |
- ) |
295 |
- if multilib_is_native_abi ; then |
296 |
- myconf+=( |
297 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
298 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
299 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
300 |
- ) |
301 |
- else |
302 |
- myconf+=( |
303 |
- --disable-bsdcat |
304 |
- --disable-bsdcpio |
305 |
- --disable-bsdtar |
306 |
- ) |
307 |
- fi |
308 |
- |
309 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
310 |
-} |
311 |
- |
312 |
-multilib_src_compile() { |
313 |
- if multilib_is_native_abi ; then |
314 |
- emake |
315 |
- else |
316 |
- emake libarchive.la |
317 |
- fi |
318 |
-} |
319 |
- |
320 |
-multilib_src_test() { |
321 |
- # Replace the default src_test so that it builds tests in parallel |
322 |
- multilib_is_native_abi && emake check |
323 |
-} |
324 |
- |
325 |
-multilib_src_install() { |
326 |
- if multilib_is_native_abi ; then |
327 |
- emake DESTDIR="${D}" install |
328 |
- |
329 |
- # Create symlinks for FreeBSD |
330 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
331 |
- # Exclude cat for the time being #589876 |
332 |
- for bin in cpio tar; do |
333 |
- dosym bsd${bin} /usr/bin/${bin} |
334 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
335 |
- doman "${T}"/${bin}.1 |
336 |
- done |
337 |
- fi |
338 |
- else |
339 |
- local install_targets=( |
340 |
- install-includeHEADERS |
341 |
- install-libLTLIBRARIES |
342 |
- install-pkgconfigDATA |
343 |
- ) |
344 |
- emake DESTDIR="${D}" "${install_targets[@]}" |
345 |
- fi |
346 |
- |
347 |
- # Libs.private: should be used from libarchive.pc instead |
348 |
- prune_libtool_files |
349 |
-} |
350 |
- |
351 |
-multilib_src_install_all() { |
352 |
- cd "${S}" || die |
353 |
- einstalldocs |
354 |
-} |