Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384). Fixed bugs #489236, #493020, #493360, #503986 and #509772

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

5 files changed, 65 insertions, 60 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 46b2d8d21d15..7338df176d6a 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/apache
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.274 2014/05/21 06:22:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.275 2014/05/22 14:02:43 polynomial-c Exp $
+
+*apache-2.4.9-r3 (22 May 2014)
+*apache-2.2.27-r3 (22 May 2014)
+
+  22 May 2014; Lars Wendler <polynomial-c@gentoo.org> -apache-2.2.27-r2.ebuild,
+  +apache-2.2.27-r3.ebuild, -apache-2.4.9-r2.ebuild, +apache-2.4.9-r3.ebuild:
+  Revbumps. Cleaned up ebuilds a bit. Moved apxs to /usr/bin (bug #502384).
+  Fixed bugs #489236, #493020, #493360, #503986 and #509772.
 
   21 May 2014; Lars Wendler <polynomial-c@gentoo.org> -apache-2.2.24.ebuild,
   -apache-2.2.25.ebuild:
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 4120ecd91c5e..2d916e1d9e67 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,30 +9,30 @@ AUX apache2.4.service 728 SHA256 4420af10d1237f90ae519e56e75f1cc84e9f7c7b63aca9d
 AUX gentoo-apache-2.2.23-initd_fixups.patch 963 SHA256 ea8cdb5ad98416fcc3daf496bc996d23c09212f325980e0328da5e76deb8ad5d SHA512 3250d94e9fc5c3f921c756d3d5cfc670b0221a06dab376ef162cc8ecec8d1300cb95266b2a96d5a608a710326de2144662d450c8a2142a12200b1210fbc9cdb0 WHIRLPOOL 314e1d2c6d156cbf1a0330ab822f64a32d2b6b52adf46e1db4d8f148eb1e471712ebd65948056e4e2e85585499cbc1f9a0d0616f2a6c1ec9b382af35bdf8f194
 AUX httpd-2.4.3-mod_systemd.patch 5396 SHA256 d8f5c76dd5eb0edc9759ea300d3b320ee96b6e6f9fabb8a4043f8d1b77b646a2 SHA512 0db785fac6034aa431e9d816bd06020a5b287dbdae794f8b94eb267805981a1d2a97fdb92bd13e32d35329e6db3f799a03e98456329f6a80c5863e72a26e5c59 WHIRLPOOL 4016b9626af1a8ca001518e8a45262ca4dd27a998727db988a8f1234aa7c5d56d439f4ecfdc6219510f57c97991884a7f57eaa83535988cb72e9fd8ffdee7b6e
 DIST gentoo-apache-2.2.23-20121012.tar.bz2 64135 SHA256 711a88f26c58b10b082f7ff411366cd768f9450101da050438a2f77abeab7333 SHA512 92a49f954b82d4427862f41977625a60641731cc25ab3efdd666be8db839038e7b1c2ef2f878d5efed243eaa63237e88ee4993cd25cca1dfbb0f56a6b2093d57 WHIRLPOOL 221d9c0cf999430afc11a8e48ae67019c7f31daca827a5db7615aca24859788743e5da00e4c99b7b7b375e58fafd6c148339e5671be939dbc30735031e12c49f
-DIST gentoo-apache-2.2.27-r2-20140421.tar.bz2 64587 SHA256 8f252d15d8812454529c980ef16b55d55f5813d438e741f8b6f35c5ec80728fd SHA512 e2833b1b9597f3e5ee5920d064dcdaa6079c89aaa4baf8135d026fd9ee5f08c083e3b1161deaee369b853aabd3c7490cacc8b8247a213d29f9bc51a0a0b1add3 WHIRLPOOL f99540af3689fcbdde1b6b5747a9246af37f3f0f8414bd6c441b63dc0c0b2fff879141083059ba59715e9af661736f18bf18bb6c5e49705c9e06bbe75fc4542a
-DIST gentoo-apache-2.4.9-r2-20140421.tar.bz2 24952 SHA256 0494a3e2fbcfc2139b2edeeb04fa87e66d31e0335c22a47e93dbb24289f13a10 SHA512 19dabea049730ab0ea177ec95cc34364835ec11185e87851e1ad31a4b08e3a2855a79d4be0eef2c72fe07bc4647fcf1ffc444be57f7af92b798decc20270552f WHIRLPOOL 96210b689696214d689e4842da4b3795f02732abedb5b9508a3e0c881b8f8bf67a41cf06a8cb6a353f267ddad1af9202a32a0b1b41c9ad49dbc98e5c0841f1d5
+DIST gentoo-apache-2.2.27-r3-20140522.tar.bz2 64561 SHA256 aff37d0c4960470e57267ccbc656b0ff1d265802bbfb8fe437845c100ff6e635 SHA512 6f2cc8f7e07b58171d253901c8a90045ae2a3a2a89d42ef9ab22bcb126c0ee849c7b4295193617f9cd3861bd0139ca6e5f3d810cfa84eea194814fc324ffa65c WHIRLPOOL ce6936d36447939c64c56f108c31e0263348b4f3d735a532e07574a29311aee74828882508f838c86270aabc7d3bdcd5c6dab23f917218822552e459817651d4
+DIST gentoo-apache-2.4.9-r3-20140522.tar.bz2 24981 SHA256 e560da197dedb4e3e1fc8ce8f8d4c06aaee910ce141c3cfc059f4c3c2e13e3a9 SHA512 58f0a5b0107a07d5521a2330c71ecdb58625b113f6c2ea8fb68f8166a60e6e10638946b247c7206876986050b81359b8c22947d99c5877e7b50cdf7c3bdc9fe0 WHIRLPOOL 37029319bb40f6929f33d20034b0a58e722516e6760131b3ecef9b4a1879c57845b304fd4341e4a3b289b34d3b979d740bcbd4d149c1f204a7a85374edacf558
 DIST httpd-2.2.27.tar.bz2 5616798 SHA256 205973ded6ca55c056ce9c84d73ab708f7829f330193bd39b651463b8d4f8147 SHA512 b318c157392e5c602d42eb52c8d7f1bd7258c817756fd20dcec8a8a177af3e42db4e25891473646c293ace42bc5d5608de083a14878ed446b8559709492bbf1d WHIRLPOOL c80c56d511586c87d6eb41eb8f5c00317d101b7532b127d50531409f4068aceba1022b16cf2ab122d91edcd9552fcae8543e8a31fbab78564dcd2e057b29e0f1
 DIST httpd-2.4.9.tar.bz2 4994460 SHA256 f78cc90dfa47caf3d83ad18fd6b4e85f237777c1733fc9088594b70ce2847603 SHA512 3a66302e18a2d165b3851665dc73be7d3849fc3359c1ff9dd9e2eaebf1f1d8fb89b7b0a05929d6247750bf0ed1abf9cf3c236a373b2d99635c8ca41698719c96 WHIRLPOOL 735677695d3b1497d554dd3e8d97733359140f3bb524335ab474275ca2b5546ceab8f5f3778948fabee2d152bf5b096d99b3dabb1011a4b68905c7cd5012a648
-EBUILD apache-2.2.27-r2.ebuild 3084 SHA256 dab174367d17465b9f4a8ef673bbe80d0dc5e9215257bbd975e5c0b9641bb7ec SHA512 989eb2e2ce712c0e37ac2dfc84061214b0bfff5d943ff2b4efba9e92678064bf0e2f2f9d47a4fa94582ee07a86017a67d01a9a0e901a4452ed899ed672688cae WHIRLPOOL f8e98f002e3eb8142c92dd675a9685065b71613ddde8708d39e6127fca07004381e300275a682ddcd0d75eca3968e09d441b0dabead37514cc4303aaf63f1e26
+EBUILD apache-2.2.27-r3.ebuild 3129 SHA256 0b7ebf6f7552c9dffa620b45d77cc0e88e107d85a87785fc39b69be0f86e0993 SHA512 a4bd5bc6e8f668358f9c93be44c0bc3231792df84dff1916679ff515b55c56df1095dd5d8df3243c5a42485d2b16fd6f768cbaf36524de61d8bf9ce18b83e630 WHIRLPOOL dbc8a1dc62e6a573d2fbce7d1ea7c4a14584ced370de93f02962db18cc1c3866382f6005766bed0a61b65b8c891798f8b9284721fb9b7bfa5b70aaf089e8149c
 EBUILD apache-2.2.27.ebuild 3406 SHA256 80f8ea23faadc81fe1b10bbb8cb4d9755df1702d39cb38e1dfe764bf6f418160 SHA512 dc8e946414f7ea3baa46337c4658f22c40e612e814f906ed02ee0132edefd6bac052a9e2cfe6b1036ae86ecaecd20a2a024673518305f362994acdd9c5756fce WHIRLPOOL 97ff85dce68dce72d40959f8508a3a70dd270200b44d49de53311e2906be3fcd730f5e49748fd8b3fe46d9a442bfffa1d10b9b4f8f90899de9805f0ce08aefa3
-EBUILD apache-2.4.9-r2.ebuild 7462 SHA256 9ae7c2af5500d53974c2b770e90e57d911475a51d43d8adc6424f3630f76871d SHA512 daf34d0dc5a447d45b5180caf94af6a37d7920aef97196acd8ccb343f3d13465ba8c9e2158b4f06e8b813bd513b94f770199a64b141a9486c33b706b06afa888 WHIRLPOOL dd6958775ed254fe1b090a1dddf7e67be956e17b84ad00edbbb1de16375a0bcaac8cee3869f7bacd91a53cbb19abcad142ab1913fdc8ce062009ff9d56699154
-MISC ChangeLog 25908 SHA256 54df7f290f4c99d77dcbf4ad0c75912ee0858842714b64e55bb445acf0e84ca6 SHA512 31341b99dcd772391e80bf7d652cd5854e9f32bfbb5b61560f421ffc7b31a5b1a102f1c72627c9e5e156bbcb70be70718be3b3749b0e8aa6157e9b85bb5f0396 WHIRLPOOL ef3373bc970c1249b2a39e190d785ce8936c583b9e9a4cc5ec4b84d5b4d18bbcc093e92e6499b1b4e3f2ff355023056f848597cf976f838e0e8a4ce869da96d9
+EBUILD apache-2.4.9-r3.ebuild 7426 SHA256 3dd3022e19d409547eb5432e1ea82af77440694bb4904b1bf72e45f23724ca0f SHA512 c51e86910813ce770f7d74d6a36bb2791224c34a005422b2370cfc87d57facd36b291ff711e28dc7e93c01690503ecd993e6c6e3233355d1d84aaa5cde140333 WHIRLPOOL 25d941f1a0b15c9a73103be6c674c11bf104cf3dab6fbbca83b4b22069a082aad70a39367711a36076be1a28d435ae63025ee9c05e3d20fdec9c56be21223ab9
+MISC ChangeLog 26268 SHA256 98e2a29fa3c70f02463f27f0e9642216bfabad0a1d906646c440f68d7cb1645e SHA512 823a0e6f12118f8b38b493defb8cb0f7a08d06322a1da3e84bcbddab1dfb9555703ca167ba38596d82d2a2837780cd275ed53402ec813f2f6322ed174a2d46c9 WHIRLPOOL 883e7c462182be39382599874f2afd0e93790dd7549da9fe4bbde218fef04f3b11a89ad62c5a2a75acbddb99e380b386bf3c6f428133431d96b5048f2c9caae3
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
-MISC metadata.xml 2525 SHA256 7fa8f12016109ded908ee9387aa3385712cc12f41c04191d35696669372a93f5 SHA512 3628766cd4c5fc05172ff46666d0c20c3d74673687c944174a722473006aa674c0d7d43401a5d86ca00beec081ec265a719b52a7fc05fb97070cccd25640f798 WHIRLPOOL f20a43f305e0130954f5070f2f5f190f54fc3627b2bcc4cb6219a81bcd78ddcc79985fb730380372eceee054102f3464de8a72af35e08592be49a7cb1fe2a49a
+MISC metadata.xml 2882 SHA256 bb1c73d9b53a1049c14b477d4441b09670ecafcf46a0ad114c24bb284d0d194a SHA512 bd9a0a5f26e1420aa6023160208d177e233f97f2265b8fad68772a084cbc9fabb2a186f14916a5a664b5590a6052fe039874ff96b1bd9d3dc530c3750561c7ce WHIRLPOOL 0e92d1cd3fbbf3f75ebd38e356a736061c9ea19afd40b06f58abe0ed86219223cafab188bbfa4ce9c91a8cc6619de47dfc3a68edc2c39e6a38476915ad8d48ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTfEYWAAoJEPiazRVxLXTFhCkQAJBCWV1QJKxvi44wS3QwFNGs
-maLwZ7o/5UUd52VZDBosjJZKWJ9Gv0RbPJKp+XxlH0ncU5bIczey98f24W5kDilD
-jncrEN1PawNke0o0y3Hn+5hKL3aFW9q2b0jiemlBbhvmU0KodqeNEy/Xuv6sO+v2
-9Al8PKBhORpZd4g6vyZ6tNKnHifRexALxMXTusQO46ShpNIj7GtJjcqrKAo0NqrB
-NE6PSg8zr1n/Jy1nb93UPJxzptgdY6+TNvXv0wKZfLcoo/3g3pwCQi/UeN1hgAHI
-8jcnBUvUfVFJ2Sb6Myfg5wvS5nazIi5vJmNKh6OSw5tX3wAj8noUZWLsEqJTmJZc
-h9JlDo0gha521yYq+4ZrHayXfHzI1RIiU8o3P8pz0i4O0VOAN7CxK07Ug/nxa/xO
-mJS4aYeoqppIwb+Aa+p/BlthYLpP8GmfB4C+2d2NsBqUYVvPwK1GFmniUbJj7DYX
-NrI/Z1rsqwRVMZwDajAqLDh0170Kbvz0MBnACoZYRtTlGIKUERoIyqZogwp9sRIy
-DAJJwbFEdr8fRKgPxAU07TueKZi3Co48zfXBih4VjvgSc/VEsr0YJlTiGKDOMgLV
-RZAFVGNnPoHAmE/ruIOlOAUIH1aAkdDmrq/XH/Ud0w9gc6nugeAwZfolXGbkF0w7
-b5y0bv+i6g3pva3d0ZSj
-=MRaA
+iQIcBAEBCAAGBQJTfgOEAAoJEPiazRVxLXTF+qAP/jGdUdNT/x7+0EnKRgEElypi
+uWQWwLF19Li3j5JUjuhrUIXIbDJiPsNKE1wwRYGh/tFX9YPQjbYP1TZ6vYUQ7K0s
+sYfOwBtu8+ngtQ4VFOyOwEg5SqnJ+RbZNiVRtW1SeB12T8Yl/RkDMyE88bA8VVF4
+lY9SvQDcE8C9xV9hppTDM3VFaFqA4CAATaiHmKFidKsRVV0tlbKENqzDeAnADay4
+O287mwBwLkv99WgOfI5BQeumLwLsfthXt15xd1zHOPJ8HWmmJ2F/+gNAXIiG02oC
+zL93Ubmz3gmA34/R/86WF9fs45yNCN7rQFyRWUBCy7KR9IH/TmkbV5z6QC1JAemP
+2PkYHfyOV7ImstCklIGVmydvyevQcDexHaljpZglex5QVI+zCQCOa27q5woq8o1F
+rz3ILESUx66y5NGKbbngSdup7jcMPE3DjxlH+e2QozwTLUBlMTpNzF5urD3ljUeA
+8pVL39eeXsOXEDGdCffcZqpUGfQon6RMRigYFCQqDlLDXbA4eD9qDMUa9CLK2brp
+6t3Y/S5cJD2esJw1GtDdRSOlwXdqNWa8oDlBLG4CRxZ7ObnLK/7lfaynQiCdb7et
+7WIry3iV+fvr9kVZIo5n11q9GwR0okH1YA1sw5o4kZjr/UAoTDNfQaGDqCAOQhju
+lej3PnLq46zeO882Pptp
+=AZ81
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.27-r2.ebuild b/www-servers/apache/apache-2.2.27-r3.ebuild
index 751d53f5c34c..231fb7a10b11 100644
--- a/www-servers/apache/apache-2.2.27-r2.ebuild
+++ b/www-servers/apache/apache-2.2.27-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r2.ebuild,v 1.1 2014/04/21 09:45:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.27-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $
 
 EAPI=5
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20140421"
+GENTOO_PATCHSTAMP="20140522"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.2.27-r2"
+GENTOO_PATCHNAME="gentoo-apache-2.2.27-r3"
 
 # IUSE/USE_EXPAND magic
 IUSE_MPMS_FORK="itk peruser prefork"
@@ -92,16 +92,6 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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 )"
-
 src_configure() {
 	# Brain dead check.
 	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
@@ -112,6 +102,14 @@ src_configure() {
 src_install() {
 	apache-2_src_install
 
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs_dir="/usr/bin"
+	dodir ${apxs_dir}
+	mv "${D}"/usr/sbin/apxs "${D}"${apxs_dir} || die
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+
 	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
 	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
 }
diff --git a/www-servers/apache/apache-2.4.9-r2.ebuild b/www-servers/apache/apache-2.4.9-r3.ebuild
index 76e095ab6bf1..a12cbdcf4318 100644
--- a/www-servers/apache/apache-2.4.9-r2.ebuild
+++ b/www-servers/apache/apache-2.4.9-r3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r2.ebuild,v 1.1 2014/04/21 09:45:27 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.9-r3.ebuild,v 1.1 2014/05/22 14:02:43 polynomial-c Exp $
 
 EAPI=5
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20140421"
+GENTOO_PATCHSTAMP="20140522"
 GENTOO_DEVELOPER="polynomial-c"
-GENTOO_PATCHNAME="gentoo-apache-2.4.9-r2"
+GENTOO_PATCHNAME="gentoo-apache-2.4.9-r3"
 
 # IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
+IUSE_MPMS_FORK="peruser prefork"
 IUSE_MPMS_THREAD="event worker"
 
 # << obsolete modules:
@@ -31,16 +31,17 @@ IUSE_MPMS_THREAD="event worker"
 # slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
 # socache_shmcb: shared object cache provider. Default config with ssl needs it
 # unixd: fixes startup error: Invalid command 'User'
-IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest authn_alias authn_anon
-authn_core authn_dbd authn_dbm authn_file authz_core authz_dbm
-authz_groupfile authz_host authz_owner authz_user autoindex cache cache_disk cern_meta
-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
-unique_id userdir usertrack unixd version vhost_alias"
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
+authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+cache cache_disk cern_meta 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  proxy_wstunnel 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:
 # bucketeer case_filter case_filter_in echo http isapi optional_fn_export
@@ -72,6 +73,7 @@ MODULE_DEPENDS="
 	proxy_http:proxy
 	proxy_scgi:proxy
 	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
 	substitute:filter
 "
 
@@ -95,6 +97,7 @@ MODULE_DEFINES="
 	proxy_http:PROXY
 	proxy_fcgi:PROXY
 	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
 	socache_shmcb:SSL
 	ssl:SSL
 	status:STATUS
@@ -122,16 +125,6 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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.5.0 for bug #492578
-RDEPEND="${RDEPEND}
-	>=dev-libs/apr-1.5.0
-	>=dev-libs/openssl-0.9.8m
-	apache2_modules_mime? ( app-misc/mime-types )"
-
 pkg_setup() {
 	# dependend critical modules which are not allowed in global scope due
 	# to USE flag conditionals (bug #499260)
@@ -176,9 +169,13 @@ src_install() {
 		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
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the 
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	local apxs="/usr/bin/apxs"
+	cp "${S}"/support/apxs "${D}"${apxs} || die "Failed to install apxs"
+	ln -s ../bin/apxs "${D}"/usr/sbin/apxs || die
+	chmod 0755 "${D}"${apxs} || die
 
 	# Note: wait for mod_systemd to be included in the next release,
 	# then apache2.4.service can be used and systemd support controlled
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index a941ea1e6ef3..d7b1a48889b0 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag>
 		<flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag>
 		<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
+		<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
 		<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
 		<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
 		<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
@@ -26,6 +27,7 @@
 		<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
 		<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag>
 		<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag>
+		<flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag>
 		<flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag>
 		<flag name='apache2_modules_remoteip'>Remotip module for logging</flag>
 	</use>