commit: 3fb9f3eea500824651b5cd69e32c65f1a74b90ac Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Fri Feb 7 14:03:36 2025 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Fri Feb 7 14:53:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb9f3ee
app-admin/apache-tools: drop 2.4.59, 2.4.61 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> app-admin/apache-tools/Manifest | 2 - app-admin/apache-tools/apache-tools-2.4.59.ebuild | 113 ---------------------- app-admin/apache-tools/apache-tools-2.4.61.ebuild | 113 ---------------------- 3 files changed, 228 deletions(-) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index fb5e5f415512..d29109c00a3a 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,3 +1 @@ -DIST httpd-2.4.59.tar.bz2 7503198 BLAKE2B 836e3538a120d71c016149397a4efd61ae6acd8a8fb9d2ce117c7d86209c4b40c0be3c464007891f28c58182e9d40a8793abe9e94e642354492954af91d9878c SHA512 209da0bbac5e2564d4590302515b35495be6402273ff4024aa93e85e44554c95e053201d606383936425a41e1b5b97e6b40055dcbb385eb691a5029a6f3158c2 -DIST httpd-2.4.61.tar.bz2 7512908 BLAKE2B 9299ef5843888829143732b3a60d1713aff688ed2f6c2b7f154be16bc075ec747a5b116716f188491ebc9947ff2dfe09dfc71f5245d98a4be3ba27ada28ec8a5 SHA512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff DIST httpd-2.4.62.tar.bz2 7521661 BLAKE2B 0e5c3b05819771e6ff72933ad715695199a32c384f63de6598e179ff5803580f04639437829305150305c9a2b7d309178552d8c9a2d7248a034c98f445193b95 SHA512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 diff --git a/app-admin/apache-tools/apache-tools-2.4.59.ebuild b/app-admin/apache-tools/apache-tools-2.4.59.ebuild deleted file mode 100644 index 98db8314ba15..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.59.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 ~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.61.ebuild b/app-admin/apache-tools/apache-tools-2.4.61.ebuild deleted file mode 100644 index 0c46af8fee86..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.61.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" -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 - - # 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 -}
