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 2325D158043 for ; Sat, 13 Apr 2024 18:32:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6332AE2A28; Sat, 13 Apr 2024 18:32:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 4D7D9E2A28 for ; Sat, 13 Apr 2024 18:32:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 7E254343307 for ; Sat, 13 Apr 2024 18:32:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3CF216D0 for ; Sat, 13 Apr 2024 18:32:21 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1713033112.18c07179cce50cda3c99858f419df8f5a755eebe.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/rpm.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 18c07179cce50cda3c99858f419df8f5a755eebe X-VCS-Branch: master Date: Sat, 13 Apr 2024 18:32:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 24e73944-8457-42b9-b558-fb231a7e22b2 X-Archives-Hash: 913a4766a5aabed2403d1420994264cb commit: 18c07179cce50cda3c99858f419df8f5a755eebe Author: Ulrich Müller gentoo org> AuthorDate: Fri Apr 12 01:40:25 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Apr 13 18:31:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c07179 rpm.eclass: Drop support for EAPI 6 Signed-off-by: Ulrich Müller gentoo.org> eclass/rpm.eclass | 63 +++---------------------------------------------------- 1 file changed, 3 insertions(+), 60 deletions(-) diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index b9187167eb8f..c9c21aa6ebbd 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -1,14 +1,13 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rpm.eclass # @MAINTAINER: # base-system@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: convenience class for extracting RPMs case ${EAPI} in - 6) inherit epatch eqawarn ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -18,10 +17,7 @@ _RPM_ECLASS=1 inherit estack -case ${EAPI} in - 6) DEPEND="app-arch/rpm2targz" ;; - *) BDEPEND="app-arch/rpm2targz" ;; -esac +BDEPEND="app-arch/rpm2targz" # @FUNCTION: rpm_unpack # @USAGE: @@ -88,59 +84,6 @@ rpm_src_unpack() { done } -# @FUNCTION: rpm_spec_epatch -# @USAGE: [spec] -# @DEPRECATED: none -# @DESCRIPTION: -# Read the specified spec (defaults to ${PN}.spec) and attempt to apply -# all the patches listed in it. If the spec does funky things like moving -# files around, well this won't handle that. -rpm_spec_epatch() { - # no epatch in EAPI 7 and later - [[ ${EAPI} == 6 ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}" - - local p spec=$1 - local dir - - if [[ -z ${spec} ]] ; then - # search likely places for the spec file - for spec in "${PWD}" "${S}" "${WORKDIR}" ; do - spec+="/${PN}.spec" - [[ -e ${spec} ]] && break - done - fi - [[ ${spec} == */* ]] \ - && dir=${spec%/*} \ - || dir= - - ebegin "Applying patches from ${spec}" - - grep '^%patch' "${spec}" | \ - while read line ; do - # expand the %patch line - set -- ${line} - p=$1 - shift - - # process the %patch arguments - local arg - EPATCH_OPTS= - for arg in "$@" ; do - case ${arg} in - -b) EPATCH_OPTS+=" --suffix" ;; - *) EPATCH_OPTS+=" ${arg}" ;; - esac - done - - # extract the patch name from the Patch# line - set -- $(grep "^P${p#%p}: " "${spec}") - shift - epatch "${dir:+${dir}/}$*" - done - - eend -} - fi EXPORT_FUNCTIONS src_unpack