From ada51f4b543568c09458d2cef4106e1824c3498c Mon Sep 17 00:00:00 2001
From: Alfred Wingate <parona@protonmail.com>
Date: Sun, 28 Feb 2021 17:15:03 +0200
Subject: [PATCH] dev-libs/olm: bump to 3.2.2, remove 3.1.5-r1

---
 dev-libs/olm/Manifest                           |  2 +-
 dev-libs/olm/files/olmlib.patch                 | 12 ------------
 .../{olm-3.1.5-r1.ebuild => olm-3.2.2.ebuild}   | 17 ++++++++++++++---
 3 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 dev-libs/olm/files/olmlib.patch
 rename dev-libs/olm/{olm-3.1.5-r1.ebuild => olm-3.2.2.ebuild} (82%)

diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 6f8238b..3e9ae61 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,2 +1,2 @@
-DIST olm-3.1.5.tar.bz2 461855 BLAKE2B 20412686ea1621de0d45885ae6f44331389cb401410809901187431eb101113f4186dc5b31c055da15143bec70f2251ee506e4fb50b0a8e495bdfa6cdb302b9e SHA512 a41be45e3fadb4e24654a4db8a68dab7fb8b021aeaf48b524d9c2c1e9d48e0b2200b9f1ac8431e79bc620560b16c66fb4c2d3727901b47b78288ea22b3f6ba02
 DIST olm-3.2.1.tar.bz2 462729 BLAKE2B 63d4c33eb79f4d0b4950ad8970d3e4a84d015193df72e4e88ad34d5d82e4c9d3c8677392ba2e12f8a80a67cff5c203b3116a0edf13798a7af3cc4fd8b6312e93 SHA512 adb9cff6148d19df4b83a287723219d4da9efd162f7a2824bee63d824d22c20a10fd2c2d8ce74aff5ec006c6dc8828bd6851cc82be93bc6c4524cf7067080412
+DIST olm-3.2.2.tar.bz2 475682 BLAKE2B f6588281ef236c36c4a678eb02250e6b0d496719dc8736b1bdcbc346a16c3b579d988d6cbe99749473e53bbc03830e90c666ced112cd5a85b63f7ebe0704b6cb SHA512 a541299f2fbdaa2be5698a690cd753142311a3206011d70186e1122d575478f91e7feba207fe5d09ce506330dd1f9fbb71dccb3de7014c5333427fdd3b77b668
diff --git a/dev-libs/olm/files/olmlib.patch b/dev-libs/olm/files/olmlib.patch
deleted file mode 100644
index e18e7a2..0000000
--- a/dev-libs/olm/files/olmlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/python/olm_build.py b/python/olm_build.py
-index 0606337..1032da0 100644
---- a/python/olm_build.py
-+++ b/python/olm_build.py
-@@ -46,6 +46,7 @@ ffibuilder.set_source(
-         #include <olm/sas.h>
-     """,
-     libraries=["olm"],
-+    library_dirs = ["../lib64"],
-     extra_compile_args=compile_args,
-     extra_link_args=link_args)
- 
diff --git a/dev-libs/olm/olm-3.1.5-r1.ebuild b/dev-libs/olm/olm-3.2.2.ebuild
similarity index 82%
rename from dev-libs/olm/olm-3.1.5-r1.ebuild
rename to dev-libs/olm/olm-3.2.2.ebuild
index 6406fc8..d58a6d9 100644
--- a/dev-libs/olm/olm-3.1.5-r1.ebuild
+++ b/dev-libs/olm/olm-3.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_OPTIONAL=1
 
 inherit cmake distutils-r1
@@ -32,13 +32,20 @@ DEPEND="
 
 CMAKE_IN_SOURCE_BUILD=1
 
-PATCHES=( "${FILESDIR}/olmlib.patch" )
-
 src_prepare() {
 	cmake_src_prepare
 	use python && (cd python; distutils-r1_src_prepare)
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DOLM_TESTS=OFF
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+	use python && (cd python; distutils-r1_src_configure)
+}
+
 src_compile() {
 	cmake_src_compile
 	export LIBRARY_PATH="${S}/$(get_libdir)/" # Let python build find the already built libolm
@@ -49,3 +56,7 @@ src_install() {
 	cmake_src_install
 	use python && (cd python; distutils-r1_src_install)
 }
+
+src_test(){
+	emake test
+}