gentoo auto-resync : 07:02:2023 - 21:26:27

15 files changed, 67 insertions, 469 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 95e0fae4ba3e..f5b196d4f811 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index df0187c3ad22..8d207db52269 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,13 +1,7 @@
-AUX assimp-5.2.2-disable-failing-tests.patch 1889 BLAKE2B 7f1f72ca6851dbe07d2493ee81a3c18e7118658b76ad5a41f31626cf0099b8bc7bb2fec83ef64c7ab6feb4fe01994cf106440d7a284d5af66b06b2a5ccb086d9 SHA512 128e420ae01246f46deab243bf09e4a0012935e34d5273792c22538bc9353641203450388c19aa5a7670d0f1a3a40e1d4e31a550711f64c8e2d4d0b0e6b3fba2
-AUX assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch 855 BLAKE2B a6f526719d65b8aeb3c8ec1333973bd273589f7a1bb03a6838331740fd1961d63d121bf07636918dd221ba9af3a32a600c3fed3f0dd3135c7e37655d5bfa1fba SHA512 2103864934bd4a3469b419536da4604839b3b1a1b412612dd5a631f578d7c54538e7c97ca612e28425e5f1dd0ce71c11117165f1cbcb5f3604113ae4be259734
-AUX assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch 5956 BLAKE2B 68efeb940358df092250a30233c137c625e8b50575323d3120e09f393ff71f3d5411f3447693ab952ab9d782df5e542bd74c601f63c27efd494c27ab7fce6791 SHA512 6f5272dde69888417deba00b49b325e58f42bc385633e2be5cf922d75a7b83d8337bccd1f39c60741deb850bd59d1209ab9404fd6ed84472552352d50cde804d
-AUX assimp-5.2.4-update-version.patch 932 BLAKE2B 641c1c745b385acf83ddbc2c3e1d21b40b43a68934bbb637aba3a61b626668c423c6bc81d4e2a94cf602a24d9a6fef89b96fe56696c925b88531c059f7240f1a SHA512 68e14391feecac4fc8ae91cedd9a902d593d3d964e7827fd9661277bd39c5de64f97a832247cfb5cd807a75d07016820caad75e70e6e04a7714ba3422206013a
 AUX assimp-5.2.5-disable-collada-tests.patch 798 BLAKE2B 302c2ea2a1152f7bcf71d82378991a2a7259e1a4d81808499b163156ddec2351f441fa7db17886977b1e51c10ba7db70ea68d4cdfcfd2dccea9d0cc06082f429 SHA512 36164420838a5bb21c11dbc3955158b07d561e2da944017a6ce65fd9eab399ddcaddeaa3031727d977a283c2af4dbfec611507251e6a91f6ad475d5ef3763a08
 AUX assimp-5.2.5-disable-failing-tests.patch 3612 BLAKE2B 08dd1585e0d5ea37f5b52a88d364f48865f3b8032eba3cbd875047b7a07a5d9df658631cb5649dc6688112a9ec8809d9dfe75959711b0238b78ed01a5bc2eeb9 SHA512 cef65009eaf04cef82c22d86273dc63a30ae32ecf352b9ce9bfc61ecd9b9c67415d4162a02ffad5337d3d2af4f594b6f4387ad68fb4b4c78500d7ea1a3d42b82
 AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf86616afcf0e050ae9d8caf956b389362a667a370a1bfc523b428990e09481c92946cf252c04259d69b1718087aa24c65e645f19a86339fd1d4f359a505 SHA512 76fa57de33bb93722d9c83af7c706a99a3a9e76f1136b63edc7ba4036fd75ada9d7d6df2060563f56963a6ec971023944d6701319bb1c810fd2803fb4fb4afc7
 AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
-DIST assimp-5.2.4.tar.gz 49613683 BLAKE2B d99243ce84a76ea237becd0b0982619e8f948ebc75784d8ea35e3800b9ca5084291fa58484433e4f2a7c3cd7ec2869033cf458daf94ee0fc4fe3283592721e73 SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf
 DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
-EBUILD assimp-5.2.4-r1.ebuild 1372 BLAKE2B d8b3b36c33040a4db2bf2e1496a4fc1fec68be1cb8bf6e39db36753da297c88d5d1ac6d638697bfe8ad0a526c4bf8aa275eec28b8b03d16499dd952e766f3780 SHA512 8a6880e26604ed4c74818ad15140b44346dfc5b0983a7c410d33fd78ab1380448ae36292266f7c54e5bf635aaf4fa284f63fb9b677571d74c9d76e9efabee727
 EBUILD assimp-5.2.5-r1.ebuild 1581 BLAKE2B 5379bd0912873efe04c375844cc6b8be15731128d4744b9153e3a8de285798b7f6339a0c678dda6d30e7647760ee231daf8f08b5a342f3f9e45a5ee428d81f67 SHA512 235f93bea9e1a0c9aef5266b37a7d225512e245a26a06c328d36d95f23636c1d20592c53102a440de5866254b170562169c7410e36b0fb760521dd7d7f5442ed
 MISC metadata.xml 602 BLAKE2B 37acfeee427b496401cc52d6f424ac33db0d84ebe3052f5d062e52ed0785751f5f693918bbe3388b657329f63b8936c37b7111e88912b376f0db0686320c2b47 SHA512 97813527a76719e99b97c81be7b11b38f5fd31e880a14519973bfa1e32ff08b8010c95ce1e872c2975a446ac567fb69ee2600920b87ead4d17b6584fda29a38a
diff --git a/media-libs/assimp/assimp-5.2.4-r1.ebuild b/media-libs/assimp/assimp-5.2.4-r1.ebuild
deleted file mode 100644
index 135d40e3ca95..000000000000
--- a/media-libs/assimp/assimp-5.2.4-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/5.2.4"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
-	"${FILESDIR}"/${PN}-5.2.2-disable-failing-tests.patch
-	"${FILESDIR}"/${P}-update-version.patch
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
-	if use x86 ; then
-		eapply "${FILESDIR}"/${P}-drop-failing-tests-for-abi_x86_32.patch
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-		-DASSIMP_WARNINGS_AS_ERRORS=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch b/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
deleted file mode 100644
index 3c423ac5107a..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-disable-failing-tests.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8bff102329461e88a879472672b584585c6fbd7e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 11 Mar 2022 11:24:13 +0100
-Subject: [PATCH] disable failing tests
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -249,11 +249,3 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4ScalingTest) {
-     aiMatrix4Scaling(&result_c, &scaling);
-     EXPECT_EQ(result_cpp, result_c);
- }
--
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromToTest) {
--    // Use predetermined vectors to prevent running into division by zero.
--    const auto from = aiVector3D(1,2,1).Normalize(), to = aiVector3D(-1,1,1).Normalize();
--    aiMatrix4x4::FromToMatrix(from, to, result_cpp);
--    aiMatrix4FromTo(&result_c, &from, &to);
--    EXPECT_EQ(result_cpp, result_c);
--}
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -84,13 +84,6 @@ TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromAxisAngleTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromNormalizedQuaternionTest) {
--    const auto qvec3 = random_unit_vec3();
--    result_cpp = aiQuaternion(qvec3);
--    aiQuaternionFromNormalizedQuaternion(&result_c, &qvec3);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionAreEqualTest) {
-     result_c = result_cpp = random_quat();
-     EXPECT_EQ(result_cpp == result_c,
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -68,10 +68,6 @@ TEST_F( utVersion, aiGetCompileFlagsTest ) {
-     EXPECT_NE( aiGetCompileFlags(), 0U );
- }
- 
--TEST_F( utVersion, aiGetVersionRevisionTest ) {
--    EXPECT_NE( aiGetVersionRevision(), 0U );
--}
--
- TEST_F( utVersion, aiGetBranchNameTest ) {
-     EXPECT_NE( nullptr, aiGetBranchName() );
- }
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch b/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
deleted file mode 100644
index 6d48161646ef..000000000000
--- a/media-libs/assimp/files/assimp-5.2.2-fix-usage-of-incompatible-minizip-data-structure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From https://github.com/assimp/assimp/issues/4334#issue-1097591121
-From: Brecht Sanders (@brechtsanders)
-Date: Fri, 11 Mar 2022 10:01:15 +0100
-Subject: [PATCH] fix usage of incompatible minizip data structure
-
-Suggested-by: Brecht Sanders (@brechtsanders)
-Bug: https://github.com/assimp/assimp/issues/4334
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/code/Common/ZipArchiveIOSystem.cpp
-+++ b/code/Common/ZipArchiveIOSystem.cpp
-@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) {
-     zlib_filefunc_def mapping;
- 
-     mapping.zopen_file = (open_file_func)open;
-+#ifdef ZOPENDISK64
-     mapping.zopendisk_file = (opendisk_file_func)opendisk;
-+#endif
-     mapping.zread_file = (read_file_func)read;
-     mapping.zwrite_file = (write_file_func)write;
-     mapping.ztell_file = (tell_file_func)tell;
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch b/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
deleted file mode 100644
index fba27be45315..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-drop-failing-tests-for-abi_x86_32.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://bugs.gentoo.org/840767
-https://github.com/assimp/assimp/issues/4438
-
-From 48cb5451383855755debfc17cb5e3428cba2d94e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 21 May 2022 17:37:04 +0200
-Subject: [PATCH] drop failing tests for abi_x86_32
-
-Drop two additional test wrt 5.2.3
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix3x3.cpp
-@@ -68,13 +68,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromMatrix4Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromQuaternionTest) {
--    const auto q = random_quat();
--    result_cpp = q.GetMatrix();
--    aiMatrix3FromQuaternion(&result_c, &q);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3AreEqualTest) {
-     result_c = result_cpp = random_mat3();
-     EXPECT_EQ(result_cpp == result_c,
-@@ -127,14 +120,6 @@ TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3RotationZTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3FromRotationAroundAxisTest) {
--    const float angle(RandPI.next());
--    const auto axis = random_unit_vec3();
--    aiMatrix3x3::Rotation(angle, axis, result_cpp);
--    aiMatrix3FromRotationAroundAxis(&result_c, &axis, angle);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix3x3, aiMatrix3TranslationTest) {
-     const auto axis = random_vec2();
-     aiMatrix3x3::Translation(axis, result_cpp);
---- a/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-+++ b/test/unit/AssimpAPITest_aiMatrix4x4.cpp
-@@ -78,15 +78,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromMatrix3Test) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromScalingQuaternionPositionTest) {
--    const aiVector3D s = random_vec3();
--    const aiQuaternion q = random_quat();
--    const aiVector3D t = random_vec3();
--    result_cpp = aiMatrix4x4(s, q, t);
--    aiMatrix4FromScalingQuaternionPosition(&result_c, &s, &q, &t);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4AddTest) {
-     const aiMatrix4x4 temp = random_mat4();
-     result_c = result_cpp = random_mat4();
-@@ -135,12 +126,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4InverseTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4DeterminantTest) {
--    result_c = result_cpp = random_mat4();
--    EXPECT_EQ(result_cpp.Determinant(),
--        aiMatrix4Determinant(&result_c));
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4IsIdentityTest) {
-     EXPECT_EQ(result_cpp.IsIdentity(),
-         (bool)aiMatrix4IsIdentity(&result_c));
-@@ -228,14 +213,6 @@ TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4RotationZTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4FromRotationAroundAxisTest) {
--    const float angle(RandPI.next());
--    const auto axis = random_unit_vec3();
--    aiMatrix4x4::Rotation(angle, axis, result_cpp);
--    aiMatrix4FromRotationAroundAxis(&result_c, &axis, angle);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiMatrix4x4, aiMatrix4TranslationTest) {
-     const auto axis = random_vec3();
-     aiMatrix4x4::Translation(axis, result_cpp);
---- a/test/unit/AssimpAPITest_aiQuaternion.cpp
-+++ b/test/unit/AssimpAPITest_aiQuaternion.cpp
-@@ -54,19 +54,6 @@ protected:
-     aiQuaternion result_c, result_cpp;
- };
- 
--TEST_F(AssimpAPITest_aiQuaternion, aiCreateQuaternionFromMatrixTest) {
--    // Use a predetermined transformation matrix
--    // to prevent running into division by zero.
--    aiMatrix3x3 m, r;
--    aiMatrix3x3::Translation(aiVector2D(14,-25), m);
--    aiMatrix3x3::RotationZ(Math::aiPi<float>() / 4.0f, r);
--    m = m * r;
--
--    result_cpp = aiQuaternion(m);
--    aiCreateQuaternionFromMatrix(&result_c, &m);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiQuaternion, aiQuaternionFromEulerAnglesTest) {
-     const float x(RandPI.next()),
-         y(RandPI.next()),
---- a/test/unit/AssimpAPITest_aiVector2D.cpp
-+++ b/test/unit/AssimpAPITest_aiVector2D.cpp
-@@ -67,28 +67,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2AreEqualEpsilonTest) {
-         (bool)aiVector2AreEqualEpsilon(&result_cpp, &result_c, Epsilon));
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2AddTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp += temp;
--    aiVector2Add(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2SubtractTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp -= temp;
--    aiVector2Subtract(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2ScaleTest) {
--    const float FACTOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp *= FACTOR;
--    aiVector2Scale(&result_c, FACTOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     result_c = result_cpp = random_vec2();
-     result_cpp = result_cpp.SymMul(temp);
-@@ -96,21 +74,6 @@ TEST_F(AssimpAPITest_aiVector2D, aiVector2SymMulTest) {
-     EXPECT_EQ(result_cpp, result_c);
- }
- 
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByScalarTest) {
--    const float DIVISOR = RandNonZero.next();
--    result_c = result_cpp = random_vec2();
--    result_cpp /= DIVISOR;
--    aiVector2DivideByScalar(&result_c, DIVISOR);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
--TEST_F(AssimpAPITest_aiVector2D, aiVector2DivideByVectorTest) {
--    result_c = result_cpp = random_vec2();
--    result_cpp = result_cpp / temp;
--    aiVector2DivideByVector(&result_c, &temp);
--    EXPECT_EQ(result_cpp, result_c);
--}
--
- TEST_F(AssimpAPITest_aiVector2D, aiVector2LengthTest) {
-     result_c = result_cpp = random_vec2();
-     EXPECT_EQ(result_cpp.Length(), aiVector2Length(&result_c));
--- 
-2.35.1
-
diff --git a/media-libs/assimp/files/assimp-5.2.4-update-version.patch b/media-libs/assimp/files/assimp-5.2.4-update-version.patch
deleted file mode 100644
index cc70165bc2e0..000000000000
--- a/media-libs/assimp/files/assimp-5.2.4-update-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/assimp/assimp/issues/4655
-https://github.com/assimp/assimp/pull/4656
-
-From 304b0f61d7c9ef7e2e5ca2eed185b32a2951aa90 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 30 Jul 2022 09:39:12 +0200
-Subject: [PATCH] update version
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED)
-   add_definitions(-DASSIMP_USE_HUNTER)
- ENDIF()
- 
--PROJECT(Assimp VERSION 5.2.0)
-+PROJECT(Assimp VERSION 5.2.4)
- 
- # All supported options ###############################################
- 
---- a/test/unit/utVersion.cpp
-+++ b/test/unit/utVersion.cpp
-@@ -61,7 +61,7 @@ TEST_F( utVersion, aiGetVersionMajorTest ) {
- }
- 
- TEST_F( utVersion, aiGetVersionPatchTest ) {
--    EXPECT_EQ(aiGetVersionPatch(), 0U );   
-+    EXPECT_EQ(aiGetVersionPatch(), 4U );
- }
- 
- TEST_F( utVersion, aiGetCompileFlagsTest ) {
--- 
-2.35.1
-
diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest
index 381505bee0c5..8cc135ad9247 100644
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@@ -1,11 +1,7 @@
 AUX exempi-2.4.2-iconv.patch 1440 BLAKE2B a3fccd3c268c28f1fe0b9e13544ba7b33d433a9a92ad9319301996c162766dac9d3fc14f97c3a3c795d787d0b7b9048dec830e1ce5d809b1a14ffa82097e2ff5 SHA512 09cc5ba46c8e0a0b0c1c3b0c86d9c49c21e64a64ca35a90053bf98ed81652b8d1c91bc29a321b5b3bf032b65af220129860f7d3f8c6e12ce608db19c01841736
-AUX exempi-2.4.5-CVE-2018-12648.patch 1556 BLAKE2B 154787079e9a1b3c747275aadd5fd2e47efd6079508b1f2db12ca5d0a83c1efb31ac87f869703e28e1b638a26d693fec6b6875d762c85c2ea63ff3adba70b036 SHA512 12594e62110d5d0e457102db94822c0920196420ca2321193b79736ed05dde6859723d66bba0177d55b0390c0716debfcf0e074ca27eaa12ef3e29e799d3913e
-AUX exempi-2.4.5-gcc11.patch 346 BLAKE2B 022ca9284b3415b2a24c1aca421488e0741cd42784cdf1c24753d5a3941274f4adad87474e72f45286dba907641101d27ca5047cfa6e8f3b36dfba470db14f32 SHA512 2ca5dc6f1147c11a8ce4911b5b5b6d52ffedc6925ea2c13bd46e074320020b3e7ef52bc405fad9214a35fc47e8087f49258660750e65f168afc8517c49629947
 AUX exempi-2.6.2-arm-static-build.patch 1785 BLAKE2B 2624ac36cdcbf8230af643f99250c9c755c5650d38a4d427125b60245dbfb79cf4d94ad135f043ddde956d3241c091f901d7243b99d26c70c88af44414a7b674 SHA512 49004cea850f2e51a4266a574e7453e21afe1a7032e7a925717c7b0df3bbe187c5c0b79dddabbd002ce662fe4055171cc72ddff6985f611cc4b8c3280dda1fc9
-DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c
 DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a
 DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4
-EBUILD exempi-2.4.5-r1.ebuild 1200 BLAKE2B 2be269505b74dc4c0d8a2f2f05a0f99a2796b9a09a9711fd2e64926daa5c9126822c0e9e6e3550fe421a272c597dbfe74283c389b887b1001722198f15282616 SHA512 600901867f7a75d18fc727df7f379bf3e0c9b4a1dfbda64f157299347e6d3a50377951db7ea4ea056ab40559e3b1ab3b45810abfcda2169bd9723b6d4943746c
 EBUILD exempi-2.6.2.ebuild 1367 BLAKE2B c14b4815a8745d6a8bad3e3539ab033c2151611b8dddf382df5649f67d758c52c1c05c2c62d5efa95b339c79b2c76c1d2023c49d9dc0e6a449a5ba6c2fbe9ac8 SHA512 558a7ecde81272289d1932b1a8e64b0f00b9f45cdedb83cd8e0cc10f0d7d291227b1816d87bf9e92b908bd6de1a41a1c021bbb8776e69c10d7b9ed5a86266f94
 EBUILD exempi-2.6.3.ebuild 1314 BLAKE2B 1b6d927a65658ebab5020ebdfcc4e20c569430e199c17d4949bc2413a5d20d66821cbe6cb5b9e5ed6a1e3fa10825ffcbc6fe56970998dbfd7cd48fd300f55951 SHA512 724bea0088f40a55e62fc56d256dd6345d8eda22a50bca7ec63816bfbfd9edd4572f6269123aefa2deb8d919496ff91b089c64c20c246c2aaabace90d5a69055
 MISC metadata.xml 323 BLAKE2B 5f01fafc347bc3dd68f29e05eeda1b335498b1ee928ab266c2f4bfe11f2833158c000a077fc1e11ee0f6be4cb1395773090687a109274e0abbb9ec8cb2e241a9 SHA512 c1c19755073fed175f6637fe6b1680867dc12c95b8c5ac4874f4a66781921fe755c8d0748d2824442289fde3cb72040ae32731e3e6a06d22e5dacc9d39924392
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
deleted file mode 100644
index 9d36d341cc38..000000000000
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2/3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/expat-2:=
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.2-iconv.patch
-	"${FILESDIR}"/${P}-CVE-2018-12648.patch
-	"${FILESDIR}"/${P}-gcc11.patch
-)
-
-src_prepare() {
-	default
-
-	config_rpath_update .
-	eautoreconf
-}
-
-src_configure() {
-	# Valgrind detection is "disabled" due to bug #295875
-	econf \
-		--disable-static \
-		$(use_enable test unittest) \
-		VALGRIND=""
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm samples/{,source,testfiles}/Makefile* || die
-		docinto examples
-		dodoc -r samples/.
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
deleted file mode 100644
index 36f0d0734350..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
-From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Date: Sat, 18 Aug 2018 13:54:55 +0000
-Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The WEBP::GetLE32 function in
-XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
-NULL pointer dereference.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=106981
-https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
-
-Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
-Signed-off-by: Hubert Figuière <hub@figuiere.net>
----
- XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-index ffaf220..4fe705b 100644
---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
-@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
- }
- void VP8XChunk::xmp(bool hasXMP)
- {
--    XMP_Uns32 flags = GetLE32(&this->data[0]);
--    flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
--    PutLE32(&this->data[0], flags);
-+    if (&this->data[0] != NULL) {
-+        XMP_Uns32 flags = GetLE32(&this->data[0]);
-+        flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
-+        PutLE32(&this->data[0], flags);
-+    }
- }
- 
- Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
--- 
-2.18.0
diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
deleted file mode 100644
index 259c05d5cbd2..000000000000
--- a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/XMPFiles/source/FormatSupport/P2_Support.hpp
-+++ b/XMPFiles/source/FormatSupport/P2_Support.hpp
-@@ -79,7 +79,7 @@
- }; // class P2_Clip
- struct P2SpannedClip_Order
- {
--	bool operator()( P2_Clip* lhs,  P2_Clip* rhs)   
-+	bool operator()( P2_Clip* lhs,  P2_Clip* rhs) const
- 	{  
- 		return lhs->GetOffsetInShot() < rhs->GetOffsetInShot();
- 	}
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index 7e5cefd0937b..ecb5f19120c7 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -3,5 +3,5 @@ AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c
 DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617
 DIST lcms2-2.14.tar.gz 7406694 BLAKE2B 777b0bf65829121a3d32bca1ab936ac022f9af739bccdd02d5f86688c3386b974f526a012bdec4d36649566eea0aa659db317dd383eede6488236d601156a0f9 SHA512 92fba0a457ea81590eba0b8d98b7b621da6a83e3857948585e0b524235954954f9ac1670cf6a19b457c0fce22a87899ea4c5810db1ff2acf7c6b6e0dc4b61a1b
 EBUILD lcms-2.13.1-r3.ebuild 1512 BLAKE2B fb15df98139327e95c3accca2ee48c0d8acd2c2eb7fd84b9ec3b200c49231ac513c531fd13444b58857970c6ba653cdedc417fcb5c8c2995581b5b07cd1e8b4a SHA512 0510bf343478291fead3e4e69bd74c5ba84eab1539e3e8e7cb78ccd56402ce42d6054baf501b1c9df5802131d18667121087b16aad1d4bb5868daf138778c307
-EBUILD lcms-2.14-r4.ebuild 1370 BLAKE2B 8a70a2f6f9f3ffe367be16ffdff2f3e6e9bcd73d262e363e208e014139ebdb5cd85fa370b7bc1537e4b54f7d707e91076415e311b81d45a8b3ea2bf51fc9a874 SHA512 5e6efceede74d72498ad2077eecc15ad988d6c7a1bb858745c6f746b74bcb7e3036494f1621f998586ef58878fc4a0bc5cb3fdc8f7df7633507ef71c3c8f71da
+EBUILD lcms-2.14-r4.ebuild 1362 BLAKE2B d8e7afbe30d08b3df83227a2f8a5c8f80d1d1105b1e808d6cec2238673173e34e572595062a9a205c78129c96c1df9271473bad1807fa6b5b3c407eb216bca90 SHA512 fc98c4e548540aa8c46afc44f940375ed05d5d5dd8a4828e4c0feb5541a5a94b24011cd0b0796e83c6e978c3c355a212f53290d2c68bfc1deeedb69b064a7aa6
 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35
diff --git a/media-libs/lcms/lcms-2.14-r4.ebuild b/media-libs/lcms/lcms-2.14-r4.ebuild
index 3260cab550d5..6b1fe0d4e1e0 100644
--- a/media-libs/lcms/lcms-2.14-r4.ebuild
+++ b/media-libs/lcms/lcms-2.14-r4.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
@@ -12,7 +12,7 @@ S="${WORKDIR}/lcms2-${PV}"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc jpeg static-libs tiff zlib"
 REQUIRED_USE="tiff? ( zlib )"
 
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 4ed86f403396..65593f8d01bf 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,4 +1,6 @@
 AUX lensfun-0.3.2-warnings.patch 1813 BLAKE2B d0ee40324b584eddbee19442f1c221b25043d06b90357feee37b93e9c77dc9475bb45bb23fcd884d90cea031f6b6b46fc9c50e6f22d5bb816d9e289bac8a1e3a SHA512 517d613ba3916dd031eb026748465ec71f2cdc4658b0ce3dede827386f9805916f9bb1c4adc9af350b61b7e68bba1ceee02f89989ff91e52ffcb1ee442599527
 DIST lensfun-0.3.3.tar.gz 992432 BLAKE2B 174f9a34195ca8d7f09de43a2f0d1015bc766579607c44541f631142386a3b5c27c823f9f54f08d462946a0809610b6a87e61cd093b69339fa7d57d28cc833ae SHA512 2d913e3d121ac069f4cb7acb3f09c9cf11c5d0069e743500631bd4b6007a1b19ebccf871a4ac8cfc2797a03066f8a678ea9d70feba0f7d6a05c28cef61f7d9cf
+DIST lensfun-0.3.4_rc1.tar.gz 1045616 BLAKE2B fee14b97dcda98be4e8a32443ff71347ba75e46192f8437be580cb6697f6ef2eca92ef57cfcb2de5bd87fe7ba96542a6b5551b12f50fec09a035c69d6f4b427f SHA512 0d034c6996e5650b022d33a7e00ef7e0e00dfa99155aa62c6c3ab48b9ac936e46f812ceea46e2070514e2c77150a1d7c827831686b1cf73e2acf88b6b3dfb6c5
 EBUILD lensfun-0.3.3.ebuild 1487 BLAKE2B aa5bb2f7e99444876507f8899fbeab603930c8973a7ef61a51b589688ed66d9203114f78debac49bee49ef83fc7c9b1b5a2e1a5347ef4ef73f8f2b761c74fdbd SHA512 0361c7d354e6680c886163793a2e32ef1367be3aa8310ef0b83708c364a40e2263526d9b733d39f06fe63fca1277f5fe3cd7455f07a2839d50148ba3a54c3247
+EBUILD lensfun-0.3.4_rc1.ebuild 1485 BLAKE2B 5a1e2cccae8f10c94bc5e52e934a43504b93d3f7b73ad6c43ace6f7eeafced37c408e1991a396ef6be7ef4d96d00eb136d87e3cd5d01fcfc4bb47456b6314daa SHA512 7c1f09f3c2e0e1032b31a45d8ca5517ff3a4663b11ce4427d34a2dbda6f981730a953d56daea7731b018d0aa6fbb92aaca7ae85372c31810ae6764b6aa30679a
 MISC metadata.xml 716 BLAKE2B 866b92afec30235731857799268948cf0d63be654432c72bf6a93084d2e344d486d0156571e08accfce4c9323aee6e7f155620d2e7a72ebfe69ef27b39bb13cb SHA512 fa3c54e5ea453bcefb5e9b9c76c3a45fa74280ba52b713ac93aa5a95341dc0f9111130b1952bc0a4b3b7898d5d0bde46234e1b42453757ead0c42c002141e6c4
diff --git a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
new file mode 100644
index 000000000000..cbdf5c801f2a
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit python-single-r1 cmake
+
+DESCRIPTION="Library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="https://lensfun.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV/_rc/-RC}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_rc/-RC}"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.40
+	media-libs/libpng:0=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)
+"
+
+DOCS=( README.md docs/mounts.txt ChangeLog )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DSETUP_PY_INSTALL_PREFIX=/usr
+		-DBUILD_LENSTOOL=ON
+		-DBUILD_STATIC=OFF
+		-DBUILD_DOC=$(usex doc)
+		-DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse)
+		-DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	mkdir -p "${T}/db/lensfun" || die
+	cp data/db/* "${T}/db/lensfun/" || die
+
+	XDG_DATA_HOME="${T}/db" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}