gentoo auto-resync : 22:02:2023 - 20:29:22

3 files changed, 34 insertions, 2 deletions

diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 2be2bab63967..0b4f8fd01acf 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,6 +1,7 @@
 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
 DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
-EBUILD lib3mf-2.2.0.ebuild 1471 BLAKE2B c0f87010353a92281a46af2798bb7eb74ffb3ef196d5f56cd05f36c9712efd5b7f92037bf4ad8e0966b23b269d6a1c1e3aa300ee2a2f138fd76bf05a04ec64eb SHA512 83037eccc8db148790fa4e950767bdc6bb8d4b01c04afc59ad059ba601142bb847bedc50651093f7fdc8347ef7a2a90ee969b22e70dc4db5d1a12d081c989c5d
+EBUILD lib3mf-2.2.0.ebuild 1527 BLAKE2B fa9c670c0764749970e78aa47da19aea52c82ae8f23d9ae091fbd867627249bfc04373bbae727566053f44967657c23b1a11ae9c79605f2f129494c3c398e110 SHA512 f5550e9c0379fda8b397ba288999f0d83f0e55d262a50b0b3ad63f771c623ad296a0b888dd73fdf8e99f482d667865cea51aa753ced62d6107973d691a6a0b68
 MISC metadata.xml 936 BLAKE2B 55b169d62c7b8e9ef8ab789c16a286ee545f6c5519833e9c27e23765fe279b059050f526b5ceb2c59eb63d8568348c403326ec5b5d2d9925728298f3875673e8 SHA512 dee8668538fab0a6ea13cce39c0b817d59ee4dca58fa3f15e1c7b995dbfbb2abe63e1ec27b5b47c7d40521daeffc1db4a357c3c9d07e39f60c9b8851066ad9fe
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
new file mode 100644
index 000000000000..c13ec9bfab90
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-remove-std-and-opt-flags.patch
@@ -0,0 +1,30 @@
+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/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index 65a29e035e5e..a9fa3aeee64c 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,6 +35,7 @@ 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
 )
 
 src_configure() {