[gentoo-commits] repo/gentoo:master commit in: net-libs/libquotient/, net-libs/libquotient/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     810839beaa65bd9bf3bfc78e5f3f407b423d8b8e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 20:09:44 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 20:44:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810839be

net-libs/libquotient: drop 0.7.2-r3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-libs/libquotient/Manifest                      |  1 -
 .../files/libquotient-0.7.0-no-android.patch       | 29 ----------
 .../files/libquotient-0.7.0-no-tests.patch         | 34 ------------
 net-libs/libquotient/libquotient-0.7.2-r3.ebuild   | 62 ----------------------
 4 files changed, 126 deletions(-)

diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest
index 8ae0a1ee6761..d9f576ea6047 100644
--- a/net-libs/libquotient/Manifest
+++ b/net-libs/libquotient/Manifest
@@ -1,2 +1 @@
-DIST libquotient-0.7.2.tar.gz 671676 BLAKE2B 37a22c01b94bb77b89534e48ebcf8427429760095ecdc9427297c57e1d7dabdaaeaf9c7498b4695d23e468b89e1ac9cd44b9f64593454e5c3f8f452b95745c75 SHA512 ba849b938c0bf93e075da466a8360703fb903ac2735b35a7e83944a1288c9324ff76daaf57164144c55cef450fc658e42e6dcacfd23f87a4db455019e9c21f47
 DIST libquotient-0.8.1.2.tar.gz 730435 BLAKE2B 7c43bc394d46ddb600c683d771add48f9a20d205ce61796b27a34933521e38be2b3b331263ffc6bb00fd1197a195b295e3311d52d8d74cdfe51453954cb79ae1 SHA512 ff11f1e9093004461425179fcab630237bf1d28f6e5abe6486d657b455b560884047715fccff5b31f26275ffd423df787014aaac35c556eddb1842e8e68841ce

diff --git a/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch b/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch
deleted file mode 100644
index f6cc8f838f1a..000000000000
--- a/net-libs/libquotient/files/libquotient-0.7.0-no-android.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 41299fe27a428bf02880865b7f8c1a7bee3f8ad5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 3 Jan 2021 15:18:01 +0100
-Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID)
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 523f5ae7..613e270c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -381,7 +381,10 @@ install(FILES
-     "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
-     DESTINATION ${CMakeFilesLocation}
- )
--install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules)
-+
-+if (ANDROID)
-+    install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION ${CMAKE_INSTALL_DATADIR}/ndk-modules)
-+endif ()
- 
- if (WIN32)
-     install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages)
--- 
-2.39.0
-

diff --git a/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch b/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch
deleted file mode 100644
index 510b8a0a4d28..000000000000
--- a/net-libs/libquotient/files/libquotient-0.7.0-no-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e5cc442f13aee922f6b2a954ad52b7aa8c558b2c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sat, 24 Dec 2022 22:51:12 +0100
-Subject: [PATCH] Put Qt5Test dependency behind -DBUILD_TESTING
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 523f5ae7..9ae697b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,7 @@ else()
-     set(QtExtraModules "Multimedia") # See #483
- endif()
- string(REGEX REPLACE "^(.).*" "Qt\\1" Qt ${QtMinVersion}) # makes "Qt5" or "Qt6"
--find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui Test ${QtExtraModules})
-+find_package(${Qt} ${QtMinVersion} REQUIRED Core Network Gui ${QtExtraModules})
- get_filename_component(Qt_Prefix "${${Qt}_DIR}/../../../.." ABSOLUTE)
- message(STATUS "Using Qt ${${Qt}_VERSION} at ${Qt_Prefix}")
- 
-@@ -342,6 +342,7 @@ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}
- # Configure testing
- 
- if (BUILD_TESTING)
-+    find_package(${Qt}Test ${QtMinVersion} REQUIRED)
-     enable_testing()
-     add_subdirectory(quotest)
-     add_subdirectory(autotests)
--- 
-2.39.0
-

diff --git a/net-libs/libquotient/libquotient-0.7.2-r3.ebuild b/net-libs/libquotient/libquotient-0.7.2-r3.ebuild
deleted file mode 100644
index b0cc7f93d0db..000000000000
--- a/net-libs/libquotient/libquotient-0.7.2-r3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Qt-based SDK to develop applications for Matrix"
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/libQuotient-${PV}"
-
-LICENSE="LGPL-2+"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/olm
-	dev-libs/openssl:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qttest:5
-	)
-"
-
-PATCHES=(
-	# downstream patches
-	"${FILESDIR}"/${PN}-0.7.0-no-android.patch
-	"${FILESDIR}"/${PN}-0.7.0-no-tests.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=OFF
-		-DBUILD_TESTING=$(usex test)
-		-DQuotient_ENABLE_E2EE=ON
-	)
-	use test && mycmakeargs+=(
-		-DQuotient_INSTALL_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# https://github.com/quotient-im/libQuotient/issues/435
-	# testolmaccount requires network connection/server set up
-	local myctestargs=(
-		-j1
-		-E "(testolmaccount)"
-	)
-	cmake_src_test
-}