From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1411857-garchives=archives.gentoo.org@lists.gentoo.org>
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 A04D9158094
	for <garchives@archives.gentoo.org>; Sat, 25 Jun 2022 07:31:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id C6156E07D8;
	Sat, 25 Jun 2022 07:31:27 +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 A9D8BE07D8
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 07:31:27 +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 78B2E34144E
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 07:31:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A19D3456
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Jun 2022 07:31:24 +0000 (UTC)
From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" <tamiko@gentoo.org>
Message-ID: <1656142279.2a3fd2e98a3702dafbc0c0b7f1f8d7aa44fcbe70.tamiko@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/hdf5/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/hdf5/hdf5-1.12.2-r3.ebuild sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
X-VCS-Directories: sci-libs/hdf5/
X-VCS-Committer: tamiko
X-VCS-Committer-Name: Matthias Maier
X-VCS-Revision: 2a3fd2e98a3702dafbc0c0b7f1f8d7aa44fcbe70
X-VCS-Branch: master
Date: Sat, 25 Jun 2022 07:31:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b82fd9a4-b8bf-4eaa-ac06-acdcb900494f
X-Archives-Hash: c711995d786d151b475340b708be21b0

commit:     2a3fd2e98a3702dafbc0c0b7f1f8d7aa44fcbe70
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 07:25:25 2022 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 07:31:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3fd2e9

sci-libs/hdf5: remove "perf" executable

Closes: https://bugs.gentoo.org/854180
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 sci-libs/hdf5/{hdf5-1.12.2-r3.ebuild => hdf5-1.12.2-r4.ebuild} | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sci-libs/hdf5/hdf5-1.12.2-r3.ebuild b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
similarity index 92%
rename from sci-libs/hdf5/hdf5-1.12.2-r3.ebuild
rename to sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
index 1a00c0b61e8b..dc668a1d721d 100644
--- a/sci-libs/hdf5/hdf5-1.12.2-r3.ebuild
+++ b/sci-libs/hdf5/hdf5-1.12.2-r4.ebuild
@@ -105,4 +105,9 @@ src_install() {
 
 	# No static archives
 	find "${ED}" -name '*.la' -delete || die
+
+	# Remove "perf" executable due to file collisions with dev-util/perf.
+	# Previously with the CMake build system we only installed h5perf, so
+	# let's simply remove the file for now.
+	rm "${ED}"/usr/bin/perf || die "rm failed"
 }