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 3263D158015 for ; Fri, 29 Dec 2023 12:48:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 00BC62BC035; Fri, 29 Dec 2023 12:47:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B095F2BC021 for ; Fri, 29 Dec 2023 12:47:56 +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 v2 1/2] ssl-cert.eclass: Drop support for EAPI 6 Date: Fri, 29 Dec 2023 13:46:59 +0100 Message-ID: <20231229124736.15497-1-ulm@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <2de80ba38c4d84e24ba05e7bb1e3b05ceddaa2e3.camel@gentoo.org> References: <2de80ba38c4d84e24ba05e7bb1e3b05ceddaa2e3.camel@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: ebb11bd0-c717-41e1-9e36-7c4f25677441 X-Archives-Hash: 09e606d0da1a314732915c2b0bf23831 Signed-off-by: Ulrich Müller --- eclass/ssl-cert.eclass | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index 0453f0fbf665..48cb10db16e8 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -6,7 +6,7 @@ # maintainer-needed@gentoo.org # @AUTHOR: # Max Kalika -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Eclass for SSL certificates # @DESCRIPTION: # This eclass implements a standard installation procedure for installing @@ -15,7 +15,7 @@ # "install_cert /foo/bar" installs ${ROOT}/foo/bar.{key,csr,crt,pem} case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -42,22 +42,11 @@ _SSL_CERT_ECLASS=1 if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then - SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )" + BDEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )" IUSE="${SSL_CERT_USE}" else - SSL_DEPEND="dev-libs/openssl:0" + BDEPEND="dev-libs/openssl:0" fi - - case "${EAPI}" in - 6) - DEPEND="${SSL_DEPEND}" - ;; - *) - BDEPEND="${SSL_DEPEND}" - ;; - esac - - unset SSL_DEPEND fi # @FUNCTION: gen_cnf -- 2.43.0