Merge my miscellaenous changes to master

Package-Manager: Portage-3.0.9, Repoman-3.0.2

dev-libs/olm/Manifest

@@ -1 +1,2 @@
 DIST olm-3.1.5.tar.bz2 461855 BLAKE2B 20412686ea1621de0d45885ae6f44331389cb401410809901187431eb101113f4186dc5b31c055da15143bec70f2251ee506e4fb50b0a8e495bdfa6cdb302b9e SHA512 a41be45e3fadb4e24654a4db8a68dab7fb8b021aeaf48b524d9c2c1e9d48e0b2200b9f1ac8431e79bc620560b16c66fb4c2d3727901b47b78288ea22b3f6ba02
+DIST olm-3.2.1.tar.bz2 462729 BLAKE2B 63d4c33eb79f4d0b4950ad8970d3e4a84d015193df72e4e88ad34d5d82e4c9d3c8677392ba2e12f8a80a67cff5c203b3116a0edf13798a7af3cc4fd8b6312e93 SHA512 adb9cff6148d19df4b83a287723219d4da9efd162f7a2824bee63d824d22c20a10fd2c2d8ce74aff5ec006c6dc8828bd6851cc82be93bc6c4524cf7067080412

dev-libs/olm/olm-3.2.1.ebuild

@@ -3,7 +3,10 @@
 
 EAPI=7
 
-inherit cmake
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
 
 DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
 HOMEPAGE="https://git.matrix.org/git/olm/about/"
@@ -18,3 +21,28 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1)"
+IUSE="python"
+
+DEPEND="
+	python? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+	)
+"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	cmake_src_prepare
+	use python && (cd python; distutils-r1_src_prepare)
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && (cd python; distutils-r1_src_compile)
+}
+
+src_install() {
+	cmake_src_install
+	use python && (cd python; distutils-r1_src_install)
+}

dev-libs/properties-cpp/properties-cpp-0_pre20180409.ebuild

@@ -20,19 +20,20 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="doc test"
+IUSE="doc"
 
 DEPEND="
 	doc? ( app-doc/doxygen )
-	test? ( dev-cpp/gtest )
 "
+#	test? ( dev-cpp/gtest )
+#"
 
 PATCHES=( "${FILESDIR}/optional_tests.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		-DPROPERTIES_CPP_ENABLE_DOC_GENERATION=$(usex doc)
-		-DPROPERTIES_CPP_BUILD_TESTS=$(usex test)
+		-DPROPERTIES_CPP_BUILD_TESTS=OFF
 	)
 	cmake_src_configure
 }

dev-libs/properties-cpp/properties-cpp-9999.ebuild

@@ -14,6 +14,8 @@ if [[ "${PV}" == 9999 ]]; then
 else
 	COMMIT="45863e849b39c4921d6553e6d27e267a96ac7d77" # 9.4.2018
 	SRC_URI="https://github.com/lib-cpp/properties-cpp/archive/"${COMMIT}".tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="LGPL-3"
@@ -24,13 +26,14 @@ DEPEND="
 	doc? ( app-doc/doxygen )
 "
 #	test? ( dev-cpp/gtest )
+#"
 
-#PATCHES=( "${FILESDIR}/optional_tests.patch" )
+PATCHES=( "${FILESDIR}/optional_tests.patch" )
 
 src_configure() {
 	local mycmakeargs=(
 		-DPROPERTIES_CPP_ENABLE_DOC_GENERATION=$(usex doc)
-#		-DPROPERTIES_CPP_BUILD_TESTS=$(usex test)
+		-DPROPERTIES_CPP_BUILD_TESTS=OFF
 	)
 	cmake_src_configure
 }

dev-python/matrix-nio/Manifest

@@ -1 +1,2 @@
 DIST matrix-nio-0.15.1.tar.gz 227809 BLAKE2B a026cb421d09ccd0949382024587a196999d09733bd76fa1a79c7423e1543b2e42209ebb39c08a227e0c7d3821ee2e2cf17253aceaa36e7be0540c0455032474 SHA512 0bcc0321e1e679e02257062ae3390a677bf5d23bf8b8ddb967037aea4120c80ed5ea37060b574e7d830b467f2b581864331db393ff4977df6fc865863f8dbd67
+DIST matrix-nio-0.15.2.tar.gz 227937 BLAKE2B 97f45be4c6449e3e9e0e64e41502e8d8fe2170e86a37ea1e0a19accab82e7979d3c92a2633652e01ae288c116894d16699ac9c77607b930da2fb5d2b714a079a SHA512 2805ac328425b5686320da969838d865d6ab17ede59b372ff9c04923ac246aa86a552e480b305c4769524f599393d6cc4a7ff75bae250d3cfebff8b8b9ed710e

dev-python/matrix-nio/matrix-nio-0.15.2.ebuild

@@ -0,0 +1,35 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9})
+inherit distutils-r1
+
+DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
+HOMEPAGE="https://github.com/poljar/matrix-nio"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="e2e"
+
+RDEPEND="
+	dev-python/future
+	dev-python/aiohttp
+	dev-python/aiofiles
+	python_targets_python3_6? ( dev-python/dataclasses )
+	dev-python/h11
+	dev-python/hyper-h2
+	dev-python/logbook
+	dev-python/jsonschema
+	dev-python/unpaddedbase64
+	dev-python/pycryptodome
+	e2e? (
+		>=dev-libs/olm-3.1.5[python(-)]
+		>=dev-python/peewee-3.9.5
+		dev-python/cachetools
+		dev-python/atomicwrites
+	)
+"

dev-python/plyer/Manifest

@@ -1 +1,2 @@
 DIST plyer-1.4.3.tar.gz 281968 BLAKE2B a779eca05ace3cc0bd1809a11b04fe9abfbb91449e875fb2e70e7c80cc3a8a925884578305c5d2f020c02e0b8c42df4d93317abf04e2494bfacf19d12e2e56dc SHA512 4d7bff97714d4222ed0e786e182a8b2e234c978dcc51650fbf5070986c305fb5b076fc127f2bfa24f22b2518f4151b5b70991ebd84007e15d9545ddc40a0e955
+DIST plyer-2.0.0.tar.gz 279943 BLAKE2B 84902f008d4584842b1fa1650a7a0cd3bbd1ca1adede330fcd6db9058b677e310417c9b4d44e0724cf03a88469b33c46dc18662e123a1aebf0b8943e6eb6816c SHA512 890878c99acf04027de3dcac3380adc923dae86029f1e78b4186fb02030a50f3538cf5ccbe5ad9c130502f8ca2915e86d08927ab89077bcb255da2b402c39e11

dev-python/plyer/plyer-2.0.0.ebuild

@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6..9})
+inherit distutils-r1
+
+DESCRIPTION="Plyer is a platform-independent Python wrapper for platform-dependent APIs"
+HOMEPAGE="https://github.com/kivy/plyer"
+SRC_URI="https://github.com/kivy/plyer/archive/"${PV}".tar.gz -> "${PF}".tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"