Revbump to fix collision.

Package-Manager: portage-2.1.2.7

5 files changed, 121 insertions, 14 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 2f809b071a60..f0231d2e3de5 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.4 2007/05/26 18:14:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.5 2007/05/27 20:11:02 kloeri Exp $
+
+*apache-tools-2.2.4-r3 (27 May 2007)
+
+  27 May 2007; Bryan Østergaard <kloeri@gentoo.org>
+  apache-tools-2.2.4-r2.ebuild, +apache-tools-2.2.4-r3.ebuild:
+  Revbump to fix collision.
 
 *apache-tools-2.2.4-r2 (26 May 2007)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 5a2c89999cd0..4cf6be5beafa 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -10,14 +10,18 @@ MD5 1897b508c0a23845ef5c46f324431508 files/apache-tools-ab-ssl.patch 369
 RMD160 d71ca40e73de658d92d40cba4552941f20b27029 files/apache-tools-ab-ssl.patch 369
 SHA256 f3ee7997715cfe8b1d9a690948ec48df7af1dfa162ce9cf1cce8e6bd1da12826 files/apache-tools-ab-ssl.patch 369
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
-EBUILD apache-tools-2.2.4-r2.ebuild 2289 RMD160 bd7f8aa82aa480f1d614ebb1a75c7bc82ec91f36 SHA1 337d508cb91fa415d576f324846847b20b1347a6 SHA256 c242ed2d8e652c960353e52ed41d025499fa1010389378c57150cd7bf1eb5f22
-MD5 2c0c31fc156e295c80f9dc6da118a29f apache-tools-2.2.4-r2.ebuild 2289
-RMD160 bd7f8aa82aa480f1d614ebb1a75c7bc82ec91f36 apache-tools-2.2.4-r2.ebuild 2289
-SHA256 c242ed2d8e652c960353e52ed41d025499fa1010389378c57150cd7bf1eb5f22 apache-tools-2.2.4-r2.ebuild 2289
-MISC ChangeLog 1100 RMD160 606c320526d7813ba9e8b072779c10f651fe102e SHA1 30e2e0a58c20110a4b22470bd01f7157313a6978 SHA256 2cff8ebb64915d20a71c8b03cdc38525d26ec87d50289f24a5ea8957c2d7230e
-MD5 ac3c85f15e9beb6ca4219f89f7f9f723 ChangeLog 1100
-RMD160 606c320526d7813ba9e8b072779c10f651fe102e ChangeLog 1100
-SHA256 2cff8ebb64915d20a71c8b03cdc38525d26ec87d50289f24a5ea8957c2d7230e ChangeLog 1100
+EBUILD apache-tools-2.2.4-r2.ebuild 2288 RMD160 8949108bad8a97351264b51dad2fd122657150f8 SHA1 085324086d4d9d2791de20671f652bcc550c0947 SHA256 bddbf2d64c7f4197f48947d1e6bfe65c3553426884b8081f10af3a7c3137c089
+MD5 61ff0a21c72af1ab5a94f7e1fa9517d3 apache-tools-2.2.4-r2.ebuild 2288
+RMD160 8949108bad8a97351264b51dad2fd122657150f8 apache-tools-2.2.4-r2.ebuild 2288
+SHA256 bddbf2d64c7f4197f48947d1e6bfe65c3553426884b8081f10af3a7c3137c089 apache-tools-2.2.4-r2.ebuild 2288
+EBUILD apache-tools-2.2.4-r3.ebuild 2283 RMD160 4f3e6e67ceb12d71904221a8682a2b2b737be727 SHA1 257d85630c7078dd8d21a923d700c41bd5d704f1 SHA256 9f90367696bab0202eacfe6035d52fe11a188519a5a90aa4cd1bc88d0b682cc5
+MD5 366c1acca692d7de43f0fbf78db76ada apache-tools-2.2.4-r3.ebuild 2283
+RMD160 4f3e6e67ceb12d71904221a8682a2b2b737be727 apache-tools-2.2.4-r3.ebuild 2283
+SHA256 9f90367696bab0202eacfe6035d52fe11a188519a5a90aa4cd1bc88d0b682cc5 apache-tools-2.2.4-r3.ebuild 2283
+MISC ChangeLog 1283 RMD160 4d71df4cd7dab1fcc7a3020db7a75063b9b0a94b SHA1 c8a3e9ecfa3714d7f2751f8bf3e3392be6679860 SHA256 83b0a5228661c5da14ea885d5ffd42981689d06db4a55ffbf1988d0decf3f343
+MD5 b25fdf49efd0bf840f059aad8dbec126 ChangeLog 1283
+RMD160 4d71df4cd7dab1fcc7a3020db7a75063b9b0a94b ChangeLog 1283
+SHA256 83b0a5228661c5da14ea885d5ffd42981689d06db4a55ffbf1988d0decf3f343 ChangeLog 1283
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
 MD5 f58e4db131bec13f30dc06e7f43d3da1 metadata.xml 444
 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 metadata.xml 444
@@ -25,10 +29,13 @@ SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c metadata
 MD5 aa71cde94322b137c83be34a071fa0b0 files/digest-apache-tools-2.2.4-r2 241
 RMD160 e147c8301d25ae38730c7fadf7353a0cdcf9a599 files/digest-apache-tools-2.2.4-r2 241
 SHA256 b4719ddba967e2c38193dc4fd4c74fd3c9a670528d947ff22095b6cf562edb41 files/digest-apache-tools-2.2.4-r2 241
+MD5 aa71cde94322b137c83be34a071fa0b0 files/digest-apache-tools-2.2.4-r3 241
+RMD160 e147c8301d25ae38730c7fadf7353a0cdcf9a599 files/digest-apache-tools-2.2.4-r3 241
+SHA256 b4719ddba967e2c38193dc4fd4c74fd3c9a670528d947ff22095b6cf562edb41 files/digest-apache-tools-2.2.4-r3 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWHj9yuNVb5qfaOYRAnbHAKDDneKEyYj3yzww1dZXISRsQGl4yACfTz5S
-IogiDAAVTl+ZQbS/g9xqa7U=
-=bS23
+iD8DBQFGWeXsugEuf3OQ0akRAjcLAJ9Jf55l8Nf+eE8BG+vt0YUFBNcDswCfSpoz
+HONbhU0Tx3ONRcBEWV3GmrQ=
+=ZDV5
 -----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.4-r2.ebuild b/app-admin/apache-tools/apache-tools-2.2.4-r2.ebuild
index c6e1c07df251..451acb419b19 100644
--- a/app-admin/apache-tools/apache-tools-2.2.4-r2.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4-r2.ebuild,v 1.1 2007/05/26 18:14:10 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.4-r2.ebuild,v 1.2 2007/05/27 20:11:02 kloeri Exp $
 
 inherit flag-o-matic eutils
 
@@ -47,7 +47,7 @@ src_compile() {
 	append-ldflags -Wl,--no-as-needed
 
 	use ssl && myconf="${myconf} --with-ssl=/usr"
-	
+
 	# econf overwrites the stuff from config.layout, so we have to put them into
 	# our myconf line too
 
diff --git a/app-admin/apache-tools/apache-tools-2.2.4-r3.ebuild b/app-admin/apache-tools/apache-tools-2.2.4-r3.ebuild
new file mode 100644
index 000000000000..0464f5f010cd
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.4-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2007 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.4-r3.ebuild,v 1.1 2007/05/27 20:11:02 kloeri 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 ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/libpcre
+	ssl? ( dev-libs/openssl )
+	!<net-www/apache-2.2.4"
+
+DEPEND="${RDEPEND}"
+
+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'
+	# (2)	apache-tools-ab-ssl.patch:
+	#		- Add support for SSL-capable version of ab
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
+	use ssl && epatch "${FILESDIR}"/${PN}-ab-ssl.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 -Wl,--no-as-needed
+
+	use ssl && myconf="${myconf} --with-ssl=/usr"
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+
+	econf \
+		--sbindir=/usr/sbin \
+		--with-perl=/usr/bin/perl \
+		--with-expat=/usr \
+		--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
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r3 b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r3
new file mode 100644
index 000000000000..1e007f41e88e
--- /dev/null
+++ b/app-admin/apache-tools/files/digest-apache-tools-2.2.4-r3
@@ -0,0 +1,3 @@
+MD5 536c86c7041515a25dd8bad3611da9a3 httpd-2.2.4.tar.bz2 4930375
+RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 httpd-2.2.4.tar.bz2 4930375
+SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8 httpd-2.2.4.tar.bz2 4930375