Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/libarchive/
Date: Wed, 05 Aug 2020 15:18:41
Message-Id: 1596640703.233c5309547e3d8d01818d65f690ef230708420a.mgorny@gentoo
1 commit: 233c5309547e3d8d01818d65f690ef230708420a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 5 15:13:23 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 5 15:18:23 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233c5309
7
8 app-arch/libarchive: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-arch/libarchive/Manifest | 1 -
13 app-arch/libarchive/libarchive-3.4.2.ebuild | 134 ----------------------------
14 2 files changed, 135 deletions(-)
15
16 diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
17 index 30ac772f2d0..0878de80977 100644
18 --- a/app-arch/libarchive/Manifest
19 +++ b/app-arch/libarchive/Manifest
20 @@ -1,2 +1 @@
21 -DIST libarchive-3.4.2.tar.gz 6979481 BLAKE2B eea90e4751ae487cd1a9b0eecd16598d1b81ffff665ae97a160e3858c8ffe60b82003f081af644f3f32260d0e1d3f3077240125e8279bf8111a79d93c68ac25d SHA512 a8922e54f2e985889d205ee8a0594c1d30dad950438b602a5be6bb1b274a735ad20a48ed484efd458013a0810d26ee4ae76e3a6c820823243d24ea0593ed7021
22 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
23
24 diff --git a/app-arch/libarchive/libarchive-3.4.2.ebuild b/app-arch/libarchive/libarchive-3.4.2.ebuild
25 deleted file mode 100644
26 index d9f9a71caad..00000000000
27 --- a/app-arch/libarchive/libarchive-3.4.2.ebuild
28 +++ /dev/null
29 @@ -1,134 +0,0 @@
30 -# Copyright 1999-2020 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -inherit libtool multilib-minimal toolchain-funcs
35 -
36 -DESCRIPTION="Multi-format archive and compression library"
37 -HOMEPAGE="https://www.libarchive.org/"
38 -SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
39 -
40 -LICENSE="BSD BSD-2 BSD-4 public-domain"
41 -SLOT="0/13"
42 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
43 -IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
44 -
45 -RDEPEND="
46 - acl? ( virtual/acl[${MULTILIB_USEDEP}] )
47 - blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
48 - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
49 - expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
50 - !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
51 - iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
52 - kernel_linux? (
53 - xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
54 - )
55 - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
56 - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
57 - lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
58 - lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
59 - lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
60 - nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
61 - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
62 - zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
63 -DEPEND="${RDEPEND}
64 - kernel_linux? (
65 - virtual/os-headers
66 - e2fsprogs? ( sys-fs/e2fsprogs )
67 - )"
68 -
69 -PATCHES=(
70 - "${FILESDIR}"/${PN}-3.3.3-libressl.patch
71 -)
72 -
73 -# Various test problems, starting with the fact that sandbox
74 -# explodes on long paths. https://bugs.gentoo.org/598806
75 -RESTRICT="test"
76 -
77 -src_prepare() {
78 - default
79 - elibtoolize # is required for Solaris sol2_ld linker fix
80 -}
81 -
82 -multilib_src_configure() {
83 - export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
84 -
85 - local myconf=(
86 - $(use_enable acl)
87 - $(use_enable static-libs static)
88 - $(use_enable xattr)
89 - $(use_with blake2 libb2)
90 - $(use_with bzip2 bz2lib)
91 - $(use_with expat)
92 - $(use_with !expat xml2)
93 - $(use_with iconv)
94 - $(use_with lz4)
95 - $(use_with lzma)
96 - $(use_with lzo lzo2)
97 - $(use_with nettle)
98 - $(use_with zlib)
99 - $(use_with zstd)
100 -
101 - # Windows-specific
102 - --without-cng
103 - )
104 - if multilib_is_native_abi ; then
105 - myconf+=(
106 - --enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
107 - --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
108 - --enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
109 - )
110 - else
111 - myconf+=(
112 - --disable-bsdcat
113 - --disable-bsdcpio
114 - --disable-bsdtar
115 - )
116 - fi
117 -
118 - ECONF_SOURCE="${S}" econf "${myconf[@]}"
119 -}
120 -
121 -multilib_src_compile() {
122 - if multilib_is_native_abi ; then
123 - emake
124 - else
125 - emake libarchive.la
126 - fi
127 -}
128 -
129 -multilib_src_test() {
130 - # Replace the default src_test so that it builds tests in parallel
131 - multilib_is_native_abi && emake check
132 -}
133 -
134 -multilib_src_install() {
135 - if multilib_is_native_abi ; then
136 - emake DESTDIR="${D}" install
137 -
138 - # Create symlinks for FreeBSD
139 - if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
140 - # Exclude cat for the time being #589876
141 - for bin in cpio tar; do
142 - dosym bsd${bin} /usr/bin/${bin}
143 - echo '.so bsd${bin}.1' > "${T}"/${bin}.1
144 - doman "${T}"/${bin}.1
145 - done
146 - fi
147 - else
148 - local install_targets=(
149 - install-includeHEADERS
150 - install-libLTLIBRARIES
151 - install-pkgconfigDATA
152 - )
153 - emake DESTDIR="${D}" "${install_targets[@]}"
154 - fi
155 -
156 - # Libs.private: should be used from libarchive.pc instead
157 - find "${ED}" -type f -name "*.la" -delete || die
158 -}
159 -
160 -multilib_src_install_all() {
161 - cd "${S}" || die
162 - einstalldocs
163 -}