aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/olm/Manifest2
-rw-r--r--dev-libs/olm/olm-3.1.3.ebuild (renamed from dev-libs/olm/olm-3.1.2.ebuild)22
-rw-r--r--dev-libs/olm/olm-9999.ebuild22
3 files changed, 3 insertions, 43 deletions
diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 98c5c81..53af252 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1 +1 @@
-DIST olm-3.1.2.tar.bz2 460046 BLAKE2B e106b1104e2e2e33d4dac31fd8281330a478a8a324b4cfb1becb0710da98dd769a1f3a9949627c61ca4f26cc6aa306dd414d7243c5b3bc4c6fd256511aa47869 SHA512 3b2d18a36a3445e799adcda0fe026e22a05ad71ded29f27a6eb172d86e6914412b4745be5067e1818c8f2885e1715092101f4a7ab076d02f76c4b59302a5a910
+DIST olm-3.1.3.tar.bz2 460618 BLAKE2B ece774684f8ec97495ba2d66b1436f24e0770b39db4e45f54e00165addb9056405562079816542f6841045126e6377cb89a2d911dd89bc9a1cee634d8c1154bb SHA512 605a9793f8c968c6bbaae6de87f831b9c330810183a1b1b87227cbddc70ca796b869b9f800480035b0de458546b2fbcbaf4bc8e239a582fe261f13f845c9a750
diff --git a/dev-libs/olm/olm-3.1.2.ebuild b/dev-libs/olm/olm-3.1.3.ebuild
index 60b2739..a5f2355 100644
--- a/dev-libs/olm/olm-3.1.2.ebuild
+++ b/dev-libs/olm/olm-3.1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit cmake-utils
DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
HOMEPAGE="https://git.matrix.org/git/olm/about/"
@@ -19,23 +19,3 @@ fi
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1)"
IUSE="debug"
-
-src_prepare() {
- default
- sed \
- -e '/^LDFLAGS/d' \
- -e 's@-Wall -Werror@@' \
- -e "s@\$(PREFIX)/lib@\$(PREFIX)/$(get_libdir)@g" \
- -i Makefile || die
- if ! use debug ; then
- sed '/^all:/s@ debug@@' -i Makefile || die
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-}
diff --git a/dev-libs/olm/olm-9999.ebuild b/dev-libs/olm/olm-9999.ebuild
index 60b2739..a5f2355 100644
--- a/dev-libs/olm/olm-9999.ebuild
+++ b/dev-libs/olm/olm-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit cmake-utils
DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
HOMEPAGE="https://git.matrix.org/git/olm/about/"
@@ -19,23 +19,3 @@ fi
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1)"
IUSE="debug"
-
-src_prepare() {
- default
- sed \
- -e '/^LDFLAGS/d' \
- -e 's@-Wall -Werror@@' \
- -e "s@\$(PREFIX)/lib@\$(PREFIX)/$(get_libdir)@g" \
- -i Makefile || die
- if ! use debug ; then
- sed '/^all:/s@ debug@@' -i Makefile || die
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" AR="$(tc-getAR)"
-}
-
-src_install() {
- emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-}