commit: 6a802139d156f02b854429b242d4fc61961e3c05 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 8 14:13:01 2024 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Wed Apr 10 17:55:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a802139
gnustep-*.eclass: Drop support for EAPI 6 In EAPI 6, gnustep-base inherits eutils which is going to be last-rited. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/gnustep-2.eclass | 20 ++++++-------------- eclass/gnustep-base.eclass | 5 ++--- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass index 9750efa8d5c8..3797dd80151e 100644 --- a/eclass/gnustep-2.eclass +++ b/eclass/gnustep-2.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnustep-2.eclass # @MAINTAINER: # GNUstep Herd <gnus...@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: gnustep-base # @BLURB: eclass for GNUstep Apps, Frameworks, and Bundles build # @DESCRIPTION: @@ -12,7 +12,7 @@ # GNUstep packages case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -21,17 +21,9 @@ _GNUSTEP_2_ECLASS=1 inherit gnustep-base -case ${EAPI} in - 6) - DEPEND=">=gnustep-base/gnustep-make-2.0" - ;; - *) - BDEPEND=">=gnustep-base/gnustep-make-2.0" - ;; -esac - -DEPEND+=" virtual/gnustep-back" -RDEPEND="${DEPEND}" +RDEPEND="virtual/gnustep-back" +DEPEND="${RDEPEND}" +BDEPEND=">=gnustep-base/gnustep-make-2.0" # The following gnustep-based exported functions are available: # * gnustep-base_pkg_setup diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index b5b350106471..a0a877bf8e13 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,17 +1,16 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnustep-base.eclass # @MAINTAINER: # GNUstep Herd <gnus...@gentoo.org> -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Internal handling of GNUstep packages # @DESCRIPTION: # Inner gnustep eclass, should only be inherited directly by gnustep-base # packages case ${EAPI} in - 6) inherit eutils ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac