diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest index 25d428e..ae13f16 100644 --- a/dev-libs/olm/Manifest +++ b/dev-libs/olm/Manifest @@ -1 +1 @@ -DIST olm-3.2.3.tar.bz2 478365 BLAKE2B d8b5069e07958a4fe12a0aeea2ba25a7b7c319c96c980abd78f78881489e68d400594a0076ecf345561364c657eb9faf54819043ca9b51af01633d8e21edf069 SHA512 b01b5bb41d828e15520a1054cd9a479ff5d464552bc379269b9bf12fd54929d2e4cd31a46c0ea07a26ead7410e50caf80d3711912131147794d88d96947ffe59 +DIST olm-3.2.6.tar.bz2 485416 BLAKE2B 414e636a1bd32ff7698f3db7748a77aaa2449d260c79f3dcb64db6c509e4f972e4098e439838eb876bc7b738d25a5c704fed94edc9ca41f2c036c3d1438934f0 SHA512 e22af4e7791962978ea4c39b9bebf807a864ca52b329f032e5e398864cd142c1f166aadbce74cb85f776cb0b8352754151f64c60dac2ce1858def73d684fd44a diff --git a/dev-libs/olm/olm-3.2.3.ebuild b/dev-libs/olm/olm-3.2.3.ebuild deleted file mode 100644 index 2fbd026..0000000 --- a/dev-libs/olm/olm-3.2.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets" -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" -IUSE="doc test" -KEYWORDS="~amd64" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="${RDEPEND}" - -src_configure() { - local -a mycmakeargs=( - -DOLM_TESTS="$(usex test)" - ) - - cmake_src_configure -} - -src_test() { - BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test -} - -src_install() { - use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md ) - - cmake_src_install -} diff --git a/dev-libs/olm/olm-3.2.6.ebuild b/dev-libs/olm/olm-3.2.6.ebuild new file mode 100644 index 0000000..0431688 --- /dev/null +++ b/dev-libs/olm/olm-3.2.6.ebuild @@ -0,0 +1,75 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{9..10} ) + +inherit cmake distutils-r1 + +DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets" +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" +IUSE="doc python test" +KEYWORDS="~amd64" +RESTRICT="!test? ( test )" + +RDEPEND="" +DEPEND=" + ${RDEPEND} + python? ( dev-python/cffi[${PYTHON_USEDEP}] ) +" + +src_prepare() { + default + + cmake_src_prepare + + if use python; then + pushd "${S}/python" > /dev/null || die + distutils-r1_src_prepare + popd > /dev/null || die + fi +} + +src_configure() { + local -a mycmakeargs=( + -DOLM_TESTS="$(usex test)" + ) + cmake_src_configure + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_configure + popd > /dev/null || die + fi +} + +src_compile(){ + cmake_src_compile + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi +} + +src_install() { + use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md ) + + cmake_src_install + + if use python; then + pushd python > /dev/null || die + distutils-r1_src_install + popd > /dev/null || die + fi +} + +src_test() { + BUILD_DIR="${BUILD_DIR}/tests" cmake_src_testwa +}