1 |
commit: a14342e4ce11023ce5eb4b9969d8c6d0a298d80a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 31 06:56:12 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 31 06:56:35 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14342e4 |
7 |
|
8 |
dev-libs/apr: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
dev-libs/apr/Manifest | 2 - |
13 |
dev-libs/apr/apr-1.5.0-r2.ebuild | 139 -------------------- |
14 |
dev-libs/apr/apr-1.5.1-r1.ebuild | 144 --------------------- |
15 |
.../files/apr-1.5.1-parallel_make_install.patch | 19 --- |
16 |
4 files changed, 304 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest |
19 |
index 056054a3308..593061921ed 100644 |
20 |
--- a/dev-libs/apr/Manifest |
21 |
+++ b/dev-libs/apr/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7 |
24 |
-DIST apr-1.5.1.tar.bz2 817569 SHA256 e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac SHA512 0d8dea97490cd0b0689eb090d0e32ab9b582e4a0248ea7028e2a44552fc3839013b18cff985547aa9bbb549d93bc4859cca1d8ef95b32d4d4fd610ed19bde435 WHIRLPOOL 553efdefdb58ae44015ef36505c70b52122b750e6c3f63d9ccaa0878efd476dac249a62e2fb644d3e709c372a2805b1d76869c0e9b880b6273f46ef2e9937ace |
25 |
DIST apr-1.5.2.tar.bz2 826885 SHA256 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d WHIRLPOOL 3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b |
26 |
|
27 |
diff --git a/dev-libs/apr/apr-1.5.0-r2.ebuild b/dev-libs/apr/apr-1.5.0-r2.ebuild |
28 |
deleted file mode 100644 |
29 |
index e038238ae89..00000000000 |
30 |
--- a/dev-libs/apr/apr-1.5.0-r2.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,139 +0,0 @@ |
33 |
-# Copyright 1999-2017 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI="4" |
37 |
- |
38 |
-inherit autotools eutils libtool multilib toolchain-funcs |
39 |
- |
40 |
-DESCRIPTION="Apache Portable Runtime Library" |
41 |
-HOMEPAGE="http://apr.apache.org/" |
42 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="1" |
46 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-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" |
47 |
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
48 |
- |
49 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
50 |
- elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
51 |
-RDEPEND="${CDEPEND} |
52 |
- selinux? ( sec-policy/selinux-apache )" |
53 |
-DEPEND="${CDEPEND} |
54 |
- >=sys-devel/libtool-2.4.2 |
55 |
- doc? ( app-doc/doxygen )" |
56 |
- |
57 |
-DOCS=(CHANGES NOTICE README) |
58 |
- |
59 |
-src_prepare() { |
60 |
- epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch |
61 |
- epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch |
62 |
- epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch |
63 |
- epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 |
64 |
- |
65 |
- epatch_user #449048 |
66 |
- |
67 |
- AT_M4DIR="build" eautoreconf |
68 |
- elibtoolize |
69 |
- |
70 |
- epatch "${FILESDIR}/config.layout.patch" |
71 |
-} |
72 |
- |
73 |
-src_configure() { |
74 |
- local myconf=() |
75 |
- |
76 |
- [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no |
77 |
- |
78 |
- if use older-kernels-compatibility; then |
79 |
- local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec |
80 |
- export apr_cv_accept4="no" |
81 |
- export apr_cv_dup3="no" |
82 |
- export apr_cv_epoll_create1="no" |
83 |
- export apr_cv_sock_cloexec="no" |
84 |
- fi |
85 |
- if tc-is-cross-compiler; then |
86 |
- # The apache project relies heavily on AC_TRY_RUN and doesn't |
87 |
- # have any sane cross-compiling fallback logic. |
88 |
- export \ |
89 |
- ac_cv_file__dev_zero="yes" \ |
90 |
- ac_cv_func_sem_open="yes" \ |
91 |
- ac_cv_negative_eai="yes" \ |
92 |
- ac_cv_o_nonblock_inherited="no" \ |
93 |
- ac_cv_struct_rlimit="yes" \ |
94 |
- ap_cv_atomic_builtins="yes" \ |
95 |
- apr_cv_accept4="yes" \ |
96 |
- apr_cv_dup3="yes" \ |
97 |
- apr_cv_epoll="yes" \ |
98 |
- apr_cv_epoll_create1="yes" \ |
99 |
- apr_cv_gai_addrconfig="yes" \ |
100 |
- apr_cv_mutex_recursive="yes" \ |
101 |
- apr_cv_mutex_robust_shared="yes" \ |
102 |
- apr_cv_process_shared_works="yes" \ |
103 |
- apr_cv_pthreads_lib="-pthread" \ |
104 |
- apr_cv_sock_cloexec="yes" \ |
105 |
- apr_cv_tcp_nodelay_with_cork="yes" |
106 |
- fi |
107 |
- |
108 |
- if use urandom; then |
109 |
- myconf+=( --with-devrandom=/dev/urandom ) |
110 |
- elif (( ${CHOST#*-hpux11.} <= 11 )); then |
111 |
- : # no /dev/*random on hpux11.11 and before, $PN detects this. |
112 |
- else |
113 |
- myconf+=( --with-devrandom=/dev/random ) |
114 |
- fi |
115 |
- |
116 |
- tc-is-static-only && myconf+=( --disable-dso ) |
117 |
- |
118 |
- # shl_load does not search runpath, but hpux11 supports dlopen |
119 |
- [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) |
120 |
- |
121 |
- if [[ ${CHOST} == *-solaris2.10 ]]; then |
122 |
- case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in |
123 |
- *atomic_cas_ptr*) ;; |
124 |
- *) |
125 |
- elog "You do not have Solaris Patch ID "$( |
126 |
- [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 |
127 |
- )" (Problem 4954703) installed on your host ($(hostname))," |
128 |
- elog "using generic atomic operations instead." |
129 |
- myconf+=( --disable-nonportable-atomics ) |
130 |
- ;; |
131 |
- esac |
132 |
- fi |
133 |
- |
134 |
- econf \ |
135 |
- --enable-layout=gentoo \ |
136 |
- --enable-nonportable-atomics \ |
137 |
- --enable-threads \ |
138 |
- $(use_enable static-libs static) \ |
139 |
- "${myconf[@]}" |
140 |
-} |
141 |
- |
142 |
-src_compile() { |
143 |
- if tc-is-cross-compiler; then |
144 |
- # This header is the same across targets, so use the build compiler. |
145 |
- emake tools/gen_test_char |
146 |
- tc-export_build_env BUILD_CC |
147 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
148 |
- tools/gen_test_char.c -o tools/gen_test_char || die |
149 |
- fi |
150 |
- |
151 |
- emake |
152 |
- |
153 |
- if use doc; then |
154 |
- emake dox |
155 |
- fi |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- default |
160 |
- |
161 |
- find "${ED}" -name "*.la" -delete |
162 |
- |
163 |
- if use doc; then |
164 |
- dohtml -r docs/dox/html/* |
165 |
- fi |
166 |
- |
167 |
- # This file is only used on AIX systems, which Gentoo is not, |
168 |
- # and causes collisions between the SLOTs, so remove it. |
169 |
- # Even in Prefix, we don't need this on AIX. |
170 |
- rm -f "${ED}usr/$(get_libdir)/apr.exp" |
171 |
-} |
172 |
|
173 |
diff --git a/dev-libs/apr/apr-1.5.1-r1.ebuild b/dev-libs/apr/apr-1.5.1-r1.ebuild |
174 |
deleted file mode 100644 |
175 |
index 1321e7bdee7..00000000000 |
176 |
--- a/dev-libs/apr/apr-1.5.1-r1.ebuild |
177 |
+++ /dev/null |
178 |
@@ -1,144 +0,0 @@ |
179 |
-# Copyright 1999-2017 Gentoo Foundation |
180 |
-# Distributed under the terms of the GNU General Public License v2 |
181 |
- |
182 |
-EAPI=5 |
183 |
- |
184 |
-inherit autotools eutils libtool multilib toolchain-funcs |
185 |
- |
186 |
-DESCRIPTION="Apache Portable Runtime Library" |
187 |
-HOMEPAGE="http://apr.apache.org/" |
188 |
-SRC_URI="mirror://apache/apr/${P}.tar.bz2" |
189 |
- |
190 |
-LICENSE="Apache-2.0" |
191 |
-SLOT="1" |
192 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-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" |
193 |
-IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" |
194 |
- |
195 |
-CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) |
196 |
- elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" |
197 |
-RDEPEND="${CDEPEND} |
198 |
- selinux? ( sec-policy/selinux-apache )" |
199 |
-DEPEND="${CDEPEND} |
200 |
- >=sys-devel/libtool-2.4.2 |
201 |
- doc? ( app-doc/doxygen )" |
202 |
- |
203 |
-DOCS=(CHANGES NOTICE README) |
204 |
- |
205 |
-src_prepare() { |
206 |
- epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch |
207 |
- epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch |
208 |
- epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch |
209 |
- epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 |
210 |
- epatch "${FILESDIR}"/${PN}-1.5.1-parallel_make_install.patch |
211 |
- |
212 |
- epatch_user #449048 |
213 |
- |
214 |
- AT_M4DIR="build" eautoreconf |
215 |
- elibtoolize |
216 |
- |
217 |
- epatch "${FILESDIR}/config.layout.patch" |
218 |
-} |
219 |
- |
220 |
-src_configure() { |
221 |
- local myconf=() |
222 |
- |
223 |
- [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no |
224 |
- |
225 |
- if use older-kernels-compatibility; then |
226 |
- local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec |
227 |
- export apr_cv_accept4="no" |
228 |
- export apr_cv_dup3="no" |
229 |
- export apr_cv_epoll_create1="no" |
230 |
- export apr_cv_sock_cloexec="no" |
231 |
- fi |
232 |
- if tc-is-cross-compiler; then |
233 |
- # The apache project relies heavily on AC_TRY_RUN and doesn't |
234 |
- # have any sane cross-compiling fallback logic. |
235 |
- export \ |
236 |
- ac_cv_file__dev_zero="yes" \ |
237 |
- ac_cv_func_sem_open="yes" \ |
238 |
- ac_cv_negative_eai="yes" \ |
239 |
- ac_cv_o_nonblock_inherited="no" \ |
240 |
- ac_cv_struct_rlimit="yes" \ |
241 |
- ap_cv_atomic_builtins="yes" \ |
242 |
- apr_cv_accept4="yes" \ |
243 |
- apr_cv_dup3="yes" \ |
244 |
- apr_cv_epoll="yes" \ |
245 |
- apr_cv_epoll_create1="yes" \ |
246 |
- apr_cv_gai_addrconfig="yes" \ |
247 |
- apr_cv_mutex_recursive="yes" \ |
248 |
- apr_cv_mutex_robust_shared="yes" \ |
249 |
- apr_cv_process_shared_works="yes" \ |
250 |
- apr_cv_pthreads_lib="-pthread" \ |
251 |
- apr_cv_sock_cloexec="yes" \ |
252 |
- apr_cv_tcp_nodelay_with_cork="yes" |
253 |
- fi |
254 |
- |
255 |
- if use urandom; then |
256 |
- myconf+=( --with-devrandom=/dev/urandom ) |
257 |
- elif (( ${CHOST#*-hpux11.} <= 11 )); then |
258 |
- : # no /dev/*random on hpux11.11 and before, $PN detects this. |
259 |
- else |
260 |
- myconf+=( --with-devrandom=/dev/random ) |
261 |
- fi |
262 |
- |
263 |
- tc-is-static-only && myconf+=( --disable-dso ) |
264 |
- |
265 |
- # shl_load does not search runpath, but hpux11 supports dlopen |
266 |
- [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) |
267 |
- |
268 |
- if [[ ${CHOST} == *-solaris2.10 ]]; then |
269 |
- case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in |
270 |
- *atomic_cas_ptr*) ;; |
271 |
- *) |
272 |
- elog "You do not have Solaris Patch ID "$( |
273 |
- [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 |
274 |
- )" (Problem 4954703) installed on your host ($(hostname))," |
275 |
- elog "using generic atomic operations instead." |
276 |
- myconf+=( --disable-nonportable-atomics ) |
277 |
- ;; |
278 |
- esac |
279 |
- fi |
280 |
- |
281 |
- econf \ |
282 |
- --enable-layout=gentoo \ |
283 |
- --enable-nonportable-atomics \ |
284 |
- --enable-posix-shm \ |
285 |
- --enable-threads \ |
286 |
- $(use_enable static-libs static) \ |
287 |
- "${myconf[@]}" |
288 |
-} |
289 |
- |
290 |
-src_compile() { |
291 |
- if tc-is-cross-compiler; then |
292 |
- # This header is the same across targets, so use the build compiler. |
293 |
- emake tools/gen_test_char |
294 |
- tc-export_build_env BUILD_CC |
295 |
- ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ |
296 |
- tools/gen_test_char.c -o tools/gen_test_char || die |
297 |
- fi |
298 |
- |
299 |
- emake |
300 |
- |
301 |
- if use doc; then |
302 |
- emake dox |
303 |
- fi |
304 |
-} |
305 |
- |
306 |
-src_install() { |
307 |
- default |
308 |
- |
309 |
- # Prallel install breaks since apr-1.5.1 |
310 |
- #make -j1 DESTDIR="${D}" install || die |
311 |
- |
312 |
- prune_libtool_files --all |
313 |
- |
314 |
- if use doc; then |
315 |
- dohtml -r docs/dox/html/* |
316 |
- fi |
317 |
- |
318 |
- # This file is only used on AIX systems, which Gentoo is not, |
319 |
- # and causes collisions between the SLOTs, so remove it. |
320 |
- # Even in Prefix, we don't need this on AIX. |
321 |
- rm -f "${ED}usr/$(get_libdir)/apr.exp" |
322 |
-} |
323 |
|
324 |
diff --git a/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch b/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch |
325 |
deleted file mode 100644 |
326 |
index a58a229c378..00000000000 |
327 |
--- a/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch |
328 |
+++ /dev/null |
329 |
@@ -1,19 +0,0 @@ |
330 |
-http://www.mail-archive.com/dev@××××××××××.org/msg25738.html |
331 |
- |
332 |
---- apr-1.5.1/Makefile.in |
333 |
-+++ apr-1.5.1/Makefile.in |
334 |
-@@ -129,11 +129,11 @@ |
335 |
- etags: |
336 |
- etags `find . -name '*.[ch]'` |
337 |
- |
338 |
--make_tools_dir: |
339 |
-+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) |
340 |
-+tools/gen_test_char.lo: tools/gen_test_char.c |
341 |
- $(APR_MKDIR) tools |
342 |
-+ $(LT_COMPILE) |
343 |
- |
344 |
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) |
345 |
--tools/gen_test_char.lo: make_tools_dir |
346 |
- tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) |
347 |
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) |
348 |
- |