Bump for #405767

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

3 files changed, 134 insertions, 16 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 8b885ef4af85..57f841fa45c1 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.180 2012/03/29 10:40:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.181 2012/04/01 04:50:02 patrick Exp $
+
+*apache-2.4.1 (01 Apr 2012)
+
+  01 Apr 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.4.1.ebuild:
+  Bump for #405767
 
   29 Mar 2012; Agostino Sarubbo <ago@gentoo.org> apache-2.2.22.ebuild:
   Stable for amd64, wrt bug #401761
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index b53d774c9a77..dbafce739e63 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,25 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST gentoo-apache-2.2.21-r1-20111018.tar.bz2 64196 RMD160 fb3d4c1716ecf2763caef5f5d927d8276ebaca47 SHA1 347138d7738c6bbfc0eab1d520f101ac1bb0fa35 SHA256 8c78505a34184b526099db5edb36b6b4ab57b6d2a43eec537ca7984f94639ec7
 DIST gentoo-apache-2.2.21-r2-20120213.tar.bz2 64529 RMD160 85a3c8a3c260a03f35c6d36e347176c5e7bd536e SHA1 e9c99bdf5d6bb1a51b0a4ca383ee41eab9f54290 SHA256 dfd8d83483681473efbd2aad5c0b3f3e76a62f8cba600e8bb75b745ed397d901
 DIST gentoo-apache-2.2.22-20120213.tar.bz2 64507 RMD160 d4d5ac58156e10cdbbfaeb3e7a7569bda81f6f7e SHA1 0c0e80bfddc0fb4b9df3b736239392be9fbc40fb SHA256 737730dabf1e1ccfe9d409067dc3c4d37d16f7fa1e792f5bf39268d904ce1c31
+DIST gentoo-apache-2.4.1-20120401.tar.bz2 24998 RMD160 b543e9965b0a3a1040683a2a62b3ea7dc1391249 SHA1 e73f6084ceb10c564dbd0a13af9a308412fa9958 SHA256 4c6c638237ccf21e14ae45eb22f21ca46ce93d5bd11bf7b043337872fdef2c7c
 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
+DIST httpd-2.4.1.tar.bz2 4101303 RMD160 6d21d828028ce1cff8648fb29c8eb1b75fd96451 SHA1 23beffce77529971e09d0fb1e760cadf80afa4e6 SHA256 7f1118cb0a1f9b505cdb9b7e854854fa2050d6ed0875b65e994bb35f267a0cca
 EBUILD apache-2.2.21-r1.ebuild 2754 RMD160 0aff5594a9a8d5155255eacc08463a4e4ac8d21a SHA1 46b377446354d5f139eb1f6572b108025267a3cc SHA256 fab891049f8d174c592348c6fff981a19908a79908fe039f390627d0d2fb9cc5
 EBUILD apache-2.2.21-r2.ebuild 2711 RMD160 1debb13ca577ca8f799f15be22a22d1c0c484c0f SHA1 76f455ec29b823bb65ace1872409abbe45c5cf60 SHA256 3bfcafd961393ecdaeff2d596f53ac636dc5764da69f39cc20d72fec72fdc83f
 EBUILD apache-2.2.22.ebuild 2918 RMD160 8bd21a25b4556dcf27be64f7cbff820bd9bf1418 SHA1 24acd6dc31cdb10a1cb25f9088be91b6ea82b63b SHA256 e7841b2b6d2bec394865bdf0798727d69c22a2dbefed02bee037a216b731dd3e
-MISC ChangeLog 12566 RMD160 5ffa1b63701dec949ca4ff6f814e7ed598d9ac33 SHA1 48f343697ae724182698956992c76022b1799497 SHA256 87c8542273750f0f4269e0637cc1db3a3efc79e586023fbd5121c033fa9652ce
+EBUILD apache-2.4.1.ebuild 3519 RMD160 d2ab79571b0fd0143712a410524c45b9f2613010 SHA1 6ba101dcc96f155d2208f2976236da9d1d1b371b SHA256 d7182b0188638e223a374569bd820f11ff50c0a6f2e138a72423daaeb67b6980
+MISC ChangeLog 12691 RMD160 1dc12bd2777e25d4c8ddbd2b74a3a85741c47adc SHA1 3d7a6b1a12e418507702afeef0b132ada8eacc26 SHA256 574b7c30ee56f4e59ce92835a0daa6f593f7df12d8aa28114ce90c211fd0de6f
 MISC ChangeLog-2008 105137 RMD160 0ee2162a0e57feab08fd8ee0c04b43bcf63ba9b4 SHA1 28bc5fda825c08a5a2b1d03dbfbc128d083507cf SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf
 MISC metadata.xml 932 RMD160 ee4ba8303731f1bb451fa96f30095dd380d7a824 SHA1 39f5bd400764a3f55b51ee17de547bc547e6c78d SHA256 f221f82c988695a174827e069157102017e724bdaae01e55f604479484e4cbaa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPdDwtAAoJEOTDgjZ80txduDEH/31D62afEH0Cjv139esVI/pk
-j2N70Cb/zlCv7aKP+CvrV/U/qLWxmEwtSbJJkDWSoigvBvrWKX66KR3iZ8N3fj2J
-4s9TXuuIyLswvJYhIDbq2T6b/Byjr59ObkwRCnrkpakCIm6hXfpG7xtSGSSNXnb2
-3ja4exl/DqvPqsv2uPx23NBsEupW93zt2ZY5deCa0Hiyh6/WrCZjGgJhCBdLBArE
-eimx+o/UAMDZcsBcUAkyZieaJIgFuuRXRtLYGlCNRsOHLCnrWkVk6n/II9pV05xO
-0k5bKuEI6kkNKAdLZc4lJthrLicYYoWT25g+rdGI8kd125+yX8aULFHc882bZGw=
-=nwQF
------END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.1.ebuild b/www-servers/apache/apache-2.4.1.ebuild
new file mode 100644
index 000000000000..8c452e5d5949
--- /dev/null
+++ b/www-servers/apache/apache-2.4.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.1.ebuild,v 1.1 2012/04/01 04:50:02 patrick Exp $
+
+EAPI="2"
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20120401"
+GENTOO_DEVELOPER="patrick"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_THREAD="event worker"
+
+IUSE_MODULES="actions alias asis auth_basic auth_digest authn_alias authn_anon
+authn_dbd authn_dbm authn_default authn_file authz_dbm authz_default
+authz_groupfile authz_host authz_owner authz_user autoindex cache cern_meta
+charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir disk_cache dumpio
+env expires ext_filter file_cache filter headers ident imagemap include info
+log_config log_forensic logio mem_cache mime mime_magic negotiation proxy
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi rewrite
+reqtimeout setenvif speling status substitute unique_id userdir usertrack
+version vhost_alias"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	disk_cache:cache
+	ext_filter:filter
+	file_cache:cache
+	log_forensic:log_config
+	logio:log_config
+	mem_cache:cache
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_http:proxy
+	proxy_scgi:proxy
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	disk_cache:CACHE
+	file_cache:CACHE
+	info:INFO
+	ldap:LDAP
+	mem_cache:CACHE
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_http:PROXY
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authz_host
+	dir
+	mime
+"
+
+inherit apache-2
+
+DESCRIPTION="The Apache Web Server."
+HOMEPAGE="http://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="${DEPEND}
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_deflate? ( sys-libs/zlib )"
+
+# dependency on >=dev-libs/apr-1.4.5 for bug #368651
+RDEPEND="${RDEPEND}
+	>=dev-libs/apr-1.4.5
+	>=dev-libs/openssl-0.9.8m
+	apache2_modules_mime? ( app-misc/mime-types )"
+
+# init script fixup - should be rolled into next tarball #389965
+src_prepare() {
+	apache-2_src_prepare
+	sed -i -e 's/! test -f/test -f/' "${GENTOO_PATCHDIR}"/init/apache2.initd || die "Failed to fix init script"
+}
+
+src_install() {
+	apache-2_src_install
+	for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
+		rm "${D}"/$i || die "Failed to prune apache-tools bits"
+	done
+	for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
+		rm "${D}/"$i || die "Failed to prune apache-tools bits"
+	done
+}