gentoo auto-resync : 23:02:2023 - 21:45:48

7 files changed, 7 insertions, 55 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f60f7097da78..c9d0306107f6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 5afa9e98728a..1cdfd82222a2 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -6,5 +6,5 @@ AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 606 BLAKE2B
 DIST freecad-0.20.2.tar.gz 75555561 BLAKE2B 278b05a3fe3bdccb46da62926aee46f066cb073f034b273dc4d8b27975724b754a6822b7eb0b673500db4592237690decb830cc7a30e8da689c6b067c256d4f8 SHA512 c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d
 EBUILD freecad-0.20.2-r1.ebuild 10338 BLAKE2B 6743b981e7f7c152a6045960b9e5e79315497af2e5b1fc3e706afeac3b1208162c2ea4e1b3f02652188685068875492e0bcd28dd5558861723f818c5cb0ce3db SHA512 ee94890a79bd87c944ef2215b890360518627f5d4dcae95ebe2ab7c810f113d10c366515193d6bfe1ced550cd0d3c1d4d0e5bb72938b7de0e25827c61687f388
 EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb
-EBUILD freecad-9999.ebuild 10319 BLAKE2B 1bc46e346c02c179adbb29c8354e3ee4e338970be58844fc47eb86292cf1a2ddac94865ac80fd25015eb980d2a6bb70c72235604f4b0f40386e39b8d13c5db15 SHA512 e5163ccb3f71547e030e2e7832fb83f9fe6bf9456217dd6b2bc1477e50de871b359f83358495d1469c5dcd3a75f3dd06497378ffe3710cb175ec3f2ad9ab374e
+EBUILD freecad-9999.ebuild 10321 BLAKE2B b60abf8a65abfdd34592b6501ef077dd93f73f83498fadf4cc5bc350f6876ae7d947f37fa409c7af4293d6cf592e88a739694912ce5084f99c861e58eba18773 SHA512 9182cfd3c7fccffd33d963fb2b0bed38c7812ca87782495e6f7afb89c79bce4954c9d8b56f21d7ba0b0a083cc315f8d7f034431a0b93b0f8c02d60ce9b3024d3
 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index a006497fe1bd..b9d1e7ae4206 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -281,7 +281,7 @@ src_install() {
 	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
 	rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
-	use test && rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die
+	use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
 
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
diff --git a/media-gfx/kgeotag/Manifest b/media-gfx/kgeotag/Manifest
index 8ad5cc5aa26f..0222677dbe89 100644
--- a/media-gfx/kgeotag/Manifest
+++ b/media-gfx/kgeotag/Manifest
@@ -1,4 +1,4 @@
 AUX kgeotag-1.3.1-cmake.patch 1101 BLAKE2B 04743a3e4aa12542075bd958b558999ad17e3f88b1e275eda4ebb3ff13b96f99aa8081e9e2b3c13fcf4700450a2ad08142662ad44ff2448885cc3304dd608109 SHA512 9f6407e27ea1318f0c6cf92530eced9d0dd3b63f098018871e8f866e6dd2e5e27ed892de3270a2aca7d87b84696e48a011123515a6849c13515332bf98c2f64d
-DIST kgeotag-1.3.1.tar.xz 365648 BLAKE2B 7d3ac33f2439072700582dbd4bfd0091728b8546865521b6a1e69a34f3a3180854026fdac67a74f053095788c3d0d1fdff94b3c923d7393b6bc453497aff5b64 SHA512 62cbf568e749a8345e8d145d0850381fcb3140bea10b02626c609c4f1bf0d0fafac23b82a796e0e4c8b293c9fcf65b2ad7c66b7354822426e56826e5b25df46e
-EBUILD kgeotag-1.3.1.ebuild 930 BLAKE2B 7897269952813d22bb6918ce2cefb18008cd2ec42232f1016e219f6017c6ec4d8ba24fafbe617e1dcec5893276af683bd9050b02a2eae9131ef8a3b8a30fcd2d SHA512 49681aa1494fd5306bf648ec057f5123f763f20433e9469df0a95d652fd7677866acf6b2b5806a95de096b41cc636e8297a0f3b58dc488aeccf254237f8e6498
+DIST kgeotag-1.4.0.tar.xz 393112 BLAKE2B 3d699b086e49482f48aef05d5b67a7db809b6c1aebf3e9336f587b50858bd99216282cdc4924362551469f8c78769501cb66e66ed8a2fd704286e30f4d3151a8 SHA512 024204f2ac9df0659ad781f31d91daba6b4177f6fe2aa4219fcf91e68051e443a03efb8a3c9a9e081b126b46304dd6be935836f43d859079a070cbf46cbfac97
+EBUILD kgeotag-1.4.0.ebuild 937 BLAKE2B c016c96f9e3354cab9cb753b9e4af406e80eb03fda98faf5166d21e1736b677bfae10c7c9af2b4d60567694de83d83d33bfdad7355bc0148f20d7349fb36c052 SHA512 cd30bbb644a1df7503e6bce3b9d97d85a72de660276b2fcda158e365003c8a716c2ac8b33cb63d367f98c2c0ef0d6ea7339d3ffae67c23cc38b0fe9f8983f762
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/media-gfx/kgeotag/kgeotag-1.3.1.ebuild b/media-gfx/kgeotag/kgeotag-1.4.0.ebuild
index 1de4cece25cc..fb25701dab4a 100644
--- a/media-gfx/kgeotag/kgeotag-1.3.1.ebuild
+++ b/media-gfx/kgeotag/kgeotag-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-DOCS=( ChangeLog.rst README.md )
+DOCS=( CHANGELOG.rst README.md )
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.3.1-cmake.patch" )
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 70003a4bd850..30ecd434a1b0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,3 @@
-AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5
 AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B 8c2ec83db05e97949aa9fb43d3980748be1324cb2ac90c8caec45b772fb2bad34f56365381bb371d0094079b42065a65c00595388ec861e127b846e6859a0281 SHA512 6f454745d8f84dbcded092a1a16b2903757b36d76888a4c40e1f019f75ba6bea9b245c980347cc7feb0a9bdd22e8eb4e4b12e639594f1fe6e928eea5298081ec
 AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
deleted file mode 100644
index d57eb8a31728..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/834005
-https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -506,6 +506,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+    add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
-     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
- 
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
- if (APPLE)
- #    add_compile_options(-stdlib=libc++)
- #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
---- a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-+    cereal::cereal
-     libigl
-     miniz
-     boost_libs
---- a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -270,7 +270,7 @@ endforeach()
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)