From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2DCEC158041 for ; Tue, 9 Apr 2024 20:01:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56757E29F8; Tue, 9 Apr 2024 20:01:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F316AE29F4 for ; Tue, 9 Apr 2024 20:01:16 +0000 (UTC) From: =?UTF-8?q?Ulrich=20M=C3=BCller?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Ulrich=20M=C3=BCller?= Subject: [gentoo-dev] [PATCH] gnustep-*.eclass: Drop support for EAPI 6 Date: Tue, 9 Apr 2024 22:00:44 +0200 Message-ID: <20240409200101.22153-1-ulm@gentoo.org> X-Mailer: git-send-email 2.44.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: b9fdd927-e912-44eb-bec1-c2a808a029b5 X-Archives-Hash: f528b0f0990cd843d95725b074082f2e In EAPI 6, gnustep-base inherits eutils which is going to be last-rited. Signed-off-by: Ulrich Müller --- 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 -# @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 -- 2.44.0