Bump

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

3 files changed, 88 insertions, 22 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 7b4fca0dee78..71a551442dfc 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.168 2013/11/20 17:50:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.169 2013/11/26 03:18:44 patrick Exp $
+
+*apache-tools-2.4.7 (26 Nov 2013)
+
+  26 Nov 2013; Patrick Lauer <patrick@gentoo.org> +apache-tools-2.4.7.ebuild:
+  Bump
 
 *apache-tools-2.2.26 (20 Nov 2013)
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index da1b7773640e..07e502ff8f22 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
@@ -8,27 +5,12 @@ DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484ba
 DIST httpd-2.2.26.tar.bz2 5390190 SHA256 af908e3dd5673f1c6f0ccc615e11d435e77517940af00e518e68ea25284b42b6 SHA512 d66bef511acfc9b0daea699c83c282a88351f6820369a6ed70c71a192a90911c6d28491d845e545a50dd394241e16e41338c054844cddcffc49af99c6208ec41 WHIRLPOOL 9ac6e8f38144b701201d87d9010a79314f331cc696660358c1cd6a27e8a712910d6cf6796156dfa2aef9aeea64d47550afc9b2afa3984afd6c8f4519d6f61744
 DIST httpd-2.4.4.tar.bz2 4780289 SHA256 92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c SHA512 d68789e1e585b4acf26e4e32d063fa512525f8fcc2077b1dbf573dd9f4b47667772d94bb65fefb354fbfae331e87b3fdea422a732838c86d8887eed4b3a76af0 WHIRLPOOL c2ec29a0d52ff1d674f103d0d59c0acd15b194b1102ba5078ef76b62aa959ff92adc5977e095b30c6a778cd9385f9c4ded9bfdc6ce8fba381735ca1aa84aa9f0
 DIST httpd-2.4.6.tar.bz2 4949897 SHA256 dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea SHA512 8ade7ec5291f07a60e279f7a73a79c11c150dbf09c9e7b059e136fcb250130aa0f381b118f84e230184b065d452d5e946df8a5766991be8cdc6e8f5d4c4bac01 WHIRLPOOL 81f036bb438afa30106a402e256d641a2687b619ef7f6ea3e4ab61f30715560e1c9dd3afa3e53c4d99c77de72f100e8a1894a5a898247c381100ceb165b8a146
+DIST httpd-2.4.7.tar.bz2 5004719 SHA256 64368d8301836815ae237f2b62d909711c896c1bd34573771e0ee5ad808ce71b SHA512 35500788e1a8b5813bbc0ee0f647ec4acb5b13c27bf5d826691487ea23ee27d4a3babea766fa70f960eb347f6e2c243d1315bb2f1aa082509e632560e7eef562 WHIRLPOOL b82065bec3d6b24ec39282f07d05e4e8ee64599679c68c2879841b359e1326ba9773f13d6c5cd5df1a1d23a641e330fcaab8b363b65eddeb1aba1733f82941c5
 EBUILD apache-tools-2.2.24.ebuild 2202 SHA256 de2aa272f672eae732029cda260db4919f1cefff76b96cfbdaf1a764ffafcfa7 SHA512 bbb79157cf3152741e9e9513ba5071bfb2e2bc089ab708dd102bc69172c3480743cd18c7cfefc0ba1f4a886e942ba44a71fca5fd4be7d0561f48b26ba9c64a1c WHIRLPOOL 792750e7f132a2a2e9d485b1453f9240f5b245879ae1dc8eb267184dda0e15de68dfb958eb29b6f4fb1498f3da5199802a58af28783f973d54bfa7e01b756c15
 EBUILD apache-tools-2.2.25.ebuild 2202 SHA256 4c0697926a8c8cd2c31f82bce92ceea30056f1bc3920a9aac3a3b820f2298fcb SHA512 b79139d2ae32a0fd8fb19202db22d29e495d30df36e249398a21afca8cb3e5865d92bdd64ddc3e6457ce85e48016e2ef8a9ece2885fb1a789e6118b9f974444e WHIRLPOOL 7e2de33d4067406b40fd88cee443c7021d85c0a4c548d5e715a52e1b71bbef75029db05614322f4b36a268d5ca04531eeedceb7d07b02d604ab5a8b0385b8c14
 EBUILD apache-tools-2.2.26.ebuild 2221 SHA256 4818d191c347047775fd571b3ca17855f3caa77190c2694e5a04ce334c5875df SHA512 b7bf51c4cff53be14a3c4b81011d2229f7980bf57413fe8a3e72764b78b2b1bf83f9d98d1765a3678ed7edbab4ad7606dc20404c43e0d542862445ca6d7bf497 WHIRLPOOL c16c8efd717e07e31a5887689a17bb9eb7e76e81614d56b6050b1b2d85b0a63d7b1c2abadb799f333ffee9cb5ea156f749b60ba121b09601207e69e3f59917f5
 EBUILD apache-tools-2.4.4-r1.ebuild 2148 SHA256 97666ace44a8cc5ac576f9c34104f9a50483d018f5466674b6ab8e2b66aece3e SHA512 2c1fc775fdc103a14072bb4d772b61ecc5ba533965a7270055dc6d43044f1eb4556802446e79074d397d9604eb0c9de29be04740c16e363a0b230cb2130274ae WHIRLPOOL 877a59cdb0b9647641abcc506df6c886decd9e500a390abf916cd9d07f3115bb6906e4dff9dd219cef0141a8210a5f6f4f571f25fe6f90a9b6c6d77241af9cad
 EBUILD apache-tools-2.4.6.ebuild 2157 SHA256 2ab323eacd82841147067319e8edb6a25ac1cf157743b67f4e6205d23c825db1 SHA512 6726a12da4311835f17c86ddbb261beeb0bb881da8f8eec0543ffbb057582d2b2c11bbeac29ee4924eedd85e73c9fb99ec25b0ed04e52b42d8e34fd009a44b03 WHIRLPOOL 614250db03146adf0c31d59f39dadfd8bc6235875522e8f74bbc42b38a4abcf23bcd0664d3aa5d67e6b9a6828ca5cf73ab9956d769bf6e59f9664de8633bf38b
-MISC ChangeLog 21926 SHA256 38f84ce0dd10b1b0de72be30c9542cd4e2a22e1768aa96fad12af663ca2a2b9a SHA512 364c7144117e3569a1fb10fb3a6e45ff6b14d0f4e5d68e76e47e62ed67d060d48129ec4b1c219f287ad336a8b9278ed5eb4c316c630d99a10677083f7c9de3d9 WHIRLPOOL 8f1863a40f2bd0b58a8c0ce3cba162fe38ac30484bff2ab406152ab151a8ac378a0b9603f8ce92a0fe3607c514288903a6bcec8dc273b4de1422621f41d9c9c4
+EBUILD apache-tools-2.4.7.ebuild 2157 SHA256 e4a80d3f02a92e9909d95a3db5d85ef571d1d6513637753927940c69b1e95c6f SHA512 00085baeee2c0e89657af5f4200e03da505ad0817be70288126dea9efd4d976b3735305c94264349709e5a14cdccc06c3a8d9d55dd674c71ffe6e1fd0ee4918a WHIRLPOOL d3224c53c70b6afd843e5872b80f202398e48b12f0eaad9f51632ad76ad2174063d8b6a6e9a3bf108de7e51ba30b719775a91cd609b351242bd4d6f0c6b5196e
+MISC ChangeLog 22042 SHA256 12a48c53abb99f703b9a82ec6110e5f21189e645ba73b6e8996e51b847dc83ea SHA512 cbf399da0f4fedc59a39562c496a606f7bd36dcf77103ff71cd22eaa2e8108010380039b3749c479fb6c41ef4c6fc4548e72fc5e135276a2e22a434ebf488c77 WHIRLPOOL af380a3d319e5f71128147c44ddb377575332a0bcf6bf7a3d9f7d9a8e141518f591dd322c7f4822ddf92ef189186ebeb7b3ae5e984245b307a0590ad08393ef7
 MISC metadata.xml 447 SHA256 0c3368f3e86be6edd03475789616c13ed8494d68cccaedcb658a93358df41e47 SHA512 b1f596f76b1a923bf1d52f1f2b5e14b22e0a73412705a9549713e566cb34351bd9845a9d4b1fc35183a4553d9ca0b69092ccd2564c04a99468890b64a0cac6be WHIRLPOOL 3fc1ec31ae1eb2e827e8a7893bf2191d4f9db4e230038204bbecf3af012d82f61e577d8f2788795ebdd23427b00983fdf1e39fbc87fe0d6d007b6dbdf5dda1c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSjPZcAAoJEPiazRVxLXTFEtoQAIa/zMauOy2C0cbevajW8wAc
-VLeDBSMcYYdvLTVeWgYuGmeDT/5Rc9xsQe619yG7v7De35hme++UyZpvEMLljosH
-6dAypRtT9AjqLxde+E++0tQLpCgho+isM1OfPMhZITgO0uYWKzFbQ8cdv+pDGmia
-dmMCutf9NC6AhA/GYT0UB1WA7877fT/lBKakAotGn39tEnna8T7uUfamC2XfzlWB
-3d3lJmuaKYNIZPf1Mzl4Xss6wJJIQlJyZ1hHCwMR4pkRT8jahue5AvaElU1mblxz
-WFXvp+lz8rnyNzsW1bi/qiXFoB5V8v82UHqPvqABSbOQf9qjxgYAVGfMyPUSoeCj
-bYFq85yMlwQ654ctFnQI30HOAAtIFH1nFfobZd3X77D6sx/oP76KDKqjzaCR7Kow
-tMN1VdGMNupHtE+KYb76bvbxJKbCGCnTyi//dQTHJ9pI02ONMnRttDE0Fb3GJFTW
-TUSXIhdea1p4an7xkLco76BpNFtCmTzQWccQmmH0/TdpCnRMG2y/HZY/DMAWCKPH
-CtQJCvT3g2xcthnaFof3H/omZ+Jwzg596W++tEGDFy+SG+4KUVhdU7zHtvYcNmf+
-fFBvCn3loTENL18nEUYRq4CfF6tNPr3tDdftAwQuLtdqkNBrTbpAi2KG107KPYvk
-wHeVm4XEvRai3XviSfb+
-=SBpe
------END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.4.7.ebuild b/app-admin/apache-tools/apache-tools-2.4.7.ebuild
new file mode 100644
index 000000000000..7a9273e60334
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.7.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 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.7.ebuild,v 1.1 2013/11/26 03:18:44 patrick Exp $
+
+EAPI="3"
+inherit flag-o-matic eutils multilib
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+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=${EPREFIX}/usr --enable-ssl"
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
+		--sbindir="${EPREFIX}"/usr/sbin \
+		--with-perl="${EPREFIX}"/usr/bin/perl \
+		--with-expat="${EPREFIX}"/usr \
+		--with-z="${EPREFIX}"/usr \
+		--with-apr="${EPREFIX}"/usr \
+		--with-apr-util="${EPREFIX}"/usr \
+		--with-pcre="${EPREFIX}"/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 "${ED}"/usr/sbin/ >/dev/null
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd "${ED}"/usr/sbin/ >/dev/null
+
+	# Provide a symlink for ab-ssl
+	if use ssl; then
+		dosym /usr/bin/ab /usr/bin/ab-ssl
+		dosym /usr/bin/ab /usr/bin/ab2-ssl
+	fi
+
+	dodoc "${S}"/CHANGES
+}