From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED1D915A7D9 for ; Sat, 18 Mar 2023 16:29:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AF38E07D0; Sat, 18 Mar 2023 16:29:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 08984E07D0 for ; Sat, 18 Mar 2023 16:29:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4827C34136C for ; Sat, 18 Mar 2023 16:29:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03C9F8E6 for ; Sat, 18 Mar 2023 16:29:10 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1679156946.6b3bd257e60be095b45d7479b9081bbcfc543800.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/apr/Manifest dev-libs/apr/apr-1.7.0-r6.ebuild X-VCS-Directories: dev-libs/apr/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 6b3bd257e60be095b45d7479b9081bbcfc543800 X-VCS-Branch: master Date: Sat, 18 Mar 2023 16:29:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d982f157-a2fe-44d7-b321-e441fbc0c90b X-Archives-Hash: e4637d4e72501848fdac6496700c1396 commit: 6b3bd257e60be095b45d7479b9081bbcfc543800 Author: Hans de Graaff gentoo org> AuthorDate: Sat Mar 18 16:27:42 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Mar 18 16:29:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3bd257 dev-libs/apr: drop 1.7.0-r6 Signed-off-by: Hans de Graaff gentoo.org> dev-libs/apr/Manifest | 1 - dev-libs/apr/apr-1.7.0-r6.ebuild | 164 --------------------------------------- 2 files changed, 165 deletions(-) diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest index 02b7c0352595..b0d3d6e02f01 100644 --- a/dev-libs/apr/Manifest +++ b/dev-libs/apr/Manifest @@ -1,2 +1 @@ -DIST apr-1.7.0.tar.bz2 872238 BLAKE2B a8750c45ca6495073a7120f3ae9b858905aecb24b6af5966c3900b06ac1f6d6b55346b17a39a9604cf1b595882335adedf8c8cf4db10e322501bfff4ad7adfe7 SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e diff --git a/dev-libs/apr/apr-1.7.0-r6.ebuild b/dev-libs/apr/apr-1.7.0-r6.ebuild deleted file mode 100644 index 855fd6a0da42..000000000000 --- a/dev-libs/apr/apr-1.7.0-r6.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools libtool toolchain-funcs - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="https://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="1/${PV%.*}" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc older-kernels-compatibility selinux static-libs +urandom" - -# See bug #815265 for libcrypt dependency -CDEPEND="virtual/libcrypt:= - elibc_glibc? ( >=sys-apps/util-linux-2.16 )" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-base-policy )" -DEPEND="${CDEPEND} - >=sys-devel/libtool-2.4.2 - doc? ( app-doc/doxygen )" - -DOCS=( CHANGES NOTICE README ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.5.0-mint.patch - "${FILESDIR}"/${PN}-1.5.0-libtool.patch - "${FILESDIR}"/${PN}-1.5.0-cross-types.patch - "${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775 - "${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch - "${FILESDIR}"/${PN}-1.7.0-autoconf-2.70.patch #750353 - "${FILESDIR}"/${PN}-1.7.0-CVE-2021-35940.patch #828545 - "${FILESDIR}"/${PN}-1.7.0-clang-16.patch #870004 - "${FILESDIR}"/${PN}-1.7.0-dev-zero.patch #830833 -) - -src_prepare() { - default - - mv configure.in configure.ac || die - AT_M4DIR="build" eautoreconf - elibtoolize - - eapply "${FILESDIR}/config.layout.patch" -} - -src_configure() { - local myconf=( - --enable-layout=gentoo - --enable-nonportable-atomics - --enable-posix-shm - --enable-threads - $(use_enable static-libs static) - --with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build - ) - - 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 - else - if use ppc || use sparc || use mips; then - # Avoid libapr containing undefined references (underlinked) - # undefined reference to `__sync_val_compare_and_swap_8' - # (May be possible to fix via libatomic linkage in future?) - # bug #740464 - myconf+=( --disable-nonportable-atomics ) - fi - fi - - econf "${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_test() { - # Building tests in parallel is broken - emake -j1 check -} - -src_install() { - default - - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - if use doc; then - docinto html - dodoc -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 "${ED}/usr/$(get_libdir)/apr.exp" || die -}