gentoo auto-resync : 21:10:2023 - 16:03:14

3 files changed, 2 insertions, 35 deletions

diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index cfdf5c448581..f0ce4b1310a6 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,5 +1,4 @@
-AUX odamex-10.3.0-master-fix.patch 681 BLAKE2B c9952d09913a2d7629c2f51dec89765e3312b977a869d55e728e4ce64f6a9464d0aaaff6d2187e671573914ddad48e15ad17cda4a3b95f6867d4e48bd411dd75 SHA512 8c213fd69e2ed78ace4926760736fddb2dc16ba7bb26a3f7b57b44f3cf767ff58776c6de530562ce5d76f2e0fdeb25b877cce47ef4eb4673042e5ec49f765975
 AUX odamex-10.3.0-unbundle-fltk.patch 3556 BLAKE2B 8aa1fd752c465a89566edab409c2df03ce1bae7a3ae1fdf3749fbce90cef81d1315f1f677f3090d676ad514df957a043cfd02c497d03673c248d55b02ee89768 SHA512 3facbcb43f0bc516e85c6030d66fc03c2c0b11d25ed30bac1947cbffd1f3123e173c46e02b198215dc5b4aac7fccbf1bfe9aeaf54db6c0d159d7bd6d3abd3797
-DIST odamex-src-10.3.0.tar.gz 24281159 BLAKE2B f38eacf700f21caa1300e46d926f6e07b97944326cd0ef9d22c3e14af82e91f39e88ae055d90442b81237888b90b8a1c478a54fd599b9648790260863916fb1f SHA512 902f4d20b9246ea94b50099e0ab2c6cd17faad68df344114e9963e100c35a4ac141f3d109b7affb8860a4e082a39ffcfdfcea45d9e6ada6efe09f01c3546f92b
-EBUILD odamex-10.3.0-r1.ebuild 2219 BLAKE2B 8f363aa5dfe2b53a000bd87e37733053dee7ffdde2cd3579862951e5ab934c4a32cbeb7e1197f0dd6ef9a8e660d0f7247e909c24627ccddbfe93e5a6450594fb SHA512 326b8ffc3f27a6bde734018daf44ef55047110961cefe80406989aa8d2a635ec9107be81613343c9fc7c8c2064cb272a2e226cec83e2878bbd854a8f99f95fd9
+DIST odamex-src-10.4.0.tar.gz 24233204 BLAKE2B 377f14db15a367db3e84267a1483d5e138291fcefe53c2d522d2767ddd4a804df7ab31726d8818497c1eed93e6f0658fa4f855b6f4b0610f378a4ef3aab180b6 SHA512 12c114181aaf50e8c1f8c04d6e252f422fe887b5dc0be21974f5c1ac6645e1988091af638eb68fb9667ec4c7c2bdd5bb49981546644c33e90c80a9baefe2c930
+EBUILD odamex-10.4.0.ebuild 2182 BLAKE2B 81af80e1d38971828369a1b67ace9761809205d0145862781542bfbbd4b615074d663e0c35fa2e5d567f6b67416a0775bca24cd27a41a47c45ca298fb2008555 SHA512 795b9e65dbaaac5dedb5bf39f0ee5022f724f47b52bef3999cdb78da069734c7915a7489a884e239f6c233c77a6541eecfb74bd027c7919edf8100c867953cb6
 MISC metadata.xml 1438 BLAKE2B 2cd891e631cb9ee0182c30d9aa8a9e69089f32fb12b44f8e4a62372e40db8f89a9701411dcb3bb86937d50e035452359cb95d2bbd5b4a74d2057cb77872196ad SHA512 72f2858c111b40de8ba9da3b5d52f673ce0847fd4036e1582dc9ce56432b3e08a61ef650fc253072789a6d00167c8312158d8be374dbbfbdd5473ab75cb447af
diff --git a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch b/games-engines/odamex/files/odamex-10.3.0-master-fix.patch
deleted file mode 100644
index 1a20d8f6523c..000000000000
--- a/games-engines/odamex/files/odamex-10.3.0-master-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 10beb4212625ee5e6d5b8a55e94d22d70d630217 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Wed, 19 Apr 2023 14:33:33 +0200
-Subject: [PATCH] include time.h on all platforms
-
----
- master/main.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/master/main.cpp b/master/main.cpp
-index a69af8dd0..3226792a7 100644
---- a/master/main.cpp
-+++ b/master/main.cpp
-@@ -38,16 +38,15 @@
- #include <string.h>
- 
- #include <stdint.h>
-+#include <time.h>
- 
- #ifdef UNIX
- #include <netinet/in.h>
- #include <unistd.h>
--#include <sys/time.h>
- #endif
- 
- #ifdef _WIN32
- #include <winsock.h>
--#include <time.h>
- #define usleep(n) Sleep(n/1000)
- #endif
- 
diff --git a/games-engines/odamex/odamex-10.3.0-r1.ebuild b/games-engines/odamex/odamex-10.4.0.ebuild
index 0c99afc1d885..594869339e54 100644
--- a/games-engines/odamex/odamex-10.3.0-r1.ebuild
+++ b/games-engines/odamex/odamex-10.4.0.ebuild
@@ -42,7 +42,6 @@ S="${WORKDIR}/${PN}-src-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.3.0-unbundle-fltk.patch
-	"${FILESDIR}"/${P}-master-fix.patch
 )
 
 src_prepare() {