Bump (but leave masked) for #412481

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

3 files changed, 138 insertions, 2 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 827c314d684d..07428281de07 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.190 2012/04/17 19:33:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.191 2012/04/20 03:58:46 patrick Exp $
+
+*apache-2.4.2 (20 Apr 2012)
+
+  20 Apr 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.4.2.ebuild:
+  Bump (but leave masked) for #412481
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> apache-2.2.22.ebuild:
   Marking apache-2.2.22 ppc64 for bug 401761
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 230a87a2146b..472c79f33668 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -5,10 +5,12 @@ DIST gentoo-apache-2.4.1-20120401.tar.bz2 24998 RMD160 b543e9965b0a3a1040683a2a6
 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
+DIST httpd-2.4.2.tar.bz2 4132105 RMD160 1b97ab44075bea0f398f507dacb5f719a87b720b SHA1 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 SHA256 5382f9c507d3d02706e33d6308ea041f39e8511b5948aef0ca188df8f90159b8
 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 2911 RMD160 73d165f06978bf84f5d6092f469dde68b3a41946 SHA1 0709924dbade42971d6d4195d75254980778e567 SHA256 58cdd4280c73b57666b55c15eb7a5223fbcc5ac4220f42fc5f389a97a79c3381
 EBUILD apache-2.4.1-r2.ebuild 3732 RMD160 595b2313fc1befc3f18100e8197620201de78287 SHA1 1ebae50a3567e766b70a4ed684f33e45c731dac7 SHA256 24defe329311af5dacf6d51f4f036780b12fe99b41ffbfa56f18b684e694e2ab
-MISC ChangeLog 13781 RMD160 12452280b56fcf3cd4e4ec56d9450f9e154222f5 SHA1 5ec12e61a68e2d3caea3c29f306b6161995a35a2 SHA256 30527a4a0b05679b7a53e76a7ca09f9f6f1d075058cca83498e23084661b7e22
+EBUILD apache-2.4.2.ebuild 3741 RMD160 50fc728bb943899fbd184e3ad30bdeeabce3ebc5 SHA1 5a96ac65640900fc0d5a010fd6ac6ca9bd03ed74 SHA256 d894157bf0d79e06342d750e6f91b59040cf4dafefc5e9e5bac196f60ae5f5bd
+MISC ChangeLog 13922 RMD160 8dbd544f0b816b3fa87ce35cf8634656c06b4bb6 SHA1 7032c059350830d6a40c4e712fd45cf9bfdc14e8 SHA256 8fb1f276803c135967669a0145f435000f63e60e07e9b8223a5577880579fd6e
 MISC ChangeLog-2008 105137 RMD160 0ee2162a0e57feab08fd8ee0c04b43bcf63ba9b4 SHA1 28bc5fda825c08a5a2b1d03dbfbc128d083507cf SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf
 MISC metadata.xml 932 RMD160 ee4ba8303731f1bb451fa96f30095dd380d7a824 SHA1 39f5bd400764a3f55b51ee17de547bc547e6c78d SHA256 f221f82c988695a174827e069157102017e724bdaae01e55f604479484e4cbaa
diff --git a/www-servers/apache/apache-2.4.2.ebuild b/www-servers/apache/apache-2.4.2.ebuild
new file mode 100644
index 000000000000..8b6f2762e837
--- /dev/null
+++ b/www-servers/apache/apache-2.4.2.ebuild
@@ -0,0 +1,129 @@
+# 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.2.ebuild,v 1.1 2012/04/20 03:58:46 patrick Exp $
+
+EAPI="2"
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20120401"
+GENTOO_DEVELOPER="patrick"
+GENTOO_PATCHNAME="gentoo-apache-2.4.1"
+
+# 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
+
+	# well, actually installing things makes them more installed, I guess?
+	cp "${S}"/support/apxs "${D}"/usr/sbin/apxs || die "Failed to install apxs"
+	chmod 0755 "${D}"/usr/sbin/apxs
+}