commit: 1919b0bc5d5a2dde1aa1286043ddd299a1e67ae1 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Fri Mar 18 07:04:03 2022 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Fri Mar 18 07:04:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1919b0bc
app-admin/apache-tools: cleanup Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> app-admin/apache-tools/Manifest | 1 - .../apache-tools/apache-tools-2.4.51-r1.ebuild | 101 -------------------- app-admin/apache-tools/apache-tools-2.4.51.ebuild | 103 --------------------- 3 files changed, 205 deletions(-) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index 3cb708c26560..5661593decba 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,3 +1,2 @@ -DIST httpd-2.4.51.tar.bz2 7653609 BLAKE2B a0743327f0411f5cb8b7d0426bf78db0f370e3d587f3a4c4bb7de0e4499effa3f44f5998e19e9ca3ed7b6fc9a8c0867cbe62134b5af7e6ed6c3bc29770b797df SHA512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 DIST httpd-2.4.52.tar.bz2 7439184 BLAKE2B caa3f96226eeaf2f7ab625a73e820e7c6c5661a80983fa1cd2f4ab5366fcad03e1f47ad02ab060662ceb941fc777b1fb8a269ec5f0d9c6f7a3d93756e995d713 SHA512 97c021c576022a9d32f4a390f62e07b5f550973aef2f299fd52defce1a9fa5d27bd4a676e7bf214373ba46063d34aecce42de62fdd93678a4e925cfcbb2afdf6 DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756 diff --git a/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild deleted file mode 100644 index 1f89503c59ee..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.51-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 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="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="${SYSROOT}${EPREFIX}"/usr - --with-apr-util="${SYSROOT}${EPREFIX}"/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.51.ebuild b/app-admin/apache-tools/apache-tools-2.4.51.ebuild deleted file mode 100644 index 2cb5bdfff763..000000000000 --- a/app-admin/apache-tools/apache-tools-2.4.51.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 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="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-perl="${EPREFIX}"/usr/bin/perl - --with-expat="${EPREFIX}"/usr - --with-z="${EPREFIX}"/usr - --with-apr="${SYSROOT}${EPREFIX}"/usr - --with-apr-util="${SYSROOT}${EPREFIX}"/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 -}
