Bump for #432284

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

3 files changed, 98 insertions, 3 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 0918f21a7dff..a2d634f30958 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.118 2012/05/12 18:09:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.119 2012/10/12 05:35:02 patrick Exp $
+
+*apache-tools-2.2.23 (12 Oct 2012)
+
+  12 Oct 2012; Patrick Lauer <patrick@gentoo.org> +apache-tools-2.2.23.ebuild:
+  Bump for #432284
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> apache-tools-2.2.22.ebuild:
   keyword ~amd64-fbsd
@@ -461,4 +466,3 @@
   +apache-tools-2.2.4.ebuild:
   Importing the ebuild from our overlay for #150943 (needed for Auth/Digest w/
   lighttpd).
-
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 9e98f30024c2..79249ca12bf2 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,8 +1,10 @@
 AUX apache-tools-2.2.20-Makefile.patch 1621 SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d SHA512 10adb26f52aee6b30214af1ecb69c7a1657a766928aa92dc5b502e702d2c3248996cccfd4cca74d550d6f378f5859289c76225cf5e145081abe2a1f2cceb9a8d WHIRLPOOL 68da82a6300facc7921cc04f0aa0aef9c50f3507f549b548aadc50be65b6097c56bda22a5409883ea83c41a681baa7b4c02a6594de9f94e7969351090bbe001f
 AUX apache-tools-Makefile.patch 1528 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b SHA512 b4c54da921ec99ddfb2be2456e4e67660db45fe4fcd4c700a753f63aab2d9b8c1a13ad3408551cbcb595afc6300ced4f2855920229d9743f87a4d18eba4a43d6 WHIRLPOOL c6afac50b5926c7b5663fef0fa21b30c978a0e28dfc36aa5c0327fd0365dcb501a9808d0b525efd4aaee75d8f3c522072e1a0755886e049dcb2c05703f02150a
 DIST httpd-2.2.22.tar.bz2 5378934 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231 SHA512 b6901453aaef3cac31cf763f7748e06a2492e1f72e4158627f38e45423a9bcd9bea1f74ba1a1ec9a5c7fc554eb062ea61b944e2001f19825def2e530ce8a42bc WHIRLPOOL 32a03d638f82d791effdce888a02e66189d6fe87c2179ab9f3de034fbf5c8311d24835f28e9a18addb847aa6859ed817bf2e11833e315285474eefcea6f56891
+DIST httpd-2.2.23.tar.bz2 5485205 SHA256 14fe79bd6edd957c02cb41f4175e132c08e6ff74a7d08dc1858dd8224e351c34 SHA512 69b3bc942b2a91cdb57356a5c57078794db2d8404a23080a2621cdf33ae2d9bdbbacd0f6e95fd6e71fbfa87e94942be0a014c3e8709148f991e391d03aa6dee2 WHIRLPOOL 8d00184aff654b2d7f1c5ebd471f19ffcb57107ea37179fa05c424424d7b70ff0c9abf3be68ed9f0d091b3c057f1ba24cb989937e35087c3199f82e3dddbbd4f
 DIST httpd-2.4.2.tar.bz2 4132105 SHA256 5382f9c507d3d02706e33d6308ea041f39e8511b5948aef0ca188df8f90159b8 SHA512 1036341eeeae36b032ec9f5077bf97a02bc4cb7eceef4b64f8a7e7809065afaeafafbda8a3547f48f34b49ac695ef39b15ba79aec917160b373cc2c1100460f8 WHIRLPOOL 2244a6c3e054c7babb30102e5ceb65239be4f3785ca739ec2c6230477c6c40f464a55cd68963fd4a8b8519fcb7a09aa039ecace15ee239cae07b69aa1c51ee51
 EBUILD apache-tools-2.2.22.ebuild 2206 SHA256 557aa0e173108d78bd3d971897df47e621b66f5abb3db31716f901fe5c70b9bd SHA512 411fc23bb8a9221b5c6ceaeb6a5ac7af25ee8fd8dd12fe930688b8e7669d65113fbab89e912ca10ab468401ed067f11f3f8f690658d3f33c4438db2e7d4a29ea WHIRLPOOL b1c47e27da7c51aacb7da44397d37a800e07f4187c972277faf8d523bbce2dd442ae44536ab81428316aa4899c0a5ced389c9f9355c7787cb2d43737994768e7
+EBUILD apache-tools-2.2.23.ebuild 2216 SHA256 9930d801c12ff46524fcfe70d3dca26f8d39a850f31d8d2b5ccd501243c76fdb SHA512 16525b4d5654a31a75c8bf3b2d0cd8cf911e9b03106afdc6ccc8cb1f11731f036910a103dbcf9c3ed7cdc4332593327876041610d47a5d8575d0c8c3759e2d24 WHIRLPOOL c2e449c43e30f498283c40e6919bfce3e6032bb89edf2ddb26673d2992c7c1ea11eed0206027e90b000387e2dd19f612bfe2a97de7624b4113e5d7c8ccfd59f6
 EBUILD apache-tools-2.4.2.ebuild 1953 SHA256 b5f76863b42280e4f61517fba0a6ebb231165c120109d8632ca8c9dbdb7d0697 SHA512 b9b5f1417002f639e8ffd66f00c2fb16d73778a2e3cf632ac399e6c5c212ef3d8567d9d4a3639c238dbe919d19825b564995a9d1822cbbfe49add45dc123c5fc WHIRLPOOL 28d19acc3ad7603707f95e0773e1df8e2dee0e18ed568396ad5d3486061db745df4ca592b7995c5ee8b20a7c802dd7b51733301689ce5036695478fb1284ef4f
-MISC ChangeLog 15751 SHA256 abad75e699eec3d67947a7bc13d32a4584673c7865367571cb046e4f20c8f585 SHA512 0d2a566483cc769a7e23ada5429a71cc4e91118693a6ec461011da412352b7eb04663fdc02d188039dbbead89bff42bacd92e361852c3a4929b80ac0ad61bd6d WHIRLPOOL 74b59472677037bf76eb9d24716d39c963cd0978092af42509d106c6a4c8ecb6e128e91c941373d505752a8d46b3d251af7fff04f9f7b73d92c8d8e0e64e16bf
+MISC ChangeLog 15884 SHA256 a4617f15f4c59eb82e38e0bab5317eebb71522febbbe6571cde70421cfd0df2e SHA512 7e8e65098e6dcc30fb736942fab11a9ff28024ccae2941e196a466a418f20706e9e603468f715e16ab3b7340c88b1593383327e963618883d94af79b273d018d WHIRLPOOL abc698a328289a4c2f2671dd7ab88aa17a6b7797af06f0c1b05a7802f14a065cb2075913af7dfdcb000691cbf2c49966904488b2dc888315089fa6285d13bdd4
 MISC metadata.xml 740 SHA256 d9a6e6550077d56e9b56524ebe1b31c6485d16345d232b2a542faa8c92193fc0 SHA512 046ec748ba58d489c371e3d57b9536ed796e227c67ed14e56cc5c774062fee9300912375603a9800e26ff94556ff0fca57e84a2a43f0a76327aea4dbc3c80ca8 WHIRLPOOL 7c809af1dcf83c39421616faf4178c9a602f71e35d2e1a0f9fea638a46187437bc326b579e118e7707c392683a7ec58b2d41de40d4ed0ddfe35118ecaac9f4ac
diff --git a/app-admin/apache-tools/apache-tools-2.2.23.ebuild b/app-admin/apache-tools/apache-tools-2.2.23.ebuild
new file mode 100644
index 000000000000..bb053313a48d
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.23.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.23.ebuild,v 1.1 2012/10/12 05:35:02 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 ~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}
+	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/{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
+}