[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     1ac8d08ba6a34013958d41bdbb06c78ae3c3ec3c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 08:23:31 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 08:23:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ac8d08b

apache-2.eclass: More dependency adjustments.

 eclass/apache-2.eclass | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index b4dcff582b5..7b30b48e089 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -24,12 +24,12 @@ esac
 case $(get_version_component_range 1-2) in
        2.4)
                DEFAULT_MPM_THREADED="event" #509922
-               RDEPEND=">=dev-libs/apr-1.5.1:=
+               CDEPEND=">=dev-libs/apr-1.5.1:=
                        !www-apache/mod_macro" #492578 #477702
        ;;
        2.2)
                DEFAULT_MPM_THREADED="worker"
-               RDEPEND=">=dev-libs/apr-1.4.5:=" #368651
+               CDEPEND=">=dev-libs/apr-1.4.5:=" #368651
        ;;
        *)
                die "Unknown MAJOR.MINOR apache version."
@@ -101,9 +101,9 @@ for mpm in ${IUSE_MPMS} ; do
        IUSE="${IUSE} apache2_mpms_${mpm}"
 done
 
-DEPEND="dev-lang/perl
-       =dev-libs/apr-1*
-       =dev-libs/apr-util-1*[ldap?]
+DEPEND="${CDEPEND}
+       dev-lang/perl
+       =dev-libs/apr-util-1*:=[ldap?]
        dev-libs/libpcre
        apache2_modules_deflate? ( sys-libs/zlib )
        apache2_modules_mime? ( app-misc/mime-types )