aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Strogin <stefan.strogin@gmail.com>2018-10-09 20:28:22 +0300
committerStefan Strogin <stefan.strogin@gmail.com>2018-10-09 20:28:35 +0300
commit4cdb9b349046c6219f8533837f131c1d6f0e1ddc (patch)
treed4d34328fcbb86cb3adf64502757a3499b564bbe
parentClean up nheko ebuilds (diff)
downloadmatrix-4cdb9b349046c6219f8533837f131c1d6f0e1ddc.tar.gz
matrix-4cdb9b349046c6219f8533837f131c1d6f0e1ddc.tar.bz2
matrix-4cdb9b349046c6219f8533837f131c1d6f0e1ddc.zip
x11-plugins/purple-matrix: update condition for USE=olm
Since https://github.com/matrix-org/purple-matrix/issues/83 is fixed, purple-matrix is linked against libgcrypt correctly with USE=olm. Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
-rw-r--r--x11-plugins/purple-matrix/Manifest2
-rw-r--r--x11-plugins/purple-matrix/purple-matrix-9999.ebuild9
2 files changed, 3 insertions, 8 deletions
diff --git a/x11-plugins/purple-matrix/Manifest b/x11-plugins/purple-matrix/Manifest
index 701d13d..4189645 100644
--- a/x11-plugins/purple-matrix/Manifest
+++ b/x11-plugins/purple-matrix/Manifest
@@ -1,2 +1,2 @@
-EBUILD purple-matrix-9999.ebuild 744 BLAKE2B 18e890311cb0cded80d3155bd77782ad0fbd1c6fd1d82a8051ba97c5994581ea9738658582c58eb290c7202cc7e1805128feee13c57777b5165ed8efb96b0cb7 SHA512 33bd1f578f489f3cb8df81c5e60167c5ece76fadd420c753979c2f6234f455d4c7aacd1736178f16509b9d9a8b1825f088b65e84b22175cbe44032e81205f4ef
+EBUILD purple-matrix-9999.ebuild 599 BLAKE2B 11b83819f4acbbd8a7ab089bcd4e0119a9c5dad7a88f707fa05c57b86713716e8436c4eaa08dfdc5eba1e4cd6bd0ec324d442a73b571e9a96e2c7ccb4ba3fac9 SHA512 87a3a4becc0701c2702d7218fa00a523d497b40f972cb300c77a8b124b9f691d8bc6a18474b455554fc24e07e20cdd117d1503c79ad0f8115aab3cca148a9f2c
MISC metadata.xml 453 BLAKE2B 483362cd715c01e4131580b3f9b78c1ea8f652b9ab7dd78cf313a2bbb5883bf53f8f5e51b987417db7d53a5d2d33c700f323f1302bdc8c29562aed7de0155de9 SHA512 ef7312b9e8705ee3180eef2ac66d86a3d658afadd4796552772c562a2d38ef5f4fbbb30a2a448e1b6221a02b14c4f50887de9ce46adbfc4c8af5c3e238986706
diff --git a/x11-plugins/purple-matrix/purple-matrix-9999.ebuild b/x11-plugins/purple-matrix/purple-matrix-9999.ebuild
index 7331bc2..08c591f 100644
--- a/x11-plugins/purple-matrix/purple-matrix-9999.ebuild
+++ b/x11-plugins/purple-matrix/purple-matrix-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,11 +26,6 @@ RDEPEND="net-im/pidgin
DEPEND="${RDEPEND}"
src_compile() {
- if use !olm; then
- export MATRIX_NO_E2E=1
- else
- # See https://github.com/matrix-org/purple-matrix/issues/83
- sed -i -e '/^LDLIBS+=-lolm/s/$/ -lgcrypt/' Makefile || die
- fi
+ use olm || export MATRIX_NO_E2E=1
emake || die "Make failed!"
}