games-engines/fs2_open: add 23.0.0, drop 21.4.1-r2

Signed-off-by: Jonas Frei <freijon@pm.me>

12 files changed, 136 insertions, 172 deletions

diff --git a/games-engines/fs2_open/Manifest b/games-engines/fs2_open/Manifest
index 612408bc3..2535f772c 100644
--- a/games-engines/fs2_open/Manifest
+++ b/games-engines/fs2_open/Manifest
@@ -1,9 +1,9 @@
-DIST fs2_open-21.4.1-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
-DIST fs2_open-21.4.1-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
-DIST fs2_open-21.4.1.tar.gz 10441595 BLAKE2B ae59cea98420cbdd6f18832fa0b8ba332993db03a53cbea43a96827dc4c7da375b14694ce60b1633d8275daa88ac32029be7b8211b7efd427baaffdd784720d9 SHA512 a4e6821ee2513cabf8b521f672c36c45aca8fc83fd6901ba19f2c0c0c27b3516c60dabfec1bfae43d82da94c628b9160c447ce853c9927dbb5901c7298986226
 DIST fs2_open-22.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
 DIST fs2_open-22.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
 DIST fs2_open-22.0.0.tar.gz 10573800 BLAKE2B b75bd9e44679bf2ad441178b7f8175f4429e321d2feeddf2cf5b4391e51f82c15250c36b73f3750326b1cd3ce71ae319042f57432d48a41b5abab9e30a4a76ba SHA512 e57972348073571947ff88e5a392ae0b4eec9d81cbcfe3d0ff3c2b844dd676cb33f727ddb32a0544e9cd3f1ae9b614429ea137b8921ef625fad27a53f1875081
 DIST fs2_open-22.2.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
 DIST fs2_open-22.2.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
 DIST fs2_open-22.2.0.tar.gz 10690003 BLAKE2B 9d751407ee06877e27e18a9295370ed2c97a48ac65c65757ea57ee1f1d7ba36e07cddb9812a62a763eefb842d5df71151243a81e97aa664a8c3123b7b7913255 SHA512 e72ad40f8f52430549f76330f8b34255ae68fff53ced76f56b04ef19d7ce510026c3bb38fcebdb6f3bfaf7db59ca89df5686e8480e883e01b6408d21cb08cc77
+DIST fs2_open-23.0.0-ext_libRocket.tar.gz 2417905 BLAKE2B 0e5ac40b0e811b9213fb84f6f2f0ef38ad7d562ae671e865d96e40615c2d67213905ce153a69192c0b53a3e4f0d1aef077c0769e46d308adf9210c0c9d1fe7c2 SHA512 700e242ecb5207faf729ca7d23ac4f28be819c0ef7a0ba51ca18de1592f1016040cd5e4c1c75a573f91cea69dd43549966ac089804a52c0f1b0cfbaabefc4346
+DIST fs2_open-23.0.0-ext_rpavlik-cmake-modules.tar.gz 267464 BLAKE2B d63fa3867aad5fad7bd5d20845dd8d6a6698d59dc30dc511704f3c74bbe958bb6d36160bae3ef5c01027719c50d18e4d24209ea5811c6a52c5af4d3de2a587e9 SHA512 0bb03e2a1c0cafa80849163455cdb5fc5c7200e51f18f0354c36f251b51156f86a04a9f87cd17e2942d14ae8767d8df756062fbcff9b37f04e8399b2e37d306f
+DIST fs2_open-23.0.0.tar.gz 12210430 BLAKE2B 95e5a4f328711a3915b2624941eb90810a19c4d8fe16edc0af47eec3cb1393be8379cd53f27cf378693ba711bd37f0fec360fda931ba17b883195f356a0f8dfc SHA512 efd3648986bb36f0b217ea033ab56ba7c1a705a0d9f16f0351a019d06276f68810729eb9749d1facbf8bc312114eb4e380b68049f5d30b410de2b28c5c67975e
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
deleted file mode 100644
index 95c186bf1..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-disable-discord.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- fs2_open/code/CMakeLists.txt	2022-03-27 21:03:27.290788070 +0200
-+++ fs2_open/code/CMakeLists.txt	2022-03-27 21:06:50.271782416 +0200
-@@ -41,8 +41,6 @@
- 
- target_link_libraries(code PUBLIC md5)
- 
--target_link_libraries(code PUBLIC discord-rpc)
--
- target_link_libraries(code PUBLIC libRocket)
- 
- target_link_libraries(code PUBLIC pcp)
---- fs2_open/code/source_groups.cmake	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/code/source_groups.cmake	2022-03-27 21:35:47.595734025 +0200
-@@ -705,11 +705,6 @@
- 	libs/antlr/ErrorListener.h
- 	)
- 
--add_file_folder("Libs\\\\Discord"
--	libs/discord/discord.cpp
--	libs/discord/discord.h
--)
--
- if (FSO_BUILD_WITH_FFMPEG)
- 	add_file_folder("Libs\\\\FFmpeg"
- 		libs/ffmpeg/FFmpeg.cpp
---- fs2_open/lib/CMakeLists.txt	2022-03-27 21:03:27.287788070 +0200
-+++ fs2_open/lib/CMakeLists.txt	2022-03-27 21:07:12.849781787 +0200
-@@ -33,8 +33,6 @@
- 	include(FFmpeg.cmake)
- endif()
- 
--add_subdirectory(discord)
--
- include(libRocket.cmake)
- 
- add_subdirectory(libpcp)
---- fs2_open/freespace2/freespace.cpp	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/freespace2/freespace.cpp	2022-03-27 21:07:50.111780749 +0200
-@@ -83,7 +83,6 @@
- #include "jumpnode/jumpnode.h"
- #include "lab/labv2.h"
- #include "lab/wmcgui.h" //So that GUI_System can be initialized
--#include "libs/discord/discord.h"
- #include "libs/ffmpeg/FFmpeg.h"
- #include "lighting/lighting.h"
- #include "localization/localize.h"
-@@ -1940,8 +1939,6 @@
- 	libs::ffmpeg::initialize();
- #endif
- 
--	libs::discord::init();
--
- 	nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));
- 	nprintf(("General", "Weapons.tbl is : %s\n", Game_weapons_tbl_valid ? "VALID" : "INVALID!!!!"));
- 
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
deleted file mode 100644
index 45ad91307..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-build-lz4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/lib/CMakeLists.txt	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/lib/CMakeLists.txt	2022-03-26 11:34:48.746075280 +0100
-@@ -50,5 +50,3 @@
- add_subdirectory(mdns)
- 
- add_subdirectory(variant)
--
--ADD_SUBDIRECTORY(lz4)
-\ No newline at end of file
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
deleted file mode 100644
index 74554ec8e..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fs2_open/cmake/toolchain-gcc.cmake	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/cmake/toolchain-gcc.cmake	2022-03-27 17:52:26.738107292 +0200
-@@ -27,6 +27,11 @@
- set(COMPILER_FLAGS "")
- set(LINKER_FLAGS "")
- 
-+# Don't ignore user-set LDFLAGS
-+if(DEFINED ENV{LDFLAGS})
-+    set(LINKER_FLAGS $ENV{LDFLAGS})
-+endif()
-+
- if (GCC_USE_GOLD)
- 	OPTION(GCC_INCREMENTAL_LINKING "Use incremental linking" OFF)
- 	set(LINKER_FLAGS "${LINKER_FLAGS} -fuse-ld=gold")
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
deleted file mode 100644
index a9c2c845f..000000000
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-version-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/version_override.cmake
-+++ fs2_open/version_override.cmake
-@@ -1,5 +1,5 @@
- set(FSO_VERSION_MAJOR 21)
- set(FSO_VERSION_MINOR 4)
--set(FSO_VERSION_BUILD 0)
-+set(FSO_VERSION_BUILD 1)
- set(FSO_VERSION_REVISION 0)
- set(FSO_VERSION_REVISION_STR )
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
deleted file mode 100644
index 1b145d7da..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.0.0-disable-discord.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- fs2_open/code/CMakeLists.txt	2022-03-27 21:03:27.290788070 +0200
-+++ fs2_open/code/CMakeLists.txt	2022-03-27 21:06:50.271782416 +0200
-@@ -41,8 +41,6 @@
- 
- target_link_libraries(code PUBLIC md5)
- 
--target_link_libraries(code PUBLIC discord-rpc)
--
- target_link_libraries(code PUBLIC libRocket)
- 
- target_link_libraries(code PUBLIC pcp)
---- fs2_open/code/source_groups.cmake	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/code/source_groups.cmake	2022-03-27 21:35:47.595734025 +0200
-@@ -705,11 +705,6 @@
- 	libs/antlr/ErrorListener.h
- 	)
- 
--add_file_folder("Libs\\\\Discord"
--	libs/discord/discord.cpp
--	libs/discord/discord.h
--)
--
- if (FSO_BUILD_WITH_FFMPEG)
- 	add_file_folder("Libs\\\\FFmpeg"
- 		libs/ffmpeg/FFmpeg.cpp
---- fs2_open/lib/CMakeLists.txt	2022-03-27 21:03:27.287788070 +0200
-+++ fs2_open/lib/CMakeLists.txt	2022-03-27 21:07:12.849781787 +0200
-@@ -33,8 +33,6 @@
- 	include(FFmpeg.cmake)
- endif()
- 
--add_subdirectory(discord)
--
- include(libRocket.cmake)
- 
- add_subdirectory(libpcp)
---- fs2_open/freespace2/freespace.cpp	2021-11-01 18:00:53.000000000 +0100
-+++ fs2_open/freespace2/freespace.cpp	2022-03-27 21:07:50.111780749 +0200
-@@ -83,7 +83,6 @@
- #include "jumpnode/jumpnode.h"
- #include "lab/labv2.h"
- #include "lab/wmcgui.h" //So that GUI_System can be initialized
--#include "libs/discord/discord.h"
- #include "libs/ffmpeg/FFmpeg.h"
- #include "lighting/lighting.h"
- #include "localization/localize.h"
-@@ -1987,8 +1987,6 @@
- #ifdef WITH_FFMPEG
- 		libs::ffmpeg::initialize();
- #endif
--
--		libs::discord::init();
- 	}
- 
- 	nprintf(("General", "Ships.tbl is : %s\n", Game_ships_tbl_valid ? "VALID" : "INVALID!!!!"));
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
deleted file mode 100644
index 60dc982a1..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.0.0-dont-build-lz4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fs2_open/lib/CMakeLists.txt	2022-04-01 23:30:46.000000000 +0200
-+++ fs2_open/lib/CMakeLists.txt	2022-04-02 08:20:16.336924470 +0200
-@@ -52,5 +52,3 @@
- add_subdirectory(variant)
- 
- add_subdirectory(any)
--
--ADD_SUBDIRECTORY(lz4)
-\ No newline at end of file
diff --git a/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
deleted file mode 100644
index c2f5d7f36..000000000
--- a/games-engines/fs2_open/files/fs2_open-22.0.0-make-arch-independent.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fs2_open/cmake/version.cmake	2021-05-22 20:20:18.448441242 +0200
-+++ fs2_open/cmake/version.cmake	2021-05-22 20:21:05.493447003 +0200
-@@ -35,11 +35,6 @@
-     SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
- ENDIF()
- 
--IF(IS_64BIT)
--	# This is a 64-bit builds
--    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
--ENDIF()
--
- IF (NOT "${FSO_INSTRUCTION_SET}" STREQUAL "")
-     SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_INSTRUCTION_SET}")
- ENDIF()
diff --git a/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
new file mode 100644
index 000000000..6dc01d4a4
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-disable-discord.patch
@@ -0,0 +1,107 @@
+--- fs2_open/freespace2/freespace.cpp	2023-02-11 13:13:50.000000000 +0100
++++ fs2_open/freespace2/freespace.cpp	2023-02-11 13:32:41.501644997 +0100
+@@ -84,7 +84,6 @@
+ #include "io/timer.h"
+ #include "jumpnode/jumpnode.h"
+ #include "lab/labv2.h"
+-#include "libs/discord/discord.h"
+ #include "libs/ffmpeg/FFmpeg.h"
+ #include "lighting/lighting.h"
+ #include "lighting/lighting_profiles.h"
+@@ -1987,9 +1986,6 @@
+ #ifdef WITH_FFMPEG
+ 		libs::ffmpeg::initialize();
+ #endif
+-		if (Discord_presence) {
+-			libs::discord::init();
+-		}
+ 	}
+ 
+ 	mod_table_post_process();
+--- fs2_open/code/source_groups.cmake	2023-02-11 13:13:50.000000000 +0100
++++ fs2_open/code/source_groups.cmake	2023-02-11 13:53:03.901702823 +0100
+@@ -706,11 +706,6 @@
+ 	libs/antlr/ErrorListener.h
+ 	)
+ 
+-add_file_folder("Libs\\\\Discord"
+-	libs/discord/discord.cpp
+-	libs/discord/discord.h
+-)
+-
+ if (FSO_BUILD_WITH_FFMPEG)
+ 	add_file_folder("Libs\\\\FFmpeg"
+ 		libs/ffmpeg/FFmpeg.cpp
+--- fs2_open/code/mod_table/mod_table.h	2023-02-11 13:13:50.000000000 +0100
++++ fs2_open/code/mod_table/mod_table.h	2023-02-11 13:57:44.162716081 +0100
+@@ -124,7 +124,6 @@
+ } Shadow_disable_overrides;
+ extern float Thruster_easing;
+ extern bool Always_use_distant_firepoints;
+-extern bool Discord_presence;
+ extern bool Hotkey_always_hide_hidden_ships;
+ extern bool Use_weapon_class_sounds_for_hits_to_player;
+ extern bool SCPUI_loads_hi_res_animations;
+--- fs2_open/code/mod_table/mod_table.cpp	2023-02-11 13:13:50.000000000 +0100
++++ fs2_open/code/mod_table/mod_table.cpp	2023-02-11 13:57:15.745714737 +0100
+@@ -12,7 +12,6 @@
+ #include "globalincs/version.h"
+ #include "graphics/shadows.h"
+ #include "localization/localize.h"
+-#include "libs/discord/discord.h"
+ #include "mission/missioncampaign.h"
+ #include "mission/missionload.h"
+ #include "mission/missionmessage.h"
+@@ -128,34 +127,10 @@
+ shadow_disable_overrides Shadow_disable_overrides {false, false, false, false};
+ float Thruster_easing;
+ bool Always_use_distant_firepoints;
+-bool Discord_presence;
+ bool Hotkey_always_hide_hidden_ships;
+ bool Use_weapon_class_sounds_for_hits_to_player;
+ bool SCPUI_loads_hi_res_animations;
+ 
+-static auto DiscordOption = options::OptionBuilder<bool>("Other.Discord", "Discord Presence", "Toggle Discord Rich Presence")
+-							 .category("Other")
+-							 .default_val(Discord_presence)
+-							 .level(options::ExpertLevel::Advanced)
+-							 .importance(55)
+-		                     .change_listener([](bool val, bool) {
+-									if(Discord_presence){
+-										if (!val) {
+-											Discord_presence = false;
+-											libs::discord::shutdown();
+-											return true;
+-										}
+-									} else {
+-										if (val) {
+-											Discord_presence = true;
+-											libs::discord::init();
+-											return true;
+-										}
+-									}
+-									return false;
+-								})
+-							 .finish();
+-
+ void mod_table_set_version_flags();
+ 
+ SCP_vector<std::pair<SCP_string, gr_capability>> req_render_ext_pairs = {
+@@ -1128,9 +1103,6 @@
+ 		if (optional_string("$Use distant firepoint for all turrets:")){
+ 			stuff_boolean(&Always_use_distant_firepoints);
+ 		}
+-		if (optional_string("$Enable Discord rich presence:")) {
+-			stuff_boolean(&Discord_presence);
+-		}
+ 
+ 		if (optional_string("$Always hide hidden ships in hotkey list:")) {
+ 			stuff_boolean(&Hotkey_always_hide_hidden_ships);
+@@ -1285,7 +1257,6 @@
+ 	Lead_indicator_behavior = leadIndicatorBehavior::DEFAULT;
+ 	Thruster_easing = 0;
+ 	Always_use_distant_firepoints = false;
+-	Discord_presence = true;
+ 	Hotkey_always_hide_hidden_ships = false;
+ 	Use_weapon_class_sounds_for_hits_to_player = false;
+ 	SCPUI_loads_hi_res_animations = true;
diff --git a/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch
new file mode 100644
index 000000000..49350a0dc
--- /dev/null
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-dont-build-lz4.patch
@@ -0,0 +1,9 @@
+--- fs2_open/lib/CMakeLists.txt	2023-02-11 13:13:50.000000000 +0100
++++ fs2_open/lib/CMakeLists.txt	2023-02-11 13:45:46.251682120 +0100
+@@ -55,6 +55,4 @@
+ 
+ add_subdirectory(optional)
+ 
+-ADD_SUBDIRECTORY(lz4)
+-
+ ADD_SUBDIRECTORY(imgui)
diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch b/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch
index c2f5d7f36..c2f5d7f36 100644
--- a/games-engines/fs2_open/files/fs2_open-21.4.1-make-arch-independent.patch
+++ b/games-engines/fs2_open/files/fs2_open-23.0.0-make-arch-independent.patch
diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
index beadddcbb..8c63d4680 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
+++ b/games-engines/fs2_open/fs2_open-23.0.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 LICENSE="Unlicense MIT Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug discord"
+IUSE="clang debug discord"
 
 DEPEND="
 	app-arch/lz4
@@ -42,12 +42,13 @@ DEPEND="
 	media-video/ffmpeg
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="
+	dev-util/cmake
+	clang? ( sys-devel/clang:= )
+"
 PATCHES=(
 	"${FILESDIR}/${P}-dont-build-lz4.patch"
-	"${FILESDIR}/${P}-dont-override-ldflags.patch"
 	"${FILESDIR}/${P}-make-arch-independent.patch"
-	"${FILESDIR}/${P}-version-fix.patch"
 )
 
 CMAKE_BUILD_TYPE=Release
@@ -60,6 +61,18 @@ src_unpack() {
 	mv cmake-modules-${HASH_CMAKE_MODULES}/* "${S}/cmake/external/rpavlik-cmake-modules/" || die
 }
 
+src_configure() {
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		LDFLAGS+=" -fuse-ld=lld"
+	fi
+	cmake_src_configure
+}
+
 src_prepare() {
 	use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
 	eapply_user