1 |
commit: cbf1548ee4a1027d572e1979446d5f3e2300ec46 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 21 06:29:14 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 21 10:08:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf1548e |
7 |
|
8 |
app-arch/libarchive: Remove redundant versions |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-arch/libarchive/Manifest | 2 - |
13 |
app-arch/libarchive/libarchive-3.3.3.ebuild | 133 --------------------------- |
14 |
app-arch/libarchive/libarchive-3.4.1.ebuild | 134 ---------------------------- |
15 |
3 files changed, 269 deletions(-) |
16 |
|
17 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
18 |
index 46f807ed6b3..b9aec85d512 100644 |
19 |
--- a/app-arch/libarchive/Manifest |
20 |
+++ b/app-arch/libarchive/Manifest |
21 |
@@ -1,4 +1,2 @@ |
22 |
-DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 |
23 |
DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852 |
24 |
-DIST libarchive-3.4.1.tar.gz 6931920 BLAKE2B e1175cac67dd265be711005ff19dc16cf807cfd2f3f77f4530165adbc11bb33b58bdb28815b7d787414b8f4c3ec180a5607283618e5c319447a414141c89c19d SHA512 fa7e9e5c8c00cd7e98f0ff373c300771f0a87317bca031c3030bac29b96b02ab66cf34905147e4135824bf9cdfdd1dedf3032e93d6d706c9a11e968da1ed8dad |
25 |
DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021 |
26 |
|
27 |
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild |
28 |
deleted file mode 100644 |
29 |
index a7ad73662a3..00000000000 |
30 |
--- a/app-arch/libarchive/libarchive-3.3.3.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,133 +0,0 @@ |
33 |
-# Copyright 1999-2020 Gentoo Authors |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=7 |
37 |
-inherit libtool multilib-minimal toolchain-funcs |
38 |
- |
39 |
-DESCRIPTION="Multi-format archive and compression library" |
40 |
-HOMEPAGE="https://www.libarchive.org/" |
41 |
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" |
42 |
- |
43 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
44 |
-SLOT="0/13" |
45 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
46 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" |
47 |
- |
48 |
-RDEPEND=" |
49 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
50 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
51 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
52 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
53 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
54 |
- kernel_linux? ( |
55 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
56 |
- ) |
57 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
58 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
59 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
60 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
61 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
62 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
63 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
64 |
- zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )" |
65 |
-DEPEND="${RDEPEND} |
66 |
- kernel_linux? ( |
67 |
- virtual/os-headers |
68 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
69 |
- )" |
70 |
- |
71 |
-PATCHES=( |
72 |
- "${FILESDIR}"/${PN}-3.3.3-libressl.patch |
73 |
-) |
74 |
- |
75 |
-# Various test problems, starting with the fact that sandbox |
76 |
-# explodes on long paths. https://bugs.gentoo.org/598806 |
77 |
-RESTRICT="test" |
78 |
- |
79 |
-src_prepare() { |
80 |
- default |
81 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
82 |
-} |
83 |
- |
84 |
-multilib_src_configure() { |
85 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
86 |
- |
87 |
- local myconf=() |
88 |
- myconf=( |
89 |
- $(use_enable acl) |
90 |
- $(use_enable static-libs static) |
91 |
- $(use_enable xattr) |
92 |
- $(use_with bzip2 bz2lib) |
93 |
- $(use_with expat) |
94 |
- $(use_with !expat xml2) |
95 |
- $(use_with iconv) |
96 |
- $(use_with lz4) |
97 |
- $(use_with lzma) |
98 |
- $(use_with lzo lzo2) |
99 |
- $(use_with nettle) |
100 |
- $(use_with zlib) |
101 |
- $(use_with zstd) |
102 |
- |
103 |
- # Windows-specific |
104 |
- --without-cng |
105 |
- ) |
106 |
- if multilib_is_native_abi ; then |
107 |
- myconf+=( |
108 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
109 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
110 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
111 |
- ) |
112 |
- else |
113 |
- myconf+=( |
114 |
- --disable-bsdcat |
115 |
- --disable-bsdcpio |
116 |
- --disable-bsdtar |
117 |
- ) |
118 |
- fi |
119 |
- |
120 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
121 |
-} |
122 |
- |
123 |
-multilib_src_compile() { |
124 |
- if multilib_is_native_abi ; then |
125 |
- emake |
126 |
- else |
127 |
- emake libarchive.la |
128 |
- fi |
129 |
-} |
130 |
- |
131 |
-multilib_src_test() { |
132 |
- # Replace the default src_test so that it builds tests in parallel |
133 |
- multilib_is_native_abi && emake check |
134 |
-} |
135 |
- |
136 |
-multilib_src_install() { |
137 |
- if multilib_is_native_abi ; then |
138 |
- emake DESTDIR="${D}" install |
139 |
- |
140 |
- # Create symlinks for FreeBSD |
141 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
142 |
- # Exclude cat for the time being #589876 |
143 |
- for bin in cpio tar; do |
144 |
- dosym bsd${bin} /usr/bin/${bin} |
145 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
146 |
- doman "${T}"/${bin}.1 |
147 |
- done |
148 |
- fi |
149 |
- else |
150 |
- local install_targets=( |
151 |
- install-includeHEADERS |
152 |
- install-libLTLIBRARIES |
153 |
- install-pkgconfigDATA |
154 |
- ) |
155 |
- emake DESTDIR="${D}" "${install_targets[@]}" |
156 |
- fi |
157 |
- |
158 |
- # Libs.private: should be used from libarchive.pc instead |
159 |
- find "${ED}" -name "*.la" -delete || die |
160 |
-} |
161 |
- |
162 |
-multilib_src_install_all() { |
163 |
- cd "${S}" || die |
164 |
- einstalldocs |
165 |
-} |
166 |
|
167 |
diff --git a/app-arch/libarchive/libarchive-3.4.1.ebuild b/app-arch/libarchive/libarchive-3.4.1.ebuild |
168 |
deleted file mode 100644 |
169 |
index c4d0a5b1fc9..00000000000 |
170 |
--- a/app-arch/libarchive/libarchive-3.4.1.ebuild |
171 |
+++ /dev/null |
172 |
@@ -1,134 +0,0 @@ |
173 |
-# Copyright 1999-2020 Gentoo Authors |
174 |
-# Distributed under the terms of the GNU General Public License v2 |
175 |
- |
176 |
-EAPI=7 |
177 |
-inherit libtool multilib-minimal toolchain-funcs |
178 |
- |
179 |
-DESCRIPTION="Multi-format archive and compression library" |
180 |
-HOMEPAGE="https://www.libarchive.org/" |
181 |
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz" |
182 |
- |
183 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
184 |
-SLOT="0/13" |
185 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
186 |
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd" |
187 |
- |
188 |
-RDEPEND=" |
189 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
190 |
- blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] ) |
191 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
192 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
193 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
194 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
195 |
- kernel_linux? ( |
196 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
197 |
- ) |
198 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
199 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
200 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
201 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
202 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
203 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
204 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
205 |
- zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )" |
206 |
-DEPEND="${RDEPEND} |
207 |
- kernel_linux? ( |
208 |
- virtual/os-headers |
209 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
210 |
- )" |
211 |
- |
212 |
-PATCHES=( |
213 |
- "${FILESDIR}"/${PN}-3.3.3-libressl.patch |
214 |
-) |
215 |
- |
216 |
-# Various test problems, starting with the fact that sandbox |
217 |
-# explodes on long paths. https://bugs.gentoo.org/598806 |
218 |
-RESTRICT="test" |
219 |
- |
220 |
-src_prepare() { |
221 |
- default |
222 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
223 |
-} |
224 |
- |
225 |
-multilib_src_configure() { |
226 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
227 |
- |
228 |
- local myconf=( |
229 |
- $(use_enable acl) |
230 |
- $(use_enable static-libs static) |
231 |
- $(use_enable xattr) |
232 |
- $(use_with blake2 libb2) |
233 |
- $(use_with bzip2 bz2lib) |
234 |
- $(use_with expat) |
235 |
- $(use_with !expat xml2) |
236 |
- $(use_with iconv) |
237 |
- $(use_with lz4) |
238 |
- $(use_with lzma) |
239 |
- $(use_with lzo lzo2) |
240 |
- $(use_with nettle) |
241 |
- $(use_with zlib) |
242 |
- $(use_with zstd) |
243 |
- |
244 |
- # Windows-specific |
245 |
- --without-cng |
246 |
- ) |
247 |
- if multilib_is_native_abi ; then |
248 |
- myconf+=( |
249 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
250 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
251 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
252 |
- ) |
253 |
- else |
254 |
- myconf+=( |
255 |
- --disable-bsdcat |
256 |
- --disable-bsdcpio |
257 |
- --disable-bsdtar |
258 |
- ) |
259 |
- fi |
260 |
- |
261 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
262 |
-} |
263 |
- |
264 |
-multilib_src_compile() { |
265 |
- if multilib_is_native_abi ; then |
266 |
- emake |
267 |
- else |
268 |
- emake libarchive.la |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-multilib_src_test() { |
273 |
- # Replace the default src_test so that it builds tests in parallel |
274 |
- multilib_is_native_abi && emake check |
275 |
-} |
276 |
- |
277 |
-multilib_src_install() { |
278 |
- if multilib_is_native_abi ; then |
279 |
- emake DESTDIR="${D}" install |
280 |
- |
281 |
- # Create symlinks for FreeBSD |
282 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
283 |
- # Exclude cat for the time being #589876 |
284 |
- for bin in cpio tar; do |
285 |
- dosym bsd${bin} /usr/bin/${bin} |
286 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
287 |
- doman "${T}"/${bin}.1 |
288 |
- done |
289 |
- fi |
290 |
- else |
291 |
- local install_targets=( |
292 |
- install-includeHEADERS |
293 |
- install-libLTLIBRARIES |
294 |
- install-pkgconfigDATA |
295 |
- ) |
296 |
- emake DESTDIR="${D}" "${install_targets[@]}" |
297 |
- fi |
298 |
- |
299 |
- # Libs.private: should be used from libarchive.pc instead |
300 |
- find "${ED}" -type f -name "*.la" -delete || die |
301 |
-} |
302 |
- |
303 |
-multilib_src_install_all() { |
304 |
- cd "${S}" || die |
305 |
- einstalldocs |
306 |
-} |