From 5b5df25227111ef465caf5c52bcfb66dac3219cd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jan 2018 20:11:46 +0000 Subject: gentoo resync : 19.01.2018 --- eclass/apache-2.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'eclass/apache-2.eclass') diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index dbd55abe8c90..7b30b48e0894 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 ) -- cgit v1.2.3