app-admin/apache-tools: Drop, fix upstream, bug #385779

6 files changed, 0 insertions, 210 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
deleted file mode 100644
index 8fb8c39a..00000000
--- a/app-admin/apache-tools/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-# ChangeLog for app-admin/apache-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  10 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> metadata.xml:
-  Fix manifest
-
-  03 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> apache-tools-2.2.21.ebuild:
-  app-admin/apache-tools: refresh with upstream
-
-  28 May 2013; Bertrand Jacquin <beber@meleeweb.net> +metadata.xml:
-  Add missing metadata.xml
-
-*apache-tools-2.2.21 (27 May 2013)
-
-  27 May 2013; Bertrand Jacquin <beber@meleeweb.net>
-  +apache-tools-2.2.21.ebuild, +files/apache-tools-2.2.20-Makefile.patch,
-  +files/apache-tools-Makefile.patch:
-  handle cross compiling
-
-  https://bugs.gentoo.org/show_bug.cgi?id=385779
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
deleted file mode 100644
index e11b6f0e..00000000
--- a/app-admin/apache-tools/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX apache-tools-2.2.20-Makefile.patch 1621 SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d WHIRLPOOL 68da82a6300facc7921cc04f0aa0aef9c50f3507f549b548aadc50be65b6097c56bda22a5409883ea83c41a681baa7b4c02a6594de9f94e7969351090bbe001f
-AUX apache-tools-Makefile.patch 1528 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b WHIRLPOOL c6afac50b5926c7b5663fef0fa21b30c978a0e28dfc36aa5c0327fd0365dcb501a9808d0b525efd4aaee75d8f3c522072e1a0755886e049dcb2c05703f02150a
-DIST httpd-2.2.21.tar.bz2 5324905 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f WHIRLPOOL fbdf7e386cc08ca2295d184d7a8f840541fe325048a9dce0c980107017a08c9d1c2d361f88b4b3b1a90a7f3a52ae7b4def1eb2948a7db50132be84b7438cf968
-EBUILD apache-tools-2.2.21.ebuild 2126 SHA256 5cfd4f7a4478ab1ad29bfade1d8682b6df61056b3c5e2ad753a877b1f12db861 WHIRLPOOL 3027079faff74f2a5493e16ee4cd3982772a381125b535e4c951af56a72eb91bb254eb1540c073ca279ce2e5024c88a317c3c19f653962a031f62645f71712d6
-MISC ChangeLog 708 SHA256 57e26b970e4dbfbdff25d538aa395acc385b0d4575a7a26641e220be7505a978 WHIRLPOOL 254b941f43f54f981ec8ed198546f644195205150750be344a765702bc5022b602213e8a5ed152748867de8d27f906875f436cc30d561384b93caa2c7e6fb7a0
-MISC metadata.xml 455 SHA256 81d799cd48afc5c9c809f2a52400bd6a38ce207b4fb985928f7828f385ce227a WHIRLPOOL 780d8b41db3fa5967b7ba92253dc011f905714ce4d65c7b49a13b904012a5379edd0659fa68f41b9e26140c8e54546d80bea92c78a33c7747eaeb588635dafcb
diff --git a/app-admin/apache-tools/apache-tools-2.2.21.ebuild b/app-admin/apache-tools/apache-tools-2.2.21.ebuild
deleted file mode 100644
index 0180cdd6..00000000
--- a/app-admin/apache-tools/apache-tools-2.2.21.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="http://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/libpcre
-	ssl? ( dev-libs/openssl )
-	!<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_prepare() {
-	# Apply these patches:
-	# (1)	apache-tools-2.2.20-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-2.2.20-Makefile.patch
-
-	tc-export CC
-}
-
-src_configure() {
-	local myconf=""
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
-
-	# econf overwrites the stuff from config.layout, so we have to put them into
-	# our myconf line too
-	econf \
-		--sbindir=/usr/sbin \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		${myconf}
-}
-
-src_compile() {
-	cd support || die
-	emake \
-		LIBTOOL="${ROOT}usr/bin/libtool"
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# 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
-	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-	popd "${D}"/usr/sbin/ >/dev/null
-
-	# 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 0ac4885f..00000000
--- a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-=== modified file 'support/Makefile.in'
---- support/Makefile.in	2011-09-01 06:33:22 +0000
-+++ support/Makefile.in	2011-09-01 06:43:51 +0000
-@@ -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)
-
diff --git a/app-admin/apache-tools/files/apache-tools-Makefile.patch b/app-admin/apache-tools/files/apache-tools-Makefile.patch
deleted file mode 100644
index ac70fee9..00000000
--- a/app-admin/apache-tools/files/apache-tools-Makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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 checkgid htdbm htcacheclean httxt2dbm
-+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm \
-+	htcacheclean httxt2dbm log_server_status split-logfile dbmmanage
- TARGETS  = $(PROGRAMS)
- 
- PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
-@@ -12,22 +13,13 @@ PROGRAM_DEPENDENCIES = 
- 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)
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
deleted file mode 100644
index cd87cdb2..00000000
--- a/app-admin/apache-tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer>
-        <email>patrick@gentoo.org</email>
-    </maintainer>
-    <longdescription lang="en">
-        app-admin/apache-tools contains tools that might be useful without
-        having apache itself installed (like htdigest/htpasswd, but also ab -
-        the apache benchmark).
-    </longdescription>
-</pkgmetadata>