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

3 files changed, 84 insertions, 0 deletions

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
+}