Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/
Date: Sat, 15 Sep 2018 19:08:40
Message-Id: 1537038508.16b949a0c3bc1c3e9888cf5f97a3ae60ce215f56.polynomial-c@gentoo
1 commit: 16b949a0c3bc1c3e9888cf5f97a3ae60ce215f56
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 15 19:08:10 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 15 19:08:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b949a0
7
8 dev-libs/apr: Removed old.
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 dev-libs/apr/Manifest | 1 -
13 dev-libs/apr/apr-1.6.2.ebuild | 146 --------------------------------------
14 dev-libs/apr/apr-1.6.3-r1.ebuild | 147 ---------------------------------------
15 dev-libs/apr/apr-1.6.3.ebuild | 146 --------------------------------------
16 4 files changed, 440 deletions(-)
17
18 diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
19 index 68b370da892..67aab0480ef 100644
20 --- a/dev-libs/apr/Manifest
21 +++ b/dev-libs/apr/Manifest
22 @@ -1,4 +1,3 @@
23 DIST apr-1.5.2.tar.bz2 826885 BLAKE2B 62953c31cd6cb9a80142cf65f791543febffd1716d9e4babd55c8010c6fc6e60ba3c287b21e146c19446185c03407f3990d862a0b9816039c2d1b7158ac90cd3 SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d
24 -DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb4393c395b66daee3d6217f17ff1c895dc1cba498b0244f32b8b00dccc76f2d84a5b3dde053458e7557753e446 SHA512 20f449fde522f186b919b64ce6f90073b267557e17438607d31af917eca7941222dd7a7379d66f1430ff68f7e28fbccd140d24f3ca7aae8a876a550b19de284a
25 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
26 DIST apr-1.6.5.tar.bz2 855393 BLAKE2B ee01a841aaf5e98175c77e406baebcd82a2148bb8220f2cfac00d91dff38525606bb0f66ecb549eb6edf1fece53cb4eec4876423a864f09ce42bd0d999dc77e6 SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
27
28 diff --git a/dev-libs/apr/apr-1.6.2.ebuild b/dev-libs/apr/apr-1.6.2.ebuild
29 deleted file mode 100644
30 index 67376760d71..00000000000
31 --- a/dev-libs/apr/apr-1.6.2.ebuild
32 +++ /dev/null
33 @@ -1,146 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit autotools libtool ltprune multilib toolchain-funcs
40 -
41 -DESCRIPTION="Apache Portable Runtime Library"
42 -HOMEPAGE="https://apr.apache.org/"
43 -SRC_URI="mirror://apache/apr/${P}.tar.bz2"
44 -
45 -LICENSE="Apache-2.0"
46 -SLOT="1"
47 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
48 -IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
49 -
50 -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
51 - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
52 -RDEPEND="${CDEPEND}
53 - selinux? ( sec-policy/selinux-apache )"
54 -DEPEND="${CDEPEND}
55 - >=sys-devel/libtool-2.4.2
56 - doc? ( app-doc/doxygen )"
57 -
58 -DOCS=( CHANGES NOTICE README )
59 -
60 -PATCHES=(
61 - "${FILESDIR}"/${PN}-1.5.0-mint.patch
62 - "${FILESDIR}"/${PN}-1.5.0-libtool.patch
63 - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
64 - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
65 -)
66 -
67 -src_prepare() {
68 - default
69 -
70 - AT_M4DIR="build" eautoreconf
71 - elibtoolize
72 -
73 - eapply "${FILESDIR}/config.layout.patch"
74 -}
75 -
76 -src_configure() {
77 - local myconf=(
78 - --enable-layout=gentoo
79 - --enable-nonportable-atomics
80 - --enable-posix-shm
81 - --enable-threads
82 - $(use_enable static-libs static)
83 - )
84 -
85 - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
86 -
87 - if use older-kernels-compatibility; then
88 - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
89 - export apr_cv_accept4="no"
90 - export apr_cv_dup3="no"
91 - export apr_cv_epoll_create1="no"
92 - export apr_cv_sock_cloexec="no"
93 - fi
94 - if tc-is-cross-compiler; then
95 - # The apache project relies heavily on AC_TRY_RUN and doesn't
96 - # have any sane cross-compiling fallback logic.
97 - export \
98 - ac_cv_file__dev_zero="yes" \
99 - ac_cv_func_sem_open="yes" \
100 - ac_cv_negative_eai="yes" \
101 - ac_cv_o_nonblock_inherited="no" \
102 - ac_cv_struct_rlimit="yes" \
103 - ap_cv_atomic_builtins="yes" \
104 - apr_cv_accept4="yes" \
105 - apr_cv_dup3="yes" \
106 - apr_cv_epoll="yes" \
107 - apr_cv_epoll_create1="yes" \
108 - apr_cv_gai_addrconfig="yes" \
109 - apr_cv_mutex_recursive="yes" \
110 - apr_cv_mutex_robust_shared="yes" \
111 - apr_cv_process_shared_works="yes" \
112 - apr_cv_pthreads_lib="-pthread" \
113 - apr_cv_sock_cloexec="yes" \
114 - apr_cv_tcp_nodelay_with_cork="yes"
115 - fi
116 -
117 - if use urandom; then
118 - myconf+=( --with-devrandom=/dev/urandom )
119 - elif (( ${CHOST#*-hpux11.} <= 11 )); then
120 - : # no /dev/*random on hpux11.11 and before, $PN detects this.
121 - else
122 - myconf+=( --with-devrandom=/dev/random )
123 - fi
124 -
125 - tc-is-static-only && myconf+=( --disable-dso )
126 -
127 - # shl_load does not search runpath, but hpux11 supports dlopen
128 - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
129 -
130 - if [[ ${CHOST} == *-solaris2.10 ]]; then
131 - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
132 - *atomic_cas_ptr*) ;;
133 - *)
134 - elog "You do not have Solaris Patch ID "$(
135 - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
136 - )" (Problem 4954703) installed on your host ($(hostname)),"
137 - elog "using generic atomic operations instead."
138 - myconf+=( --disable-nonportable-atomics )
139 - ;;
140 - esac
141 - fi
142 -
143 - econf "${myconf[@]}"
144 -}
145 -
146 -src_compile() {
147 - if tc-is-cross-compiler; then
148 - # This header is the same across targets, so use the build compiler.
149 - emake tools/gen_test_char
150 - tc-export_build_env BUILD_CC
151 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
152 - tools/gen_test_char.c -o tools/gen_test_char || die
153 - fi
154 -
155 - emake
156 -
157 - if use doc; then
158 - emake dox
159 - fi
160 -}
161 -
162 -src_install() {
163 - default
164 -
165 - # Prallel install breaks since apr-1.5.1
166 - #make -j1 DESTDIR="${D}" install || die
167 -
168 - prune_libtool_files --all
169 -
170 - if use doc; then
171 - docinto html
172 - dodoc -r docs/dox/html/*
173 - fi
174 -
175 - # This file is only used on AIX systems, which Gentoo is not,
176 - # and causes collisions between the SLOTs, so remove it.
177 - # Even in Prefix, we don't need this on AIX.
178 - rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
179 -}
180
181 diff --git a/dev-libs/apr/apr-1.6.3-r1.ebuild b/dev-libs/apr/apr-1.6.3-r1.ebuild
182 deleted file mode 100644
183 index b158e12bf63..00000000000
184 --- a/dev-libs/apr/apr-1.6.3-r1.ebuild
185 +++ /dev/null
186 @@ -1,147 +0,0 @@
187 -# Copyright 1999-2018 Gentoo Foundation
188 -# Distributed under the terms of the GNU General Public License v2
189 -
190 -EAPI=6
191 -
192 -inherit autotools libtool ltprune multilib toolchain-funcs
193 -
194 -DESCRIPTION="Apache Portable Runtime Library"
195 -HOMEPAGE="https://apr.apache.org/"
196 -SRC_URI="mirror://apache/apr/${P}.tar.bz2"
197 -
198 -LICENSE="Apache-2.0"
199 -SLOT="1/${PV%.*}"
200 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
201 -IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
202 -
203 -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
204 - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
205 -RDEPEND="${CDEPEND}
206 - selinux? ( sec-policy/selinux-apache )"
207 -DEPEND="${CDEPEND}
208 - >=sys-devel/libtool-2.4.2
209 - doc? ( app-doc/doxygen )"
210 -
211 -DOCS=( CHANGES NOTICE README )
212 -
213 -PATCHES=(
214 - "${FILESDIR}"/${PN}-1.5.0-mint.patch
215 - "${FILESDIR}"/${PN}-1.5.0-libtool.patch
216 - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
217 - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
218 -)
219 -
220 -src_prepare() {
221 - default
222 -
223 - mv configure.in configure.ac || die
224 - AT_M4DIR="build" eautoreconf
225 - elibtoolize
226 -
227 - eapply "${FILESDIR}/config.layout.patch"
228 -}
229 -
230 -src_configure() {
231 - local myconf=(
232 - --enable-layout=gentoo
233 - --enable-nonportable-atomics
234 - --enable-posix-shm
235 - --enable-threads
236 - $(use_enable static-libs static)
237 - )
238 -
239 - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
240 -
241 - if use older-kernels-compatibility; then
242 - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
243 - export apr_cv_accept4="no"
244 - export apr_cv_dup3="no"
245 - export apr_cv_epoll_create1="no"
246 - export apr_cv_sock_cloexec="no"
247 - fi
248 - if tc-is-cross-compiler; then
249 - # The apache project relies heavily on AC_TRY_RUN and doesn't
250 - # have any sane cross-compiling fallback logic.
251 - export \
252 - ac_cv_file__dev_zero="yes" \
253 - ac_cv_func_sem_open="yes" \
254 - ac_cv_negative_eai="yes" \
255 - ac_cv_o_nonblock_inherited="no" \
256 - ac_cv_struct_rlimit="yes" \
257 - ap_cv_atomic_builtins="yes" \
258 - apr_cv_accept4="yes" \
259 - apr_cv_dup3="yes" \
260 - apr_cv_epoll="yes" \
261 - apr_cv_epoll_create1="yes" \
262 - apr_cv_gai_addrconfig="yes" \
263 - apr_cv_mutex_recursive="yes" \
264 - apr_cv_mutex_robust_shared="yes" \
265 - apr_cv_process_shared_works="yes" \
266 - apr_cv_pthreads_lib="-pthread" \
267 - apr_cv_sock_cloexec="yes" \
268 - apr_cv_tcp_nodelay_with_cork="yes"
269 - fi
270 -
271 - if use urandom; then
272 - myconf+=( --with-devrandom=/dev/urandom )
273 - elif (( ${CHOST#*-hpux11.} <= 11 )); then
274 - : # no /dev/*random on hpux11.11 and before, $PN detects this.
275 - else
276 - myconf+=( --with-devrandom=/dev/random )
277 - fi
278 -
279 - tc-is-static-only && myconf+=( --disable-dso )
280 -
281 - # shl_load does not search runpath, but hpux11 supports dlopen
282 - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
283 -
284 - if [[ ${CHOST} == *-solaris2.10 ]]; then
285 - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
286 - *atomic_cas_ptr*) ;;
287 - *)
288 - elog "You do not have Solaris Patch ID "$(
289 - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
290 - )" (Problem 4954703) installed on your host ($(hostname)),"
291 - elog "using generic atomic operations instead."
292 - myconf+=( --disable-nonportable-atomics )
293 - ;;
294 - esac
295 - fi
296 -
297 - econf "${myconf[@]}"
298 -}
299 -
300 -src_compile() {
301 - if tc-is-cross-compiler; then
302 - # This header is the same across targets, so use the build compiler.
303 - emake tools/gen_test_char
304 - tc-export_build_env BUILD_CC
305 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
306 - tools/gen_test_char.c -o tools/gen_test_char || die
307 - fi
308 -
309 - emake
310 -
311 - if use doc; then
312 - emake dox
313 - fi
314 -}
315 -
316 -src_install() {
317 - default
318 -
319 - # Prallel install breaks since apr-1.5.1
320 - #make -j1 DESTDIR="${D}" install || die
321 -
322 - prune_libtool_files --all
323 -
324 - if use doc; then
325 - docinto html
326 - dodoc -r docs/dox/html/*
327 - fi
328 -
329 - # This file is only used on AIX systems, which Gentoo is not,
330 - # and causes collisions between the SLOTs, so remove it.
331 - # Even in Prefix, we don't need this on AIX.
332 - rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
333 -}
334
335 diff --git a/dev-libs/apr/apr-1.6.3.ebuild b/dev-libs/apr/apr-1.6.3.ebuild
336 deleted file mode 100644
337 index 67376760d71..00000000000
338 --- a/dev-libs/apr/apr-1.6.3.ebuild
339 +++ /dev/null
340 @@ -1,146 +0,0 @@
341 -# Copyright 1999-2018 Gentoo Foundation
342 -# Distributed under the terms of the GNU General Public License v2
343 -
344 -EAPI=6
345 -
346 -inherit autotools libtool ltprune multilib toolchain-funcs
347 -
348 -DESCRIPTION="Apache Portable Runtime Library"
349 -HOMEPAGE="https://apr.apache.org/"
350 -SRC_URI="mirror://apache/apr/${P}.tar.bz2"
351 -
352 -LICENSE="Apache-2.0"
353 -SLOT="1"
354 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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"
355 -IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
356 -
357 -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
358 - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
359 -RDEPEND="${CDEPEND}
360 - selinux? ( sec-policy/selinux-apache )"
361 -DEPEND="${CDEPEND}
362 - >=sys-devel/libtool-2.4.2
363 - doc? ( app-doc/doxygen )"
364 -
365 -DOCS=( CHANGES NOTICE README )
366 -
367 -PATCHES=(
368 - "${FILESDIR}"/${PN}-1.5.0-mint.patch
369 - "${FILESDIR}"/${PN}-1.5.0-libtool.patch
370 - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch
371 - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
372 -)
373 -
374 -src_prepare() {
375 - default
376 -
377 - AT_M4DIR="build" eautoreconf
378 - elibtoolize
379 -
380 - eapply "${FILESDIR}/config.layout.patch"
381 -}
382 -
383 -src_configure() {
384 - local myconf=(
385 - --enable-layout=gentoo
386 - --enable-nonportable-atomics
387 - --enable-posix-shm
388 - --enable-threads
389 - $(use_enable static-libs static)
390 - )
391 -
392 - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
393 -
394 - if use older-kernels-compatibility; then
395 - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
396 - export apr_cv_accept4="no"
397 - export apr_cv_dup3="no"
398 - export apr_cv_epoll_create1="no"
399 - export apr_cv_sock_cloexec="no"
400 - fi
401 - if tc-is-cross-compiler; then
402 - # The apache project relies heavily on AC_TRY_RUN and doesn't
403 - # have any sane cross-compiling fallback logic.
404 - export \
405 - ac_cv_file__dev_zero="yes" \
406 - ac_cv_func_sem_open="yes" \
407 - ac_cv_negative_eai="yes" \
408 - ac_cv_o_nonblock_inherited="no" \
409 - ac_cv_struct_rlimit="yes" \
410 - ap_cv_atomic_builtins="yes" \
411 - apr_cv_accept4="yes" \
412 - apr_cv_dup3="yes" \
413 - apr_cv_epoll="yes" \
414 - apr_cv_epoll_create1="yes" \
415 - apr_cv_gai_addrconfig="yes" \
416 - apr_cv_mutex_recursive="yes" \
417 - apr_cv_mutex_robust_shared="yes" \
418 - apr_cv_process_shared_works="yes" \
419 - apr_cv_pthreads_lib="-pthread" \
420 - apr_cv_sock_cloexec="yes" \
421 - apr_cv_tcp_nodelay_with_cork="yes"
422 - fi
423 -
424 - if use urandom; then
425 - myconf+=( --with-devrandom=/dev/urandom )
426 - elif (( ${CHOST#*-hpux11.} <= 11 )); then
427 - : # no /dev/*random on hpux11.11 and before, $PN detects this.
428 - else
429 - myconf+=( --with-devrandom=/dev/random )
430 - fi
431 -
432 - tc-is-static-only && myconf+=( --disable-dso )
433 -
434 - # shl_load does not search runpath, but hpux11 supports dlopen
435 - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
436 -
437 - if [[ ${CHOST} == *-solaris2.10 ]]; then
438 - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
439 - *atomic_cas_ptr*) ;;
440 - *)
441 - elog "You do not have Solaris Patch ID "$(
442 - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
443 - )" (Problem 4954703) installed on your host ($(hostname)),"
444 - elog "using generic atomic operations instead."
445 - myconf+=( --disable-nonportable-atomics )
446 - ;;
447 - esac
448 - fi
449 -
450 - econf "${myconf[@]}"
451 -}
452 -
453 -src_compile() {
454 - if tc-is-cross-compiler; then
455 - # This header is the same across targets, so use the build compiler.
456 - emake tools/gen_test_char
457 - tc-export_build_env BUILD_CC
458 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
459 - tools/gen_test_char.c -o tools/gen_test_char || die
460 - fi
461 -
462 - emake
463 -
464 - if use doc; then
465 - emake dox
466 - fi
467 -}
468 -
469 -src_install() {
470 - default
471 -
472 - # Prallel install breaks since apr-1.5.1
473 - #make -j1 DESTDIR="${D}" install || die
474 -
475 - prune_libtool_files --all
476 -
477 - if use doc; then
478 - docinto html
479 - dodoc -r docs/dox/html/*
480 - fi
481 -
482 - # This file is only used on AIX systems, which Gentoo is not,
483 - # and causes collisions between the SLOTs, so remove it.
484 - # Even in Prefix, we don't need this on AIX.
485 - rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
486 -}