| 1 |
commit: 823bf5eab42bcd808742cf6eafed0e6841e4291e |
| 2 |
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jul 30 12:33:58 2016 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 30 12:33:58 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=823bf5ea |
| 7 |
|
| 8 |
patch from https://marc.info/?l=gentoo-dev&m=146852788902799&w=2 |
| 9 |
|
| 10 |
eclass/depend.apache.eclass | 14 +++++++++++--- |
| 11 |
1 file changed, 11 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass |
| 14 |
index 22a8216..d0b30eb 100644 |
| 15 |
--- a/eclass/depend.apache.eclass |
| 16 |
+++ b/eclass/depend.apache.eclass |
| 17 |
@@ -162,6 +162,8 @@ depend.apache_pkg_setup() { |
| 18 |
else |
| 19 |
_init_no_apache |
| 20 |
fi |
| 21 |
+ else |
| 22 |
+ _init_apache2 |
| 23 |
fi |
| 24 |
} |
| 25 |
|
| 26 |
@@ -226,7 +228,9 @@ need_apache2() { |
| 27 |
|
| 28 |
DEPEND="${DEPEND} ${APACHE2_DEPEND}" |
| 29 |
RDEPEND="${RDEPEND} ${APACHE2_DEPEND}" |
| 30 |
- _init_apache2 |
| 31 |
+ case "${EAPI:-0}" in |
| 32 |
+ 0|1|2|3|4|5) _init_apache2 ;; |
| 33 |
+ esac |
| 34 |
} |
| 35 |
|
| 36 |
# @FUNCTION: need_apache2_2 |
| 37 |
@@ -237,7 +241,9 @@ need_apache2_2() { |
| 38 |
|
| 39 |
DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" |
| 40 |
RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" |
| 41 |
- _init_apache2 |
| 42 |
+ case "${EAPI:-0}" in |
| 43 |
+ 0|1|2|3|4|5) _init_apache2 ;; |
| 44 |
+ esac |
| 45 |
} |
| 46 |
|
| 47 |
# @FUNCTION: need_apache2_4 |
| 48 |
@@ -248,7 +254,9 @@ need_apache2_4() { |
| 49 |
|
| 50 |
DEPEND="${DEPEND} ${APACHE2_4_DEPEND}" |
| 51 |
RDEPEND="${RDEPEND} ${APACHE2_4_DEPEND}" |
| 52 |
- _init_apache2 |
| 53 |
+ case "${EAPI:-0}" in |
| 54 |
+ 0|1|2|3|4|5) _init_apache2 ;; |
| 55 |
+ esac |
| 56 |
} |
| 57 |
|
| 58 |
# @FUNCTION: has_apache |
Archives