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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43D02159C96 for ; Thu, 25 Jul 2024 05:36:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64EB5E2A6F; Thu, 25 Jul 2024 05:36:03 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90A6CE2A0E for ; Thu, 25 Jul 2024 05:36:02 +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] savedconfig.eclass: Drop support for EAPI 6 Date: Thu, 25 Jul 2024 07:35:36 +0200 Message-ID: <20240725053547.6281-1-ulm@gentoo.org> X-Mailer: git-send-email 2.45.2 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: b2d841ec-a513-4f67-adc8-ff4e6b51ce4f X-Archives-Hash: d50c48f757c9a9264838a642dbab251a Signed-off-by: Ulrich Müller --- eclass/savedconfig.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass index cc5748543078..65a1f3bfd800 100644 --- a/eclass/savedconfig.eclass +++ b/eclass/savedconfig.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: savedconfig.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: common API for saving/restoring complex configuration files # @DESCRIPTION: # It is not uncommon to come across a package which has a very fine @@ -31,7 +31,7 @@ # build. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -60,12 +60,12 @@ save_config() { if [[ $# -eq 1 && -f $1 ]] ; then # Just one file, so have the ${configfile} be that config file dodir "${configfile%/*}" - cp "$@" "${ED%/}/${configfile}" || die "failed to save $*" + cp "$@" "${ED}/${configfile}" || die "failed to save $*" else # A dir, or multiple files, so have the ${configfile} be a dir # with all the saved stuff below it dodir "${configfile}" - treecopy "$@" "${ED%/}/${configfile}" || die "failed to save $*" + treecopy "$@" "${ED}/${configfile}" || die "failed to save $*" fi elog "Your configuration for ${CATEGORY}/${PF} has been saved in " @@ -150,7 +150,7 @@ savedconfig_pkg_postinst() { # are worse :/. if use savedconfig ; then - find "${EROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PF}" \ + find "${EROOT}/etc/portage/savedconfig/${CATEGORY}/${PF}" \ -exec touch {} + 2>/dev/null fi } -- 2.45.2