From eccbaf6d01fb4a73c18778fa551e74960b1e0419 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Apr 2024 00:32:37 +0100 Subject: gentoo auto-resync : 11:04:2024 - 00:32:37 --- eclass/Manifest.gz | Bin 39625 -> 39612 bytes eclass/gnustep-2.eclass | 20 ++++++-------------- eclass/gnustep-base.eclass | 5 ++--- 3 files changed, 8 insertions(+), 17 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 3e93aeba9499..857408716e35 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ 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 -# @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 -# @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 -- cgit v1.2.3