[gentoo-commits] repo/gentoo:master commit in: games-fps/eduke32/files/, games-fps/eduke32/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     bba1c8a8c402298a48bf67e9eb76ba61c951915f
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 00:12:55 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 00:13:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba1c8a8

games-fps/eduke32: fix patch

Bug: https://bugs.gentoo.org/913354
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-fps/eduke32/eduke32-20230926.10459.ebuild               |  2 +-
 .../files/eduke32-20190820.8043-search-duke3d-path.patch      | 11 -----------
 .../files/eduke32-20230926.10459-search-duke3d-path.patch     | 11 +++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/games-fps/eduke32/eduke32-20230926.10459.ebuild b/games-fps/eduke32/eduke32-20230926.10459.ebuild
index 388719401c0c..4f27ffafa2d1 100644
--- a/games-fps/eduke32/eduke32-20230926.10459.ebuild
+++ b/games-fps/eduke32/eduke32-20230926.10459.ebuild
@@ -77,9 +77,9 @@ BDEPEND="
 PDEPEND="duke3d? ( games-fps/duke3d-data )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
 	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
 	"${FILESDIR}/${PN}-20220204.9957-log-to-tmpdir.patch"
+	"${FILESDIR}/${PN}-20230926.10459-search-duke3d-path.patch"
 )
 
 src_unpack() {

diff --git a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
deleted file mode 100644
index c35af40c749e..000000000000
--- a/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/duke3d/src/common.cpp	2018-04-12 23:03:47.000000000 +0200
-+++ b/source/duke3d/src/common.cpp	2018-05-11 00:04:36.590712915 +0200
-@@ -794,6 +794,8 @@
- 
-     addsearchpath("/usr/share/games/jfduke3d");
-     addsearchpath("/usr/local/share/games/jfduke3d");
-+    addsearchpath("/usr/share/games/duke3d");
-+    addsearchpath("/usr/share/duke3d");
-     addsearchpath("/usr/share/games/eduke32");
-     addsearchpath("/usr/local/share/games/eduke32");
- #elif defined EDUKE32_OSX

diff --git a/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch
new file mode 100644
index 000000000000..0bb66794b401
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20230926.10459-search-duke3d-path.patch
@@ -0,0 +1,11 @@
+--- a/source/duke3d/src/common.cpp
++++ b/source/duke3d/src/common.cpp
+@@ -642,6 +642,8 @@
+ 
+     addsearchpath("/usr/share/games/jfduke3d");
+     addsearchpath("/usr/local/share/games/jfduke3d");
++    addsearchpath("/usr/share/games/duke3d");
++    addsearchpath("/usr/share/duke3d");
+     addsearchpath("/usr/share/games/" APPBASENAME);
+     addsearchpath("/usr/local/share/games/" APPBASENAME);
+     addsearchpath("/app/extensions/extra");