[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2024-03-03 Thread Sam James 
commit: d275800246740d03ba99ffae641454d31f7aef89
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 22:12:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 22:12:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2758002

dev-libs/olm: Stabilize 3.2.16 amd64, #926043

Signed-off-by: Sam James  gentoo.org>

 dev-libs/olm/olm-3.2.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.16.ebuild b/dev-libs/olm/olm-3.2.16.ebuild
index 45c0b02fa849..b037e5f4ebff 100644
--- a/dev-libs/olm/olm-3.2.16.ebuild
+++ b/dev-libs/olm/olm-3.2.16.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2024-03-03 Thread Sam James 
commit: c13cce3225e065dbc1687ef7bd79445f787b1d8e
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 22:12:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 22:12:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13cce32

dev-libs/olm: Stabilize 3.2.16 arm64, #926043

Signed-off-by: Sam James  gentoo.org>

 dev-libs/olm/olm-3.2.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.16.ebuild b/dev-libs/olm/olm-3.2.16.ebuild
index 8478830343a0..e71d25eb1fbc 100644
--- a/dev-libs/olm/olm-3.2.16.ebuild
+++ b/dev-libs/olm/olm-3.2.16.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2024-03-03 Thread Sam James 
commit: 0424cadc26842246a19311fd6b4519a3647ffd64
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar  3 22:12:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar  3 22:12:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0424cadc

dev-libs/olm: Stabilize 3.2.16 x86, #926043

Signed-off-by: Sam James  gentoo.org>

 dev-libs/olm/olm-3.2.16.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.16.ebuild b/dev-libs/olm/olm-3.2.16.ebuild
index e71d25eb1fbc..45c0b02fa849 100644
--- a/dev-libs/olm/olm-3.2.16.ebuild
+++ b/dev-libs/olm/olm-3.2.16.ebuild
@@ -11,7 +11,7 @@ 
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"
+KEYWORDS="~amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/, dev-libs/olm/files/

2024-01-27 Thread Joonas Niilola 
commit: c217ad652278cc077107d0e79b09b1247f8e3c62
Author: Gavin D. Howard  gavinhoward  com>
AuthorDate: Sat Nov 25 17:44:52 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan 27 09:16:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c217ad65

dev-libs/olm: add 3.2.16

Signed-off-by: Gavin D. Howard  gavinhoward.com>
Closes: https://github.com/gentoo/gentoo/pull/33983
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/olm/Manifest |  1 +
 dev-libs/olm/files/olm-3.2.16-cmake.patch | 56 +++
 dev-libs/olm/olm-3.2.16.ebuild| 25 ++
 3 files changed, 82 insertions(+)

diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 75abd2e0c681..f5e4eb869158 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1 +1,2 @@
 DIST olm-3.2.15.tar.bz2 2744760 BLAKE2B 
44486a63217998010a0bb7e01ff3315c88e139d686b97158e67af29b2f052912412541fb944a17c5d8931df9c641a73e521ef8d0ff352b80fe30bd6fb73b2e7b
 SHA512 
81832766e477fc17908e8d1c49b5403d87b5977fd9102605d95ef2a3907619b7301e32fe0e18ec0f575b1f004ce248633307ff43b0f48bc9bb2313cdfefd6ea7
+DIST olm-3.2.16.tar.bz2 2744360 BLAKE2B 
236cd08cb4f014ef4f90377fe30907490dbf6482629ab47a779114c711de1855c44874a45ee92f4f55d7c100abbbde2c427996ce534dd95ce401a7549db351b7
 SHA512 
504ddc91297e7aef99e9b25f73b33bac29716ca33eb333bf1217b719d8862438e2cdaadd88cef3dc84e9f618bcc9eeeaf7e513f2d6909cc4a3d98a5dd79b0581

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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2023-06-08 Thread Arthur Zamarin 
commit: 6e77fa1ac61abf580bd0a5e3aac572d50c295446
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 18:32:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 18:32:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e77fa1a

dev-libs/olm: Keyword 3.2.15 ppc64, #908069

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/olm/olm-3.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.15.ebuild b/dev-libs/olm/olm-3.2.15.ebuild
index e14e9f557e6c..760b1ef928c2 100644
--- a/dev-libs/olm/olm-3.2.15.ebuild
+++ b/dev-libs/olm/olm-3.2.15.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2023-06-08 Thread Arthur Zamarin 
commit: d2b0e1e6ae57c27d6a0dd9eac0f316d80206d8e0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 16:36:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 16:36:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b0e1e6

dev-libs/olm: Keyword 3.2.15 arm64, #908069

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/olm/olm-3.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.15.ebuild b/dev-libs/olm/olm-3.2.15.ebuild
index 5c92e33525bd..e14e9f557e6c 100644
--- a/dev-libs/olm/olm-3.2.15.ebuild
+++ b/dev-libs/olm/olm-3.2.15.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2023-06-08 Thread Arthur Zamarin 
commit: 10d7700257beb2413fa8fd1c7fe0a81121ac
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Jun  8 16:36:36 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Jun  8 16:36:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d77002

dev-libs/olm: Keyword 3.2.15 x86, #908069

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/olm/olm-3.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.15.ebuild b/dev-libs/olm/olm-3.2.15.ebuild
index 1146f6c87aa9..5c92e33525bd 100644
--- a/dev-libs/olm/olm-3.2.15.ebuild
+++ b/dev-libs/olm/olm-3.2.15.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/olm/

2023-06-08 Thread Andreas Sturmlechner 
commit: d173640bb5db78a75833f7c5b826d1926fc179aa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  8 13:35:56 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  8 14:05:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d173640b

dev-libs/olm: fix LICENSE

See also: https://github.com/gentoo/gentoo/pull/31113

Closes: https://bugs.gentoo.org/908066
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-libs/olm/olm-3.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/olm/olm-3.2.15.ebuild b/dev-libs/olm/olm-3.2.15.ebuild
index 51730d54f75a..1146f6c87aa9 100644
--- a/dev-libs/olm/olm-3.2.15.ebuild
+++ b/dev-libs/olm/olm-3.2.15.ebuild
@@ -9,7 +9,7 @@ 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="GPL-3"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"