commit: 564a195f9ceac7382beac3a7c699f84e862c180d Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 10 20:01:07 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jan 10 20:01:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564a195f
net-libs/libquotient: drop 0.6.11-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-libs/libquotient/Manifest | 1 - .../files/libquotient-0.6.3-no-android.patch | 29 --------------- .../files/libquotient-0.6.3-no-tests.patch | 42 ---------------------- net-libs/libquotient/libquotient-0.6.11-r1.ebuild | 39 -------------------- 4 files changed, 111 deletions(-) diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest index d5b713bed46e..002b058fad7e 100644 --- a/net-libs/libquotient/Manifest +++ b/net-libs/libquotient/Manifest @@ -1,2 +1 @@ -DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa DIST libquotient-0.7.1.tar.gz 667590 BLAKE2B 93c601960c43511ba0118ac0224c34064a6c1b1fa9a526ca8a064495e8d5b981ab197ed958ced3ba4bf869e0554ee37d2be82cddb6610e9d5ef371a1d3a144a7 SHA512 88819cafb49712d53c692008be69ea1fc01ca1ac6aedc15696eba2f830956660d185fb07273d50c7dc3e9208314ac24838746d5d9e70b3aad7fccbd15fd7c545 diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch deleted file mode 100644 index 5541f4d7133b..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-android.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d82cb1f43cab7976e25c6e9ff3e4ae17789ee11c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sun, 3 Jan 2021 15:18:01 +0100 -Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID) - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ee1cb4..eec27c8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,7 +321,10 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${ConfigFilesLocation} - ) --install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+ -+if (ANDROID) -+ install(EXPORT_ANDROID_MK ${PROJECT_NAME}Targets DESTINATION share/ndk-modules) -+endif () - - if (WIN32) - install(FILES mime/packages/freedesktop.org.xml DESTINATION mime/packages) --- -2.30.0 - diff --git a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch b/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch deleted file mode 100644 index fb884e10ac76..000000000000 --- a/net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff972d181f0f9e7bfa327c71450d55f951de27c1 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Sun, 3 Jan 2021 15:05:59 +0100 -Subject: [PATCH] Put Qt5Test dependency behind -DQuotient_INSTALL_TESTS - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2ee1cb4..2a0908d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ else() - endforeach () - endif() - --find_package(Qt5 5.9 REQUIRED Network Gui Multimedia Test) -+find_package(Qt5 5.9 REQUIRED Network Gui Multimedia) - get_filename_component(Qt5_Prefix "${Qt5_DIR}/../../../.." ABSOLUTE) - - if (${PROJECT_NAME}_ENABLE_E2EE) -@@ -280,9 +280,12 @@ if (${PROJECT_NAME}_ENABLE_E2EE) - endif() - target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network Qt5::Gui Qt5::Multimedia) - --set(TEST_BINARY quotest) --add_executable(${TEST_BINARY} ${tests_SRCS}) --target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+if(${PROJECT_NAME}_INSTALL_TESTS) -+ find_package(Qt5Test) -+ set(TEST_BINARY quotest) -+ add_executable(${TEST_BINARY} ${tests_SRCS}) -+ target_link_libraries(${TEST_BINARY} Qt5::Core Qt5::Test ${PROJECT_NAME}) -+endif() - - configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc @ONLY NEWLINE_STYLE UNIX) - --- -2.30.0 - diff --git a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild b/net-libs/libquotient/libquotient-0.6.11-r1.ebuild deleted file mode 100644 index 6e9390a92391..000000000000 --- a/net-libs/libquotient/libquotient-0.6.11-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Qt5-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" -KEYWORDS="~amd64 ~arm64 ~ppc64" -IUSE="" - -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] -" -RDEPEND="${DEPEND}" - -PATCHES=( - # downstream patches - "${FILESDIR}"/${PN}-0.6.3-no-android.patch - "${FILESDIR}"/${PN}-0.6.3-no-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DQuotient_INSTALL_TESTS=OFF - -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # no thanks. - ) - cmake_src_configure -}
