www-servers/apache: Renamed CDEPEND to COMMON_DEPEND

Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Lars Wendler <[email protected]>
johu · Jan 26, 2021 · c313d7c · c313d7c
1 parent f6f7bed
commit c313d7c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
@@ -25,7 +25,7 @@ esac
 case $(ver_cut 1-2) in
  2.4)
  DEFAULT_MPM_THREADED="event" #509922
- CDEPEND=">=dev-libs/apr-1.5.1:=
+ COMMON_DEPEND=">=dev-libs/apr-1.5.1:=
  !www-apache/mod_macro" #492578 #477702
  ;;
  *)
@@ -121,7 +121,7 @@ _apache2_set_mpms() {
 _apache2_set_mpms
 unset -f _apache2_set_mpms
 
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
  dev-lang/perl
  =dev-libs/apr-util-1*:=[gdbm=,ldap?]
  dev-libs/libpcre

diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -146,7 +146,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
 # New suexec options (since 2.4.34)
 IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
 
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -155,9 +155,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  !libressl? ( dev-libs/apr-util[openssl] )
  )"
 
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
  suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
 
 REQUIRED_USE="apache2_modules_http2? ( ssl )
  apache2_modules_md? ( ssl )"

diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -146,7 +146,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
 # New suexec options (since 2.4.34)
 IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
 
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -155,9 +155,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  !libressl? ( dev-libs/apr-util[openssl] )
  )"
 
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
  suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
 
 REQUIRED_USE="apache2_modules_http2? ( ssl )
  apache2_modules_md? ( ssl )"

diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
@@ -144,7 +144,7 @@ IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
 # New suexec options (since 2.4.34)
 IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
 
-CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
+COMMON_DEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 )
  apache2_modules_md? ( >=dev-libs/jansson-2.10 )
@@ -153,9 +153,9 @@ CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
  !libressl? ( dev-libs/apr-util[openssl] )
  )"
 
-DEPEND+="${CDEPEND}
+DEPEND+="${COMMON_DEPEND}
  suexec? ( suexec-caps? ( sys-libs/libcap ) )"
-RDEPEND+="${CDEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
 
 REQUIRED_USE="apache2_modules_http2? ( ssl )
  apache2_modules_md? ( ssl )"