Moved use conditionals from global scope to pkg_setup() (bug #499260). Removed old

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

5 files changed, 40 insertions, 254 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 305fb33c514f..baa0d2fd63b9 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.258 2014/02/19 08:51:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.259 2014/02/19 09:20:39 polynomial-c Exp $
+
+  19 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -apache-2.4.6-r1.ebuild,
+  apache-2.4.6-r2.ebuild, apache-2.4.7.ebuild:
+  Moved use conditionals from global scope to pkg_setup() (bug #499260).
+  Removed old.
 
   19 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> apache-2.2.26.ebuild:
   Removed WANT_AUTOMAKE (bug #501518).
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index ea23a09b44e7..c71172eb3e89 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,7 +9,6 @@ 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.4.4-20130725.tar.bz2 24525 SHA256 c155dae39d87acc43ef34b385a2eaf2a45ff9c11d31b1c1791a74f9946335c39 SHA512 95489af418e3674b9d20dc988f4473d5d088d892bb2e6660a46a225667b0427c904d883a19fa3a847778fa00eb8ac0f27e1a5f76f0d65a28eaf0a39747353bbb WHIRLPOOL 1fd36df2db6814d01846cb40be9443aa963a0df9b45647859e901981872f64a8b4ba95aff9a14a8985feb74d51c551ab10c6734a63d5e9d001c53ab3c4383c42
 DIST gentoo-apache-2.4.4-20130801.tar.bz2 24536 SHA256 bae819de1ded2104a65dabc759e8a7bc6b442d2588ffb99e563be8482b3d87bf SHA512 97474e7d7f17d6537337b51385be4d093f9a15cf3a0a5f567ad883c4cc653d9bd3bed6e5f308e1bb9cf648be2c4a67a3099a95bd36b1be7c15ca8c512e01b2b0 WHIRLPOOL 4b75f5477b601f4159cb1b12c5f76ae4f678c83cef4441eba0e90a9be8222e4abd981a0d2205a54ddeebd8276567670c5ad827aa19f22f17196986bfd5c05c73
 DIST httpd-2.2.24.tar.bz2 5490439 SHA256 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 SHA512 e1c24535bb0ae309c249c0a6fbd390064a929d960241e5e68737744f120a88b615bd5d9065fc2f749ee664ed96621c9373576e6ca32bd189d625fcd4dc1b8f01 WHIRLPOOL b24bf388e1be29cc52341d66af00318b3a60ad6db6b4df8c6cc0abf496c4e603d3b733529d21d3d1c37dad0008cacafa8078abdff6c25cb42b3874b6e176713e
 DIST httpd-2.2.25.tar.bz2 5524905 SHA256 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a SHA512 4750e79bdab4ca28c602a808531dfc1482e86bf425d5cb3bcb42a9ccfbbfde5bfd05e66649ea741523c96de6582f5e12facbb1e7d67257bcf78a3ed7a66f80d9 WHIRLPOOL 7ce37be9b66de24cc7259c6e8a0696b496c893933b1c5dbdff5147c279fb644b5d5fc77ed02531b0f081f0c217f684d1bcd98bac26938b23c1d7a4ec085162f6
@@ -19,26 +18,25 @@ DIST httpd-2.4.7.tar.bz2 5004719 SHA256 64368d8301836815ae237f2b62d909711c896c1b
 EBUILD apache-2.2.24.ebuild 3241 SHA256 fb797efa6220ed5ab35d9a3ed6e652e72f97e1fdc99c7f8113768a1799f6abbc SHA512 cf1306c8ee02ee40ad8a6119148cd7ca02fabefeee7529250c230daff73118c9bce24707fdc0db681e6de86c34891c60313ecf3adca8098b89ca9057ab97fab8 WHIRLPOOL e1364ee59ac46ffd523de98cfaa417c86e4b9d0196dce50a0519808798560bd3140c35bd411f66ad3b7c643d312fb49a6c7943b5e7e41ee224f7c3742c27a140
 EBUILD apache-2.2.25.ebuild 3431 SHA256 1c22f6a2ad0126cc7be3bce968931b0c204a030af925f843e81129cf89c21fd0 SHA512 3e2c527b1abefda9934bc3c272df412e2878894424b026df367107fddb39502b3d5251d1807edf22ba9b634c24321d0516cd918e1ee9703b2e500f4aab3f9ddd WHIRLPOOL cdeb8411ffcbaa0a86d5d4ab17af2785046750c026e1a431d3b61f0394e95aff92e8b1bb6e3742d4190a3d1ddbe21a8ae314672a37708471594f1716f56d3c58
 EBUILD apache-2.2.26.ebuild 3423 SHA256 a14661e5b61eab42351fa4e55e820368b4456927171d89a5c034690a233c8120 SHA512 4122fcaeedb1108bfb3f25a35f52d2eea2f4d6e1ebdef2f552836bffb1d401a316a5b76f961b44658f561e2a2abafc915fd86f13dfa02259947ec14c53d11bc0 WHIRLPOOL 5fbe8114565013c93ab53b337f26f265b08b2d68338408b64e545a415ad70c3f6d1099f5db364b3d493a40d45fceb89ecc15ad363bd05d93dde16e9dea5cb4b2
-EBUILD apache-2.4.6-r1.ebuild 7601 SHA256 10d2c0921637af980abf4f11c28101c1b8c95935fc0eff2800a09a1726303f68 SHA512 5511ee233eb5f09a299704f6a1d28ece24b99ae4b29a23a55d215eab150500d57cc9266251b826ffac09ec65faca514d4d2aff5ff6cdc80d2ab7656f1b8ee8f9 WHIRLPOOL 9b45f7f56ae217fc0c81e3c2ae6dcd17b20b945d0d9b8239a2c48fc56160e23758003a7c1e32bbe24b75d3cd8775459f74c1bb04abc02fcd70508e479db7ab3c
-EBUILD apache-2.4.6-r2.ebuild 7601 SHA256 4ee72fe405f5c7d8e1a8d2fcc1aba06e4bc4423c9984c6a6670e1566be6ade22 SHA512 92ae48fb447f77674b3b01b038675a8498a069d32223c680ac70f6e81938159bd8454912f032182ed6c242b1afb4afc0e0cc2ac508303bb394a3fc291bd61ef4 WHIRLPOOL bb16050e9c2847e497703ef9800792c2abf33d53d8e3b2d2c45b57f45caa13a186949a7d4ca11062f7542e927e7217cd1bc7a60b40629a80b5d0db48f41fc555
-EBUILD apache-2.4.7.ebuild 7983 SHA256 218fd785d2d884eaaaa484fd64b7957c7f74fed01ee53ea5e61f322764d3e397 SHA512 c551880ba7f9f5dd30edd988a8eda6f3113f497b3001835168bc5724f354ba47bbb10a22a4a0161f7aaa1b51860ba7b42f8068c2b0960c1cd9f5178ee9bf87d5 WHIRLPOOL ca9cfbcbcac4d1d11b707da93fbabda5ca8a0df98c2c969fb2b1ea4f65b09885fdf42dbec433a18ad375b9507f6bd4df2e92646fae6f815b5d9b5ac6bb510103
-MISC ChangeLog 23621 SHA256 6f76ad83dd2bbf23d982e8c20184bc78f8e9317caa9bb75af079b6b623296698 SHA512 e3b1ad02122dbed0c4d38d0e084a769005a2e369d91e877b6b62f5caa7e63241f21af010a02c6bc71f5ea266f2df76a2cf2366e0e75627ce8b55f9331eb9bc7f WHIRLPOOL cb61f38da06420c79a4f166734245b60cf407bbe16666f5c3a6f705299c84b564733f8192778553e52eba2916982875ccda89f5eb6b6ccd12ba288ab9719ac44
+EBUILD apache-2.4.6-r2.ebuild 7738 SHA256 9371a6dedf4e6295b9b8bb9913fe30be5cc85bdab0491f8ba6d723ec85e3e621 SHA512 f02176e86f7ce1670760722974f617b9696ab5a963f0d9737ba09258f6396049f0d7518039f802353b23bbe29ee735f893be3b952c50272fb325d6178448a57d WHIRLPOOL dd61a5092fbc876c66a491e20645f14660db80df2e56f95eb106aaad35c9a82091f2a953b71da6b2aeda30c4c40a8032cac8e8bd164aea0914a84e84ac53a40f
+EBUILD apache-2.4.7.ebuild 8119 SHA256 a3865e28574993cf912cb0e00542beaf9ebebe855d6783df4c0cd7af3f2e92c5 SHA512 45b80565021343940586ff5b54fbc8804123e522092b3ecf877edde88ea84f4137c8907b9565f2ca37d99aa2639729d09eed2057c7e2445bd008eb0d4c60b2fc WHIRLPOOL f39be6e88e53321548d89038a6033d73df2d94ca97a0be89acc961a66e3b8b7c0f8bece36d6354a89ae232e5202df584de8f9ef65d318bb42ed39d7c762c138e
+MISC ChangeLog 23836 SHA256 4f8bfe1bb51984cf686e72acbd2d01ca50a21ddff87905b461bb61c3bf543acd SHA512 f25b14b98b1084f73be3775905be999718e458ee5c92bbce8ff86d7b13ac1fc471c27f88d746d8e9a16a6cf04b7c6dff5f31d7a173f54b875500dad7a2214bb1 WHIRLPOOL 4fd6cde06ea4cccbe9fda51a42898e0d7702ebff12e0b22c87ae7a09a954c098588034d833be4f2d380725b66d1702a0f0a7fdd951fab9c9859bcb0950492c3d
 MISC ChangeLog-2008 105137 SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf SHA512 92dfd339b1c4ddec29222076a597220dc7faa504e2ee770339892f155febbf34004e60395f9eb21b43d3b1feb5f362c2946b69cc65151b5ba00fb53b35ccb9c6 WHIRLPOOL 89d77300aafb53ae0632904118064de19313fe51f635512314471e845574e7a624a770ae4ca4e335cff67d4fee92e062d28ef985a54c577a1b8b3ea0f621c0f8
 MISC metadata.xml 2590 SHA256 165207b1cfcf0ce30ad2af5b0dd7e8cf06dbfc9ae4ed42e35bbc5d8e6ce0fdee SHA512 74bd116d0678c035c0e19f82a379c80b7f59b87db649e9c6835a3133569c52d6c0973f9445054bb1b5278d22c95f28f3d85dfda0878ae094172f7e84e15a0113 WHIRLPOOL 8c5ce73c072551040ac44c6ee632fd6144cf2673904401481a01311fe9edf72eb8e1a3d57cee9f94c1c8d9d71d1f80ce2a2f11fb9cb3274b7057489fe7b8578c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTBHCpAAoJEPiazRVxLXTFBP8P/3b6fth1FrFCits+5kCN5gZM
-Tx8Nug1rs3fTWMboJSlXHm/os3Sn4QOtD29KksOD4/gWFw4C9+apbpac0qSTmrlB
-YRXzKEROHl6FW1u8sztirsMeumOsfG9tvdsRKbhzNvDDMkW/U6eg1V6+nsgx59S7
-awcAgit6HjUwSbZtwJobYASFeB2EhVnQkwxUk8RVK/lTQ530bLnOo3SfQz6aLFt0
-p5QKRhnOxpXDB1sX3G+w/rslqtuPp2QVHa64GMv2EeB4Of3Yp4U9TAFp/LEOIVXE
-X6gy3FaCftOeCsGVEhp5al1VX50X0MzN9k4PZw12BsKQbjwrfRlBgU16xMm8SnUa
-B9w8Y5HftbT6LapzDIoDdqGlu5TUruFwc79DTh1ZBnPWWjUFIZ4LDsObrr78eJ9e
-hQUBAxg/ZWwq9gPVhueq0ZXvEXIQD51JUEilUHRztF8PPy1FDrdFbndXne/wXIuc
-x3ZGZDVaqiqdd+kyCv2zU5Ko07M7aiRzTrIBDta15dLzQwXvYfEMpe8+86GaYsYV
-XuKq9v7OyvwFk5MgapUlzJKGGtysXplTWRjeTNVO+oQYyfYyI0kVsKBgc1gISRXV
-umtGV6ASufI11ijm8JPIPsymPcRfLVXHnZzot8f0aIYo2xLToBaNvBDMTmJTnqtX
-VUrfJN796gOTwdFWdOUA
-=DZdX
+iQIcBAEBCAAGBQJTBHdoAAoJEPiazRVxLXTF4sUP/1hTimwZuUzgMvVYXuJCJww2
+F5Rv8xMVWxrx7Xm2MYUmI5iKRRolhLYFRDJQnK4MChUS5XdnwupG8rd5fW+jtG2A
+e3GDMekdlFrVzGH58LrDxEuYaQRrX0R21q6ZcNfdupyeAaNoN0cYbC+m/V4RILdZ
+15vqsIPeV6oOLGWngN7UmlkCDt8KHp5Ndq7wCMPYvT6eivp9R8sE+ZRCO3S6cKlV
+ya2qdwjfyG0Gpkxxp8BopPwD6j+fsai6wKEwtIwSaGL8ZDCk2DDCZgTMGP/Ow0e3
+scoRLsvJqtLxZocr5CFjrr1XRZSnDbWh0AtUn0QOh9/tgrM+xv+BvvyhGl/yKsJj
+GRs71eudZOUoj2AabbecRiw2fmoIxYNkEHQdSqzXDVYXpKpo7pbIuaao46Jrg1Q/
+q9W2HvGFrEjQkvRfOOUWoLUQYVkgnQ5k8uzRQpULikXuQXcygKf9Iyu21+RfwNkC
+vXHLdeJys0lscvSpHxJ5htYeb4RUnu38RYOLimzrtDW3KCDNhwVGEJOJmhL/Q8+t
+qh1rXatSgsdrOePY63TjdQu7EmDI1qwVpDzAzmTe7txG2xAxg+OHBaiziKX15gPA
+GqwBZjFgQLI0H9NTBiXK1iYmxQ0kLlhkFii3hAe3bd3feeRLxnO3W//ceHLqPgn6
+qhUL298KhlczbsJ4KeTC
+=ORP7
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.4.6-r1.ebuild b/www-servers/apache/apache-2.4.6-r1.ebuild
deleted file mode 100644
index 5eb293a6ed07..000000000000
--- a/www-servers/apache/apache-2.4.6-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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.6-r1.ebuild,v 1.5 2014/01/31 08:32:28 vapier Exp $
-
-EAPI="2"
-
-# latest gentoo apache files
-GENTOO_PATCHSTAMP="20130725"
-GENTOO_DEVELOPER="kensington"
-GENTOO_PATCHNAME="gentoo-apache-2.4.4"
-
-# IUSE/USE_EXPAND magic
-IUSE_MPMS_FORK="itk peruser prefork"
-IUSE_MPMS_THREAD="event worker"
-
-# << obsolete modules:
-# authn_default authz_default mem_cache
-# mem_cache is replaced by cache_disk
-# ?? buggy modules
-# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
-# >> added modules for reason:
-# compat: compatibility with 2.2 access control
-# authz_host: new module for access control
-# authn_core: functionality provided by authn_alias in previous versions
-# authz_core: new module, provides core authorization capabilities
-# cache_disk: replacement for mem_cache
-# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
-# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
-# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
-# 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"
-# 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
-	cache_disk:cache
-	ext_filter:filter
-	file_cache:cache
-	lbmethod_byrequests:proxy_balancer
-	lbmethod_byrequests:slotmem_shm
-	lbmethod_bytraffic:proxy_balancer
-	lbmethod_bybusyness:proxy_balancer
-	lbmethod_heartbeat:proxy_balancer
-	log_forensic:log_config
-	logio:log_config
-	cache_disk:cache
-	mime_magic:mime
-	proxy_ajp:proxy
-	proxy_balancer:proxy
-	proxy_connect:proxy
-	proxy_ftp:proxy
-	proxy_http:proxy
-	proxy_scgi:proxy
-	proxy_fcgi:proxy
-	substitute:filter
-"
-
-# module<->define mappings
-MODULE_DEFINES="
-	auth_digest:AUTH_DIGEST
-	authnz_ldap:AUTHNZ_LDAP
-	cache:CACHE
-	cache_disk:CACHE
-	dav:DAV
-	dav_fs:DAV
-	dav_lock:DAV
-	file_cache:CACHE
-	info:INFO
-	ldap:LDAP
-	proxy:PROXY
-	proxy_ajp:PROXY
-	proxy_balancer:PROXY
-	proxy_connect:PROXY
-	proxy_ftp:PROXY
-	proxy_http:PROXY
-	proxy_fcgi:PROXY
-	socache_shmcb:SSL
-	ssl:SSL
-	status:STATUS
-	suexec:SUEXEC
-	userdir:USERDIR
-"
-
-# critical modules for the default config
-MODULE_CRITICAL="
-	authn_core
-	authz_core
-	authz_host
-	dir
-	mime
-	unixd
-"
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-
-inherit eutils apache-2 systemd toolchain-funcs
-
-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 ~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 )"
-
-# init script fixup - should be rolled into next tarball #389965
-src_prepare() {
-	# the following patch can be removed once it is included in
-	# 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"
-		cd "${S}" || die "Failed to cd to ${S}"
-	fi
-	apache-2_src_prepare
-	pushd "${GENTOO_PATCHDIR}" &>/dev/null || die
-	epatch "${FILESDIR}"/gentoo-apache-2.2.23-initd_fixups.patch
-	popd &>/dev/null || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	apache-2_src_configure
-}
-
-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
-
-	# Note: wait for mod_systemd to be included in the next release,
-	# then apache2.4.service can be used and systemd support controlled
-	# through --enable-systemd
-	systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
-	systemd_dotmpfilesd "${FILESDIR}/apache.conf"
-	#insinto /etc/apache2/modules.d
-	#doins "${FILESDIR}/00_systemd.conf"
-}
-
-pkg_postinst()
-{
-	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
-	# warnings that default config might not work out of the box
-	for mod in $MODULE_CRITICAL; do
-		if ! use "apache2_modules_${mod}"; then
-			echo
-			ewarn "Warning: Critical module not installed!"
-			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
-			ewarn "are highly recomended but might not be in the base profile yet."
-			ewarn "Default config for ssl needs module 'socache_shmcb'."
-			ewarn "Enabling the following flags is highly recommended:"
-			for cmod in $MODULE_CRITICAL; do
-				use "apache2_modules_${cmod}" || \
-					ewarn "+ apache2_modules_${cmod}"
-			done
-			echo
-			break
-		fi
-	done
-	# warning for proxy_balancer and missing load balancing scheduler
-	if use apache2_modules_proxy_balancer; then
-		local lbset=
-		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
-			if use "apache2_modules_${mod}"; then
-				lbset=1 && break
-			fi
-		done
-		if [ ! $lbset ]; then
-			echo
-			ewarn "Info: Missing load balancing scheduler algorithm module"
-			ewarn "(They were split off from proxy_balancer in 2.3)"
-			ewarn "In order to get the ability of load balancing, at least"
-			ewarn "one of these modules has to be present:"
-			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
-			echo
-		fi
-	fi
-}
diff --git a/www-servers/apache/apache-2.4.6-r2.ebuild b/www-servers/apache/apache-2.4.6-r2.ebuild
index f6f4d2bf6a55..97735c08368a 100644
--- a/www-servers/apache/apache-2.4.6-r2.ebuild
+++ b/www-servers/apache/apache-2.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.6-r2.ebuild,v 1.4 2014/01/31 08:32:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.6-r2.ebuild,v 1.5 2014/02/19 09:20:39 polynomial-c Exp $
 
 EAPI="2"
 
@@ -109,9 +109,6 @@ MODULE_CRITICAL="
 	mime
 	unixd
 "
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
 
 inherit eutils apache-2 systemd toolchain-funcs
 
@@ -134,6 +131,14 @@ RDEPEND="${RDEPEND}
 	>=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)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
 # init script fixup - should be rolled into next tarball #389965
 src_prepare() {
 	# the following patch can be removed once it is included in
diff --git a/www-servers/apache/apache-2.4.7.ebuild b/www-servers/apache/apache-2.4.7.ebuild
index 46829b173d76..1141ddd0bc9a 100644
--- a/www-servers/apache/apache-2.4.7.ebuild
+++ b/www-servers/apache/apache-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.7 2014/01/31 08:48:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.7.ebuild,v 1.8 2014/02/19 09:20:39 polynomial-c Exp $
 
 EAPI=5
 
@@ -111,10 +111,6 @@ MODULE_CRITICAL="
 	mime
 	unixd
 "
-# dependend criticals
-use ssl && MODULE_CRITICAL+=" socache_shmcb"
-use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
-
 inherit eutils apache-2 systemd toolchain-funcs
 
 DESCRIPTION="The Apache Web Server."
@@ -136,6 +132,14 @@ RDEPEND="${RDEPEND}
 	>=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)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
 # init script fixup - should be rolled into next tarball #389965
 src_prepare() {
 	# the following patch can be removed once it is included in