Bump for #401761

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

3 files changed, 99 insertions, 3 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 4e9b50b7dda9..736583a05b1f 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,11 @@
 # 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.105 2011/10/14 16:25:46 beandog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.106 2012/03/28 15:02:38 patrick Exp $
+
+*apache-tools-2.2.22 (28 Mar 2012)
+
+  28 Mar 2012; Patrick Lauer <patrick@gentoo.org> +apache-tools-2.2.22.ebuild:
+  Bump for #401761
 
   14 Oct 2011; Steve Dibb <beandog@gentoo.org> apache-tools-2.2.14.ebuild,
   apache-tools-2.2.15.ebuild, apache-tools-2.2.16.ebuild,
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index c8a346844d5c..4037945a6f8d 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -6,11 +6,13 @@ DIST httpd-2.2.16.tar.bz2 4775545 RMD160 2e6d7d1dae40905be7fdd793140f62cf5811209
 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
 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
-MISC ChangeLog 14049 RMD160 35dd40daff2b9af0cde2d340fd7707dc2f7bafd4 SHA1 a12e5505fb5b44e99aca492c4b95a8e98e48d0ac SHA256 7f97bbbf6c7db31f0b7fbb6f8f2c899d3676ec2e5a47139c4a39b2ef18394dee
+EBUILD apache-tools-2.2.22.ebuild 2204 RMD160 a2a48414cf3af6e16194ddb21f1e885d982cf6ff SHA1 548aefe03456fe849bdd148ce60d7e92caa49558 SHA256 7d535b73fddc05d5e4193e7a7217dd37e113f91dd2cb1165b7427b4244d4ea37
+MISC ChangeLog 14184 RMD160 7e7b12d303141e38e692919257c527f8334f76e4 SHA1 6531135b1d08b4e775b73b4affde5d4cfe3f59ea SHA256 f2b070761b619ee3f003534ca6680320cd2d66c4d4ee1afd628d8deb2b9ab5ec
 MISC metadata.xml 505 RMD160 183767f6b3ccea982051dbcdf5b629d974ad4f93 SHA1 96bc02e944586719635449f469bfaae8749f39ab SHA256 6edf92855e13c3f84d19d6934bc8ca9a80c0af0a15e80463c356b7a5768df292
diff --git a/app-admin/apache-tools/apache-tools-2.2.22.ebuild b/app-admin/apache-tools/apache-tools-2.2.22.ebuild
new file mode 100644
index 000000000000..abb7dca66cd3
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.22.ebuild
@@ -0,0 +1,89 @@
+# 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.2.22.ebuild,v 1.1 2012/03/28 15:02:38 patrick 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,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
+}