diff --git a/dev-libs/olm/olm-3.2.14-r1.ebuild b/dev-libs/olm/olm-3.2.14-r1.ebuild deleted file mode 100644 index 19d31a4..0000000 --- a/dev-libs/olm/olm-3.2.14-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -KEYWORDS="~amd64 ~arm64" - -IUSE="doc test" -RESTRICT="!test? ( test )" - -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.13.ebuild b/dev-libs/olm/olm-3.2.14-r2.ebuild old mode 100755 new mode 100644 similarity index 60% rename from dev-libs/olm/olm-3.2.13.ebuild rename to dev-libs/olm/olm-3.2.14-r2.ebuild index 19d31a4..1f35b71 --- a/dev-libs/olm/olm-3.2.13.ebuild +++ b/dev-libs/olm/olm-3.2.14-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,23 +13,21 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64" -IUSE="doc test" +IUSE="+pie test" RESTRICT="!test? ( test )" +DOCS=( README.md docs/{{,meg}olm,signing}.md docs/{"DH ",double_}ratchet.svg ) + src_configure() { - local -a mycmakeargs=( - -DOLM_TESTS="$(usex test)" + local mycmakeargs=( + -DCMAKE_POSITION_INDEPENDENT_CODE=$(usex pie) + -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 + local -x BUILD_DIR="${BUILD_DIR}/tests" + cmake_src_test }