commit:     42d10d5a4cb15d7b84276713dc14ea3ff3678b1d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 13:16:48 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 16 18:23:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d10d5a

www-servers/apache: Honour USE="-split-usr"

* Invoking maintainer timeout

Closes: https://bugs.gentoo.org/697974
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 www-servers/apache/apache-2.4.41.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-servers/apache/apache-2.4.41.ebuild 
b/www-servers/apache/apache-2.4.41.ebuild
index 36acc74b412..ce8e5e98037 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.41.ebuild
@@ -142,7 +142,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 
~s390 ~sh sparc x86 ~a
 # FIXME: Move to apache-2.eclass once this has reached stable.
 IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
 # New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog"
+IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
 
 CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
        apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
@@ -210,7 +210,7 @@ src_install() {
        # old location until all ebuilds and eclasses have been modified to
        # use the new location.
        dobin support/apxs
-       dosym ../bin/apxs /usr/sbin/apxs
+       use split-usr && dosym ../bin/apxs /usr/sbin/apxs
 
        # Note: wait for mod_systemd to be included in some forthcoming release,
        # Then apache2.4.service can be used and systemd support controlled

Reply via email to