Pin automake to 1.11 slot (bug #465392). Permission kindly granted by patrick. Fixed whitespace and quoting errors mentioned by repoman

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 14 insertions, 6 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index a1f6fd48c576..41e9c6a9896d 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.227 2013/03/25 06:31:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.228 2013/04/11 09:24:14 polynomial-c Exp $
+
+  11 Apr 2013; Lars Wendler <polynomial-c@gentoo.org> apache-2.2.24.ebuild,
+  apache-2.4.4-r3.ebuild:
+  echangelog Non-maintainer commit: Pin automake to 1.11 slot (bug #465392).
+  Permission kindly granted by patrick. Fixed whitespace and quoting errors
+  mentioned by repoman.
 
 *apache-2.4.4-r3 (25 Mar 2013)
 
diff --git a/www-servers/apache/apache-2.2.24.ebuild b/www-servers/apache/apache-2.2.24.ebuild
index 5883c98b2ea3..4a4f4ebc6dc4 100644
--- a/www-servers/apache/apache-2.2.24.ebuild
+++ b/www-servers/apache/apache-2.2.24.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.12 2013/03/05 09:18:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.24.ebuild,v 1.13 2013/04/11 09:24:14 polynomial-c Exp $
 
 EAPI="2"
 
+WANT_AUTOMAKE="1.11"
+
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20121012"
 GENTOO_DEVELOPER="patrick"
@@ -106,5 +108,5 @@ RDEPEND="${RDEPEND}
 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"
-	cp ${FILESDIR}/2.2.22-envvars-std.in ${S}/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
+	cp "${FILESDIR}"/2.2.22-envvars-std.in "${S}"/support/envvars-std.in || die "Failed to apply LD_PRELOAD fix"
 }
diff --git a/www-servers/apache/apache-2.4.4-r3.ebuild b/www-servers/apache/apache-2.4.4-r3.ebuild
index faa1f472e694..4ffb00b4f2b8 100644
--- a/www-servers/apache/apache-2.4.4-r3.ebuild
+++ b/www-servers/apache/apache-2.4.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.1 2013/03/25 06:31:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.4-r3.ebuild,v 1.2 2013/04/11 09:24:14 polynomial-c Exp $
 
 EAPI="2"
 
@@ -38,8 +38,8 @@ charset_lite cgi cgid dav dav_fs dav_lock dbd deflate dir dumpio
 env expires ext_filter file_cache filter headers ident imagemap include info
 lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat
 log_config log_forensic logio mime mime_magic negotiation proxy
-proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi 
-rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute 
+proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_http proxy_scgi proxy_fcgi
+rewrite ratelimit remoteip reqtimeout setenvif slotmem_shm speling socache_shmcb status substitute
 unique_id userdir usertrack unixd version vhost_alias"
 # The following are also in the source as of this version, but are not available
 # for user selection: