diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-10-08 12:03:01 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-08 12:03:01 +0100 |
| commit | 522fa4e6f267ba688a264ceec8d6c79663b61219 (patch) | |
| tree | 67895f3a8243148309fbd841dabba28c37f4ed4a /eclass | |
| parent | 32c16465e56b0122cf6e5a4625e9c7b56b107b07 (diff) | |
gentoo auto-resync : 08:10:2023 - 12:03:01
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39148 -> 39145 bytes | |||
| -rw-r--r-- | eclass/apache-module.eclass | 4 | ||||
| -rw-r--r-- | eclass/depend.apache.eclass | 34 |
3 files changed, 26 insertions, 12 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 3d8a2ff4048e..e98fbe309997 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass index 8074aff5ddcb..5a84ffedf71a 100644 --- a/eclass/apache-module.eclass +++ b/eclass/apache-module.eclass @@ -4,7 +4,7 @@ # @ECLASS: apache-module.eclass # @MAINTAINER: # apache-bugs@gentoo.org -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Provides a common set of functions for apache modules # @DESCRIPTION: # This eclass handles apache modules in a sane way. @@ -45,7 +45,7 @@ # @CODE case ${EAPI} in - 6|7) ;; + 6|7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 4dc3f68daabc..8f0469931d2c 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -4,7 +4,7 @@ # @ECLASS: depend.apache.eclass # @MAINTAINER: # apache-bugs@gentoo.org -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 6 7 8 # @BLURB: Functions to allow ebuilds to depend on apache # @DESCRIPTION: # This eclass handles depending on apache in a sane way and provides information @@ -41,7 +41,7 @@ # @CODE case ${EAPI:-0} in - 6|7) + 6|7|8) ;; *) die "EAPI=${EAPI} is not supported by depend.apache.eclass" @@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*" # @ECLASS_VARIABLE: APACHE2_2_DEPEND # @DESCRIPTION: -# Dependencies for Apache 2.2.x +# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8. APACHE2_2_DEPEND="=www-servers/apache-2.2*" # @ECLASS_VARIABLE: APACHE2_4_DEPEND @@ -215,10 +215,17 @@ want_apache2() { want_apache2_2() { debug-print-function $FUNCNAME $* - local myiuse=${1:-apache2} - IUSE="${IUSE} ${myiuse}" - DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" - RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + case ${EAPI:-0} in + 6|7) + local myiuse=${1:-apache2} + IUSE="${IUSE} ${myiuse}" + DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + ;; + *) + errror "want-apache2_2 is no longer supported in EAPI 8" + ;; + esac } # @FUNCTION: want_apache2_4 @@ -263,9 +270,16 @@ need_apache2() { need_apache2_2() { debug-print-function $FUNCNAME $* - DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" - RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" - _init_apache2 + case ${EAPI:-0} in + 6|7) + DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" + RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" + _init_apache2 + ;; + *) + error "need_apache2-2 is no longer supported in EAPI 8" + ;; + esac } # @FUNCTION: need_apache2_4 |