From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 5DF831582EF for ; Mon, 24 Feb 2025 04:55:03 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 43695335C0F for ; Mon, 24 Feb 2025 04:55:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4227F1102F2; Mon, 24 Feb 2025 04:55:02 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 382E61102F2 for ; Mon, 24 Feb 2025 04:55:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF174342F64 for ; Mon, 24 Feb 2025 04:55:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 744C81596 for ; Mon, 24 Feb 2025 04:55:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1740372840.a6f09dafb524e7b6bdbc0585713c58fa324dfdc8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/amanda/amanda-3.5.1-r5.ebuild app-backup/amanda/amanda-3.5.4-r2.ebuild X-VCS-Directories: app-backup/amanda/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a6f09dafb524e7b6bdbc0585713c58fa324dfdc8 X-VCS-Branch: master Date: Mon, 24 Feb 2025 04:55:00 +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: 3ffd0348-2981-49f9-b1c9-21de42c93a07 X-Archives-Hash: aa98bca734f4cb945ef634dbf1902a6b commit: a6f09dafb524e7b6bdbc0585713c58fa324dfdc8 Author: Sam James gentoo org> AuthorDate: Mon Feb 24 04:44:39 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 24 04:54:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6f09daf app-backup/amanda: drop bogus eapply_user 'default' is called already in src_prepare (which calls eapply_user). This would apply user patches twice. Signed-off-by: Sam James gentoo.org> app-backup/amanda/amanda-3.5.1-r5.ebuild | 4 +--- app-backup/amanda/amanda-3.5.4-r2.ebuild | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app-backup/amanda/amanda-3.5.1-r5.ebuild b/app-backup/amanda/amanda-3.5.1-r5.ebuild index 7496f6cc59e6..c53b20474278 100644 --- a/app-backup/amanda/amanda-3.5.1-r5.ebuild +++ b/app-backup/amanda/amanda-3.5.1-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -183,8 +183,6 @@ src_prepare() { server-src/am{addclient,serverconfig}.pl || die cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1 > "${T}"/amandahosts || die fi - - eapply_user } src_configure() { diff --git a/app-backup/amanda/amanda-3.5.4-r2.ebuild b/app-backup/amanda/amanda-3.5.4-r2.ebuild index ed950f08ffc3..86f820cfe224 100644 --- a/app-backup/amanda/amanda-3.5.4-r2.ebuild +++ b/app-backup/amanda/amanda-3.5.4-r2.ebuild @@ -210,8 +210,6 @@ src_prepare() { server-src/am{addclient,serverconfig}.pl || die cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1 > "${T}"/amandahosts || die fi - - eapply_user } src_configure() {