gentoo auto-resync : 27:01:2024 - 12:56:47

11 files changed, 94 insertions, 41 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6cc7a8934c33..85d433bce820 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 2795d061620b..3a647ae05aa4 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,6 +1,5 @@
-DIST inih-56.tar.gz 18458 BLAKE2B 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d SHA512 ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2
 DIST inih-57.tar.gz 18954 BLAKE2B df2e2a14b4186616071f6ad2a64e0423148fb9a4624a74d4b16845a4a12eb72b1965f1314b92a710b80cc68d85dbe4ef09d6db159b76be856a4041f21a8c520c SHA512 9f758df876df54ed7e228fd82044f184eefbe47e806cd1e6d62e1b0ea28e2c08e67fa743042d73b4baef0b882480e6afe2e72878b175822eb2bdbb6d89c0e411
-EBUILD inih-56-r1.ebuild 747 BLAKE2B 713a3953a3c59d3352a44baad67f713d40cd0c5908b937bb7f78db1451dc8ee9972143bc35c52729351139fb1a76866b9b58e61936bc2a3dc60272892d29b700 SHA512 19cfe78a753ec682994d34a4b7c9659ee8861f27b04d20b46022e655ba6d5939e315435ab2519f9be212475af2d749437478594f2e25d615d29fa936654835f6
+DIST inih-58.tar.gz 19964 BLAKE2B ba71b21b30c039df026adbd29b422b064934046ced21a37479421e866b73969826dc1fea4e3bc0c5ea427248c774d8f80b83056c54769d454bafa2f336d08024 SHA512 d69f488299c1896e87ddd3dd20cd9db5848da7afa4c6159b8a99ba9a5d33f35cadfdb9f65d6f2fe31decdbadb8b43bf610ff2699df475e1f9ff045e343ac26ae
 EBUILD inih-57-r1.ebuild 765 BLAKE2B cfae9595103362d7773146f371ec9ba197e8d9ce1c694af85c41d8a50bfc5999709928131b08b905c1c6abab583c6f76a5e7961501f64a666d009a1d28799cbf SHA512 93e97a12c39bd08516c78584230ff31a21c75007047def432eec29bad220c7eaeffcf5ba5612026d8ba2069d8a9c728f9db7a6105b14cccd1ca7a2d8b69d6e66
-EBUILD inih-57.ebuild 747 BLAKE2B 4df67063887533bc446fd1c5a412e1a3890fb5d09a39d18bea27024bd4e81734ddf519f708712f81e38113a86dd9e67f2d818c16f460101b869445abef460959 SHA512 6ef01f17a0b06e061aa3ce6fbf9f4c74be4cab4f20fc07d0b5eae9b41edcc7a2b048a7ca595702bfbff8eba5b3edbf9d39d32f77e84e1e0b27156553e5d64fa6
+EBUILD inih-58.ebuild 773 BLAKE2B 593ccd7e36d73c04f2c4222ddda8080103d63b69cd22c21b19cb214a6833f9a2c92a6be25f70c6b2883b1c29b4b042f9d5eaed899b0954e0e4ec6ff76aefd1af SHA512 06ced5a17ddcfac4ab15770867a09ea634781a1269c7a5f8dabbdf2cef2769b54df3e2c6d79342eb6ab504d4824c8940e74a6c4b5a764f0b656be8594670debb
 MISC metadata.xml 520 BLAKE2B d067b0d423cb2ecdeee888a8b6588c1ee3a47d9080a83d0288736fd31d2521956e6dfb970d612ca27f3c9da8103f37e3dd3245eba9b57f9a1ce4d8631695da14 SHA512 47fafee9e35a1827b8d68ab35fea44e8895658dbdd77628f03d31160bbeb915e2cdad81a17c0530d3b0de713fd141999949992feb4c98fabf2ed9bcf717e6b1f
diff --git a/dev-libs/inih/inih-57.ebuild b/dev-libs/inih/inih-57.ebuild
deleted file mode 100644
index bb6473c9f6c9..000000000000
--- a/dev-libs/inih/inih-57.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests not wired up to meson and don't seem to be intended for downstream use yet
-# e.g. hardcoding gcc, just a shell script
-
-inherit meson
-
-DESCRIPTION="inih (INI not invented here) simple .INI file parser"
-HOMEPAGE="https://github.com/benhoyt/inih"
-SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/inih-r${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-DOCS=( README.md )
-
-src_configure() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		-Ddistro_install=true
-		-Dwith_INIReader=true
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/inih/inih-56-r1.ebuild b/dev-libs/inih/inih-58.ebuild
index e287c82e011d..6793c8255fc4 100644
--- a/dev-libs/inih/inih-56-r1.ebuild
+++ b/dev-libs/inih/inih-58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 # Tests not wired up to meson and don't seem to be intended for downstream use yet
 # e.g. hardcoding gcc, just a shell script
 
-inherit meson
+inherit meson-multilib
 
 DESCRIPTION="inih (INI not invented here) simple .INI file parser"
 HOMEPAGE="https://github.com/benhoyt/inih"
@@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 DOCS=( README.md )
 
@@ -26,5 +26,5 @@ src_configure() {
 		-Dwith_INIReader=true
 	)
 
-	meson_src_configure
+	meson-multilib_src_configure
 }
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 90217a9f43ae..f4b77e7ab806 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -6,6 +6,6 @@ AUX liborcus-0.17.2-python-optional.patch 681 BLAKE2B 2338884cd5e694c850cd63b85d
 DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
 DIST liborcus-0.19.2.tar.xz 2211268 BLAKE2B 4ee3fd2fb122d3a9840cb92452bf8a6d3d54b7b50a32be84e1bb08dfe2e2abc2de80098d9460b6bd82d0249304a7ba5c39b18ace3f69150ba71e16ef14795ca4 SHA512 c955490f57e91615278a83bb48726025cd5f8059b97ed5532f770199e134ca511c7ee6b0cd0a9d3a2d54208a5fdd19117054e95e818162ea568052fa11b21d4e
 EBUILD liborcus-0.17.2-r1.ebuild 1527 BLAKE2B 7a67cb9ceff42a7f06a6d84026fa630f2fa32bb101c56a40c56bd5269fa429d4de5e2b4132653c2bbe77d79d383196f34d6166864cb75744cf9cbb8b8955a6c6 SHA512 7a75ccf1e156c6581772d8083aef3ff5148dace2e7e78195cb009cda3e518c7291b2d09a491b6d6e7247ed3b870fa2b083f93c349040548e438a4ffa0f5e3051
-EBUILD liborcus-0.19.2.ebuild 1318 BLAKE2B a1d902458819e198891dd55e49202e447ec6fd69ddafd40935b8ef49780d7d1d01665ba9769216427fac194667066126f744d1a673d4f3a9f2950fa6b69c904e SHA512 097c89eb89ef221df3ff933d838911ce7dcd1fbab0e9e7a993126ae55ae7340a4b68b5bffd042df6c981d54db48bc90073fcbf03827922287df9642d61bdf085
+EBUILD liborcus-0.19.2.ebuild 1332 BLAKE2B dc84a5a1a4ae17d720e8195eadf30a295ae33baa84c18c1c600961b1c974ca492c85deab1c17a5b6bd9af7bb505e3a6a9ae12ffcc9465462a6214831f058599a SHA512 db635959e9684cf7b5f6947e1fdc8aefa90fcf905ceef45837b919fdfde6a617102adfe86dba2c2601607af8350f4bbb0ca613a27f11ee4f8cf5f43c37e4f57f
 EBUILD liborcus-9999.ebuild 1340 BLAKE2B 47b83c7345c7e6bbc9d8b3ce196c56ca14aadd938cbdf74fa4afa8df0f75c84cb96598362a3fb695173fed75e54d41099090dc4a592c4966842478193bcea1d0 SHA512 c433a64f5ef7abd0b650c999b6cd5fc6f6c5a3ce3c3be6ca2723f8ce503bfd31836f6a6276dbe40dc4ddcce2998fd203aa9ab41ef40301865570adaff9871977
 MISC metadata.xml 557 BLAKE2B b8dd01b0df50a1c6dafedc40f4cebbbd7851ee67fd1ac94f4c8107f052db8721ce12b0ae486e42f459e0b5d337525edc0359e9e94b8da1261e3521c11f66ef64 SHA512 2eca4f5fd25121bdb3ecb9470b66c2c5373ab266c53bf7af55b3f46245ad6973f3cd65ff80c6d1c33cb738136cddf22489b61dc1863701225842ca9dfa4e2c9d
diff --git a/dev-libs/liborcus/liborcus-0.19.2.ebuild b/dev-libs/liborcus/liborcus-0.19.2.ebuild
index b714913999b7..cc256f36d078 100644
--- a/dev-libs/liborcus/liborcus-0.19.2.ebuild
+++ b/dev-libs/liborcus/liborcus-0.19.2.ebuild
@@ -57,6 +57,6 @@ src_configure() {
 
 src_install() {
 	default
-	python_optimize
+	use python && python_optimize
 	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 15debb481186..e7b6b55ed3d9 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -8,6 +8,6 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.11.5-r1.ebuild 5310 BLAKE2B 4e8e6c29a9004453eb62f6676f3808231b45c6b616af48b13ac32d14d8893bc836449cfbca1414af3f293e03abacc26454c54be960b61c264e31955946507818 SHA512 babbb1587967ec402f27607e04650183938f7ca16c3d32b5cf68e94c3a98decb3d97dcfc8f2a4b8afc0ac081338df41d1c7eb0fca5675b53593b37beda5686bf
 EBUILD libxml2-2.11.5.ebuild 5250 BLAKE2B e80ea2e65f1e93abb589e30e03efaf0422e29a93de8666209d64db2413928f428547511809664acc1d0c8f5536e9f7bc4decd6f4823b722d64c1d43829ef4c20 SHA512 88657c42445c0c0313a818fab6106fb3b9110e5a30d6908eb8a0ee5cc1b8522e8c179581d834de4573cd96263a82c7a9af3a4164515dd7006b1feedea5523544
 EBUILD libxml2-2.11.6.ebuild 5318 BLAKE2B 69f5beb4b641f3a2fc4547aa01a081a382771af00616d1fe33519a88cec66b12e5911f7211aa4fdbdf6b92d5b85a307c8d68c6bd7d400d158e161ef7db33c5d0 SHA512 a16a8ac93379ee896a60823b975a42666dd9cfaed58894884f606133fd7fb46770c24f11928aa73fbc2659af5185603be31cee9ce32a6ce829d2d22b7c4977d9
-EBUILD libxml2-2.12.4.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
+EBUILD libxml2-2.12.4.ebuild 5249 BLAKE2B 7ed075e1fb2fcb860e28da0e0d653bccac730180ba61755c76b90db227fdff3194b1504ddfe89a350d72a41b12aaba9854c638412be9e56b5b5949665ee00394 SHA512 a1dbcf241e782a54f04227e61082d6d8706879321ae63bd1f9b3d9e5a0e424e2d58a7ebb7b2c1223bcaebfab5c90f7c7d25ba638a1a12c7d4f5ebb1dce88a82b
 EBUILD libxml2-9999.ebuild 5256 BLAKE2B 8e512b8c1bff1c1799f73004a96bacab4679bd3d1dde1f50adb23bac04c49718946d9dc4f5b07182a6b920a2a07257b1692d990cfb5a0608bc71f0fe4ed7a693 SHA512 26894b5fd0dc9a8f5afb162373aaff979ad2901ee9912d869773035082a7b337efe9fe034732009a4326bcbad4e5a0f9048792b0fafd9d7fb3bbc5ed4b393cbd
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.12.4.ebuild b/dev-libs/libxml2/libxml2-2.12.4.ebuild
index c4d87530a6d4..bcb12e755d35 100644
--- a/dev-libs/libxml2/libxml2-2.12.4.ebuild
+++ b/dev-libs/libxml2/libxml2-2.12.4.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 33bd8a942a90..473cc30765b2 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,4 +1,7 @@
 AUX olm-3.2.15-cmake.patch 1585 BLAKE2B 4de4f3e6e29792fc697f40dbc303ad630222491a4692a05a953b1db7518ae22a557acdc570e3f0bd3dc080bc46aae128ec380963ee5274506e446f678f26472b SHA512 025fd3dbc26d59d3b5db1ac3a77e72dee396acdf1b3c2ee2d3746a6b1e2cf2c6965083707d3fc7df88a6f0c62729601f5df7e262998c806d98d2159fd6dbbfb2
+AUX olm-3.2.16-cmake.patch 1573 BLAKE2B e7667c692b017060b20f86e69d3e37ddda7bd6642e60fcb7570b58ce4a4523fec5234635431b17ec0e01650d8935aefec3082433992c4928c92fc22b7f2f1b5f SHA512 a191e607f4c6d48a4692f20e2efd09ec1c4e10156bb60a23f859483d46d2ccd0074b210c80ce4543f22e76eeb4799b8e640706010c5ad1b26549dd310ddb0b46
 DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b SHA512 81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7
+DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7 SHA512 504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581
 EBUILD olm-3.2.15.ebuild 604 BLAKE2B b3c34c37603490ef1f603d6207fd7edc801c6a42b43ec06f6e48a22690351a657f874c98045ac53b21cbce861a1cb169e9d7e636693a83bf4119dec938005fb3 SHA512 359c1abc4b29c5e14b76044650655ee730d6865ffcaa588082f0b31c3c22d883d79849d185416a144cd450f1924bf5ec65d4bc5ac14c7e39d3a36404cee24365
+EBUILD olm-3.2.16.ebuild 607 BLAKE2B d2b87c23270e125035189e23b49eec779f51c42efd8f054be7e2c1805f1658259d756eeb297ea54d64e4fd3e45680a17e399c3fce03379ba7c03027371735905 SHA512 ca64ccd2df952e8959b0eae1e1296f377cdefe1a8c85058b6d311cec549d942bc8b713870bce748599abad6c61adcd52e7c5029ec2740624c5fdd1890bb7dbdb
 MISC metadata.xml 703 BLAKE2B e15af6cc88087ba2f7ed109a13e31908ab529ad52755403b4272170e7d8a89330539f1b735b03624ec3b45a2ef5d5c4f37ebc1d6f279ed49f852edfa2ae1f2ae SHA512 81c2896d8a489001e0ceffc99e97d20da679aba2fe83f2bea94cc7ddcaa3c09a52bf0c2266d53440fc6cbcecaf607a2b89193f8aa76ec6d50746cb3ab6ced7cb
diff --git a/dev-libs/olm/files/olm-3.2.16-cmake.patch b/dev-libs/olm/files/olm-3.2.16-cmake.patch
new file mode 100644
index 000000000000..7a93eae9ffdb
--- /dev/null
+++ b/dev-libs/olm/files/olm-3.2.16-cmake.patch
@@ -0,0 +1,56 @@
+From 5567dc0ef9133df7cea5b9ae29c4fb642a8fbe83 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 8 Jun 2023 11:40:01 +0200
+Subject: [PATCH] Use CTest module and standard BUILD_TESTING switch
+
+Improves downstream package testing integration.
+
+See also:
+https://cmake.org/cmake/help/latest/command/enable_testing.html
+https://cmake.org/cmake/help/latest/module/CTest.html#module:CTest
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt       | 5 +++--
+ tests/CMakeLists.txt | 2 --
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 951965f..44b53c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.4)
+ 
+ project(olm VERSION 3.2.16 LANGUAGES CXX C)
+ 
+-option(OLM_TESTS "Build tests" ON)
+ option(BUILD_SHARED_LIBS "Build as a shared library" ON)
+ 
+ add_definitions(-DOLMLIB_VERSION_MAJOR=${PROJECT_VERSION_MAJOR})
+@@ -52,6 +51,8 @@ add_library(olm
+     lib/curve25519-donna/curve25519-donna.c)
+ add_library(Olm::Olm ALIAS olm)
+ 
++include(CTest)
++
+ # restrict the exported symbols
+ include(GenerateExportHeader)
+ generate_export_header(olm
+@@ -137,6 +138,6 @@ export(EXPORT olm-targets
+     NAMESPACE Olm::)
+ export(PACKAGE Olm)
+ 
+-if (OLM_TESTS)
++if (BUILD_TESTING)
+    add_subdirectory(tests)
+ endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 0343abb..64585ca 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-enable_testing()
+-
+ set(TEST_LIST
+     base64
+     crypto
diff --git a/dev-libs/olm/olm-3.2.16.ebuild b/dev-libs/olm/olm-3.2.16.ebuild
new file mode 100644
index 000000000000..8478830343a0
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
+SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # TODO: upstream
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}