gentoo auto-resync : 21:10:2024 - 04:04:33

4 files changed, 49 insertions, 2 deletions

diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 1eb3e32b03d6..c30893aa115a 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,7 +1,9 @@
 AUX olm-3.2.15-cmake.patch 1585 BLAKE2B 4de4f3e6e29792fc697f40dbc303ad630222491a4692a05a953b1db7518ae22a557acdc570e3f0bd3dc080bc46aae128ec380963ee5274506e446f678f26472b SHA512 025fd3dbc26d59d3b5db1ac3a77e72dee396acdf1b3c2ee2d3746a6b1e2cf2c6965083707d3fc7df88a6f0c62729601f5df7e262998c806d98d2159fd6dbbfb2
+AUX olm-3.2.16-clang-19-const.patch 501 BLAKE2B a0deafe652091a5600cb046f8bf4dd7a2431dace5779f4ede25f46b93e6db9b54ea4c189d6e7f531775b4e472fe5c31efc625a3c75d43639a3193c505d7ccdd5 SHA512 179ada66d4e2024f30aff1255b6da432c747c0bc743b01e6393fc67f3d18512c3dc1b9857c52f8571dc27288429b9b70420a783ea99cff5317a0e67c97ac3d2c
 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-r1.ebuild 649 BLAKE2B fa77431197c9ff4cc986b23d277e886b5041fe4dba2389d3db5d4297d8f4f1dce1bf8088e888eda7ff9498892041df62da4176e4317ab73a3b280d68e490b04f SHA512 2a69e314b58d84dda0cdff1aa9980e5b0905cde66c69edf375f9bc460ae9b651830d2d719c15b218d693b3be9e0c293ffd5bfd2fad0851c6f993a4f64214d4a1
 EBUILD olm-3.2.16.ebuild 604 BLAKE2B e5904cddaf06bd6f8b77f54e29dbafd7767d1620700c1a05016e15c412867049b32b8c752abddd663e71827d02f400912be0421861f71f2dbe510430ad1ee5a4 SHA512 f1b66e4f7cd86a6034f6ffd04fb9d384aba5f49089adf0cdc9b673aa02ecabce99b8beab4ac4a9d7f307ff5b9d5bd164f2478dadfe465b4ee10abbedbdf760be
-MISC metadata.xml 703 BLAKE2B e15af6cc88087ba2f7ed109a13e31908ab529ad52755403b4272170e7d8a89330539f1b735b03624ec3b45a2ef5d5c4f37ebc1d6f279ed49f852edfa2ae1f2ae SHA512 81c2896d8a489001e0ceffc99e97d20da679aba2fe83f2bea94cc7ddcaa3c09a52bf0c2266d53440fc6cbcecaf607a2b89193f8aa76ec6d50746cb3ab6ced7cb
+MISC metadata.xml 703 BLAKE2B da390f27931e3c95933b24227537294bd33def6b6736b87a6c1accaaa87d354496653ea9dbc08ec17566c99233c89a30a26c6696bd97f8c8e2613ee320705599 SHA512 01845e6fb0f46e1caf04a0bd6025ae339bdbf8bfdb750ded1031917c87f0b8cf220403f49bbfceffd08479bad2ceb1e26b2c81ecbee7d7ab75b35d2195f064be
diff --git a/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
new file mode 100644
index 000000000000..688e3290fb37
--- /dev/null
+++ b/dev-libs/olm/files/olm-3.2.16-clang-19-const.patch
@@ -0,0 +1,17 @@
+Fixes compilation on Clang 19.
+Patch by Marco Rebhan <me@dblsaiko.net>
+Fixes https://bugs.gentoo.org/940764
+
+Signed-off-by: Gavin D. Howard <gavin@gavinhoward.com>
+
+--- a/include/olm/list.hh
++++ b/include/olm/list.hh
+@@ -99,7 +99,7 @@ public:
+             return *this;
+         }
+         T * this_pos = _data;
+-        T * const other_pos = other._data;
++        T const * other_pos = other._data;
+         while (other_pos != other._end) {
+             *this_pos = *other;
+             ++this_pos;
diff --git a/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml
index e47db7bbc780..c2404edb3336 100644
--- a/dev-libs/olm/metadata.xml
+++ b/dev-libs/olm/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://gitlab.matrix.org/matrix-org/olm</bugs-to>
-		<remote-id type="gitlab">matrix-org/olm</remote-id>
+		<remote-id type="github">matrix-org/olm</remote-id>
 	</upstream>
 	<longdescription lang="en">
 		Official, audited implementation of the olm and megolm cryptographic
diff --git a/dev-libs/olm/olm-3.2.16-r1.ebuild b/dev-libs/olm/olm-3.2.16-r1.ebuild
new file mode 100644
index 000000000000..7a54cba592ae
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.16-r1.ebuild
@@ -0,0 +1,28 @@
+# 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
+	"${FILESDIR}/${P}-clang-19-const.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}