From 8aac8b2006b6bf1c27463fea60f637445d46d450 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Tue, 29 Dec 2020 22:18:42 +0200 Subject: [PATCH] dev-libs/olm: fix license, modify metadata and add tests Package-Manager: Portage-3.0.9, Repoman-3.0.2 --- dev-libs/olm/metadata.xml | 19 +++++++++++-------- dev-libs/olm/olm-3.1.5-r1.ebuild | 2 +- dev-libs/olm/olm-3.2.1.ebuild | 15 ++++++++++++++- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml index 6160564..905801e 100644 --- a/dev-libs/olm/metadata.xml +++ b/dev-libs/olm/metadata.xml @@ -1,12 +1,15 @@ - - parona@protonmail.com - Alfred Wingate - - - hedmoo@yahoo.com - Andreas Westman Dorcsak - + + parona@protonmail.com + Alfred Wingate + + + hedmoo@yahoo.com + Andreas Westman Dorcsak + + + matrix-org/olm + diff --git a/dev-libs/olm/olm-3.1.5-r1.ebuild b/dev-libs/olm/olm-3.1.5-r1.ebuild index f1440cd..2daa1e9 100644 --- a/dev-libs/olm/olm-3.1.5-r1.ebuild +++ b/dev-libs/olm/olm-3.1.5-r1.ebuild @@ -19,7 +19,7 @@ else KEYWORDS="~amd64" fi -LICENSE="GPL-3" +LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" IUSE="python" diff --git a/dev-libs/olm/olm-3.2.1.ebuild b/dev-libs/olm/olm-3.2.1.ebuild index ebd3c87..7ff8dc0 100644 --- a/dev-libs/olm/olm-3.2.1.ebuild +++ b/dev-libs/olm/olm-3.2.1.ebuild @@ -19,7 +19,7 @@ else KEYWORDS="~amd64" fi -LICENSE="GPL-3" +LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1)" IUSE="python" @@ -37,6 +37,15 @@ 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 use python && (cd python; distutils-r1_src_compile) @@ -46,3 +55,7 @@ src_install() { cmake_src_install use python && (cd python; distutils-r1_src_install) } + +src_test(){ + emake test +}