Cleanup

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

9 files changed, 8 insertions, 642 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index deb16f4de93d..8db5b574b098 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.116 2012/04/20 04:00:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.117 2012/04/20 04:38:40 patrick Exp $
+
+  20 Apr 2012; Patrick Lauer <patrick@gentoo.org> -apache-tools-2.2.14.ebuild,
+  -apache-tools-2.2.15.ebuild, -apache-tools-2.2.16.ebuild,
+  -apache-tools-2.2.17.ebuild, -apache-tools-2.2.20.ebuild,
+  -apache-tools-2.2.21.ebuild, -apache-tools-2.4.1.ebuild:
+  Cleanup
 
 *apache-tools-2.4.2 (20 Apr 2012)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 02b82a43ad93..e32c0399c072 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,22 +1,8 @@
 AUX apache-tools-2.2.20-Makefile.patch 1621 RMD160 9932b9ec5a8aa63628c4aefed3437c0eded71b9c SHA1 50b81e7caeb2c128de377d682d95ca831be44b0a SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d
 AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db1030fa3 SHA1 863110419b1fa393d36dfbcd0adf1da827b86f76 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b
-DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
-DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfdf SHA1 5f0e973839ed2e38a4d03adba109ef5ce3381bc2 SHA256 5ae0c428e7abd87eecbac8564d90a7182104325bae7086c21db7b3a1e3140ca7
-DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf58112095 SHA1 ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9 SHA256 9457d57a6bea15ce5bde83c88803c030953b99bdd0fbae65854adff527ed4c52
-DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaff SHA1 5c9b44620dee449a86ba1bcba1715033c2c26b08 SHA256 868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04
-DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
-DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
 DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb9 SHA1 766cd0843050a8dfb781e48b976f3ba6ebcf8696 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
-DIST httpd-2.4.1.tar.bz2 4101303 RMD160 6d21d828028ce1cff8648fb29c8eb1b75fd96451 SHA1 23beffce77529971e09d0fb1e760cadf80afa4e6 SHA256 7f1118cb0a1f9b505cdb9b7e854854fa2050d6ed0875b65e994bb35f267a0cca
 DIST httpd-2.4.2.tar.bz2 4132105 RMD160 1b97ab44075bea0f398f507dacb5f719a87b720b SHA1 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 SHA256 5382f9c507d3d02706e33d6308ea041f39e8511b5948aef0ca188df8f90159b8
-EBUILD apache-tools-2.2.14.ebuild 2278 RMD160 d5343cbb152ad2ca485f4bb8af49ae14f7c1ce12 SHA1 b9c686e79e85b961e4155a0173643884492e8339 SHA256 e31fdf1ef8db4ce82973637b7f1d0b4ad4cebaa9188c8e2aaba910651a4f18bd
-EBUILD apache-tools-2.2.15.ebuild 2278 RMD160 fa188e760527e9df296fe702dc0292f25f731a92 SHA1 4f7a69a4beb68f891937469d6ea0e6b493a6f252 SHA256 48ae8ba286d57ebe5d26c8b51e58cc4315ddfdac17431ad03ce30bde1eb9e970
-EBUILD apache-tools-2.2.16.ebuild 2278 RMD160 0709eb0d8595b84e0649ea71e1bb12b9f7d0b471 SHA1 ae69e4f093a21cefec38a45fcb5983841dbbdd14 SHA256 76339e9a16770c2338e29e60911ed32c03b5e0e6f6bd30bd2ed52c9e330acb88
-EBUILD apache-tools-2.2.17.ebuild 2278 RMD160 895211a8d5826186d2ff97f6b58f71094d1c01e5 SHA1 8ff07a2d097b6d999f1c9a288aada54d068af9f9 SHA256 977b93decd0c226b037501edd2e202f55cfa6778602d57a41c13e3bc2ae53286
-EBUILD apache-tools-2.2.20.ebuild 2193 RMD160 d91e8696d2f91f7018819cf73e045f1479a6b316 SHA1 e022c94716dd36c72a39fa2d81d1d34a4ab22f29 SHA256 24112652c333eb2549d7c0ed69d097ee787bc58516882d738156bcd1cd36f828
-EBUILD apache-tools-2.2.21.ebuild 2193 RMD160 a5aa55b8d6639c3afeae72ce4c5f23e9602b4ce9 SHA1 ea103fbe1febcafb57ca7618c1657f426c3dae95 SHA256 4dad414ea1453bdf5627697ae4d3ad0dc226d089d589988221b19e81ac0ff78f
 EBUILD apache-tools-2.2.22.ebuild 2192 RMD160 0754bfc27b750e90b1dc3f8ef8de7270c8b1b43a SHA1 2be186311296c25d5e5e1acbcea639f2c1be05a4 SHA256 2145b07d59cd1df5a933e54f64ccd3866aeac24d15d054686c2a93ede623836f
-EBUILD apache-tools-2.4.1.ebuild 1953 RMD160 2e20a9320fc2c1a459784077769232a5c0f3185f SHA1 552a2ef40796d70266fc89384f4ff4a8142a5fce SHA256 df902239134f236e6abb907ac964c10d2247a9d29f4724823e091b92a68a69e3
 EBUILD apache-tools-2.4.2.ebuild 1953 RMD160 d09b3b7b2f87e0e46780bf272a2f920eb9c6aaff SHA1 fde4dbc459feec4091cd9405f4751928334bd4a7 SHA256 b5f76863b42280e4f61517fba0a6ebb231165c120109d8632ca8c9dbdb7d0697
-MISC ChangeLog 15378 RMD160 0d2f7aa047ed7f49c84d92083be06d7fee399adf SHA1 8e2b155f7173aa7c68cd67ce71defaae0c62d7e6 SHA256 a50c33af84b14dffe1f0ba337728e58efb3df609e4ade839052e74b0d4e8cd51
+MISC ChangeLog 15647 RMD160 db35b7471c6c1423d68ef5839e4a76d467806f6d SHA1 e64d32a3614a1eba61f83930d83682d4c49df043 SHA256 9693551609d4b722c2a404a5189a521e19de68d2e2626d470f77ad689665ef14
 MISC metadata.xml 740 RMD160 d7c1fb22c5db40796d9fbfe0d7ec49eaa3e25b73 SHA1 c83da0ebabef3bc3593410736acbc092f2353b95 SHA256 d9a6e6550077d56e9b56524ebe1b31c6485d16345d232b2a542faa8c92193fc0
diff --git a/app-admin/apache-tools/apache-tools-2.2.14.ebuild b/app-admin/apache-tools/apache-tools-2.2.14.ebuild
deleted file mode 100644
index 7e7c19b04f4b..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.14.ebuild,v 1.9 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply these patches:
-	# (1)	apache-tools-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-}
-
-src_compile() {
-	local myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags $(no-as-needed)
-
-	if use ssl ; then
-		myconf="${myconf} --with-ssl=/usr --enable-ssl"
-	fi
-
-	# 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} || die "econf failed!"
-
-	cd support
-	emake || die "emake support/ failed!"
-}
-
-src_install () {
-	cd "${S}"/support
-
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-
-	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# 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/apache-tools-2.2.15.ebuild b/app-admin/apache-tools/apache-tools-2.2.15.ebuild
deleted file mode 100644
index af225e1e5b6a..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.15.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.15.ebuild,v 1.8 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply these patches:
-	# (1)	apache-tools-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-}
-
-src_compile() {
-	local myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags $(no-as-needed)
-
-	if use ssl ; then
-		myconf="${myconf} --with-ssl=/usr --enable-ssl"
-	fi
-
-	# 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} || die "econf failed!"
-
-	cd support
-	emake || die "emake support/ failed!"
-}
-
-src_install () {
-	cd "${S}"/support
-
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-
-	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# 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/apache-tools-2.2.16.ebuild b/app-admin/apache-tools/apache-tools-2.2.16.ebuild
deleted file mode 100644
index 78eb6d43ab20..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.16.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.16.ebuild,v 1.8 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply these patches:
-	# (1)	apache-tools-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-}
-
-src_compile() {
-	local myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags $(no-as-needed)
-
-	if use ssl ; then
-		myconf="${myconf} --with-ssl=/usr --enable-ssl"
-	fi
-
-	# 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} || die "econf failed!"
-
-	cd support
-	emake || die "emake support/ failed!"
-}
-
-src_install () {
-	cd "${S}"/support
-
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-
-	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# 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/apache-tools-2.2.17.ebuild b/app-admin/apache-tools/apache-tools-2.2.17.ebuild
deleted file mode 100644
index 7c6da8168c0e..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.17.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.17.ebuild,v 1.9 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply these patches:
-	# (1)	apache-tools-Makefile.patch:
-	#		- fix up the `make install' for support/
-	#		- remove envvars from `make install'
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-}
-
-src_compile() {
-	local myconf=""
-	cd "${S}"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	# Thanks to Harald van Dijk
-	append-ldflags $(no-as-needed)
-
-	if use ssl ; then
-		myconf="${myconf} --with-ssl=/usr --enable-ssl"
-	fi
-
-	# 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} || die "econf failed!"
-
-	cd support
-	emake || die "emake support/ failed!"
-}
-
-src_install () {
-	cd "${S}"/support
-
-	make DESTDIR="${D}" install || die "make install failed!"
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-
-	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-
-	# 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/apache-tools-2.2.20.ebuild b/app-admin/apache-tools/apache-tools-2.2.20.ebuild
deleted file mode 100644
index 4e8386cbd20e..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.20.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.20.ebuild,v 1.7 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-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
-}
-
-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
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.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/apache-tools-2.2.21.ebuild b/app-admin/apache-tools/apache-tools-2.2.21.ebuild
deleted file mode 100644
index 2b597ef0fdba..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.21.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.21.ebuild,v 1.7 2011/10/14 16:25:46 beandog Exp $
-
-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 ~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}
-	sys-devel/libtool"
-
-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
-}
-
-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
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.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/apache-tools-2.4.1.ebuild b/app-admin/apache-tools/apache-tools-2.4.1.ebuild
deleted file mode 100644
index 3ca6dd5d13ce..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.1.ebuild,v 1.1 2012/04/01 04:51:41 patrick Exp $
-
-EAPI="2"
-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 ~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 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-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
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs}.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
-}