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 3E3BD15852A for ; Fri, 23 Aug 2024 14:55:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 885BDE2A1F; Fri, 23 Aug 2024 14:55:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E948E2A1F for ; Fri, 23 Aug 2024 14:55:03 +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 AF8F033BE26 for ; Fri, 23 Aug 2024 14:55:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 146011EF2 for ; Fri, 23 Aug 2024 14:55:01 +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: <1724424812.26f310b9ab18d3b7ccc04ed121534658726f6246.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xvfb-run/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild X-VCS-Directories: x11-misc/xvfb-run/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 26f310b9ab18d3b7ccc04ed121534658726f6246 X-VCS-Branch: master Date: Fri, 23 Aug 2024 14:55:01 +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: 154055da-808a-486c-9d4c-070565e8c3d8 X-Archives-Hash: da43fca3a3667a98a305d6aa05bfcb91 commit: 26f310b9ab18d3b7ccc04ed121534658726f6246 Author: Sam James gentoo org> AuthorDate: Fri Aug 23 14:53:32 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 23 14:53:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f310b9 x11-misc/xvfb-run: tidy filterdiff use a bit more I should've dropped the '|| die' consistently in 2e3800a592ff6bfe6fe6075e46ff3e5b6851a2ec. Signed-off-by: Sam James gentoo.org> x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild | 2 +- x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild | 2 +- x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild index d3f185b1c52f..920d9448d95c 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild index d3f185b1c52f..920d9448d95c 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild index d3f185b1c52f..920d9448d95c 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}"/ src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch || die + filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch assert "filterdiff+patch failed" eapply_user }