From 668b6c051118bd7663f29833629d2ca1319c181b Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Fri, 5 Dec 2025 17:23:01 +0100 Subject: [PATCH] app-admin/apache-tools: drop 2.4.63, 2.4.64 Signed-off-by: Hans de Graaff --- app-admin/apache-tools/Manifest | 2 - .../apache-tools/apache-tools-2.4.63.ebuild | 114 ------------------ .../apache-tools/apache-tools-2.4.64.ebuild | 114 ------------------ 3 files changed, 230 deletions(-) delete mode 100644 app-admin/apache-tools/apache-tools-2.4.63.ebuild delete mode 100644 app-admin/apache-tools/apache-tools-2.4.64.ebuild diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index fd25a7db15ac..51774ec0f95e 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,4 +1,2 @@ -DIST httpd-2.4.63.tar.bz2 7517972 BLAKE2B adc4b3ad640919a2df1eaae9a4a7d004f60b2d59a6fa4a624c7e97758c0e244378cb06f11d69a54e789dd216f8f3fb8e967b2e01fd3bdab10ce1ae332d2a4d07 SHA512 a804ca564dfee5907fe4ce4f36884815bace0621bc7b8c9aa7c99472a954aa19cb13733f90678ff3d58ab3c76cc0e33a27e1035dc1d8cb597a9622154c59ef48 -DIST httpd-2.4.64.tar.bz2 7293281 BLAKE2B 80e8334fcdbf69af9d5a041e6206f510ad39c77cacf272bd59b098d2f91835713485532c23987dd407573865050e6183c8c9c5db11759010f9ab68e0ef64a30c SHA512 299cb0d87a7e0e0a99d22bba7349b6b07c69222897410f9670af29896288d1f4e1da81d22ac9e1d8d6ea096e88044ab1dd34555b40a4b1b1cb3fd4b1d1897a7a DIST httpd-2.4.65.tar.bz2 7506711 BLAKE2B 67da132d066e03690d3a3ead8a528ab020564699c82584adf5bc637e1bc6c1def6f08e7b8b7962115fcb5bab31be7c977442549096d171321f95f54796ece63a SHA512 202f8bfe2aafcfbcd7315191d466e9c10b9a8c0abafb7864510b6e1abe4cb660aaacc2456aa77d43e48ef7a49e591d0b54170d3daf67abc3e06c3da1c63fdffc DIST httpd-2.4.66.tar.bz2 7504564 BLAKE2B 3e702c9eda81440733516b6fe26f44cd358c385203de5a674f65e3806b0204bae4eb845e3a9ab340b2d731f98c9a0e72f616dd3ad070421b31e7814bbfcd6469 SHA512 49031a3465d956ee3b755e65810b6c35561ddd5fac2c624a273b733c238e115b914cd7b246837e5a3090ccfded6e0b8b3059bfd1f8ce4419081c805a38d05a4b diff --git a/app-admin/apache-tools/apache-tools-2.4.63.ebuild b/app-admin/apache-tools/apache-tools-2.4.63.ebuild deleted file mode 100644 index 13e7a9c4fca5..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.63.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2025 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" -S="${WORKDIR}/httpd-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="ssl" - -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 -" - -RESTRICT="test" - -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 - - tc-export PKG_CONFIG - # 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" - - export ac_cv_path_PKGCONFIG="${PKG_CONFIG}" - export PCRE_CONFIG="${T}"/pcre2-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.64.ebuild b/app-admin/apache-tools/apache-tools-2.4.64.ebuild deleted file mode 100644 index 4d3fe98f186a..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.64.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2025 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" -S="${WORKDIR}/httpd-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="ssl" - -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 -" - -RESTRICT="test" - -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 - - tc-export PKG_CONFIG - # 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" - - export ac_cv_path_PKGCONFIG="${PKG_CONFIG}" - export PCRE_CONFIG="${T}"/pcre2-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 -}