commit: a14342e4ce11023ce5eb4b9969d8c6d0a298d80a Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed May 31 06:56:12 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed May 31 06:56:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14342e4
dev-libs/apr: Removed old. Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-libs/apr/Manifest | 2 - dev-libs/apr/apr-1.5.0-r2.ebuild | 139 -------------------- dev-libs/apr/apr-1.5.1-r1.ebuild | 144 --------------------- .../files/apr-1.5.1-parallel_make_install.patch | 19 --- 4 files changed, 304 deletions(-) diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index 056054a3308..593061921ed 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -1,3 +1 @@ -DIST apr-1.5.0.tar.bz2 813976 SHA256 17287d36a5917e27281e60d47e7b147bd5ddcd1ca832702c2318f5e0724f1221 SHA512 d54d995a67fe13a619d4781cbfcfae07679d15defa49634ee472c6a93f9521f7964e6e3e366188f1817c01a8fdb98b4ff042e56d8bd9bc379683d6c4ccff2a3e WHIRLPOOL 083da7589f85fb2212b4ced33004ee30848a40cf4718de36a21dfcba15b794dc9b57a9324cdd400e2df74564f9ad27899119de55075f1e0285415471b47f90e7 -DIST apr-1.5.1.tar.bz2 817569 SHA256 e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac SHA512 0d8dea97490cd0b0689eb090d0e32ab9b582e4a0248ea7028e2a44552fc3839013b18cff985547aa9bbb549d93bc4859cca1d8ef95b32d4d4fd610ed19bde435 WHIRLPOOL 553efdefdb58ae44015ef36505c70b52122b750e6c3f63d9ccaa0878efd476dac249a62e2fb644d3e709c372a2805b1d76869c0e9b880b6273f46ef2e9937ace DIST apr-1.5.2.tar.bz2 826885 SHA256 7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a SHA512 d1156ad16abf07887797777b56c2147c890f16d8445829b3e3b4917950d24c5fd2f8febd439992467a5ea0511da562c0fb4a7cfd8a235ab55882388bfa2b919d WHIRLPOOL 3f6fbb9410f7cd3ace2f80f361a02b190e14d744f38dbd6f87a5c60b4b1c4a99cd902ba9351a235d9f3bab044a981de21fb6c193d3ab3caba2448bf6c4e1bd1b diff --git a/dev-libs/apr/apr-1.5.0-r2.ebuild b/dev-libs/apr/apr-1.5.0-r2.ebuild deleted file mode 100644 index e038238ae89..00000000000 --- a/dev-libs/apr/apr-1.5.0-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit autotools eutils libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/"; -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -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" -IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" - -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-apache )" -DEPEND="${CDEPEND} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch - epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch - epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 - - epatch_user #449048 - - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf=() - - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - if tc-is-cross-compiler; then - # The apache project relies heavily on AC_TRY_RUN and doesn't - # have any sane cross-compiling fallback logic. - export \ - ac_cv_file__dev_zero="yes" \ - ac_cv_func_sem_open="yes" \ - ac_cv_negative_eai="yes" \ - ac_cv_o_nonblock_inherited="no" \ - ac_cv_struct_rlimit="yes" \ - ap_cv_atomic_builtins="yes" \ - apr_cv_accept4="yes" \ - apr_cv_dup3="yes" \ - apr_cv_epoll="yes" \ - apr_cv_epoll_create1="yes" \ - apr_cv_gai_addrconfig="yes" \ - apr_cv_mutex_recursive="yes" \ - apr_cv_mutex_robust_shared="yes" \ - apr_cv_process_shared_works="yes" \ - apr_cv_pthreads_lib="-pthread" \ - apr_cv_sock_cloexec="yes" \ - apr_cv_tcp_nodelay_with_cork="yes" - fi - - if use urandom; then - myconf+=( --with-devrandom=/dev/urandom ) - elif (( ${CHOST#*-hpux11.} <= 11 )); then - : # no /dev/*random on hpux11.11 and before, $PN detects this. - else - myconf+=( --with-devrandom=/dev/random ) - fi - - tc-is-static-only && myconf+=( --disable-dso ) - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf+=( --disable-nonportable-atomics ) - ;; - esac - fi - - econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-threads \ - $(use_enable static-libs static) \ - "${myconf[@]}" -} - -src_compile() { - if tc-is-cross-compiler; then - # This header is the same across targets, so use the build compiler. - emake tools/gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - tools/gen_test_char.c -o tools/gen_test_char || die - fi - - emake - - if use doc; then - emake dox - fi -} - -src_install() { - default - - find "${ED}" -name "*.la" -delete - - if use doc; then - dohtml -r docs/dox/html/* - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - # Even in Prefix, we don't need this on AIX. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} diff --git a/dev-libs/apr/apr-1.5.1-r1.ebuild b/dev-libs/apr/apr-1.5.1-r1.ebuild deleted file mode 100644 index 1321e7bdee7..00000000000 --- a/dev-libs/apr/apr-1.5.1-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils libtool multilib toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/"; -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1" -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" -IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom" - -CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 ) - elibc_mintlib? ( >=sys-apps/util-linux-2.18 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-apache )" -DEPEND="${CDEPEND} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" - -DOCS=(CHANGES NOTICE README) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.0-mint.patch - epatch "${FILESDIR}"/${PN}-1.5.0-libtool.patch - epatch "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - epatch "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 - epatch "${FILESDIR}"/${PN}-1.5.1-parallel_make_install.patch - - epatch_user #449048 - - AT_M4DIR="build" eautoreconf - elibtoolize - - epatch "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf=() - - [[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no - - if use older-kernels-compatibility; then - local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec - export apr_cv_accept4="no" - export apr_cv_dup3="no" - export apr_cv_epoll_create1="no" - export apr_cv_sock_cloexec="no" - fi - if tc-is-cross-compiler; then - # The apache project relies heavily on AC_TRY_RUN and doesn't - # have any sane cross-compiling fallback logic. - export \ - ac_cv_file__dev_zero="yes" \ - ac_cv_func_sem_open="yes" \ - ac_cv_negative_eai="yes" \ - ac_cv_o_nonblock_inherited="no" \ - ac_cv_struct_rlimit="yes" \ - ap_cv_atomic_builtins="yes" \ - apr_cv_accept4="yes" \ - apr_cv_dup3="yes" \ - apr_cv_epoll="yes" \ - apr_cv_epoll_create1="yes" \ - apr_cv_gai_addrconfig="yes" \ - apr_cv_mutex_recursive="yes" \ - apr_cv_mutex_robust_shared="yes" \ - apr_cv_process_shared_works="yes" \ - apr_cv_pthreads_lib="-pthread" \ - apr_cv_sock_cloexec="yes" \ - apr_cv_tcp_nodelay_with_cork="yes" - fi - - if use urandom; then - myconf+=( --with-devrandom=/dev/urandom ) - elif (( ${CHOST#*-hpux11.} <= 11 )); then - : # no /dev/*random on hpux11.11 and before, $PN detects this. - else - myconf+=( --with-devrandom=/dev/random ) - fi - - tc-is-static-only && myconf+=( --disable-dso ) - - # shl_load does not search runpath, but hpux11 supports dlopen - [[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn ) - - if [[ ${CHOST} == *-solaris2.10 ]]; then - case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in - *atomic_cas_ptr*) ;; - *) - elog "You do not have Solaris Patch ID "$( - [[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885 - )" (Problem 4954703) installed on your host ($(hostname))," - elog "using generic atomic operations instead." - myconf+=( --disable-nonportable-atomics ) - ;; - esac - fi - - econf \ - --enable-layout=gentoo \ - --enable-nonportable-atomics \ - --enable-posix-shm \ - --enable-threads \ - $(use_enable static-libs static) \ - "${myconf[@]}" -} - -src_compile() { - if tc-is-cross-compiler; then - # This header is the same across targets, so use the build compiler. - emake tools/gen_test_char - tc-export_build_env BUILD_CC - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \ - tools/gen_test_char.c -o tools/gen_test_char || die - fi - - emake - - if use doc; then - emake dox - fi -} - -src_install() { - default - - # Prallel install breaks since apr-1.5.1 - #make -j1 DESTDIR="${D}" install || die - - prune_libtool_files --all - - if use doc; then - dohtml -r docs/dox/html/* - fi - - # This file is only used on AIX systems, which Gentoo is not, - # and causes collisions between the SLOTs, so remove it. - # Even in Prefix, we don't need this on AIX. - rm -f "${ED}usr/$(get_libdir)/apr.exp" -} 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 deleted file mode 100644 index a58a229c378..00000000000 --- a/dev-libs/apr/files/apr-1.5.1-parallel_make_install.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://www.mail-archive.com/dev@apr.apache.org/msg25738.html - ---- apr-1.5.1/Makefile.in -+++ apr-1.5.1/Makefile.in -@@ -129,11 +129,11 @@ - etags: - etags `find . -name '*.[ch]'` - --make_tools_dir: -+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) -+tools/gen_test_char.lo: tools/gen_test_char.c - $(APR_MKDIR) tools -+ $(LT_COMPILE) - --OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) --tools/gen_test_char.lo: make_tools_dir - tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -
