1 |
commit: 05ce6f122db963b02af9b6356fbd763be77ee77d |
2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 20 18:45:17 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 20 18:45:17 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=05ce6f12 |
7 |
|
8 |
app-arch/*: drop as gentoo.git is carrying patches now |
9 |
|
10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
11 |
|
12 |
app-arch/libarchive/Manifest | 1 - |
13 |
.../files/libarchive-3.3.2-libressl-2.7.patch | 14 --- |
14 |
app-arch/libarchive/libarchive-3.3.2.ebuild | 128 --------------------- |
15 |
app-arch/libarchive/metadata.xml | 36 ------ |
16 |
4 files changed, 179 deletions(-) |
17 |
|
18 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
19 |
deleted file mode 100644 |
20 |
index 1e3ae30..0000000 |
21 |
--- a/app-arch/libarchive/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 |
25 |
|
26 |
diff --git a/app-arch/libarchive/files/libarchive-3.3.2-libressl-2.7.patch b/app-arch/libarchive/files/libarchive-3.3.2-libressl-2.7.patch |
27 |
deleted file mode 100644 |
28 |
index 252d9e4..0000000 |
29 |
--- a/app-arch/libarchive/files/libarchive-3.3.2-libressl-2.7.patch |
30 |
+++ /dev/null |
31 |
@@ -1,14 +0,0 @@ |
32 |
-$OpenBSD: patch-libarchive_archive_openssl_hmac_private_h,v 1.3 2018/02/18 14:57:47 sthen Exp $ |
33 |
- |
34 |
---- a/libarchive/archive_openssl_hmac_private.h |
35 |
-+++ b/libarchive/archive_openssl_hmac_private.h |
36 |
-@@ -28,7 +28,8 @@ |
37 |
- #include <openssl/hmac.h> |
38 |
- #include <openssl/opensslv.h> |
39 |
- |
40 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
41 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
42 |
-+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) |
43 |
- #include <stdlib.h> /* malloc, free */ |
44 |
- #include <string.h> /* memset */ |
45 |
- static inline HMAC_CTX *HMAC_CTX_new(void) |
46 |
|
47 |
diff --git a/app-arch/libarchive/libarchive-3.3.2.ebuild b/app-arch/libarchive/libarchive-3.3.2.ebuild |
48 |
deleted file mode 100644 |
49 |
index d6134b1..0000000 |
50 |
--- a/app-arch/libarchive/libarchive-3.3.2.ebuild |
51 |
+++ /dev/null |
52 |
@@ -1,128 +0,0 @@ |
53 |
-# Copyright 1999-2018 Gentoo Foundation |
54 |
-# Distributed under the terms of the GNU General Public License v2 |
55 |
- |
56 |
-EAPI=6 |
57 |
-inherit eutils libtool multilib-minimal toolchain-funcs |
58 |
- |
59 |
-DESCRIPTION="BSD tar command" |
60 |
-HOMEPAGE="http://www.libarchive.org/" |
61 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
62 |
- |
63 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
64 |
-SLOT="0/13" |
65 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
66 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" |
67 |
- |
68 |
-RDEPEND=" |
69 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
70 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
71 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
72 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
73 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
74 |
- kernel_linux? ( |
75 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
76 |
- ) |
77 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
78 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
79 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
80 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
81 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
82 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
83 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
84 |
-DEPEND="${RDEPEND} |
85 |
- kernel_linux? ( |
86 |
- virtual/os-headers |
87 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
88 |
- )" |
89 |
- |
90 |
-PATCHES=( |
91 |
- "${FILESDIR}"/${PN}-3.3.2-libressl-2.7.patch |
92 |
-) |
93 |
- |
94 |
-# Various test problems, starting with the fact that sandbox |
95 |
-# explodes on long paths. https://bugs.gentoo.org/598806 |
96 |
-RESTRICT="test" |
97 |
- |
98 |
-src_prepare() { |
99 |
- default |
100 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
101 |
-} |
102 |
- |
103 |
-multilib_src_configure() { |
104 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
105 |
- |
106 |
- local myconf=() |
107 |
- myconf=( |
108 |
- $(use_enable acl) |
109 |
- $(use_enable static-libs static) |
110 |
- $(use_enable xattr) |
111 |
- $(use_with bzip2 bz2lib) |
112 |
- $(use_with expat) |
113 |
- $(use_with !expat xml2) |
114 |
- $(use_with iconv) |
115 |
- $(use_with lz4) |
116 |
- $(use_with lzma) |
117 |
- $(use_with lzo lzo2) |
118 |
- $(use_with nettle) |
119 |
- $(use_with zlib) |
120 |
- ) |
121 |
- if multilib_is_native_abi ; then |
122 |
- myconf+=( |
123 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
124 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
125 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
126 |
- ) |
127 |
- else |
128 |
- myconf+=( |
129 |
- --disable-bsdcat |
130 |
- --disable-bsdcpio |
131 |
- --disable-bsdtar |
132 |
- ) |
133 |
- fi |
134 |
- |
135 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
136 |
-} |
137 |
- |
138 |
-multilib_src_compile() { |
139 |
- if multilib_is_native_abi ; then |
140 |
- emake |
141 |
- else |
142 |
- emake libarchive.la |
143 |
- fi |
144 |
-} |
145 |
- |
146 |
-multilib_src_test() { |
147 |
- # Replace the default src_test so that it builds tests in parallel |
148 |
- multilib_is_native_abi && emake check |
149 |
-} |
150 |
- |
151 |
-multilib_src_install() { |
152 |
- if multilib_is_native_abi ; then |
153 |
- emake DESTDIR="${D}" install |
154 |
- |
155 |
- # Create symlinks for FreeBSD |
156 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
157 |
- # Exclude cat for the time being #589876 |
158 |
- for bin in cpio tar; do |
159 |
- dosym bsd${bin} /usr/bin/${bin} |
160 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
161 |
- doman "${T}"/${bin}.1 |
162 |
- done |
163 |
- fi |
164 |
- else |
165 |
- local install_targets=( |
166 |
- install-includeHEADERS |
167 |
- install-libLTLIBRARIES |
168 |
- install-pkgconfigDATA |
169 |
- ) |
170 |
- emake DESTDIR="${D}" "${install_targets[@]}" |
171 |
- fi |
172 |
- |
173 |
- # Libs.private: should be used from libarchive.pc instead |
174 |
- prune_libtool_files |
175 |
-} |
176 |
- |
177 |
-multilib_src_install_all() { |
178 |
- cd "${S}" || die |
179 |
- einstalldocs |
180 |
-} |
181 |
|
182 |
diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml |
183 |
deleted file mode 100644 |
184 |
index 126e3e2..0000000 |
185 |
--- a/app-arch/libarchive/metadata.xml |
186 |
+++ /dev/null |
187 |
@@ -1,36 +0,0 @@ |
188 |
-<?xml version="1.0" encoding="UTF-8"?> |
189 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
190 |
-<pkgmetadata> |
191 |
- <maintainer type="project"> |
192 |
- <email>bsd@g.o</email> |
193 |
- <name>BSD Project</name> |
194 |
- </maintainer> |
195 |
- <longdescription lang="en"> |
196 |
- The bsdtar program creates and manipulates streaming archive files. |
197 |
- It has a number of advantages over previous tar implementations. |
198 |
- </longdescription> |
199 |
- <use> |
200 |
- <flag name="bzip2"> |
201 |
- Allow accessing bzip2-compressed archives through libbz2 (which |
202 |
- comes with <pkg>app-arch/bzip2</pkg>). This only affects |
203 |
- libarchive's native support: bsdtar will keep using bunzip2 as a |
204 |
- filter if that's not built-in. |
205 |
- </flag> |
206 |
- <flag name="e2fsprogs"> |
207 |
- Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers</pkg> headers |
208 |
- </flag> |
209 |
- <flag name="lz4"> |
210 |
- Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg> |
211 |
- </flag> |
212 |
- <flag name="nettle"> |
213 |
- Use <pkg>dev-libs/nettle</pkg> as crypto backend |
214 |
- </flag> |
215 |
- <flag name="zlib"> |
216 |
- Allow accessing gzip-compressed archives through |
217 |
- <pkg>sys-libs/zlib</pkg>. This only affects libarchive's native |
218 |
- support: bsdtar will keep using gunzip as a filter if that's not |
219 |
- built-in. It's also needed for supporting extraction of ZIP |
220 |
- files. |
221 |
- </flag> |
222 |
- </use> |
223 |
-</pkgmetadata> |