Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!35

dev-libs/libQuotient/Manifest

@@ -1 +1,2 @@
 DIST libQuotient-0.6_beta1.tar.gz 549192 BLAKE2B e91e08bb2cfe8b369d79ae9d4514c15097042d74510d8d7428c25c12b635974fb637a126e4d87f34f9913f7d65ea14c5b83a5ebc2ed57039dc9fb884112e03bc SHA512 255560ee9a827ce140291859c9a7d11c718094b38a06e4555539aeda055daacd6a354e6685d67991fbbf2b407ab92b12986b854c27b81cfddb7b9b26c0e80e04
+DIST libQuotient-0.6_beta2.tar.gz 550380 BLAKE2B fd53fbc8ed4f2cff7d468e14dd2d2ee011b526f99fa5af499a3c2bb4d8ba2dfa07ffc83f0be80a747651c0f805c9e6802c3bc371e28804bea16d257890e942d0 SHA512 2261efcfec77cd478f5a50be88cdb4be506e2ae4f95970ed578258fe59b5033bebb570a25cd5a8b84631be3aa49f2d9a5abc3a0f058b6e159438c06163730d8e

dev-libs/libQuotient/libQuotient-0.6_beta2.ebuild

@@ -0,0 +1,40 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
+HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
+
+inherit eutils cmake
+
+MY_PV="$(ver_rs 2 '-')"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
+else
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtcore
+	dev-qt/qtmultimedia
+	!!dev-libs/libqmatrixclient
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+}

dev-libs/olm/Manifest

@@ -1 +1,2 @@
 DIST olm-3.1.4.tar.bz2 461540 BLAKE2B fa69b1543330c5da37c04227b51197ba57968ef24def40df621b85c0988eac91f8a155f600ab26849f2cd213059c97c7035be6dcca0943245cd4e4895da314b3 SHA512 87265d835ca7332d162bd3573dffdd09c8337c464dd673f100db9193e8ea4cedd8cb2a92cf2c34ad1b552a55bbbce8f87a47559ccfba03fa69b32fc7ff07f5f0
+DIST olm-3.1.5.tar.bz2 461855 BLAKE2B 20412686ea1621de0d45885ae6f44331389cb401410809901187431eb101113f4186dc5b31c055da15143bec70f2251ee506e4fb50b0a8e495bdfa6cdb302b9e SHA512 a41be45e3fadb4e24654a4db8a68dab7fb8b021aeaf48b524d9c2c1e9d48e0b2200b9f1ac8431e79bc620560b16c66fb4c2d3727901b47b78288ea22b3f6ba02

dev-libs/olm/olm-3.1.5.ebuild

@@ -0,0 +1,21 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://git.matrix.org/git/olm/about/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
+else
+	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1)"
+IUSE=""

net-im/spectral/spectral-854.ebuild

@@ -32,7 +32,7 @@ RDEPEND="
 	dev-qt/qtmultimedia[qml]
 	dev-qt/qtwidgets
 	>=dev-qt/qtquickcontrols2-5.12
-	>=dev-libs/libQuotient-0.6_beta1
+	=dev-libs/libQuotient-0.6_beta1
 	dev-libs/libQtOlm
 	dev-libs/qtkeychain
 	|| ( media-fonts/roboto media-fonts/noto )

sys-kernel/ck-sources/Manifest

@@ -13,9 +13,6 @@ DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457
 DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
 DIST genpatches-5.7-6.experimental.tar.xz 13692 BLAKE2B e49fca2f4419aa0923f33ba38daab49faf105ef03849bfc59dc9efecc980aaf3ccb0e34a7755149b1e4841b884494b146659df49f44f5e2913973d4ada9d5e63 SHA512 f83f8485d4e3f2c0bc5faf6c59db6745e287db7f3eeb4d1db7a8c92b7492d9d1678069c67e89fec2ac63f831a8419855caf70f9e71efb7ebfa7c0e1461e37ab3
 DIST genpatches-5.7-6.extras.tar.xz 1764 BLAKE2B db13c787489b7b21d9848cbd0079683bc5a93a9ff4df09901bb00cf275183f0a367999fd9416ec97d36cbad6351b119bf6fb347f2fb645d4e515f3e6548e9f96 SHA512 acc190f9c6efe34f5b29a86d787ec047bf8df1d8b7c726fb79279f77b2cdb7a0bc777f353c9ecadec7414797f15562c36734a69e6bb2d4a5f05acddb659c4d12
-DIST genpatches-5.7-7.base.tar.xz 322208 BLAKE2B 832e79c3aa2a044993ba2b0f75e844e5da0adf0b290e4c1e1883a382b94ee5ac882cb2b0db585bbb2ba133b5dbb908b6c02a29ea4384a2166146448d2e8eef15 SHA512 4321746f6acccc17d84ace29db9214528752eb7230265cb296b957797656a9bb65dc47529b0d2d3c8faada1f0866fe3e4fed79bd57d7154cf817183aa6db0e0c
-DIST genpatches-5.7-7.experimental.tar.xz 13700 BLAKE2B 3af6ae0514af32f5c881d67206085da436f4445f436c5caac0b7e3548553aa1da9843d1975a87d5256cd6a9b7ea44030ca1757621aee7f44ee328eaf138b9a90 SHA512 ce4b739c2713c3c244466b20f7225c89eb7dcae00454368828c90f460c953a0abaf25f14dd2ba6a6107bca8ba0c1cec4b9ad545ecf931517b2d67908fbe103c4
-DIST genpatches-5.7-7.extras.tar.xz 1764 BLAKE2B 01efd460c869218bda48f2b7b270d67e4da47b6ada6af38301495bfb960c64049898a8705146d40f6baf9d4782cea3e3be6aeb55a265ef5ce2b7616a8c7be657 SHA512 4fb0a24a6cbbb05cbb0c81daba926c6b71b01821f8cf60fb81fb57b5130783c99ff726e93b7a7a265ecfe1194a353189e790a5d17b8d86cd38441a1af2c3c74e
 DIST linux-5.6.tar.xz 111785252 BLAKE2B 8dbe02a8ca7fd3dcf512a15c5d8098c1e7f94257e65173fed43fcc45480e4ab790df8cd39bbbb4e2a21dc9a00385bc9bbe98215a31e7f7e1d9c8f21cd8ace69e SHA512 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST patch-5.6-ck1.xz 91240 BLAKE2B 20dba509c16cf41226414c2e70e2a3434573638bf93ce25786c2cd4663c98bfa04845cda780c750afbfa26918cffa394d905d16bd687d6145acb8dbd2489fdd0 SHA512 6c66592966e3a7799daa015352c6d906160a0f4d743952a299b83ba826c2a9a901a39ee289e99434128f0a21161cbb1af7b96a4079456d1ba2fd30db214e9068