[gentoo-dev] [PATCH 16/44] multilib-build.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/multilib-build.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 1774ad057430b..22c4a8bb30489 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Gentoo Authors +# Copyright 2013-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-build.eclass @@ -17,14 +17,18 @@ # dependencies shall use the USE dependency string in ${MULTILIB_USEDEP} # to properly request multilib enabled. +if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then +_MULTILIB_BUILD_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_MULTILIB_BUILD_ECLASS} ]]; then -_MULTILIB_BUILD_ECLASS=1 - inherit multibuild multilib # @ECLASS_VARIABLE: _MULTILIB_FLAGS -- 2.46.0
[gentoo-dev] [PATCH 17/44] multilib.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/multilib.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index bf9c88f7e6a4e..eca8c02d8336c 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib.eclass @@ -9,14 +9,18 @@ # @DESCRIPTION: # This eclass is for all functions pertaining to handling multilib configurations. +if [[ -z ${_MULTILIB_ECLASS} ]]; then +_MULTILIB_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_MULTILIB_ECLASS} ]]; then -_MULTILIB_ECLASS=1 - inherit toolchain-funcs # Defaults: -- 2.46.0
[gentoo-dev] [PATCH 18/44] multilib-minimal.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/multilib-minimal.eclass | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 92968b6cf2137..c84fb3781a975 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib-minimal.eclass @@ -23,16 +23,21 @@ # # If you need generic install rules, use multilib_src_install_all function. -case ${EAPI} in - 6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - inherit multilib-build if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then _MULTILIB_MINIMAL_ECLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + + multilib-minimal_src_configure() { debug-print-function ${FUNCNAME} "$@" -- 2.46.0
[gentoo-dev] [PATCH 19/44] multiprocessing.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/multiprocessing.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/multiprocessing.eclass b/eclass/multiprocessing.eclass index 13d6a92f2f2e5..f9627de26c3b9 100644 --- a/eclass/multiprocessing.eclass +++ b/eclass/multiprocessing.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multiprocessing.eclass @@ -24,14 +24,18 @@ # } # @CODE -case ${EAPI:-0} in - [5678]) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ -z ${_MULTIPROCESSING_ECLASS} ]]; then _MULTIPROCESSING_ECLASS=1 +case ${EAPI} in + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + # @FUNCTION: get_nproc # @USAGE: [${fallback:-1}] # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 20/44] out-of-source-utils.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/out-of-source-utils.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/out-of-source-utils.eclass b/eclass/out-of-source-utils.eclass index d68b210889951..55a88127ca711 100644 --- a/eclass/out-of-source-utils.eclass +++ b/eclass/out-of-source-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: out-of-source-utils.eclass @@ -12,14 +12,18 @@ # This eclass provides a run_in_build_dir() helper that can be used # to execute specified command inside BUILD_DIR. +if [[ ! ${_OUT_OF_SOURCE_UTILS_ECLASS} ]]; then +_OUT_OF_SOURCE_UTILS_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_OUT_OF_SOURCE_UTILS_ECLASS} ]]; then -_OUT_OF_SOURCE_UTILS_ECLASS=1 - # @FUNCTION: run_in_build_dir # @USAGE: ... # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 21/44] pax-utils.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/pax-utils.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass index 3830f03df3419..a7144278fd9a4 100644 --- a/eclass/pax-utils.eclass +++ b/eclass/pax-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: pax-utils.eclass @@ -21,14 +21,18 @@ # To control what markings are made, set PAX_MARKINGS in /etc/portage/make.conf # to contain either "PT", "XT" or "none". The default is none -case ${EAPI:-0} in - 5|6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ -z ${_PAX_UTILS_ECLASS} ]]; then _PAX_UTILS_ECLASS=1 +case ${EAPI} in + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + # @ECLASS_VARIABLE: PAX_MARKINGS # @DESCRIPTION: # Control which markings are made: -- 2.46.0
[gentoo-dev] [PATCH 22/44] perl-functions.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/perl-functions.eclass | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eclass/perl-functions.eclass b/eclass/perl-functions.eclass index 142fdeb8cfbd0..d2b6cfb85f734 100644 --- a/eclass/perl-functions.eclass +++ b/eclass/perl-functions.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-functions.eclass @@ -17,11 +17,12 @@ # global scope. case ${EAPI} in - 7|8) - ;; - *) - die "${ECLASS}: EAPI ${EAPI:-0} not supported" + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac [[ ${CATEGORY} == "perl-core" ]] && inherit alternatives -- 2.46.0
[gentoo-dev] [PATCH 23/44] php-pear-r2.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/php-pear-r2.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass index 9882c7dcc7004..567aa9a8144f3 100644 --- a/eclass/php-pear-r2.eclass +++ b/eclass/php-pear-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-pear-r2.eclass @@ -14,14 +14,18 @@ # Note that this eclass doesn't handle dependencies of PEAR packages # on purpose; please use (R)DEPEND to define them correctly! +if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then +_PHP_PEAR_R2_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then -_PHP_PEAR_R2_ECLASS=1 - RDEPEND=">=dev-php/pear-1.8.1" [[ ${EAPI} != [67] ]] && IDEPEND=">=dev-php/pear-1.8.1" -- 2.46.0
[gentoo-dev] [PATCH 24/44] portability.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/portability.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/portability.eclass b/eclass/portability.eclass index 78da440e22ddb..926ac8b8b825f 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.eclass @@ -9,14 +9,18 @@ # @SUPPORTED_EAPIS: 6 7 8 # @BLURB: This eclass is created to avoid using non-portable GNUisms inside ebuilds +if [[ -z ${_PORTABILITY_ECLASS} ]]; then +_PORTABILITY_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_PORTABILITY_ECLASS} ]]; then -_PORTABILITY_ECLASS=1 - # @FUNCTION: treecopy # @USAGE: [orig2 orig3 ] # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 25/44] prefix.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/prefix.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/prefix.eclass b/eclass/prefix.eclass index 8d50d0ba7b6e1..e968e8ae8bac7 100644 --- a/eclass/prefix.eclass +++ b/eclass/prefix.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: prefix.eclass @@ -12,14 +12,18 @@ # located somewhere in the filesystem. Prefix ebuilds require # additional functions and variables which are defined by this eclass. -case ${EAPI:-0} in - [5678]) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ -z ${_PREFIX_ECLASS} ]]; then _PREFIX_ECLASS=1 +case ${EAPI} in + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + # @ECLASS_VARIABLE: EPREFIX # @DESCRIPTION: # The offset prefix of a Gentoo Prefix installation. When Gentoo Prefix -- 2.46.0
[gentoo-dev] [PATCH 26/44] preserve-libs.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/preserve-libs.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/preserve-libs.eclass b/eclass/preserve-libs.eclass index 35c65ef4436f9..38571447b945d 100644 --- a/eclass/preserve-libs.eclass +++ b/eclass/preserve-libs.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: preserve-libs.eclass @@ -7,14 +7,18 @@ # @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: preserve libraries after SONAME changes +if [[ -z ${_PRESERVE_LIBS_ECLASS} ]]; then +_PRESERVE_LIBS_ECLASS=1 + case ${EAPI} in - 5|6|7|8) ;; + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_PRESERVE_LIBS_ECLASS} ]]; then -_PRESERVE_LIBS_ECLASS=1 - # @FUNCTION: preserve_old_lib # @USAGE: [more libs] # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 27/44] readme.gentoo-r1.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/readme.gentoo-r1.eclass | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index 48023d9c049f8..3d2d8244687c7 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.eclass @@ -21,7 +21,11 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then _README_GENTOO_ECLASS=1 case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 28/44] ruby-fakegem.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/ruby-fakegem.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 40ff76ce900e0..04099a82ef4fd 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-fakegem.eclass @@ -139,7 +139,11 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}" RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}" case ${EAPI} in - 5|6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 29/44] ruby-ng.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/ruby-ng.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index d80ae96dd40bc..2ef6d22474351 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-ng.eclass @@ -67,7 +67,11 @@ # passed to "grep -E" to remove reporting of these shared objects. case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 30/44] ruby-utils.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/ruby-utils.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass index 789f57ce25f6a..48a25114b396b 100644 --- a/eclass/ruby-utils.eclass +++ b/eclass/ruby-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ruby-utils.eclass @@ -15,13 +15,17 @@ # This eclass does not set any metadata variables nor export any phase # functions. It can be inherited safely. -case ${EAPI:-0} in - [5678]) ;; +if [[ ! ${_RUBY_UTILS} ]]; then + +case ${EAPI} in + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_RUBY_UTILS} ]]; then - # @ECLASS_VARIABLE: RUBY_TARGETS_PREFERENCE # @INTERNAL # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 31/44] strip-linguas.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/strip-linguas.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/strip-linguas.eclass b/eclass/strip-linguas.eclass index 718341b4a6264..b31f414c87c31 100644 --- a/eclass/strip-linguas.eclass +++ b/eclass/strip-linguas.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2021 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: strip-linguas.eclass @@ -9,15 +9,19 @@ # @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: convenience function for LINGUAS support +if [[ -z ${_STRIP_LINGUAS_ECLASS} ]]; then +_STRIP_LINGUAS_ECLASS=1 + case ${EAPI} in - 5|6|7|8) ;; + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_STRIP_LINGUAS_ECLASS} ]]; then -_STRIP_LINGUAS_ECLASS=1 - -# @FUNCTION: strip-linguas +# FUNCTION: strip-linguas # @USAGE: [|<-i|-u> ] # @DESCRIPTION: # Make sure that LINGUAS only contains languages that a package can -- 2.46.0
[gentoo-dev] [PATCH 32/44] systemd.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/systemd.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index 03d6a82fd3103..a5f0decde1e35 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -1,4 +1,4 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: systemd.eclass @@ -25,7 +25,11 @@ # @CODE case ${EAPI} in - 5|6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 33/44] tmpfiles.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/tmpfiles.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass index 39650401a6a0f..63889a275fef5 100644 --- a/eclass/tmpfiles.eclass +++ b/eclass/tmpfiles.eclass @@ -1,4 +1,4 @@ -# Copyright 2016-2022 Gentoo Authors +# Copyright 2016-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: tmpfiles.eclass @@ -55,9 +55,13 @@ if [[ -z ${_TMPFILES_ECLASS} ]]; then _TMPFILES_ECLASS=1 -case "${EAPI}" in -5|6|7|8) ;; -*) die "API is undefined for EAPI ${EAPI}" ;; +case ${EAPI} in + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # @ECLASS_VARIABLE: TMPFILES_OPTIONAL -- 2.46.0
[gentoo-dev] [PATCH 34/44] toolchain-funcs.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/toolchain-funcs.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 5e36fa275dcd0..66819996ea33b 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -13,14 +13,18 @@ # in such a way that you can rely on the function always returning # something sane. +if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then +_TOOLCHAIN_FUNCS_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then -_TOOLCHAIN_FUNCS_ECLASS=1 - inherit multilib # tc-getPROG [tuple] -- 2.46.0
[gentoo-dev] [PATCH 35/44] udev.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/udev.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/udev.eclass b/eclass/udev.eclass index ac94f98221aad..7fd99cbba8b06 100644 --- a/eclass/udev.eclass +++ b/eclass/udev.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: udev.eclass @@ -36,14 +36,18 @@ # } # @CODE +if [[ -z ${_UDEV_ECLASS} ]]; then +_UDEV_ECLASS=1 + case ${EAPI} in - 5|6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_UDEV_ECLASS} ]]; then -_UDEV_ECLASS=1 - inherit toolchain-funcs if [[ ${EAPI} == [56] ]]; then -- 2.46.0
[gentoo-dev] [PATCH 36/44] vcs-clean.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/vcs-clean.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/vcs-clean.eclass b/eclass/vcs-clean.eclass index e4c61ac7164ac..719bdec17676b 100644 --- a/eclass/vcs-clean.eclass +++ b/eclass/vcs-clean.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vcs-clean.eclass @@ -9,14 +9,18 @@ # @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: helper functions to remove VCS directories +if [[ -z ${_VCS_CLEAN_ECLASS} ]] ; then +_VCS_CLEAN_ECLASS=1 + case ${EAPI} in - 5|6|7|8) ;; + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_VCS_CLEAN_ECLASS} ]] ; then -_VCS_CLEAN_ECLASS=1 - # @FUNCTION: ecvs_clean # @USAGE: [list of dirs] # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 37/44] vim-doc.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/vim-doc.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass index 119ce793071d6..f20f7397cf65b 100644 --- a/eclass/vim-doc.eclass +++ b/eclass/vim-doc.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vim-doc.eclass @@ -16,13 +16,17 @@ # DEPEND in vim-plugin or by whatever version of vim is being # installed by the eclass. +if [[ ! ${_VIM_DOC_ECLASS} ]] ; then + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_VIM_DOC_ECLASS} ]] ; then - # @FUNCTION: update_vim_helptags # @USAGE: # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 38/44] vim-plugin.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/vim-plugin.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass index ee4f1b6e0f813..b2ae0cb9e4c33 100644 --- a/eclass/vim-plugin.eclass +++ b/eclass/vim-plugin.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: vim-plugin.eclass @@ -12,14 +12,18 @@ # which is read automatically by vim. The only exception is # documentation, for which we make a special case via vim-doc.eclass. +if [[ -z ${_VIM_PLUGIN_ECLASS} ]]; then +_VIM_PLUGIN_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_VIM_PLUGIN_ECLASS} ]]; then -_VIM_PLUGIN_ECLASS=1 - inherit vim-doc [[ ${EAPI} != [67] ]] && _DEFINE_VIM_PLUGIN_SRC_PREPARE=true -- 2.46.0
[gentoo-dev] [PATCH 39/44] vim-spell.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/vim-spell.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass index 607771ae8035d..57bcb0dc8021b 100644 --- a/eclass/vim-spell.eclass +++ b/eclass/vim-spell.eclass @@ -62,14 +62,18 @@ # spell files. It's best to let upstream know if you've generated spell files # for another language rather than keeping them Gentoo-specific. +if [[ -z ${_VIM_SPELL_ECLASS} ]] ; then +_VIM_SPELL_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_VIM_SPELL_ECLASS} ]] ; then -_VIM_SPELL_ECLASS=1 - SRC_URI="mirror://gentoo/${P}.tar.bz2" SLOT="0" -- 2.46.0
[gentoo-dev] [PATCH 40/44] virtualx.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/virtualx.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index f7318eafc59e7..07d303899582e 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: virtualx.eclass @@ -9,14 +9,18 @@ # @SUPPORTED_EAPIS: 6 7 8 # @BLURB: This eclass can be used for packages that need a working X environment to build. +if [[ -z ${_VIRTUALX_ECLASS} ]]; then +_VIRTUALX_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_VIRTUALX_ECLASS} ]]; then -_VIRTUALX_ECLASS=1 - # @ECLASS_VARIABLE: VIRTUALX_REQUIRED # @PRE_INHERIT # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 41/44] webapp.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/webapp.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 5b091c84851ff..e8bc127e1b96c 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: webapp.eclass @@ -10,14 +10,18 @@ # The webapp eclass contains functions to handle web applications with # webapp-config. Part of the implementation of GLEP #11 +if [[ -z ${_WEBAPP_ECLASS} ]]; then +_WEBAPP_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_WEBAPP_ECLASS} ]]; then -_WEBAPP_ECLASS=1 - # @ECLASS_VARIABLE: WEBAPP_DEPEND # @DESCRIPTION: # An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be built, most -- 2.46.0
[gentoo-dev] [PATCH 42/44] wrapper.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/wrapper.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/wrapper.eclass b/eclass/wrapper.eclass index 8d3d273d81c65..a62bb51d0fe71 100644 --- a/eclass/wrapper.eclass +++ b/eclass/wrapper.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: wrapper.eclass @@ -7,15 +7,19 @@ # @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: create a shell wrapper script +if [[ -z ${_WRAPPER_ECLASS} ]]; then +_WRAPPER_ECLASS=1 + case ${EAPI} in - 5|6|7|8) ;; + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_WRAPPER_ECLASS} ]]; then -_WRAPPER_ECLASS=1 - -# @FUNCTION: make_wrapper +# FUNCTION: make_wrapper # @USAGE: [chdir] [libpaths] [installpath] # @DESCRIPTION: # Create a shell wrapper script named wrapper in installpath -- 2.46.0
[gentoo-dev] [PATCH 43/44] xdg.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/xdg.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 14c56047af451..6af4b91875fc6 100644 --- a/eclass/xdg.eclass +++ b/eclass/xdg.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xdg.eclass @@ -13,14 +13,18 @@ # Utility eclass to update the desktop, icon and shared mime info as laid # out in the freedesktop specs & implementations +if [[ -z ${_XDG_ECLASS} ]]; then +_XDG_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_XDG_ECLASS} ]]; then -_XDG_ECLASS=1 - inherit xdg-utils # Avoid dependency loop as both depend on glib-2 -- 2.46.0
[gentoo-dev] [PATCH 44/44] xdg-utils.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/xdg-utils.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass index 34535a129e334..84f88eee18fce 100644 --- a/eclass/xdg-utils.eclass +++ b/eclass/xdg-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xdg-utils.eclass @@ -18,7 +18,11 @@ # * XDG mime information database management case ${EAPI} in - 5|6|7|8) ;; + 5|6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] Re: Last rites: eapi7-ver.eclass, eqawarn.eclass, versionator.eclass
> On Mon, 26 Aug 2024, Ulrich Mueller wrote: > Eclasses that support EAPI 6 only, which is no longer used in the > Gentoo repository. > Removal in 30 days, i.e. on 2024-09-25. Update from the local planning office (beware of the leopard!): Removal of these eclasses will be postponed to 2024-10-08. signature.asc Description: PGP signature
[gentoo-dev] What about phonon-vlc w/ qt5-only vlc? Was: Last-rites: media-libs/phonon-gstreamer
Andreas Sturmlechner posted on Wed, 04 Sep 2024 16:56:57 +0200 as excerpted: > # Andreas Sturmlechner (2024-09-04) > # Unmaintained upstream, latest media-libs/phonon release incompatible. > # Removal on 2024-10-04. > media-libs/phonon-gstreamer [I thought I already sent this reply/question but don't see it on-list so trying again...] I'll take this opportunity to ask... What's the plan for phonon, with phonon-vlc the only backend, and even vlc- being qt5-only, so apparently there's no qt6 vlc any time soon? -- Duncan - List replies preferred. No HTML msgs. "Every nonfree program has a lord, a master -- and if you use the program, he is your master." Richard Stallman
[gentoo-dev] Last rites: sci-physics/qmeq
# Michał Górny (2024-09-08) # Does not build anymore. No upstream activity since 2021. # Removal on 2024-10-08. Bug #932532. sci-physics/qmeq -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 00/44] eclass: add global-scope ewarn for deprecated < EAPI 7
The motivation here is to give users and casual ebuild authors a final last warning before things are yanked out from under them, to make Gentoo a bit less hostile to develop on without following the MLs closely. While we want people to run e.g. pkgcheck, not everyone is going to. The global scope warning is noisy but all consumers in ::gentoo are gone already and the noise will be there in 30 days once the support is actually removed (as is already queued [0]) but with no temporary workaround then. For future EAPI deprecation cycles, we should consider warnings in the package manager as well as maybe a better well-defined lifecycle for EAPI support in eclasses, as it's currently very ad-hoc based on when the last consumer is gone in ::gentoo per-eclass. [0] https://github.com/gentoo/gentoo/pull/37652 Sam James (44): apache-module.eclass: add global-scope ewarn for deprecated < EAPI 7 autotools.eclass: add global-scope ewarn for deprecated < EAPI 7 bash-completion-r1.eclass: add global-scope ewarn for deprecated < EAPI 7 cdrom.eclass: add global-scope ewarn for deprecated < EAPI 7 check-reqs.eclass: add global-scope ewarn for deprecated < EAPI 7 depend.apache.eclass: add global-scope ewarn for deprecated < EAPI 7 desktop.eclass: add global-scope ewarn for deprecated < EAPI 7 flag-o-matic.eclass: add global-scope ewarn for deprecated < EAPI 7 fortran-2.eclass: add global-scope ewarn for deprecated < EAPI 7 gnuconfig.eclass: add global-scope ewarn for deprecated < EAPI 7 java-pkg-2.eclass: add global-scope ewarn for deprecated < EAPI 7 java-utils-2.eclass: add global-scope ewarn for deprecated < EAPI 7 libtool.eclass: add global-scope ewarn for deprecated < EAPI 7 mono-env.eclass: add global-scope ewarn for deprecated < EAPI 7 multibuild.eclass: add global-scope ewarn for deprecated < EAPI 7 multilib-build.eclass: add global-scope ewarn for deprecated < EAPI 7 multilib.eclass: add global-scope ewarn for deprecated < EAPI 7 multilib-minimal.eclass: add global-scope ewarn for deprecated < EAPI 7 multiprocessing.eclass: add global-scope ewarn for deprecated < EAPI 7 out-of-source-utils.eclass: add global-scope ewarn for deprecated < EAPI 7 pax-utils.eclass: add global-scope ewarn for deprecated < EAPI 7 perl-functions.eclass: add global-scope ewarn for deprecated < EAPI 7 php-pear-r2.eclass: add global-scope ewarn for deprecated < EAPI 7 portability.eclass: add global-scope ewarn for deprecated < EAPI 7 prefix.eclass: add global-scope ewarn for deprecated < EAPI 7 preserve-libs.eclass: add global-scope ewarn for deprecated < EAPI 7 readme.gentoo-r1.eclass: add global-scope ewarn for deprecated < EAPI 7 ruby-fakegem.eclass: add global-scope ewarn for deprecated < EAPI 7 ruby-ng.eclass: add global-scope ewarn for deprecated < EAPI 7 ruby-utils.eclass: add global-scope ewarn for deprecated < EAPI 7 strip-linguas.eclass: add global-scope ewarn for deprecated < EAPI 7 systemd.eclass: add global-scope ewarn for deprecated < EAPI 7 tmpfiles.eclass: add global-scope ewarn for deprecated < EAPI 7 toolchain-funcs.eclass: add global-scope ewarn for deprecated < EAPI 7 udev.eclass: add global-scope ewarn for deprecated < EAPI 7 vcs-clean.eclass: add global-scope ewarn for deprecated < EAPI 7 vim-doc.eclass: add global-scope ewarn for deprecated < EAPI 7 vim-plugin.eclass: add global-scope ewarn for deprecated < EAPI 7 vim-spell.eclass: add global-scope ewarn for deprecated < EAPI 7 virtualx.eclass: add global-scope ewarn for deprecated < EAPI 7 webapp.eclass: add global-scope ewarn for deprecated < EAPI 7 wrapper.eclass: add global-scope ewarn for deprecated < EAPI 7 xdg.eclass: add global-scope ewarn for deprecated < EAPI 7 xdg-utils.eclass: add global-scope ewarn for deprecated < EAPI 7 eclass/apache-module.eclass | 15 ++- eclass/autotools.eclass | 14 +- eclass/bash-completion-r1.eclass | 8 ++-- eclass/cdrom.eclass | 16 ++-- eclass/check-reqs.eclass | 14 +- eclass/depend.apache.eclass | 13 +++-- eclass/desktop.eclass | 8 ++-- eclass/flag-o-matic.eclass| 12 eclass/fortran-2.eclass | 14 +- eclass/gnuconfig.eclass | 14 +- eclass/java-pkg-2.eclass | 12 eclass/java-utils-2.eclass| 12 eclass/libtool.eclass | 9 + eclass/mono-env.eclass| 14 +- eclass/multibuild.eclass | 14 +- eclass/multilib-build.eclass | 14 +- eclass/multilib-minimal.eclass| 17 +++-- eclass/multilib.eclass| 14 +- eclass/multiprocessing.eclass | 16 ++-- eclass/out-of-source-utils.eclass | 14 +- eclass/pax-utils.eclass | 16 ++-- eclass/
[gentoo-dev] [PATCH 01/44] apache-module.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/apache-module.eclass | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass index 5a84ffedf71a0..07bdb79e08a27 100644 --- a/eclass/apache-module.eclass +++ b/eclass/apache-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: apache-module.eclass @@ -44,14 +44,19 @@ # # @CODE -case ${EAPI} in - 6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac if [[ -z ${_APACHE_MODULE_ECLASS} ]]; then _APACHE_MODULE_ECLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + inherit depend.apache # == -- 2.46.0
[gentoo-dev] [PATCH 02/44] autotools.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/autotools.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 3c9e89bda90ed..0571b18ba5252 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -13,11 +13,6 @@ # Note: We require GNU m4, as does autoconf. So feel free to use any features # from the GNU version of m4 without worrying about other variants (i.e. BSD). -case ${EAPI} in - 6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ ${_AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then # See if we were included already, but someone changed the value # of AUTOTOOLS_AUTO_DEPEND on us. We could reload the entire @@ -31,6 +26,15 @@ fi if [[ -z ${_AUTOTOOLS_ECLASS} ]] ; then _AUTOTOOLS_ECLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + [[ ${EAPI} == 6 ]] && inherit eqawarn GNUCONFIG_AUTO_DEPEND=no -- 2.46.0
[gentoo-dev] [PATCH 03/44] bash-completion-r1.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/bash-completion-r1.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass index df1a2a54d39a8..be506793ae94b 100644 --- a/eclass/bash-completion-r1.eclass +++ b/eclass/bash-completion-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: bash-completion-r1.eclass @@ -29,7 +29,11 @@ _BASH_COMPLETION_R1_ECLASS=1 inherit toolchain-funcs case ${EAPI} in - 5|6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 04/44] cdrom.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/cdrom.eclass | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass index 4e56db9511960..4f7ba663bebaf 100644 --- a/eclass/cdrom.eclass +++ b/eclass/cdrom.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: cdrom.eclass @@ -15,14 +15,18 @@ # eclass will require RESTRICT="bindist" but the point still stands. # The functions are generally called in src_unpack. -case ${EAPI:-0} in - 6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ -z ${_CDROM_ECLASS} ]]; then _CDROM_ECLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + inherit portability # @ECLASS_VARIABLE: CDROM_OPTIONAL -- 2.46.0
[gentoo-dev] [PATCH 05/44] check-reqs.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/check-reqs.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index fac2f4553d746..02ff61187c455 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: check-reqs.eclass @@ -38,14 +38,18 @@ # These checks should probably mostly work on non-Linux, and they should # probably degrade gracefully if they don't. Probably. +if [[ -z ${_CHECK_REQS_ECLASS} ]]; then +_CHECK_REQS_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_CHECK_REQS_ECLASS} ]]; then -_CHECK_REQS_ECLASS=1 - # @ECLASS_VARIABLE: CHECKREQS_MEMORY # @DEFAULT_UNSET # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 06/44] depend.apache.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/depend.apache.eclass | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 8f0469931d2c7..60926c298f042 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: depend.apache.eclass @@ -40,12 +40,13 @@ # } # @CODE -case ${EAPI:-0} in - 6|7|8) - ;; - *) - die "EAPI=${EAPI} is not supported by depend.apache.eclass" +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # == -- 2.46.0
[gentoo-dev] [PATCH 07/44] desktop.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/desktop.eclass | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index 780971342ba1e..144514c8f7c27 100644 --- a/eclass/desktop.eclass +++ b/eclass/desktop.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: desktop.eclass @@ -8,7 +8,11 @@ # @BLURB: support for desktop files, menus, and icons case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -- 2.46.0
[gentoo-dev] [PATCH 08/44] flag-o-matic.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index c6b1ad80e12eb..02cd2dcfc5926 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -10,14 +10,18 @@ # This eclass contains a suite of functions to help developers sanely # and safely manage toolchain flags in their builds. +if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then +_FLAG_O_MATIC_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then -_FLAG_O_MATIC_ECLASS=1 - inherit toolchain-funcs [[ ${EAPI} == 6 ]] && inherit eqawarn -- 2.46.0
[gentoo-dev] [PATCH 09/44] fortran-2.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/fortran-2.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 855dcba59a390..5e2ce1fc68e48 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fortran-2.eclass @@ -26,14 +26,18 @@ # # FORTRAN_NEED_OPENMP=1 +if [[ -z ${_FORTRAN_2_ECLASS} ]]; then +_FORTRAN_2_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_FORTRAN_2_ECLASS} ]]; then -_FORTRAN_2_ECLASS=1 - inherit toolchain-funcs # @ECLASS_VARIABLE: FORTRAN_NEED_OPENMP -- 2.46.0
[gentoo-dev] [PATCH 10/44] gnuconfig.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/gnuconfig.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass index fb73087aeacf4..afcb8feee04ef 100644 --- a/eclass/gnuconfig.eclass +++ b/eclass/gnuconfig.eclass @@ -16,14 +16,18 @@ # other files that come with automake, e.g. depcomp, mkinstalldirs, etc. # -case ${EAPI:-0} in - 6|7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; -esac - if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then _GNUCONFIG_CLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + # @ECLASS_VARIABLE: GNUCONFIG_DEPEND # @OUTPUT_VARIABLE # @DESCRIPTION: -- 2.46.0
[gentoo-dev] [PATCH 11/44] java-pkg-2.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/java-pkg-2.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index df024bbadf51f..6da4efd222c22 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -13,14 +13,18 @@ # This eclass should be inherited for pure Java packages, or by packages which # need to use Java. +if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then +_JAVA_PKG_2_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_JAVA_PKG_2_ECLASS} ]] ; then -_JAVA_PKG_2_ECLASS=1 - inherit java-utils-2 # @ECLASS_VARIABLE: JAVA_PKG_IUSE -- 2.46.0
[gentoo-dev] [PATCH 12/44] java-utils-2.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/java-utils-2.eclass | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 647f25e2c9870..6bf6b7788aa59 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -17,14 +17,18 @@ # that have optional Java support. In addition you can inherit java-ant-2 for # Ant-based packages. +if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then +_JAVA_UTILS_2_ECLASS=1 + case ${EAPI} in - 6|7|8) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_JAVA_UTILS_2_ECLASS} ]] ; then -_JAVA_UTILS_2_ECLASS=1 - # EAPI 7 has version functions built-in. Use eapi7-ver for all earlier EAPIs. # Keep versionator inheritance in case consumers are using it implicitly. [[ ${EAPI} == 6 ]] && inherit eapi7-ver eqawarn multilib versionator -- 2.46.0
[gentoo-dev] [PATCH 13/44] libtool.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/libtool.eclass | 9 + 1 file changed, 9 insertions(+) diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index bd6141e1ede93..b36b1fd365d3b 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -17,6 +17,15 @@ if [[ -z ${_LIBTOOL_ECLASS} ]]; then _LIBTOOL_ECLASS=1 +case ${EAPI} in + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac + case ${EAPI} in 6) DEPEND=">=app-portage/elt-patches-20240116" ;; 7|8) BDEPEND=">=app-portage/elt-patches-20240116" ;; -- 2.46.0
[gentoo-dev] [PATCH 14/44] mono-env.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/mono-env.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/mono-env.eclass b/eclass/mono-env.eclass index 48712587ff3ed..02bd7e8dd9bee 100644 --- a/eclass/mono-env.eclass +++ b/eclass/mono-env.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: mono-env.eclass @@ -9,14 +9,18 @@ # @DESCRIPTION: # Set environment variables commonly used by dotnet packages. +if [[ -z ${_MONO_ENV_ECLASS} ]] ; then +_MONO_ENV_ECLASS=1 + case ${EAPI} in - 6|7) ;; + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_MONO_ENV_ECLASS} ]] ; then -_MONO_ENV_ECLASS=1 - SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"; mono-env_pkg_setup() { -- 2.46.0
[gentoo-dev] [PATCH 15/44] multibuild.eclass: add global-scope ewarn for deprecated < EAPI 7
Signed-off-by: Sam James --- eclass/multibuild.eclass | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass index f15d3327c7dd2..0677ea346e4ce 100644 --- a/eclass/multibuild.eclass +++ b/eclass/multibuild.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multibuild.eclass @@ -13,17 +13,21 @@ # multiple 'variants' of a package (e.g. multilib, Python # implementations). +if [[ ! ${_MULTIBUILD_ECLASS} ]]; then +_MULTIBUILD_ECLASS=1 + case ${EAPI} in - 6|7|8) + 6) + ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" + ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." + ;; + 7|8) # backwards compatibility for run_in_build_dir inherit out-of-source-utils ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ! ${_MULTIBUILD_ECLASS} ]]; then -_MULTIBUILD_ECLASS=1 - # @ECLASS_VARIABLE: MULTIBUILD_VARIANTS # @REQUIRED # @DESCRIPTION: -- 2.46.0