Version bump, bug #382971 wrt Agostino Sarubbo.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 102 insertions, 13 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 2ce175a6d3a4..f967d7e7a808 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.98 2011/09/03 13:31:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.99 2011/09/15 08:55:22 pva Exp $
+
+*apache-tools-2.2.21 (15 Sep 2011)
+
+  15 Sep 2011; Peter Volkov <pva@gentoo.org> +apache-tools-2.2.21.ebuild,
+  metadata.xml:
+  Version bump, bug #382971 wrt Agostino Sarubbo.
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> apache-tools-2.2.20.ebuild:
   arm/ia64/s390/sh/sparc/x86 stable wrt #380475
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index bd205f0ca058..b5caaeb287de 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -8,17 +5,12 @@ DIST httpd-2.2.15.tar.bz2 4959582 RMD160 e5c5da1fdf86a6b0501f6c8e97ccb1982e81cfd
 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
 EBUILD apache-tools-2.2.14.ebuild 2258 RMD160 2efba97f354d6a9eaee14b1ccce2c727fa99a7da SHA1 75ab4754ab0b5f51279fdfb13ef7d8df38fb4f28 SHA256 950671fe3809bfd809298c4bd320bb364d5ab92d3a15f0ea5f1b5313aa6253dd
 EBUILD apache-tools-2.2.15.ebuild 2258 RMD160 59724ab7bcdfba7b11df8e6c9d8cd9031e5b8009 SHA1 3b5d911a704aad2265c00979fa51d63b63bc9639 SHA256 e111039c13003aaa2b742e3b3331377d5e603f918102ab7816a1fdb57ac6e08b
 EBUILD apache-tools-2.2.16.ebuild 2258 RMD160 6320170a229afd82f5fb22f93a40a28bffda8796 SHA1 9dbda888e500f59f70a0cd104c65337134b98c13 SHA256 06f0709af7f0ac17065f83c8b682a59e576b9d8644ca789581dc66a7607db564
 EBUILD apache-tools-2.2.17.ebuild 2255 RMD160 b41f63e196b47409806ff15b05e0c2d1da6fe7ba SHA1 43ca70737bc80d08cc766d8411caee5eab68eb35 SHA256 57340284a76b4e01c1f58e8849f5c6bf4180ec66240cb3320c30362898051503
 EBUILD apache-tools-2.2.20.ebuild 2174 RMD160 e2dfd657e12c2a5fa91c5e6d5a71ced7b4fc7f30 SHA1 e13bc39b48cf16ff601497108d8b71eef66ef63c SHA256 437ec6866337c6930130759f8d42de8abffc3cc267851932b21f008abb189230
-MISC ChangeLog 12840 RMD160 6dce22e07f2b74494fa1df9ae3cc10bb9a7ad2a0 SHA1 5a55693180e4703580a060e4689c3128443bdf52 SHA256 2dffd5c46552b953892e71b7982707e5a642d083edbabd830b7780942ec55f99
-MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5iLDoACgkQuQc30/atMkBVZACgijR/Luuen9/Po4iCerGW0bOs
-n0AAnRo+HEU8RkIaGj4fdIuXP8he0bK+
-=pVOw
------END PGP SIGNATURE-----
+EBUILD apache-tools-2.2.21.ebuild 2181 RMD160 cc8472ff4f20892fb5d93ca7858c4b4b0443a50c SHA1 d30f33ea4cf06ac53ef15e71b78b289be48fa15b SHA256 ed3ed3dc5e6818cd171057bf3b602e2492e55ca79f6d9c5c08a09117d45cec97
+MISC ChangeLog 13013 RMD160 c498d330b41d5efde1592b62a59fa16b3eba37fd SHA1 a5e95e7ec6034a659344756c355f17ccd07ff679 SHA256 38a748d3be6369b763d74754426c1cf37c692270dbff6f13b62928e6e949d951
+MISC metadata.xml 505 RMD160 183767f6b3ccea982051dbcdf5b629d974ad4f93 SHA1 96bc02e944586719635449f469bfaae8749f39ab SHA256 6edf92855e13c3f84d19d6934bc8ca9a80c0af0a15e80463c356b7a5768df292
diff --git a/app-admin/apache-tools/apache-tools-2.2.21.ebuild b/app-admin/apache-tools/apache-tools-2.2.21.ebuild
new file mode 100644
index 000000000000..798e60660354
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.21.ebuild
@@ -0,0 +1,88 @@
+# 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.1 2011/09/15 08:55:22 pva 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}"
+
+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/metadata.xml b/app-admin/apache-tools/metadata.xml
index ace24ac6e456..4d46b240afd5 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -5,6 +5,9 @@
 	<maintainer>
 		<email>apache-bugs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>pva@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 -