Merge miscellanous changes to ebuilds

Package-Manager: Portage-3.0.9, Repoman-3.0.2

dev-cpp/properties-cpp/files/FindGtest.cmake

@@ -0,0 +1,17 @@
+include(FindPackageHandleStandardArgs)
+
+find_path(GTEST_INCLUDE_DIR gtest/gtest.h)
+find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
+
+find_library(GMOCK_LIBRARY libgmock.so)
+find_library(GMOCK_MAIN_LIBRARY libgmock_main.so)
+find_library(GTEST_LIBRARY libgtest.so)
+find_library(GTEST_MAIN_LIBRARY libgtest_main.so)
+
+set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
+set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
+
+find_package_handle_standard_args(Gtest  DEFAULT_MSG
+                                    GMOCK_INCLUDE_DIR
+                                    GTEST_INCLUDE_DIR)

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

@@ -20,20 +20,25 @@ fi
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
 
 DEPEND="
 	doc? ( app-doc/doxygen )
+	test? ( dev-cpp/gtest )
 "
-#	test? ( dev-cpp/gtest )
-#"
 
 PATCHES=( "${FILESDIR}/optional_tests.patch" )
 
+src_prepare() {
+	# Provided FindGtest tries (and fails) to build its own version of gtest rather than actually search for it on the system
+	cp "${FILESDIR}"/FindGtest.cmake cmake/FindGtest.cmake || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DPROPERTIES_CPP_ENABLE_DOC_GENERATION=$(usex doc)
-		-DPROPERTIES_CPP_BUILD_TESTS=OFF
+		-DPROPERTIES_CPP_BUILD_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }

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

@@ -24,16 +24,18 @@ IUSE="doc"
 
 DEPEND="
 	doc? ( app-doc/doxygen )
+	dev-cpp/gtest
 "
-#	test? ( dev-cpp/gtest )
-#"
 
-PATCHES=( "${FILESDIR}/optional_tests.patch" )
+src_prepare() {
+	# Provided FindGtest tries (and fails) to build its own version of gtest rather than actually search for it on the system
+	cp "${FILESDIR}"/FindGtest.cmake cmake/FindGtest.cmake || die
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DPROPERTIES_CPP_ENABLE_DOC_GENERATION=$(usex doc)
-		-DPROPERTIES_CPP_BUILD_TESTS=OFF
 	)
 	cmake_src_configure
 }

dev-libs/libQuotient/Manifest

@@ -1,2 +1,2 @@
-DIST libQuotient-0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
 DIST libQuotient-0.6.1.tar.gz 557477 BLAKE2B f0e90c0bbf2eccc93cbb9a4598368929ebe2e03aea9db3b4ea1782e41cd96ae9812b649c3d2f3f3e62f09d7266dd4c27c24d87163c0ae05c0d122e734e6f59e2 SHA512 17f6bac381d62e3975d6099a92a80c6855ba078947f9855960e7c963c05e094127eb926e922868456eb0694bd5eb1f4294bb12bfdea73db1724313359a330e2e
+DIST libQuotient-0.6.3.tar.gz 559142 BLAKE2B 77ba0583a90e9d29d44ce9a70909d6b51462a1f16dbc2e9d321eb9d638329af41fe7b0c4f7569e5d46f3a9c12d32b1ef0b926c5e285bc3ed9b70ba6d4dbe8024 SHA512 a81d88b00edc2af8ad9a6a297f1d65ef5d96fb305f503b46f29381df1bb007b42e44b207fb649316c38c977a5b03c93f884407dccdc48ab066af6b004dd9a9d6

dev-libs/libQuotient/libQuotient-0.6.3.ebuild

@@ -3,11 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
-HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
-
 inherit cmake
 
+DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
+HOMEPAGE="https://matrix.org/docs/projects/sdk/quotient"
+
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
@@ -18,20 +18,27 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
+IUSE="e2e extra"
 
-RDEPEND=""
+RDEPEND="
-DEPEND="
-	${RDEPEND}
 	dev-qt/qtcore
+	dev-qt/qtgui
 	dev-qt/qtmultimedia
+	dev-qt/qtnetwork
+	dev-qt/qttest
+	e2e? ( dev-libs/libQtOlm )
 	!!dev-libs/libqmatrixclient
 "
+DEPEND="${RDEPEND}"
 
 S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
+		-DQuotient_ENABLE_E2EE=$(usex e2e)
+		-DUSE_INTREE_LIBQOLM=OFF
+		-DQuotient_INSTALL_TESTS=$(usex extra)
 	)
 	cmake_src_configure
 }

dev-libs/libQuotient/libQuotient-9999.ebuild

@@ -3,11 +3,11 @@
 
 EAPI=7
 
-DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
-HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
-
 inherit cmake
 
+DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
+HOMEPAGE="https://matrix.org/docs/projects/sdk/quotient"
+
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quotient-im/"${PN}".git"
@@ -18,20 +18,27 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
+IUSE="e2e extra"
 
-RDEPEND=""
+RDEPEND="
-DEPEND="
-	${RDEPEND}
 	dev-qt/qtcore
+	dev-qt/qtgui
 	dev-qt/qtmultimedia
+	dev-qt/qtnetwork
+	dev-qt/qttest
+	e2e? ( dev-libs/libQtOlm )
 	!!dev-libs/libqmatrixclient
 "
+DEPEND="${RDEPEND}"
 
 S=""${WORKDIR}"/"${PN}"-"${PV}""
 
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON
+		-DQuotient_ENABLE_E2EE=$(usex e2e)
+		-DUSE_INTREE_LIBQOLM=OFF
+		-DQuotient_INSTALL_TESTS=$(usex extra)
 	)
 	cmake_src_configure
 }

dev-libs/libQuotient/metadata.xml

@@ -5,4 +5,11 @@
     <email>hedmoo@yahoo.com</email>
     <name>Andreas Westman Dorcsak</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">quotient-im/libQuotient</remote-id>
+  </upstream>
+  <use>
+    <flag name="e2e">Build with e2e encryption support</flag>
+    <flag name="extra">Install quotest tool</flag>
+  </use>
 </pkgmetadata>

dev-libs/olm/metadata.xml

@@ -9,4 +9,7 @@
     <email>hedmoo@yahoo.com</email>
     <name>Andreas Westman Dorcsak</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gitlab">matrix-org/olm</remote-id>
+  </upstream>
 </pkgmetadata>

dev-libs/olm/olm-3.1.5-r1.ebuild

@@ -19,7 +19,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3"
+LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
 IUSE="python"
 

dev-libs/olm/olm-3.2.1.ebuild

@@ -19,7 +19,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3"
+LICENSE="Apache-2.0"
 SLOT="0/$(ver_cut 1)"
 IUSE="python"
 
@@ -37,6 +37,15 @@ src_prepare() {
 	use python && (cd python; distutils-r1_src_prepare)
 }
 
+src_configure() {
+	local mycmakeargs=(
+		-DOLM_TESTS=OFF
+		-DBUILD_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+	use python && (cd python; distutils-r1_src_configure)
+}
+
 src_compile() {
 	cmake_src_compile
 	use python && (cd python; distutils-r1_src_compile)
@@ -46,3 +55,7 @@ src_install() {
 	cmake_src_install
 	use python && (cd python; distutils-r1_src_install)
 }
+
+src_test(){
+	emake test
+}