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 181DD158020 for ; Sun, 25 Dec 2022 22:18:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BA3AE09A8; Sun, 25 Dec 2022 22:16:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 E8ACDE099F for ; Sun, 25 Dec 2022 22:16:20 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 10/41] fcaps.eclass: drop EAPI 6 support Date: Sun, 25 Dec 2022 23:15:21 +0100 Message-Id: <20221225221552.8023-10-soap@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225221552.8023-1-soap@gentoo.org> References: <20221225221552.8023-1-soap@gentoo.org> 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-Transfer-Encoding: 8bit X-Archives-Salt: 0e58ad8c-270f-4123-942d-1160b4abbd93 X-Archives-Hash: 214a53da5237237d50fa2a48a9eb7c87 Signed-off-by: David Seifert --- eclass/fcaps.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass index d1860f5ac9a..349e72a63af 100644 --- a/eclass/fcaps.eclass +++ b/eclass/fcaps.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: fcaps.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: function to set POSIX file-based capabilities # @DESCRIPTION: # This eclass provides a function to set file-based capabilities on binaries. @@ -30,8 +30,8 @@ # @CODE case ${EAPI} in - 6|7|8) ;; - *) die "EAPI ${EAPI:-0} is unsupported" ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac if [[ -z ${_FCAPS_ECLASS} ]]; then @@ -41,8 +41,8 @@ IUSE="+filecaps" # Since it is needed in pkg_postinst() it must be in IDEPEND case ${EAPI} in - 7) BDEPEND="filecaps? ( sys-libs/libcap )" ;& # fallthrough - 6) RDEPEND="filecaps? ( sys-libs/libcap )" ;; + 7) BDEPEND="filecaps? ( sys-libs/libcap )" + RDEPEND="filecaps? ( sys-libs/libcap )" ;; *) IDEPEND="filecaps? ( sys-libs/libcap )" ;; esac -- 2.39.0