From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A81C0138206 for ; Wed, 17 Jan 2018 08:23:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBF39E0885; Wed, 17 Jan 2018 08:23:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97E00E0885 for ; Wed, 17 Jan 2018 08:23:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FA09335C39 for ; Wed, 17 Jan 2018 08:23:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5D121A6 for ; Wed, 17 Jan 2018 08:23:53 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1516177411.1ac8d08ba6a34013958d41bdbb06c78ae3c3ec3c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/apache-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1ac8d08ba6a34013958d41bdbb06c78ae3c3ec3c X-VCS-Branch: master Date: Wed, 17 Jan 2018 08:23:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 67fbdbd5-f2c1-4114-8cdc-333a1e60621a X-Archives-Hash: f52d24501c6fbb22c677bef318a45873 commit: 1ac8d08ba6a34013958d41bdbb06c78ae3c3ec3c Author: Lars Wendler gentoo org> AuthorDate: Wed Jan 17 08:23:31 2018 +0000 Commit: Lars Wendler gentoo 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 )