1 |
commit: 42d10d5a4cb15d7b84276713dc14ea3ff3678b1d |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 18 13:16:48 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 16 18:23:03 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d10d5a |
7 |
|
8 |
www-servers/apache: Honour USE="-split-usr" |
9 |
|
10 |
* Invoking maintainer timeout |
11 |
|
12 |
Closes: https://bugs.gentoo.org/697974 |
13 |
Package-Manager: Portage-2.3.77, Repoman-2.3.17 |
14 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
15 |
|
16 |
www-servers/apache/apache-2.4.41.ebuild | 4 ++-- |
17 |
1 file changed, 2 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild |
20 |
index 36acc74b412..ce8e5e98037 100644 |
21 |
--- a/www-servers/apache/apache-2.4.41.ebuild |
22 |
+++ b/www-servers/apache/apache-2.4.41.ebuild |
23 |
@@ -142,7 +142,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a |
24 |
# FIXME: Move to apache-2.eclass once this has reached stable. |
25 |
IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}" |
26 |
# New suexec options (since 2.4.34) |
27 |
-IUSE="${IUSE} +suexec-caps suexec-syslog" |
28 |
+IUSE="${IUSE} +suexec-caps suexec-syslog split-usr" |
29 |
|
30 |
CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) |
31 |
apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) |
32 |
@@ -210,7 +210,7 @@ src_install() { |
33 |
# old location until all ebuilds and eclasses have been modified to |
34 |
# use the new location. |
35 |
dobin support/apxs |
36 |
- dosym ../bin/apxs /usr/sbin/apxs |
37 |
+ use split-usr && dosym ../bin/apxs /usr/sbin/apxs |
38 |
|
39 |
# Note: wait for mod_systemd to be included in some forthcoming release, |
40 |
# Then apache2.4.service can be used and systemd support controlled |