[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr/

["Sam James" <sam@gentoo.org>]

commit:     4e3b8eaecca0d09babc909ad7488968265898518
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 23:06:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 23:06:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3b8eae

dev-libs/apr: drop 1.7.4, 1.7.4-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/apr/apr-1.7.4-r1.ebuild | 150 ---------------------------------------
 dev-libs/apr/apr-1.7.4.ebuild    | 149 --------------------------------------
 2 files changed, 299 deletions(-)

diff --git a/dev-libs/apr/apr-1.7.4-r1.ebuild b/dev-libs/apr/apr-1.7.4-r1.ebuild
deleted file mode 100644
index 3b3f2bbff171..000000000000
--- a/dev-libs/apr/apr-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc old-kernel selinux static-libs +urandom valgrind"
-
-# See bug #815265 for libcrypt dependency
-DEPEND="
-	virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-base-policy )
-"
-DEPEND+=" valgrind? ( dev-debug/valgrind )"
-BDEPEND="
-	>=dev-build/libtool-2.4.2
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
-	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
-	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
-	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
-	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
-	"${FILESDIR}"/config.layout.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-}
-
-src_configure() {
-	tc-export AS CC CPP
-
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		$(use_with valgrind)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	if use old-kernel; 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_mmap__dev_zero="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 )
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	# 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
-	append-atomic-flags
-	if [[ ${LIBS} == *atomic* ]] ; then
-		myconf+=( --disable-nonportable-atomics )
-	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 all $(usev doc dox)
-}
-
-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
-}

diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
deleted file mode 100644
index 89c1e10ad25a..000000000000
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc old-kernel selinux static-libs +urandom valgrind"
-
-# See bug #815265 for libcrypt dependency
-DEPEND="
-	virtual/libcrypt:=
-	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-base-policy )
-"
-DEPEND+=" valgrind? ( dev-debug/valgrind )"
-BDEPEND="
-	>=dev-build/libtool-2.4.2
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( CHANGES NOTICE README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
-	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
-	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
-	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
-	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
-	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
-	"${FILESDIR}"/config.layout.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	AT_M4DIR="build" eautoreconf
-}
-
-src_configure() {
-	tc-export AS CC CPP
-
-	local myconf=(
-		--enable-layout=gentoo
-		--enable-nonportable-atomics
-		--enable-posix-shm
-		--enable-threads
-		$(use_enable static-libs static)
-		$(use_with valgrind)
-		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
-	)
-
-	tc-is-static-only && myconf+=( --disable-dso )
-
-	if use old-kernel; 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_mmap__dev_zero="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 )
-	else
-		myconf+=( --with-devrandom=/dev/random )
-	fi
-
-	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
-
-	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 all $(usev doc dox)
-}
-
-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
-}