commit:     2210db61e7c70445f8cc9b2a213295193f123fd0
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 16:47:37 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> 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 <flow <AT> 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 <k...@kmk-computers.de>
-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 <k...@kmk-computers.de>
----
- 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() {

Reply via email to