gentoo auto-resync : 19:07:2024 - 12:29:09

3 files changed, 5 insertions, 120 deletions

diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 4eabc9173b6c..c9319938d4f1 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,12 +1,10 @@
 AUX apache-tools-2.4.54-Makefile.patch 1263 BLAKE2B f54fa67584b3dda69cf5030e800376d13b7538738a594b8bff4a5b2e975d4e5d45737bdbbc636c0ff559d81cf477178c60e883185618ec56a318f918418c2112 SHA512 0ace6ac636530b6f73f84052fd569d2fa09164691db8181a3738157cb0d59da984d3d84d3fe182dd84ed22269f2aa4c37bf468791d6831d60d77c94f5efe866d
 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
-DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
-DIST httpd-2.4.58.tar.bz2 7485817 BLAKE2B 2105b8fada99f1dda55201ed89ed5326f0edb078d352cbff44f02cde80d129b65b63e07366a9a744ba474be5687fa8d3d2d8ddc64ac914b47166607f3f4a9de2 SHA512 d6e73bf413a507ec16b621ff635e178206207a9e9810ce3944b3dc98d39cde8f225307110167fc9da5822175796c8cb66f98be5b9f0d8b76dcd83a401d39b2c1
 DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2
 DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff
-EBUILD apache-tools-2.4.57.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
-EBUILD apache-tools-2.4.58.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
+DIST httpd-2.4.62.tar.bz2 7521661 BLAKE2B 0e5c3b05819771e6ff72933ad715695199a32c384f63de6598e179ff5803580f04639437829305150305c9a2b7d309178552d8c9a2d7248a034c98f445193b95 SHA512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77
 EBUILD apache-tools-2.4.59.ebuild 2660 BLAKE2B e610383768eb40949e65f762eb68ce449aa777aa3fdd39d9c58cee42525422baa74d57b6200d194c4371123a22d9f7469b6340cf28c2ac73acd19b342409f3f9 SHA512 3a234b734543c19ebbf6f6f0616e01ce9dee328493d95a8be7cda9ccc43da4205de6b7979e3c5eddc904717a2309cafef77f50b8ee08803d23d42dc394fccc5b
 EBUILD apache-tools-2.4.61.ebuild 2667 BLAKE2B 8becbcf721c217ebbed456d632443d7801d9def997a5495ab5d112a0549296b8bfef7471880a31b52c8f2760bce05e520359b9d47a3188564170499153d03ba8 SHA512 85fcdc522a88628bb8c6f82dc0d8350e98016c755a8d227f71fac4a9ce72140c1db59f9af4922d46481af04a1cddb21fd8d22df0c79eddf04d29ff3ebdb561f6
+EBUILD apache-tools-2.4.62.ebuild 2667 BLAKE2B 8becbcf721c217ebbed456d632443d7801d9def997a5495ab5d112a0549296b8bfef7471880a31b52c8f2760bce05e520359b9d47a3188564170499153d03ba8 SHA512 85fcdc522a88628bb8c6f82dc0d8350e98016c755a8d227f71fac4a9ce72140c1db59f9af4922d46481af04a1cddb21fd8d22df0c79eddf04d29ff3ebdb561f6
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.58.ebuild b/app-admin/apache-tools/apache-tools-2.4.58.ebuild
deleted file mode 100644
index f3af585656d2..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.58.ebuild
+++ /dev/null
@@ -1,113 +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="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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
-	dev-libs/apr-util:1=
-	dev-libs/expat
-	dev-libs/libpcre2
-	virtual/libcrypt:=
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	dev-build/libtool"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${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}"/pcre2-config
-	#!/usr/bin/env bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre2-8 "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre2-config || die
-
-	# Only here for libtool and which patches
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-		--sbindir="${EPREFIX}"/usr/sbin
-		--with-z="${EPREFIX}"/usr
-		--with-apr="${ESYSROOT}"/usr
-		--with-apr-util="${ESYSROOT}"/usr
-		--without-pcre
-		--with-pcre2="${T}"/pcre2-config
-		$(use_enable ssl)
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
-	)
-
-	# econf overwrites the stuff from config.layout.
-	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.57.ebuild b/app-admin/apache-tools/apache-tools-2.4.62.ebuild
index f3af585656d2..f25e9b88cde5 100644
--- a/app-admin/apache-tools/apache-tools-2.4.57.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.62.ebuild
@@ -8,12 +8,12 @@ inherit autotools toolchain-funcs
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
 HOMEPAGE="https://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+S="${WORKDIR}/httpd-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
+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="ssl"
-RESTRICT="test"
 
 RDEPEND=">=dev-libs/apr-1.5.0:1=
 	dev-libs/apr-util:1=
@@ -28,7 +28,7 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/httpd-${PV}"
+RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.54-Makefile.patch" #459446