[patch] 0001-depend.apache.eclass-use-usr-bin-apxs-not-sbin-as-ap.patch

0001-depend.apache.eclass-use-usr-bin-apxs-not-sbin-as-ap.patch (text/plain), 1.23 KB, created by Michael Orlitzky on 2015-11-24 17:45:38 UTC

From 3f32a9f9c98fdda097799bd77086d5c0c2915e01 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <[e-mail]>
Date: Tue, 24 Nov 2015 11:43:35 -0500
Subject: [PATCH 1/2] depend.apache.eclass: use /usr/bin/apxs (not sbin) as
 apxs path.

The apxs binary used to be installed in /usr/sbin. However, it should
be available to non-root users, so it was moved to /usr/bin in bug
502384. Now that all apache ebuilds in the tree use /usr/bin, it is
safe to update the depend.apache eclass to use the new path.

This will ultimately fix bug 538020 which results from the user being
unable to access /usr/sbin.

Gentoo-Bug: 502384
Gentoo-Bug: 538020
---
 eclass/depend.apache.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 22a8216..69e0143 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -122,7 +122,7 @@ _init_apache2() {
 	# WARNING: Do not use these variables with anything that is put
 	# into the dependency cache (DEPEND/RDEPEND/etc)
 	APACHE_VERSION="2"
-	APXS="/usr/sbin/apxs2"
+	APXS="${EPREFIX}/usr/bin/apxs"
 	APACHE_BIN="/usr/sbin/apache2"
 	APACHE_CTL="/usr/sbin/apache2ctl"
 	APACHE_INCLUDEDIR="/usr/include/apache2"
-- 
2.4.10