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 9BA801581FB for ; Tue, 27 Aug 2024 15:18:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2070E2A4A; Tue, 27 Aug 2024 15:16:22 +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 756DBE2A46 for ; Tue, 27 Aug 2024 15:16:22 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 07/50] desktop.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:52 +0200 Message-ID: <20240827151553.210835-7-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-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: 17a74f30-3ea7-405a-8d18-7e4d2bcf9dc1 X-Archives-Hash: 867f9c9d9f99ec1824aafbb739ea09dd Signed-off-by: David Seifert --- eclass/desktop.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass index 780971342ba1..433120ffef09 100644 --- a/eclass/desktop.eclass +++ b/eclass/desktop.eclass @@ -1,14 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: desktop.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: support for desktop files, menus, and icons case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -212,7 +212,7 @@ make_desktop_entry() { insopts -m 0644 insinto /usr/share/applications doins "${desktop}" - ) || die "installing desktop file failed" + ) } # @FUNCTION: make_session_desktop @@ -353,7 +353,7 @@ _iconins() { if [[ ${funcname} == newicon ]] ; then newins "$@" fi - ) || die + ) } # @FUNCTION: doicon -- 2.46.0