gentoo auto-resync : 03:10:2023 - 05:47:56

4 files changed, 14 insertions, 14 deletions

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 14ffc18355c8..b485937fa827 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,6 +1,6 @@
-AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-20200505.8904-gcc10.patch 294 BLAKE2B fe527a1a38b17731322dd5d7c9c1ea16dce86eb2c023966a28e87477c9b25001294fcda456fc2bdbfdfbbefb67991e67f9693db69ef18d8485035546e231e0cf SHA512 a79859e6f167203ee0d09db1740cfd223e0e196f2ed5f65e51830e27c8a7bf284ff9bd20d1527dfc2679a08f1ec2aa92a1e582599e656bd0e655bfda189608c7
 AUX eduke32-20220204.9957-log-to-tmpdir.patch 229 BLAKE2B 7a2529e435363c6950958d0bc88339c0a0d6bc3da39980a2e8649ce878e72afcb67121899034841e69cdb11b6ba61b84961b61199a0dcdec3b5db311c4b24264 SHA512 916bb036f6a7550505f6af89ac8e8974e689ac0789863b98dfc65d2775b3d22776f94d30590ebdcc267f1184ea5ceea1affdc43786bf4d74b25df80c0866c166
+AUX eduke32-20230926.10459-search-duke3d-path.patch 441 BLAKE2B fc62a97610ce16d8d318aacdf3773f4cfc40a949c0de4fe8e68241ff7eda9a9c31bd3114c43e436fbfbf084625d7251fc16775f412de9fa40f6be365d0a5b178 SHA512 d3d7fb1f7949a2d67a524a1bc198df830829c0a4b80199e525aa3e1827d2785979bb2a1bb02a0b30e6dc8128e8330bf829a542a7994621ba3f5d1dca61a542b8
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
 AUX voidsw-bin 265 BLAKE2B 61ff722fbf4a161aaf0851d00fe3c4c0ecd9544ef95e9d19df779b52feedbaba3a40c5b094b4ef21360b00e10058fc2773de0971dc4427b9c0e8ca6e135d5890 SHA512 ffeaca39dde274b4eec2cb3d2e59e2503140b3a6fe1451abd57557e3030ecc89425ae98beecf2595920d338b72b582ce40d8439c11b63ac1935cfbf409d9c6e5
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
@@ -11,5 +11,5 @@ DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
 DIST eduke32_src_20230926-10459-8feaf6c25.tar.xz 19141676 BLAKE2B 387d56f09d98a661d0518ddc23420b42f955d2285bc9075e6cec1a60ba6d814ee96e3452c92cb57dd0a82949f7f353186b92eca912fa184c7bb0941413c2a28c SHA512 1575d03cf6b3a92e9b911cac98b10650b940a15793f87d5203b6d146b5ca6108901ad2fd1508276742376fec600149f8e658a5e37ce006a6c26bd1e8f75930d4
-EBUILD eduke32-20230926.10459.ebuild 5797 BLAKE2B 42c33769184f20f5581d362780da3b8d4ec64df3de76439861ed1df538b5cb503361277beaa0110467bac43ccf3ad08d9344d5741be4b9dc180beb9379a0c1d7 SHA512 44b6e79013a52f8ee7fa22fe7406e457514400bb36410dc201786e5e50f482d7852b286efd1cdd7ed18a307276766e3dd506816a626a5c1587c8aaacac30e2ee
+EBUILD eduke32-20230926.10459.ebuild 5798 BLAKE2B 47cd6a6391f2635305b2e38db4c3e7f61999839f999fd8016b264d78626b5b3a8f7b08e4e2ee5955a7ef1570a221c952dc6ea09905bc20e568167f8c36163bbb SHA512 775a4e4dc0df49b1309462698a1bb87e14f35f99504b7ef63cd2dbad52b2c85297753ffbded608eceeab47632fc1ed0688d1853b43bdc09fdf960bfce7de79f0
 MISC metadata.xml 1696 BLAKE2B 76d8cb27f0b64251519778ed51c1497807772d552eef3972312b8971e606087f4d44e4fda17499fea766233c1b7aa25ccf1467e76cc74bf1aee58d8cd21f158c SHA512 46dbbacbdcc05ef6907431f8d6bf1385af78c2d717653026ae565a26db2d0c8f05f242aaa78f4b14791c16c40862dc2e4d9a02892f650e222ee8fb4222603a8d
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");