1 |
commit: 2ead6cf1effb2c441017bd27d966e33efa1880f5 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 17 07:05:15 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 17 07:09:59 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ead6cf1 |
7 |
|
8 |
apache-2.eclass: Replaced versionator with eapi7-ver eclass. |
9 |
|
10 |
eclass/apache-2.eclass | 6 +++--- |
11 |
1 file changed, 3 insertions(+), 3 deletions(-) |
12 |
|
13 |
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass |
14 |
index b2d72f479c7..56187720b5d 100644 |
15 |
--- a/eclass/apache-2.eclass |
16 |
+++ b/eclass/apache-2.eclass |
17 |
@@ -9,7 +9,7 @@ |
18 |
# This eclass handles apache-2.x ebuild functions such as LoadModule generation |
19 |
# and inter-module dependency checking. |
20 |
|
21 |
-inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs versionator |
22 |
+inherit autotools eutils flag-o-matic multilib ssl-cert user toolchain-funcs eapi7-ver |
23 |
|
24 |
[[ ${CATEGORY}/${PN} != www-servers/apache ]] \ |
25 |
&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!" |
26 |
@@ -21,7 +21,7 @@ case ${EAPI:-0} in |
27 |
esac |
28 |
|
29 |
# settings which are version specific go in here: |
30 |
-case $(get_version_component_range 1-2) in |
31 |
+case $(ver_cut 1-2) in |
32 |
2.4) |
33 |
DEFAULT_MPM_THREADED="event" #509922 |
34 |
CDEPEND=">=dev-libs/apr-1.5.1:= |
35 |
@@ -119,7 +119,7 @@ _apache2_set_mpms() { |
36 |
REQUIRED_USE+=" )" |
37 |
done |
38 |
|
39 |
- if [[ "${PV}" != 2.2* ]] ; then |
40 |
+ if [[ "$(ver_cut 1-2)" != 2.2 ]] ; then |
41 |
REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )" |
42 |
fi |
43 |
} |