commit: acec3c65b1b62c529de4a5415ffd2d951a2cf0af Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Dec 10 14:59:24 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Dec 10 14:59:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acec3c65
app-admin/apache-tools: 2.2 removal Bug: https://bugs.gentoo.org/692088 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-admin/apache-tools/Manifest | 1 - app-admin/apache-tools/apache-tools-2.2.34.ebuild | 85 ---------------------- .../files/apache-tools-2.2.20-Makefile.patch | 41 ----------- 3 files changed, 127 deletions(-) diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest index bf65ba13076..c926034bb90 100644 --- a/app-admin/apache-tools/Manifest +++ b/app-admin/apache-tools/Manifest @@ -1,2 +1 @@ -DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335 diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild deleted file mode 100644 index e98b337dda0..00000000000 --- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic eutils - -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 ~s390 ~sh sparc x86" -IUSE="ssl" -RESTRICT="test" - -RDEPEND="=dev-libs/apr-1* - =dev-libs/apr-util-1* - dev-libs/expat - dev-libs/libpcre - kernel_linux? ( sys-apps/util-linux ) - ssl? ( dev-libs/openssl:0= ) - !<www-servers/apache-2.2.4" - -DEPEND="${RDEPEND} - sys-devel/libtool" - -S="${WORKDIR}/httpd-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.20-Makefile.patch" -) - -src_configure() { - # Brain dead check. - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" - - # Instead of filtering --as-needed (bug #128505), append --no-as-needed - append-ldflags $(no-as-needed) - - # econf overwrites the stuff from config.layout. - econf \ - --sbindir=/usr/sbin \ - --with-z=/usr \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --with-pcre=/usr \ - $(use_enable ssl) \ - $(usex ssl '--with-ssl=/usr' '') -} - -src_compile() { - cd support || die - emake -} - -src_install () { - cd support || die - - make DESTDIR="${D}" install || die - - # install manpages - doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \ - "${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8 - - # Providing compatiblity symlinks for #177697 (which we'll stop to install - # at some point). - pushd "${D}"/usr/sbin/ >/dev/null || die - for i in *; do - dosym /usr/sbin/${i} /usr/sbin/${i}2 - done - popd >/dev/null || die - - # Provide a symlink for ab-ssl - if use ssl; then - dosym /usr/sbin/ab /usr/sbin/ab-ssl - dosym /usr/sbin/ab /usr/sbin/ab2-ssl - fi - - # make htpasswd accessible for non-root users - dosym /usr/sbin/htpasswd /usr/bin/htpasswd - dosym /usr/sbin/htdigest /usr/bin/htdigest - - dodoc "${S}"/CHANGES -} diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch deleted file mode 100644 index 7bc39527790..00000000000 --- a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -=== modified file 'support/Makefile.in' ---- a/support/Makefile.in -+++ b/support/Makefile.in -@@ -1,9 +1,10 @@ - DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ -- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std -+ logresolve.pl phf_abuse_log.cgi split-logfile - - CLEAN_TARGETS = suexec - --PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) -+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \ -+ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage - TARGETS = $(PROGRAMS) - - PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) -@@ -12,22 +13,13 @@ - include $(top_builddir)/build/rules.mk - - install: -- @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) - @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) -- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) -- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) -- @for i in apxs apachectl dbmmanage; do \ -+ @for i in $(PROGRAMS) ; do \ - if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(DESTDIR)$(sbindir); \ - chmod 755 $(DESTDIR)$(sbindir)/$$i; \ - fi ; \ - done -- @if test -f "$(builddir)/envvars-std"; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir); \ -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -- fi ; \ -- fi - - htpasswd_OBJECTS = htpasswd.lo - htpasswd: $(htpasswd_OBJECTS) -
