9 files changed, 99 insertions, 247 deletions
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index adde9192b1f1..999619fbd78f 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,12 +1,11 @@
-AUX lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch 1067 BLAKE2B 1c56383b9a791ea5bcc8762a23c92426d308d6f55e5b51ec9268a779bb202144958f9cfa02686d72bf260d2beeb08b3ddf0c58441bf1a899032c408fd137df93 SHA512 af9930e67b6a0a3db26a97326e68a8e8a2d3ac57c378cf8f79397f514ec18ab600efb84b941d0449ffc8d620564082f8942a428c1fefa3cf199d972a7a4f9622
-AUX lib3mf-2.2.0-0001-remove-std-and-opt-flags.patch 992 BLAKE2B e000fe00773010bdf31435e327e9e6c4f8d1de3424d636c4c779617f3fb5f8ae87a27e19a7d7209a300376730cdead2249fb5361434d14ee823dde0206e4eb87 SHA512 93249caaa883aef7a191a6e6d56418158e6d298d2a73a3e685fedc8e4e6d768ef5618366acfa64ad99c2b8b41626c08e37cadfcd6851ad22558352d91501c085
-AUX lib3mf-2.2.0-0001-use-system-provided-act-binary.patch 5370 BLAKE2B c5d3cfe734311995f9fb98a4c7083267af04740e9cc94f6251ec01a837cce8e52587bae4f587a246317976eb60be931c44d1b6bb5f0d72599d07845cadd1a8c4 SHA512 4832d2661dab796e78a737f7aca2f7516e4f4b8c29d0897779ad82be91ec523941f51d39564ad61b01a158a5f313c365a26d5499ce2ccc85793fca8f81b75aee
-AUX lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch 936 BLAKE2B ac89b89c223eaa81334da6ae84d1c785beccea2687b883954a93ede0d7fa49d11afc91ff5a6d41e195d7feb959d4317986cc97ac58047328ce372e40e787cefa SHA512 42c9ede93e79c7548b5ed9bed2f5ec0e275441ab5daa5cf9eb72f31610da512b7a3f118a075a8cfc21d1244c96ba42efadaee8c26c1b1837295e8a2ce4a93255
 AUX lib3mf-2.2.0-include-cstdint.patch 570 BLAKE2B d239701017d68d9dc1c9f8e97f49e74e6af13b93d4f89b97b64248b3b779fbda62a85d085abf66b41990e91085adde0c757089fd12740be8f3e200468dbc56ab SHA512 61be13edfa4c54ee11ff9c2dd11c3740fbaaaa3d07f5bad10bb48a2ce41eb0c090960c44834b0fb60109952dadfda3071c998e4e866d1acd13874106542e7a01
 AUX lib3mf-2.3.2-include-cstdint.patch 323 BLAKE2B c2eb04f8ea0f2f60a028c54625bda8c1859fad9e5fc7592294103681a019b7e8d278eeb397ffddbf6163bdf8d73a6eeed8a565a871c18b5589385ce0ce27cdb6 SHA512 335f18348240371d1607c4eb8a56294ec9d57f12e80d7e16b90e84ad907d1e468f5ebc942d4a9d913bc1c0e527f5622e3ae719f7affebf2cb53ded4bdcdc2310
 AUX lib3mf-2.3.2-remove-std-and-opt-flags.patch 992 BLAKE2B 24cb13d5bbe128dafe933829510bf0db9ee45523a5aef9ea8285c18bc37d5ddaa7ee071ceb11899ce110812c66573cad022e18fb2bc9d8c79d1811201fbae216 SHA512 25cd5ed0fdccba847252d8809a55da4076708f618c5cd7047f77157c247a9037d37c6b95f71a5e5ce14d41ecda431bdd428d771f3c84fe0243e114c4460e12c7
-DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
+AUX lib3mf-2.4.1-cmake_minimum_version-3.10.patch 530 BLAKE2B 5a967147709a5618e6e5fae1fe26149b986791bf527ab4c33e348e1190eb78850b18a3071597f929428c8c6d95091fa8f24a17132fa37637c22fd3b4f65fb79a SHA512 b130e23dff68d75ba85ce9b0844093f585830489c1b613b2fe576f6e843cc89f4f4e9d63fe08bfff75f3dc3f66dce526379ba15aa8c34c2cba06fd591a35ee48
+AUX lib3mf-2.4.1-include-algorithm.patch 1148 BLAKE2B 6acf97c00c663f7e862be880f18920c66a27e4894570b87ded353d2177a0bcc1da517a62a59e25e9d62b5047225f98e023d1b0972cc8461e68112b2ec884a08c SHA512 1936bf5942e60ecf0c263efd80da238a4f941c0483c0791f8a5116335af1ee4f745fc0a8b49c5122be34e3f42d97c05d0de5770fcba89b56a3121a7ffb1857ba
+AUX lib3mf-2.4.1-remove-std-and-opt-flags.patch 899 BLAKE2B 38a706a4f149f8f13096bc37a7b39c777ddf8733c8a5faf28c8a2d869960057b3ffe3d2194df719864cab858125420b9f219dd1e0315ecee1593a8dafcc99f3b SHA512 5a0f08b8928dc0917a03f8b7d2716c632c3458f269cb7b978d59f819c79aa4adba369f7e499a9343fe2e69f86f614092e5e5177702a4563357922a9cbfb0ec64
 DIST lib3mf-2.3.2.tar.gz 35247937 BLAKE2B 8e20e44d715a2942dea8b3d08cb18593162bfd12b9f09b82b182e901f6beb76e2c88d83860c39cdd4e4c239e18f6949e9f9fd5921bc8a9d257975c54a8777e26 SHA512 875529759aff6128b32291d0719b95a75a72a3b19f98711b12c9b1076727b231668b3b14604e69bb1fec79b4725fd098f030b7e965072e566bfb061f3086279c
-EBUILD lib3mf-2.2.0-r1.ebuild 1788 BLAKE2B 8cdb876ca0d240fea3bc0c7103b41e6c0c4abbda665e3bf98904673f0bc9ed7937b0a62a73fee5cee880284d95cf7ca84b2e5be641c5bf09fe0297d6bc80cf8d SHA512 d78f4b07eaa4b0adabc1371169eed867c6c8498031e46056b0aedde955c5bf248bc23b5cacef8fff34601e50475a6613d54461ad3b5709d0f771afc7625c332b
+DIST lib3mf-2.4.1.tar.gz 36313494 BLAKE2B f5fea473e2e28480372cc39178e78022c3612e705d4ea95366a9b9988bdf729a09ee6045af234bc3b4d817d2cd77c1523b27c93abc86c10893a04268276aa251 SHA512 91d3928315bd5d1a8553284505d28c7d839a3cbd8b07a87bca5a21087fffa8ba7a1738ed14313212815a09e33f7a82318f7b069f1bbe40456b57ec528379ab4b
 EBUILD lib3mf-2.3.2.ebuild 1437 BLAKE2B 2912bb66f2bef2c743748e6392b2af63d9a2848729a2a08d86a5b6a8d18c849a074e1a432b0e739d56342b4ca02299570fb2732ce21493bc6a64a9a3f2a6e726 SHA512 2c11c82c5f3b0032874e1b527e09fc68b8dbac2ae3a4447e2fc8a314c4ca81671557a5d0747f5097305db1a325266350834c1395069775386d1ae059e5344698
+EBUILD lib3mf-2.4.1.ebuild 1456 BLAKE2B 039a724a8612aa539942ae1e13dc8b241f1b2a09bacee8517b1f9f904a044aff0e9d7cc9d81a643ed9d25f3365e87b297df57915edf6837451f6a8e0428421d0 SHA512 daddc575022eea226d95e3d73e85e7ad0820588c306d75e3d061dc270b94c71edbbce8e6067226334325efd1e5e8d1810435c698e337f4a4725dbaef10ea34d2
 MISC metadata.xml 937 BLAKE2B 5794675d2197f8da85354f0dc542ac3ae65ea5124a26030a9fdb19e9fa78bbfa8298a13d2c7a4509d2782012ac157f09827afff00b5615e01b0580a71c2aacef SHA512 c62d56ccf3727f5bfa1a04b031ff44506332138c97258f4b3078eb6570a9dc048b4da1fbf1c495175ea169e2b21d11128437c16234f38df5d70fc3994462c0f4
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch b/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
deleted file mode 100644
index 7c5cdd0c68fb..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 13f974157b178efe4c6d617f23246dde2b100f0d Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 10 Feb 2021 18:49:14 +0100
-Subject: [PATCH] [Gentoo-specific] avoid pre-stripping library
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c8b4ba..05d493f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -182,9 +182,6 @@ if (UNIX OR MINGW)
-   # Uncomment the following to put the version info into the .so-file.
-   set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${LIB3MF_VERSION_MAJOR}.${LIB3MF_VERSION_MINOR}.${LIB3MF_VERSION_MICRO}.${BUILD_NUMBER}")
-   set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION "${LIB3MF_VERSION_MAJOR}")
--  if (NOT APPLE)
--    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS -s)
--  endif()
- else()
-   # wd4996 masks the deprecated-warning
-   target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:/Od;/Ob0;/sdl;/W3;/WX;/FC;/wd4996>")
--- 
-2.30.1
-
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-remove-std-and-opt-flags.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-remove-std-and-opt-flags.patch
deleted file mode 100644
index c13ec9bfab90..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-remove-std-and-opt-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 057ae273bf223573b7cdb6ec978e051220ffe401 Mon Sep 17 00:00:00 2001
-From: Peter Levine <plevine457@gmail.com>
-Date: Sat, 18 Feb 2023 13:21:29 -0500
-Subject: [PATCH] [Gentoo specific] remove optimization flags and C++ standard
- flags
-
-Remove the lines in CMakeLists.txt that emit -std=c++11 (as wall as
-emitting -O2) to enable the compiler default, which builds against
-the latest GTest with both clang-16.0.0_pre20230107 and
-gcc-12.2.1_p20230121-r1.
-
-Signed-off-by: Peter Levine <plevine457@gmail.com>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,12 +32,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-   # using GCC
-   add_definitions(-DBUILD_DLL)
-   add_compile_options(-Wall)
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
- elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-   # using GCC
-   add_definitions(-DBUILD_DLL)
-   add_compile_options(-Wall) 
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
-   set(CMAKE_MACOSX_RPATH ON)
- endif()
- 
--- 
-2.39.1
-
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
deleted file mode 100644
index 35beebf19306..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 25 Aug 2021 09:29:17 +0200
-Subject: [PATCH] use system provided act binary
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 110 ++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 73 insertions(+), 37 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d70a030..9c91496 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,14 +62,19 @@ endif()
- 
- 
- ### The API generation target
--if(CMAKE_HOST_UNIX)
--  if(APPLE)
--    set(ACT_COMMANDENDING darwin)
--  else()
--    set(ACT_COMMANDENDING linux)
-+option(USE_SYSTEM_ACT "Use system provided act binary" OFF)
-+if(NOT USE_SYSTEM_ACT)
-+  if(CMAKE_HOST_UNIX)
-+    if(APPLE)
-+      set(ACT_COMMANDENDING darwin)
-+    else()
-+      set(ACT_COMMANDENDING linux)
-+    endif()
-+  elseif(CMAKE_HOST_WIN32)
-+    set(ACT_COMMANDENDING exe)
-   endif()
--elseif(CMAKE_HOST_WIN32)
--  set(ACT_COMMANDENDING exe)
-+else()
-+  find_program(ACT act)
- endif()
- 
- set(CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED ${CMAKE_CURRENT_SOURCE_DIR}/Autogenerated)
-@@ -80,36 +85,67 @@ set(ACT_GENERATED_SOURCE
-   ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacewrapper.cpp
-   ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacejournal.cpp
- )
--add_custom_command(
--  BYPRODUCTS
--    ${ACT_GENERATED_SOURCE}
--  OUTPUT
--    ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
--  WORKING_DIRECTORY
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
--  COMMAND
--    cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
--  COMMAND
--    cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
--  COMMAND
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
--  COMMAND
--    cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
--  COMMAND
--    cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
--  COMMAND
--    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
--  COMMAND
--    cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
--  COMMAND
--    cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
--  COMMENT
--    "Generating hourglass API bindings and implementation stub"
--  DEPENDS
--    ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
--  VERBATIM
--)
--
-+if(NOT USE_SYSTEM_ACT)
-+  add_custom_command(
-+    BYPRODUCTS
-+      ${ACT_GENERATED_SOURCE}
-+    OUTPUT
-+      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+    WORKING_DIRECTORY
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+    COMMAND
-+      cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
-+    COMMAND
-+      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+    COMMAND
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+    COMMENT
-+      "Generating hourglass API bindings and implementation stub"
-+    DEPENDS
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    VERBATIM
-+  )
-+else()
-+  add_custom_command(
-+    BYPRODUCTS
-+      ${ACT_GENERATED_SOURCE}
-+    OUTPUT
-+      ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+    WORKING_DIRECTORY
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+    COMMAND
-+      cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+    COMMAND
-+      cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+    COMMAND
-+      ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+    COMMAND
-+      cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/"
-+    COMMAND
-+      cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+    COMMENT
-+      "Generating hourglass API bindings and implementation stub"
-+    DEPENDS
-+      ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+    VERBATIM
-+  )
-+endif()
- add_custom_target(lib3mfACT
-   DEPENDS
-     ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
--- 
-2.32.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
deleted file mode 100644
index 742c877e2b41..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 25 Aug 2021 18:19:25 +0200
-Subject: [PATCH] [Gentoo specific] remove add_dependencies
-
-Remove the add_dependencies commands on ssl and crypto.
-We use global openssl support instead of package libressl.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- Tests/CPP_Bindings/CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Tests/CPP_Bindings/CMakeLists.txt b/Tests/CPP_Bindings/CMakeLists.txt
-index 4a816a5..c26c498 100644
---- a/Tests/CPP_Bindings/CMakeLists.txt
-+++ b/Tests/CPP_Bindings/CMakeLists.txt
-@@ -47,9 +47,6 @@ if (WIN32)
- 	target_compile_options(${TESTNAME} PUBLIC "$<$<CONFIG:RELEASE>:/O2;/sdl;/WX;/Oi;/Gy;/FC;/MD;/wd4996>")
- endif()
- 
--add_dependencies(${TESTNAME} ssl)
--add_dependencies(${TESTNAME} crypto)
--
- target_include_directories(${TESTNAME} PRIVATE
- 	${CMAKE_CURRENT_SOURCE_DIR}/Include
- 	${gtest_SOURCE_DIR}/include
--- 
-2.32.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-2.4.1-cmake_minimum_version-3.10.patch b/media-libs/lib3mf/files/lib3mf-2.4.1-cmake_minimum_version-3.10.patch
new file mode 100644
index 000000000000..400553d93a60
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.4.1-cmake_minimum_version-3.10.patch
@@ -0,0 +1,20 @@
+From 55ace19a0c65bbe4021530d47b0169786ff1bb47 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx@gmail.com>
+Date: Tue, 22 Apr 2025 13:26:57 +0200
+Subject: [PATCH] cmake_minimum_version 3.10
+
+Signed-off-by: Paul Zander <negril.nx@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72b6a36..b400e4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.0)
++cmake_minimum_required (VERSION 3.10)
+ 
+ cmake_policy(SET CMP0054 NEW)
+ cmake_policy(SET CMP0048 NEW)
+-- 
+2.49.0
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.4.1-include-algorithm.patch b/media-libs/lib3mf/files/lib3mf-2.4.1-include-algorithm.patch
new file mode 100644
index 000000000000..1fc3b8d048a9
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.4.1-include-algorithm.patch
@@ -0,0 +1,36 @@
+From 6b90468066d41ce29f8a8341fd9ae5ea21138569 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx@gmail.com>
+Date: Tue, 22 Apr 2025 14:05:21 +0200
+Subject: [PATCH] include algorithm
+
+Signed-off-by: Paul Zander <negril.nx@gmail.com>
+
+diff --git a/Source/Model/Writer/v100/NMR_ResourceDependencySorter.cpp b/Source/Model/Writer/v100/NMR_ResourceDependencySorter.cpp
+index b7e3967..add22a3 100644
+--- a/Source/Model/Writer/v100/NMR_ResourceDependencySorter.cpp
++++ b/Source/Model/Writer/v100/NMR_ResourceDependencySorter.cpp
+@@ -37,6 +37,8 @@ sorting them topologically.
+ #include "Model/Classes/NMR_Model.h"
+ #include "Model/Classes/NMR_ModelResource.h"
+ 
++#include <algorithm>
++
+ namespace NMR
+ {
+ 
+diff --git a/Tests/CPP_Bindings/Source/Volumetric.cpp b/Tests/CPP_Bindings/Source/Volumetric.cpp
+index 9c5291c..846097a 100644
+--- a/Tests/CPP_Bindings/Source/Volumetric.cpp
++++ b/Tests/CPP_Bindings/Source/Volumetric.cpp
+@@ -33,6 +33,8 @@ Vulometric.cpp: Defines Unittests for the Volumetric extension
+ #include "UnitTest_Utilities.h"
+ #include "lib3mf_implicit.hpp"
+ 
++#include <algorithm>
++
+ namespace Lib3MF
+ {
+     namespace helper
+-- 
+2.49.0
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.4.1-remove-std-and-opt-flags.patch b/media-libs/lib3mf/files/lib3mf-2.4.1-remove-std-and-opt-flags.patch
new file mode 100644
index 000000000000..8d32374b2f78
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.4.1-remove-std-and-opt-flags.patch
@@ -0,0 +1,29 @@
+From 48c55f48d896daa8ec851d659b441e3f2c8988c4 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx@gmail.com>
+Date: Tue, 22 Apr 2025 13:28:03 +0200
+Subject: [PATCH 2/2] [Gentoo specific] remove optimization flags and C++
+ standard
+
+Signed-off-by: Paul Zander <negril.nx@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b400e4d..986c1f7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,13 +42,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+   # using GCC
+   add_definitions(-DBUILD_DLL)
+   add_compile_options(-Wall)
+-  if (CMAKE_BUILD_TYPE MATCHES DEBUG)
+-    add_compile_options(-g)
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Og")
+-  else()
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2")
+-  endif(CMAKE_BUILD_TYPE MATCHES DEBUG)
+-  
+ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
+   # using GCC
+   add_definitions(-DBUILD_DLL)
+-- 
+2.49.0
+
diff --git a/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild b/media-libs/lib3mf/lib3mf-2.4.1.ebuild
index c980abe83fef..386b2a306f58 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+system-act test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +23,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	system-act? ( dev-go/act )
 	test? (
 		dev-cpp/gtest
 		dev-libs/openssl
@@ -32,19 +31,16 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
-	"${FILESDIR}"/${P}-0001-use-system-provided-act-binary.patch
-	"${FILESDIR}"/${P}-0002-Gentoo-specific-remove-add_dependencies.patch
-	"${FILESDIR}"/${P}-0001-remove-std-and-opt-flags.patch
-	"${FILESDIR}"/${P}-include-cstdint.patch
+	"${FILESDIR}/${PN}-2.4.1-cmake_minimum_version-3.10.patch"
+	"${FILESDIR}/${PN}-2.4.1-remove-std-and-opt-flags.patch"
+	"${FILESDIR}/${PN}-2.4.1-include-algorithm.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -r Include/Libraries/{libzip,zlib} || die
-	ln -s "${EPREFIX}/usr/include" Include/Libraries/zlib || die
-	ln -s "${EPREFIX}/usr/include" Include/Libraries/libzip || die
+	# DO NOT WANT!
+	rm -r Libraries/libressl || die
 }
 
 src_configure() {
@@ -53,12 +49,11 @@ src_configure() {
 		-DLIB3MF_TESTS=$(usex test)
 		-DUSE_INCLUDED_LIBZIP=OFF
 		-DUSE_INCLUDED_ZLIB=OFF
-		-DUSE_SYSTEM_ACT=$(usex system-act)
+		-DSTRIP_BINARIES=OFF
 	)
 
 	if use test; then
 		mycmakeargs+=(
-			-DUSE_INCLUDED_GTEST=OFF
 			# code says it uses libressl, but works with openssl too
 			-DUSE_INCLUDED_SSL=OFF
 		)
@@ -71,6 +66,6 @@ src_install() {
 	cmake_src_install
 
 	for suf in abi types implicit; do
-		dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+		dosym -r "/usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp" "/usr/include/${PN}/${PN}_${suf}.hpp"
 	done
 }