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 0F7A8158094 for ; Sun, 14 Aug 2022 20:07:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E066E0C22; Sun, 14 Aug 2022 20:07:33 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 202B5E0C22 for ; Sun, 14 Aug 2022 20:07:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 3AF763415F4 for ; Sun, 14 Aug 2022 20:07:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8EB055B for ; Sun, 14 Aug 2022 20:07:30 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1660507642.2210db61e7c70445f8cc9b2a213295193f123fd0.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/hpx/files/hpx-1.8.1-python.patch sys-cluster/hpx/hpx-1.8.1.ebuild X-VCS-Directories: sys-cluster/hpx/ sys-cluster/hpx/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 2210db61e7c70445f8cc9b2a213295193f123fd0 X-VCS-Branch: master Date: Sun, 14 Aug 2022 20:07:30 +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: db96b97e-6042-4228-970a-68021a9abbe9 X-Archives-Hash: a2f372609d25024d82b34aa28f97b06a commit: 2210db61e7c70445f8cc9b2a213295193f123fd0 Author: Florian Schmaus gentoo org> AuthorDate: Sun Aug 14 16:47:37 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Aug 14 20:07:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2210db61 sys-cluster/hpx: de-duplicate duplicate patches Signed-off-by: Florian Schmaus gentoo.org> sys-cluster/hpx/files/hpx-1.8.1-python.patch | 30 ---------------------------- sys-cluster/hpx/hpx-1.8.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/sys-cluster/hpx/files/hpx-1.8.1-python.patch b/sys-cluster/hpx/files/hpx-1.8.1-python.patch deleted file mode 100644 index 21b7ce3ceeff..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.1-python.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Tue, 17 Mar 2020 16:20:35 +0100 -Subject: [PATCH 1/4] cmake: python: Use standard python interpreter - -These scripts are needed during build and run time. So, use a python interpreter -which works for both cases. - -Signed-off-by: Kurt Kanzenbach ---- - cmake/templates/hpxcxx.in | 2 +- - cmake/templates/hpxrun.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/cmake/templates/hpxcxx.in -+++ b/cmake/templates/hpxcxx.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Steven R. Brandt - # ---- a/cmake/templates/hpxrun.py.in -+++ b/cmake/templates/hpxrun.py.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Thomas Heller - # diff --git a/sys-cluster/hpx/hpx-1.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild index a1b86f1f953f..f99ace8db3a8 100644 --- a/sys-cluster/hpx/hpx-1.8.1.ebuild +++ b/sys-cluster/hpx/hpx-1.8.1.ebuild @@ -46,7 +46,7 @@ RDEPEND=" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-python.patch" + "${FILESDIR}/${PN}-1.8.0-python.patch" ) hpx_memory_requirement() {