Fixed bug #492578. Moved latest 2.4 ebuild to EAPI-5. Added myself as maintainer

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 38 insertions, 10 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index ddb6368d5daf..f853ca33dd8d 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.251 2013/11/26 03:18:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.252 2013/11/26 08:27:56 polynomial-c Exp $
+
+  26 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> apache-2.4.7.ebuild,
+  metadata.xml:
+  Fixed bug #492578. Moved latest 2.4 ebuild to EAPI-5. Added myself as
+  maintainer.
 
 *apache-2.4.7 (26 Nov 2013)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 29152c6b58db..90ba5e9497db 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 00_systemd.conf 88 SHA256 487e7451ce2d834d8af09a1db09bfe235fbc87b17b13a88bf849f0739b023ce3 SHA512 c510b77450f45d8ca5b8f00ebae5de9e3dc0ecb45f9857e391ac923dadb6b5193b13e9bc372790de20bb8829f2bee5bfc0e85ad03b3a72818c5dd6a0d7f45353 WHIRLPOOL 35ff7234f1ac513a522481ed08d2281dc331835cccd1049dbbadd9f2dff7fce1700a3ae9fd8f2f490f09d82edd960f4a0b4f00a91db2bafb7c647e3b54733cef
 AUX 2.2.22-envvars-std.in 1071 SHA256 1721b424f2335640e49d71e671a4be15424d29fe90f55fe4f52bd241a998d3ee SHA512 c18fd461f02ab79fc456a1ad99bf91c8891ecdabd90f41437ebf87e20b3d28d2006a10d6726164c2f0333e7aee350bd125838abaff3a188d8ab2f5f34d3e5466 WHIRLPOOL 59cbee68fc8012df01229b8d5e38045eb974bab3f08ebf5b01097dabb5275bb83e28cd09a058ce71949ca4a2439811cff457d4c7df88d7b3fc5318c6b7ef0075
 AUX apache.conf 55 SHA256 ea616c5cc37979a006d69c51bda43fca15a4327d33175762652b29f5cdea1c7b SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 WHIRLPOOL fa348414f320a9f70001386dfb77d57ca4836c3ef3d251976077b7ad545d7f6752e534efadbf28c7dcb777388e3d844eba84b939dcf48881983388daf6ac23f0
@@ -18,7 +21,24 @@ EBUILD apache-2.2.25.ebuild 3288 SHA256 b0a9162f6d2dbf57bc312fd52cc495844a70376d
 EBUILD apache-2.2.26.ebuild 3295 SHA256 e0e3689fab59f9e189b48a18755a18987dc2e6602ffb7a324de026a354264a26 SHA512 69d68e0a4c9117583bb4d4eb935e67b487ae0347399f7a59e3c0a0f7043776f8854e02d556ee423bec285c17bc9305322b417e7536e67d10596e5f26292e98e0 WHIRLPOOL 73b55f2e8c28f105d6fe59b9c957c3e3183ba701f27d5e663921f7b123168bbd1cceaa7e1afee990ec7bd8958d130391b49b54f0bb896f58663ed46754be7f26
 EBUILD apache-2.4.6-r1.ebuild 7457 SHA256 2440b94f37d21a4caf7ffd43b8a662515df98aebd4efa373eca5f90e774730e7 SHA512 088ebd904cff8d88160f628255c9e40b3ba6abf25818464769a029246d2f74d9132a8a8f5235083f052ebb8fb44acb0ffae939a09dadd83dc80449b0032d1272 WHIRLPOOL 991f357cd3b6221a56184808247fba881901b4115cea128cf87e2d6b98eb25abcb27ea1452160513d4786fe8688c13fddd52ae9dc192d1fad51b1ee08252fce5
 EBUILD apache-2.4.6-r2.ebuild 7457 SHA256 b7de783e8e1ddd59b2fa05bd8169d727e3a70d129ce4fffb886ca862de142645 SHA512 cd6844573d40f2508bc5b16d762df5869d5ba363733f07beb600fe148937166b1556de7b57cac9663c93545e820f0cf4af2bc6adb072d054778dbbb50f441465 WHIRLPOOL 7cb32151f2df8a05c03962ccf4876f5a9c0303c3caad06c960011b836d7f0243e691618ba75a7c2493242a65ef3e8b3eb75b430371846ef97d6890cd1facceb7
-EBUILD apache-2.4.7.ebuild 7449 SHA256 bb4a50d6dc596d9ba5d548f86e723de18fd2ecb7733f901fab17229206c79079 SHA512 10b998fabd319455d92938965f543c4bb20adb7e1cb013aa5dfeffbfd2e57bb6cbe7eaafdd080f53c3636ce51b35bb605d0f31cb0022d639ea3ba16b8ccdb70b WHIRLPOOL 2d7cae0d1c315a382788c4e31976f0eaa29625cdfe1525a6ae7354253b689ee9fdef033dcc50e345cecee29c3cfbf48a911e19b18df242b0d22249ee3094ae9f
-MISC ChangeLog 22380 SHA256 46c4eaafbdc4a40d1f2128bbac89fe121012308c834593688a7e94b5dbefe752 SHA512 e94cbb57c7fa8f0608d8737d814198fb68088b2b09cdd8c7d57a8573f6b6dddff1c5178ffa8cde2097c6c1e433a083bf488b3cfcad711f9eaa4d9275bd619d49 WHIRLPOOL 8020d7ba8953d4a49d34a04d0eb0df6e0375af8ae6929de21e457f905bc750778bbaf5b5d9449c52dfdcae0790d49f5d6f2faab5355124769a2d86838ac672f0
+EBUILD apache-2.4.7.ebuild 7424 SHA256 b46efdbb0bdc553e620207b3dab4295a420f58bc6570620c5514543822cb1433 SHA512 486fbc426beae4563762368f9fe3671c5e4b08f88c30b149891b882e4fadc8d3264ae2d19003dc3724fbd12636e06bbc983ff4a32568615dbd28bf031c1a71fc WHIRLPOOL c9d4b27481114c698bf74aa1ab77936c3288ac01f2172fc77c46a8c0035ccc049a8c9b404a004cc7d963b01d2f8076ae6f50cd0300be9ba9b26ca592538400fd
+MISC ChangeLog 22563 SHA256 fa0ba5daa5c6fc7534dd252e498fb995b0830e128dfac8b8db34b7bd316cf5bf SHA512 7b315abaf2b11f1f3313eb6a04d3e8b3f219bf90d56873b24be530b93437ccddd5adfff638be60a7bb029959f48c8a3ad984f8860e8d656d9fa91f7470dbd793 WHIRLPOOL ed6a09d82a09bae767ebf7f1091dbd7d8679b91d5e52371931298f50366a7114e628d26fbe395d24526983d6cc0a668f07f4e78688370a1089b3a387f49314ff
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
-MISC metadata.xml 2492 SHA256 f132bc37567605f338e23ed6ec22c553e1443d2b6cf407ab0bcff359fc9b3f90 SHA512 0582259bc2d615f1f640d375aab4452613a4006dca03c8bcf9757c376599bc2c7789df44003db914e2e3a5cd5a3ce725b0bf76d92488f65c67f4859927c83d11 WHIRLPOOL 6e826e0847788527dc2499e10c8c4ec59b78e2e4859b23127c26f103fc679c1516720be587ee25753c52d04f0544e634f553a769bed2d24db8442d57be22d26f
+MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSlFuNAAoJEPiazRVxLXTF2C0P/2oZahNN4dDxNK8gP4/GdVsp
+w8TvEmql9/qxLnk2aVguRCHXa162y/VGCGPyPZvWRH9Z8r6Z6d+digK0fkKi9CCf
+646SHifTAbBCF7WedwkTuKpGPfsjLImfCXw3guBurL4Sy35v0pdsMibg8yo/i/Sx
+qshoEdGI16aj70nip/tSmI0IyvrPZHAH7MZfT6zyu9EkQ7//UUI+tOvR6IP8REaj
+l5VVuWcrscaUWmT5joZDCeCU+LXMs6FLIt1WAAsYjocKTNb5RKBQOaua29dlIfg/
+bnk60y25bzmRiM8RNk9rgSKltHUQEqsSZB8hfNpw+OMxqWLD9iciApFLjdj2xBYK
+ClpYe/HPThc6HZf7pZPKGZ/HXKBKiEb0UFfqV8C3t8kFfjYEC0/hXUEEbf/2KnLu
+TufCPQ9PRnUjIle7xrGxVLbibvGEDE4JB6+4ltlHlI7ScVhRDI09BVV3rlfbmIRi
+aTLtiGqrMPNcuaZcKqSK0dHvBv5H/1CRvoJFsGuMgfrIJUEiff1G0vxyNmcXFf34
+CM+f3PSYPOTdV4cIHOQ25lvVoYorWxhPevtAbGJ+3Z1UQxZhnZNENe0Y6bMnwxh1
+gMT0fj/yVW5LWMyasRYsstInpCtjyQeUIJvUCB/kZlscMBR9yxF38jpg4Mq02Ujp
+2o00WrxcGp2VpNd0l90N
+=QtEw
+-----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild
index 26d7d0b065fa..3f4a421a7f82 100644
--- a/www-servers/apache/apache-2.4.7.ebuild
+++ b/www-servers/apache/apache-2.4.7.ebuild
@@ -1,8 +1,8 @@
 # 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.7.ebuild,v 1.1 2013/11/26 03:18:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.2 2013/11/26 08:27:56 polynomial-c Exp $
 
-EAPI="2"
+EAPI=5
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20130801"
@@ -128,9 +128,9 @@ 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
+# dependency on >=dev-libs/apr-1.5.0 for bug #492578
 RDEPEND="${RDEPEND}
-	>=dev-libs/apr-1.4.5
+	>=dev-libs/apr-1.5.0
 	>=dev-libs/openssl-0.9.8m
 	apache2_modules_mime? ( app-misc/mime-types )"
 
@@ -140,8 +140,7 @@ src_prepare() {
 	# GENTOO_PATCHNAME="gentoo-apache-2.4.1" ...
 	if [ -f "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" ]; then
 		cd "${GENTOO_PATCHDIR}" || die "Failed to cd to ${GENTOO_PATCHDIR}"
-		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch" \
-			|| die "epatch failed"
+		epatch "${FILESDIR}/${GENTOO_PATCHNAME}-${GENTOO_DEVELOPER}-${GENTOO_PATCHSTAMP}-${PVR}.patch"
 		cd "${S}" || die "Failed to cd to ${S}"
 	fi
 	apache-2_src_prepare
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index 7d3321f608d8..9d9a4bf08c56 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer>
 		<email>patrick@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<longdescription>
 		The Apache HTTP Server Project is an effort to develop and maintain an
 		open-source HTTP server for modern operating systems. The goal of this