gentoo auto-resync : 14:12:2022 - 15:30:24

3 files changed, 17 insertions, 118 deletions

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 618ac00d667f..11e52f650d5f 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,10 +2,8 @@ AUX apache-tools-2.4.54-Makefile.patch 1263 BLAKE2B f54fa67584b3dda69cf5030e8003
 AUX apache-tools-2.4.54-libtool.patch 594 BLAKE2B c1b11ad580369a42fde6cbaec8d4191c7c8f26760a596e4a1a2f095727942625e0573c7846b680bcef8d08a63632be3393478992853c6d1a97951dd5eec395ce SHA512 dd18b43fcc71c2e3ddf0fe9e6731dc76dfea8078eb709bdf092ac5bf829810f25bc11b16d52d2f443e22359aafaf3e75a8066b6320174e4cf462190449cd53c7
 AUX apache-tools-2.4.54-no-which.patch 1807 BLAKE2B 27fbe5079f3844645c1e3fe237f47f5524ccb1c9a5532b8529091176ea0fc561c0888b74997acb98f4c86cacf8f138f065f248295c2a79779eb84f706173849a SHA512 830125dd90479972715a6b09bc0cef7bfe2c8ce7d198e52765e4284555cd60e400820a622530eb2bffa9b7aec9fd6bdb3f633b948075c68e9fd96a49a7eb41fd
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
-DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
-EBUILD apache-tools-2.4.53-r1.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
-EBUILD apache-tools-2.4.54-r1.ebuild 2519 BLAKE2B 9891e61ffc376012f1bb63f71699e8943899ac94d176ece8ef948485e282e0212121e75edc5625b3b515f55b8d604061d3a21469de99d7ced6cc1d4820ab7b41 SHA512 9e30cc37ffcd1df4c15838b4c7e81631bbffafbafe49243e63306e9fd89d503925ee646f25574230aba4f3e85d2b1b12a30f0fda4a42c28aa6eacab7c2695c11
 EBUILD apache-tools-2.4.54-r2.ebuild 2586 BLAKE2B e990f5cc4de3d131134e154a2435f80101b77037f633ac6c9f0ac514bcd0aa75bf9d5ddf18f3eee2124a645c51929120ac9be07adcfd22673329e430611febe9 SHA512 f1edba9061d857af1929dbd80064712609e68aa4f52c19a7a25693cf1ebff67ac9774e22b12978da27d51f271b95e195f65d6d02399c4df33e356dc8e813e74f
+EBUILD apache-tools-2.4.54-r3.ebuild 2684 BLAKE2B 6a7a34ef44d3bb6af49dc7a00c42d81de694fb1a8b5b7d6b1c45f650a80e2725de4c2fab375043152d4400777de692cb39032c0c9fd1621a651837175bf8ea1b SHA512 58f78c00493bf65b88aefa54772b4056f250134ccb4fc655f29fe69945e9bf5e1632e9538a1353f9a6215939f868ecb90199b3101b22863d8d15a50df4dd3f76
 EBUILD apache-tools-2.4.54.ebuild 2423 BLAKE2B 5d4e00341e2809571e9ee0e76f09641487a68a82b93cf7b8dc23af359f62068207d7dbaf0748245c03869d989b0f9782e6a56c0c23a6b7e564f6785c365af6d1 SHA512 6d9787f2df850f1264c64fd8f4df19f8b85b83f9282e80d472296d9354b281bf5ab13e0449a0b562c0c333074a2e1714a8f53e8e47f30b5d0b6ce831bad6b41e
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
deleted file mode 100644
index bf1562cee74c..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-BDEPEND="
-	sys-apps/which
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	local myeconfargs=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--with-pcre="${T}"/pcre-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
-	econf "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
index 8b3560d27cf2..6f81b8aa7f99 100644
--- a/app-admin/apache-tools/apache-tools-2.4.54-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.54-r3.ebuild
@@ -11,14 +11,14 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/apr-util:1=
 	dev-libs/expat
-	dev-libs/libpcre
+	dev-libs/libpcre2
 	virtual/libcrypt:=
 	kernel_linux? ( sys-apps/util-linux )
 	ssl? ( dev-libs/openssl:0= )"
@@ -31,16 +31,17 @@ BDEPEND="
 S="${WORKDIR}/httpd-${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446
 	"${FILESDIR}/${PN}-2.4.54-no-which.patch" #844868
+	"${FILESDIR}/${PN}-2.4.54-libtool.patch" #858833
 )
 
 src_prepare() {
 	default
 
 	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
+	cat <<-\EOF > "${T}"/pcre2-config
+	#!/usr/bin/env bash
 	flags=()
 	for flag; do
 		if [[ ${flag} == "--version" ]]; then
@@ -49,19 +50,21 @@ src_prepare() {
 			flags+=( "${flag}" )
 		fi
 	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
 	EOF
-	chmod a+x "${T}"/pcre-config || die
+	chmod a+x "${T}"/pcre2-config || die
 
-	# Only here for which patch
+	# Only here for libtool and which patches
 	eautoreconf
 }
 
 src_configure() {
-	# Brain dead check.
+	# Silly check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
 
 	tc-export PKG_CONFIG
+	export ac_cv_path_PKGCONFIG="${PKG_CONFIG}"
+	export ac_cv_prog_ac_ct_PCRE_CONFIG="${T}"/pcre2-config
 
 	local myeconfargs=(
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
@@ -69,13 +72,15 @@ src_configure() {
 		--with-z="${EPREFIX}"/usr
 		--with-apr="${ESYSROOT}"/usr
 		--with-apr-util="${ESYSROOT}"/usr
-		--with-pcre="${T}"/pcre-config
+		--without-pcre
+		--with-pcre2="${T}"/pcre2-config
 		$(use_enable ssl)
 		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
 	)
+
 	# econf overwrites the stuff from config.layout.
-	ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
 	econf "${myeconfargs[@]}"
+
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die