Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/
Date: Wed, 06 Jul 2016 09:56:44
Message-Id: 1467798838.1675c734501a7a1f707455aecd2b5a10f83d20f7.polynomial-c@gentoo
1 commit: 1675c734501a7a1f707455aecd2b5a10f83d20f7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 09:53:58 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 09:53:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1675c734
7
8 www-servers/apache: Removed old.
9
10 Package-Manager: portage-2.3.0
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 www-servers/apache/Manifest | 2 -
14 www-servers/apache/apache-2.4.18-r1.ebuild | 237 -----------------------------
15 www-servers/apache/apache-2.4.18.ebuild | 231 ----------------------------
16 3 files changed, 470 deletions(-)
17
18 diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
19 index e7d70ba..5e98137 100644
20 --- a/www-servers/apache/Manifest
21 +++ b/www-servers/apache/Manifest
22 @@ -1,7 +1,5 @@
23 DIST gentoo-apache-2.2.29-20140922.tar.bz2 64135 SHA256 8c69c36c2f40fb81ee905b4dd72ab74aab4563c75149d302f372a451498e2678 SHA512 1d9aa12aa3ab79b5f80ee3fda020b33ff6798e5b1abbcbc138acea06a1ab9968ad240d2bdf9c5dbb9640fa9fb6718eec7175df7cc0fb8574cc4d7d5cdfb5bcc4 WHIRLPOOL f655300f0dcd2f4503cbdb25983fed902e4b717ff57e06f66486bebd0ed7cb8df56387be74b4259bfffad949bb446c5ec28f89065b6d5239585324b610be7b88
24 -DIST gentoo-apache-2.4.10-r1-20140731.tar.bz2 24531 SHA256 8e093a18582c3a20283ed1c09de9acc6832a80b1d5a02962599db0535d38af19 SHA512 c54239df36d7ab30bd14a41241d94b4b49b92c5e50e64857da3e7cde7575d5c0a634d51710bdf75807a57932bf9447906407ae4ef6cb333d7197e82ba5052cd9 WHIRLPOOL 0d184763a033209eaa3c91f7050b24c2a2da24d930ed280a8aa99e32461ac31402e6fd8f57e2122a96e45a8308c4a332144ede7b511ceee352be2f38a6ef7839
25 DIST gentoo-apache-2.4.18-r1-20160303.tar.bz2 24505 SHA256 d81e32d876594b48a7ff6d9123bf776c5bea5453eddd2fe40f4a9b79c11537aa SHA512 68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d WHIRLPOOL fb61224b2104e611237e1d09eb4dfb3d2b8f023348c9622f7f19434b6b77d63786c41af17a300d994c14d983676f3753ab6fa52f7a7fcd07b9cea3d7eeacc9b9
26 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
27 -DIST httpd-2.4.18.tar.bz2 5181291 SHA256 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c SHA512 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31 WHIRLPOOL e0ae6b8581e2993e0f873d8928e3b54f1df750f29e82d2f1308376af440308c56e89dfb3ec051cdf164a271580ccac71ebc5b038e23ca65a9221fdfc08b47b41
28 DIST httpd-2.4.20.tar.bz2 6331344 SHA256 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da SHA512 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53 WHIRLPOOL cc61fa5a2344268cdba69ba1662d555d492b40468a81b1d67fce55f85e178f63ef218a303e51e494c91a26dcec259e3912ca640192dbbe42d2b02ee4fac19a1d
29 DIST httpd-2.4.23.tar.bz2 6351875 SHA256 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58 SHA512 c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1 WHIRLPOOL f3defbd06a878c66236adfcac2b59b6f47115ac815708bb45f2152bd1754b14a01458c9331eb7a65cba52e0bc53e2e66b32a384d44a029b07ffdd068c7c08a19
30
31 diff --git a/www-servers/apache/apache-2.4.18-r1.ebuild b/www-servers/apache/apache-2.4.18-r1.ebuild
32 deleted file mode 100644
33 index d2eebc8..0000000
34 --- a/www-servers/apache/apache-2.4.18-r1.ebuild
35 +++ /dev/null
36 @@ -1,237 +0,0 @@
37 -# Copyright 1999-2016 Gentoo Foundation
38 -# Distributed under the terms of the GNU General Public License v2
39 -# $Id$
40 -
41 -EAPI=5
42 -
43 -# latest gentoo apache files
44 -GENTOO_PATCHSTAMP="20160303"
45 -GENTOO_DEVELOPER="polynomial-c"
46 -GENTOO_PATCHNAME="gentoo-apache-2.4.18-r1"
47 -
48 -# IUSE/USE_EXPAND magic
49 -IUSE_MPMS_FORK="prefork"
50 -IUSE_MPMS_THREAD="event worker"
51 -
52 -# << obsolete modules:
53 -# authn_default authz_default mem_cache
54 -# mem_cache is replaced by cache_disk
55 -# ?? buggy modules
56 -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
57 -# >> added modules for reason:
58 -# compat: compatibility with 2.2 access control
59 -# authz_host: new module for access control
60 -# authn_core: functionality provided by authn_alias in previous versions
61 -# authz_core: new module, provides core authorization capabilities
62 -# cache_disk: replacement for mem_cache
63 -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
64 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
65 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
66 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
67 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
68 -# socache_shmcb: shared object cache provider. Default config with ssl needs it
69 -# unixd: fixes startup error: Invalid command 'User'
70 -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
71 -authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
72 -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
73 -cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
74 -dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap
75 -include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
76 -lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
77 -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
78 -proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
79 -slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
80 -unixd version vhost_alias"
81 -# The following are also in the source as of this version, but are not available
82 -# for user selection:
83 -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
84 -# optional_fn_import optional_hook_export optional_hook_import
85 -
86 -# inter-module dependencies
87 -# TODO: this may still be incomplete
88 -MODULE_DEPENDS="
89 - dav_fs:dav
90 - dav_lock:dav
91 - deflate:filter
92 - cache_disk:cache
93 - ext_filter:filter
94 - file_cache:cache
95 - lbmethod_byrequests:proxy_balancer
96 - lbmethod_byrequests:slotmem_shm
97 - lbmethod_bytraffic:proxy_balancer
98 - lbmethod_bybusyness:proxy_balancer
99 - lbmethod_heartbeat:proxy_balancer
100 - log_forensic:log_config
101 - logio:log_config
102 - cache_disk:cache
103 - mime_magic:mime
104 - proxy_ajp:proxy
105 - proxy_balancer:proxy
106 - proxy_balancer:slotmem_shm
107 - proxy_connect:proxy
108 - proxy_ftp:proxy
109 - proxy_html:proxy
110 - proxy_http:proxy
111 - proxy_scgi:proxy
112 - proxy_fcgi:proxy
113 - proxy_wstunnel:proxy
114 - substitute:filter
115 -"
116 -
117 -# module<->define mappings
118 -MODULE_DEFINES="
119 - auth_digest:AUTH_DIGEST
120 - authnz_ldap:AUTHNZ_LDAP
121 - cache:CACHE
122 - cache_disk:CACHE
123 - dav:DAV
124 - dav_fs:DAV
125 - dav_lock:DAV
126 - file_cache:CACHE
127 - http2:HTTP2
128 - info:INFO
129 - ldap:LDAP
130 - proxy:PROXY
131 - proxy_ajp:PROXY
132 - proxy_balancer:PROXY
133 - proxy_connect:PROXY
134 - proxy_ftp:PROXY
135 - proxy_html:PROXY
136 - proxy_http:PROXY
137 - proxy_fcgi:PROXY
138 - proxy_scgi:PROXY
139 - proxy_wstunnel:PROXY
140 - socache_shmcb:SSL
141 - ssl:SSL
142 - status:STATUS
143 - suexec:SUEXEC
144 - userdir:USERDIR
145 -"
146 -
147 -# critical modules for the default config
148 -MODULE_CRITICAL="
149 - authn_core
150 - authz_core
151 - authz_host
152 - dir
153 - mime
154 - unixd
155 -"
156 -inherit eutils apache-2 systemd toolchain-funcs
157 -
158 -DESCRIPTION="The Apache Web Server"
159 -HOMEPAGE="https://httpd.apache.org/"
160 -
161 -# some helper scripts are Apache-1.1, thus both are here
162 -LICENSE="Apache-2.0 Apache-1.1"
163 -SLOT="2"
164 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
165 -
166 -DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
167 -
168 -REQUIRED_USE="apache2_modules_http2? ( ssl )"
169 -
170 -pkg_setup() {
171 - # dependend critical modules which are not allowed in global scope due
172 - # to USE flag conditionals (bug #499260)
173 - use ssl && MODULE_CRITICAL+=" socache_shmcb"
174 - use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
175 - apache-2_pkg_setup
176 -}
177 -
178 -src_configure() {
179 - # Brain dead check.
180 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
181 -
182 - apache-2_src_configure
183 -}
184 -
185 -src_compile() {
186 - if tc-is-cross-compiler; then
187 - # This header is the same across targets, so use the build compiler.
188 - pushd server >/dev/null
189 - emake gen_test_char
190 - tc-export_build_env BUILD_CC
191 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
192 - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
193 - popd >/dev/null
194 - fi
195 -
196 - default
197 -}
198 -
199 -src_install() {
200 - apache-2_src_install
201 - for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
202 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
203 - done
204 - for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
205 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
206 - done
207 - for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
208 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
209 - done
210 - for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
211 - rm "${ED}/"$i || die "Failed to prune apache-tools bits"
212 - done
213 -
214 - # install apxs in /usr/bin (bug #502384) and put a symlink into the
215 - # old location until all ebuilds and eclasses have been modified to
216 - # use the new location.
217 - local apxs="/usr/bin/apxs"
218 - cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
219 - ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
220 - chmod 0755 "${ED}"${apxs} || die
221 -
222 - # Note: wait for mod_systemd to be included in the next release,
223 - # then apache2.4.service can be used and systemd support controlled
224 - # through --enable-systemd
225 - systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
226 - systemd_dotmpfilesd "${FILESDIR}/apache.conf"
227 - #insinto /etc/apache2/modules.d
228 - #doins "${FILESDIR}/00_systemd.conf"
229 -
230 - # Install http2 module config
231 - insinto /etc/apache2/modules.d
232 - doins "${FILESDIR}"/41_mod_http2.conf
233 -}
234 -
235 -pkg_postinst()
236 -{
237 - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
238 - # warnings that default config might not work out of the box
239 - for mod in $MODULE_CRITICAL; do
240 - if ! use "apache2_modules_${mod}"; then
241 - echo
242 - ewarn "Warning: Critical module not installed!"
243 - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
244 - ewarn "are highly recomended but might not be in the base profile yet."
245 - ewarn "Default config for ssl needs module 'socache_shmcb'."
246 - ewarn "Enabling the following flags is highly recommended:"
247 - for cmod in $MODULE_CRITICAL; do
248 - use "apache2_modules_${cmod}" || \
249 - ewarn "+ apache2_modules_${cmod}"
250 - done
251 - echo
252 - break
253 - fi
254 - done
255 - # warning for proxy_balancer and missing load balancing scheduler
256 - if use apache2_modules_proxy_balancer; then
257 - local lbset=
258 - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
259 - if use "apache2_modules_${mod}"; then
260 - lbset=1 && break
261 - fi
262 - done
263 - if [ ! $lbset ]; then
264 - echo
265 - ewarn "Info: Missing load balancing scheduler algorithm module"
266 - ewarn "(They were split off from proxy_balancer in 2.3)"
267 - ewarn "In order to get the ability of load balancing, at least"
268 - ewarn "one of these modules has to be present:"
269 - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
270 - echo
271 - fi
272 - fi
273 -}
274
275 diff --git a/www-servers/apache/apache-2.4.18.ebuild b/www-servers/apache/apache-2.4.18.ebuild
276 deleted file mode 100644
277 index 40cfb2e..0000000
278 --- a/www-servers/apache/apache-2.4.18.ebuild
279 +++ /dev/null
280 @@ -1,231 +0,0 @@
281 -# Copyright 1999-2016 Gentoo Foundation
282 -# Distributed under the terms of the GNU General Public License v2
283 -# $Id$
284 -
285 -EAPI=5
286 -
287 -# latest gentoo apache files
288 -GENTOO_PATCHSTAMP="20140731"
289 -GENTOO_DEVELOPER="polynomial-c"
290 -GENTOO_PATCHNAME="gentoo-apache-2.4.10-r1"
291 -
292 -# IUSE/USE_EXPAND magic
293 -IUSE_MPMS_FORK="prefork"
294 -IUSE_MPMS_THREAD="event worker"
295 -
296 -# << obsolete modules:
297 -# authn_default authz_default mem_cache
298 -# mem_cache is replaced by cache_disk
299 -# ?? buggy modules
300 -# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
301 -# >> added modules for reason:
302 -# compat: compatibility with 2.2 access control
303 -# authz_host: new module for access control
304 -# authn_core: functionality provided by authn_alias in previous versions
305 -# authz_core: new module, provides core authorization capabilities
306 -# cache_disk: replacement for mem_cache
307 -# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
308 -# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
309 -# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
310 -# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
311 -# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
312 -# socache_shmcb: shared object cache provider. Default config with ssl needs it
313 -# unixd: fixes startup error: Invalid command 'User'
314 -IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest
315 -authn_alias authn_anon authn_core authn_dbd authn_dbm authn_file authz_core
316 -authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
317 -cache cache_disk cern_meta charset_lite cgi cgid dav dav_fs dav_lock dbd deflate
318 -dir dumpio env expires ext_filter file_cache filter headers http2 ident imagemap
319 -include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
320 -lbmethod_heartbeat log_config log_forensic logio macro mime mime_magic negotiation
321 -proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_html proxy_http proxy_scgi
322 -proxy_fcgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout setenvif
323 -slotmem_shm speling socache_shmcb status substitute unique_id userdir usertrack
324 -unixd version vhost_alias"
325 -# The following are also in the source as of this version, but are not available
326 -# for user selection:
327 -# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
328 -# optional_fn_import optional_hook_export optional_hook_import
329 -
330 -# inter-module dependencies
331 -# TODO: this may still be incomplete
332 -MODULE_DEPENDS="
333 - dav_fs:dav
334 - dav_lock:dav
335 - deflate:filter
336 - cache_disk:cache
337 - ext_filter:filter
338 - file_cache:cache
339 - lbmethod_byrequests:proxy_balancer
340 - lbmethod_byrequests:slotmem_shm
341 - lbmethod_bytraffic:proxy_balancer
342 - lbmethod_bybusyness:proxy_balancer
343 - lbmethod_heartbeat:proxy_balancer
344 - log_forensic:log_config
345 - logio:log_config
346 - cache_disk:cache
347 - mime_magic:mime
348 - proxy_ajp:proxy
349 - proxy_balancer:proxy
350 - proxy_balancer:slotmem_shm
351 - proxy_connect:proxy
352 - proxy_ftp:proxy
353 - proxy_html:proxy
354 - proxy_http:proxy
355 - proxy_scgi:proxy
356 - proxy_fcgi:proxy
357 - proxy_wstunnel:proxy
358 - substitute:filter
359 -"
360 -
361 -# module<->define mappings
362 -MODULE_DEFINES="
363 - auth_digest:AUTH_DIGEST
364 - authnz_ldap:AUTHNZ_LDAP
365 - cache:CACHE
366 - cache_disk:CACHE
367 - dav:DAV
368 - dav_fs:DAV
369 - dav_lock:DAV
370 - file_cache:CACHE
371 - http2:HTTP2
372 - info:INFO
373 - ldap:LDAP
374 - proxy:PROXY
375 - proxy_ajp:PROXY
376 - proxy_balancer:PROXY
377 - proxy_connect:PROXY
378 - proxy_ftp:PROXY
379 - proxy_html:PROXY
380 - proxy_http:PROXY
381 - proxy_fcgi:PROXY
382 - proxy_scgi:PROXY
383 - proxy_wstunnel:PROXY
384 - socache_shmcb:SSL
385 - ssl:SSL
386 - status:STATUS
387 - suexec:SUEXEC
388 - userdir:USERDIR
389 -"
390 -
391 -# critical modules for the default config
392 -MODULE_CRITICAL="
393 - authn_core
394 - authz_core
395 - authz_host
396 - dir
397 - mime
398 - unixd
399 -"
400 -inherit eutils apache-2 systemd toolchain-funcs
401 -
402 -DESCRIPTION="The Apache Web Server"
403 -HOMEPAGE="https://httpd.apache.org/"
404 -
405 -# some helper scripts are Apache-1.1, thus both are here
406 -LICENSE="Apache-2.0 Apache-1.1"
407 -SLOT="2"
408 -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
409 -
410 -DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
411 -
412 -pkg_setup() {
413 - # dependend critical modules which are not allowed in global scope due
414 - # to USE flag conditionals (bug #499260)
415 - use ssl && MODULE_CRITICAL+=" socache_shmcb"
416 - use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
417 - apache-2_pkg_setup
418 -}
419 -
420 -src_configure() {
421 - # Brain dead check.
422 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
423 -
424 - apache-2_src_configure
425 -}
426 -
427 -src_compile() {
428 - if tc-is-cross-compiler; then
429 - # This header is the same across targets, so use the build compiler.
430 - pushd server >/dev/null
431 - emake gen_test_char
432 - tc-export_build_env BUILD_CC
433 - ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
434 - gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
435 - popd >/dev/null
436 - fi
437 -
438 - default
439 -}
440 -
441 -src_install() {
442 - apache-2_src_install
443 - for i in /usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}; do
444 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
445 - done
446 - for i in /usr/share/man/man8/{rotatelogs.8,htcacheclean.8}; do
447 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
448 - done
449 - for i in /usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}; do
450 - rm "${ED}"/$i || die "Failed to prune apache-tools bits"
451 - done
452 - for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
453 - rm "${ED}/"$i || die "Failed to prune apache-tools bits"
454 - done
455 -
456 - # install apxs in /usr/bin (bug #502384) and put a symlink into the
457 - # old location until all ebuilds and eclasses have been modified to
458 - # use the new location.
459 - local apxs="/usr/bin/apxs"
460 - cp "${S}"/support/apxs "${ED}"${apxs} || die "Failed to install apxs"
461 - ln -s ../bin/apxs "${ED}"/usr/sbin/apxs || die
462 - chmod 0755 "${ED}"${apxs} || die
463 -
464 - # Note: wait for mod_systemd to be included in the next release,
465 - # then apache2.4.service can be used and systemd support controlled
466 - # through --enable-systemd
467 - systemd_newunit "${FILESDIR}/apache2.2.service" "apache2.service"
468 - systemd_dotmpfilesd "${FILESDIR}/apache.conf"
469 - #insinto /etc/apache2/modules.d
470 - #doins "${FILESDIR}/00_systemd.conf"
471 -}
472 -
473 -pkg_postinst()
474 -{
475 - apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
476 - # warnings that default config might not work out of the box
477 - for mod in $MODULE_CRITICAL; do
478 - if ! use "apache2_modules_${mod}"; then
479 - echo
480 - ewarn "Warning: Critical module not installed!"
481 - ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
482 - ewarn "are highly recomended but might not be in the base profile yet."
483 - ewarn "Default config for ssl needs module 'socache_shmcb'."
484 - ewarn "Enabling the following flags is highly recommended:"
485 - for cmod in $MODULE_CRITICAL; do
486 - use "apache2_modules_${cmod}" || \
487 - ewarn "+ apache2_modules_${cmod}"
488 - done
489 - echo
490 - break
491 - fi
492 - done
493 - # warning for proxy_balancer and missing load balancing scheduler
494 - if use apache2_modules_proxy_balancer; then
495 - local lbset=
496 - for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
497 - if use "apache2_modules_${mod}"; then
498 - lbset=1 && break
499 - fi
500 - done
501 - if [ ! $lbset ]; then
502 - echo
503 - ewarn "Info: Missing load balancing scheduler algorithm module"
504 - ewarn "(They were split off from proxy_balancer in 2.3)"
505 - ewarn "In order to get the ability of load balancing, at least"
506 - ewarn "one of these modules has to be present:"
507 - ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
508 - echo
509 - fi
510 - fi
511 -}