From 113cc6fe7a9adc2baf67f9ef7723db6ed2b24887 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 10 Jan 2023 23:43:04 +0000 Subject: gentoo auto-resync : 10:01:2023 - 23:43:04 --- net-libs/Manifest.gz | Bin 32768 -> 32762 bytes net-libs/libquotient/Manifest | 8 +--- .../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 ------------------- net-libs/libquotient/libquotient-0.7.0.ebuild | 40 -------------------- net-libs/libquotient/libquotient-0.7.1.ebuild | 40 ++++++++++++++++++++ 7 files changed, 42 insertions(+), 156 deletions(-) delete mode 100644 net-libs/libquotient/files/libquotient-0.6.3-no-android.patch delete mode 100644 net-libs/libquotient/files/libquotient-0.6.3-no-tests.patch delete mode 100644 net-libs/libquotient/libquotient-0.6.11-r1.ebuild delete mode 100644 net-libs/libquotient/libquotient-0.7.0.ebuild create mode 100644 net-libs/libquotient/libquotient-0.7.1.ebuild (limited to 'net-libs') diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz index f2f71c37c793..0ff0f1f9d573 100644 Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ diff --git a/net-libs/libquotient/Manifest b/net-libs/libquotient/Manifest index ae9d0892b0ab..e19d7becd550 100644 --- a/net-libs/libquotient/Manifest +++ b/net-libs/libquotient/Manifest @@ -1,9 +1,5 @@ -AUX libquotient-0.6.3-no-android.patch 930 BLAKE2B 15ae94889d5543b9d8e6113752df00fef0bcabd2c44adf4146d2751077ec08db17048d4c8716bd245b4f6856e581970c1d230511a681dbb6ae64178bc3fcf75e SHA512 ef3414f3e3dda3926c246d0360be227c52a1ce0aa970f65aff29d2dcbe2c605fc2f583cebba4ad3f8934b872a035a3cc7a9895847eaf9faddf0f46023647f7b9 -AUX libquotient-0.6.3-no-tests.patch 1421 BLAKE2B 97f6b9c3cfe5b32607d64fadbd8e72aa0d1f5d14382edd2792fd564cc226cc473ccda18e770d1b449c158b156bb67dcbbbc36f8587436bec28295b8737279f9e SHA512 76d47d6837c4cfb86be95253ad89fb31de60181b12433a579072b567d18c49a040aafeeb51f333ae4038b141724fbaf68a28a440a1a986f5c61eb25b093b2139 AUX libquotient-0.7.0-no-android.patch 969 BLAKE2B 775a680ed803047c7bd5fd72a9a40f0a9540921a6004fe8242c0df9a849d868100283a3ebc4e586e0b50de4e3cf7dc1ba8d9731b427515bc4f90196e61fab1a9 SHA512 27d56906e23ae8f56696ca9d7aeafc15398f81286cafd4f2eae54638b16819ec3fcd40a53b96953b3f62eb4982e09db1abc00e8e76abd61a55343752fb5e5ad4 AUX libquotient-0.7.0-no-tests.patch 1234 BLAKE2B 60a3da8a15c9c77d8c997b0c0d95a6e13e9d332fdcbee2e6a88882269969519a82daea1280721ff6661a410f03fbd43d5233d8f4804896af637dfca67dd7111f SHA512 e2aa9d7ddca5d7cbb9323d3be9551515b726293c14eb34b4374f701082d9ce21af9f39836ecfada4247b25f1fe6b8fdd2f62976c32658e7d48266f02123ff582 -DIST libquotient-0.6.11.tar.gz 562144 BLAKE2B 75be68371ac1873e38f9ff81273419ed1eb773d02408137a7dafc9a60f520a2ba0b5556783272f8902dd98f7f5dac3a92ab393da5dd48acfffeba8b1631a84dd SHA512 76a11c80822ae3279d643559b481a09fe45b1f8effb7b0efeeb7ab54f13dd06997d9220dcb36c13d270f5641f496dba350f528c49e239757f4546de9fbe940fa -DIST libquotient-0.7.0.tar.gz 667312 BLAKE2B 020baf8bcbbcedd6220e4f3476b152b3a0e88d53786e5b4575f9c096aa36847220a186ca782e068b2fd1f54771e45e1b313d10913af2cc2be3a1c45074acb733 SHA512 6770e3caa6198a77fc33bf7edd2a34d5673e01474b639aa020af989046ff04c44ff5ce26b6418ae31fcca49cc54a147052153ed5c60706f26c177ebd57d452c5 -EBUILD libquotient-0.6.11-r1.ebuild 884 BLAKE2B 0981774edca56b1d36903fb93f6e7e07cd2a0a2588b3be94cfec0e5c08dbad1a5ec698712b4e9eebb667688e196e654f9203201ae94e8b452cda61d6e21df37e SHA512 8cf90f54efed70cd3244c6dddc5a057032a595133467d8f7872035156f931a4b55fed51adb407e81afd2552a6522fb4d297b1988e305a92c1d06493954cc1281 -EBUILD libquotient-0.7.0.ebuild 878 BLAKE2B 71c2e1d26aaf4973c744a63c142fa0718c9b89e9bd38b76fee8115934e3329c7d0a8d34df1ce3891e627168d80ace5efcc72101b6a63d89430466c4cbc747d01 SHA512 fd443872405381afe418b68b971e2bee2d91dc081f1ececd70d269bcb3bc6587d71f7e1b6aba7041759a6d7c8ef4ddd8e96627ae8127ba558891499f0867f283 +DIST libquotient-0.7.1.tar.gz 667590 BLAKE2B 93c601960c43511ba0118ac0224c34064a6c1b1fa9a526ca8a064495e8d5b981ab197ed958ced3ba4bf869e0554ee37d2be82cddb6610e9d5ef371a1d3a144a7 SHA512 88819cafb49712d53c692008be69ea1fc01ca1ac6aedc15696eba2f830956660d185fb07273d50c7dc3e9208314ac24838746d5d9e70b3aad7fccbd15fd7c545 +EBUILD libquotient-0.7.1.ebuild 892 BLAKE2B d6972f361756787e468bd456b22429263809cf4c5f1abc69938041611c3bf1253d3573abb6e6c65891188a8087dd42d0cbe712e83f6f8d97382498812f69a675 SHA512 8f0d14f2e2274e5d5545e1738b2c547480e8189cabd04ccf152d1b4ffb446836e9438a93cac0e660d02dbdcf37bfec259e80621801e37b4c6f2137c675a9db0e MISC metadata.xml 338 BLAKE2B 84af57de6f4faeb65a9a9bd272a29e6cb4491e8eff3d79c4704566baa4af7cfa2f9c6c14a52a0a44e8751848b9e89f30807a6d0c304eb28d8b2cb9f43f0b37c5 SHA512 f93f27e29f09f8e6e6c0038a403990260c8998213c8248c2acbfc1f7e76faa07c296d4b30214c746f30d42b37d636be92720e692280098d4d72d3d542b5004aa 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 -Date: Sun, 3 Jan 2021 15:18:01 +0100 -Subject: [PATCH] Install EXPORT_ANDROID_MK only if(ANDROID) - -Signed-off-by: Andreas Sturmlechner ---- - 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 -Date: Sun, 3 Jan 2021 15:05:59 +0100 -Subject: [PATCH] Put Qt5Test dependency behind -DQuotient_INSTALL_TESTS - -Signed-off-by: Andreas Sturmlechner ---- - 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 -} diff --git a/net-libs/libquotient/libquotient-0.7.0.ebuild b/net-libs/libquotient/libquotient-0.7.0.ebuild deleted file mode 100644 index 11ec72e83ea7..000000000000 --- a/net-libs/libquotient/libquotient-0.7.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 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" -IUSE="" - -DEPEND=" - dev-libs/qtkeychain:=[qt5(+)] - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] -" -RDEPEND="${DEPEND}" - -PATCHES=( - # downstream patches - "${FILESDIR}"/${P}-no-android.patch - "${FILESDIR}"/${P}-no-tests.patch -) - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=OFF - -DBUILD_TESTING=OFF - -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged - ) - cmake_src_configure -} diff --git a/net-libs/libquotient/libquotient-0.7.1.ebuild b/net-libs/libquotient/libquotient-0.7.1.ebuild new file mode 100644 index 000000000000..4a30091b1f75 --- /dev/null +++ b/net-libs/libquotient/libquotient-0.7.1.ebuild @@ -0,0 +1,40 @@ +# 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" +IUSE="" + +DEPEND=" + dev-libs/qtkeychain:=[qt5(+)] + 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.7.0-no-android.patch + "${FILESDIR}"/${PN}-0.7.0-no-tests.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT6=OFF + -DBUILD_TESTING=OFF + -DQuotient_ENABLE_E2EE=OFF # TODO: libolm, libqtolm not packaged + ) + cmake_src_configure +} -- cgit v1.2.3