From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- kde-frameworks/purpose/Manifest | 10 ++-- .../files/purpose-5.64.0-ecmqmlmodules.patch | 32 ++++++++++++ kde-frameworks/purpose/metadata.xml | 1 + kde-frameworks/purpose/purpose-5.60.0.ebuild | 49 ------------------ kde-frameworks/purpose/purpose-5.64.0-r2.ebuild | 60 ++++++++++++++++++++++ kde-frameworks/purpose/purpose-5.64.0.ebuild | 2 +- kde-frameworks/purpose/purpose-5.65.0.ebuild | 60 ++++++++++++++++++++++ 7 files changed, 160 insertions(+), 54 deletions(-) create mode 100644 kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch delete mode 100644 kde-frameworks/purpose/purpose-5.60.0.ebuild create mode 100644 kde-frameworks/purpose/purpose-5.64.0-r2.ebuild create mode 100644 kde-frameworks/purpose/purpose-5.65.0.ebuild (limited to 'kde-frameworks/purpose') diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest index 673483cc0d30..4400280bf862 100644 --- a/kde-frameworks/purpose/Manifest +++ b/kde-frameworks/purpose/Manifest @@ -1,5 +1,7 @@ -DIST purpose-5.60.0.tar.xz 147472 BLAKE2B c29506d7d1cb4adb09705b40e10ff4459c8c9dca68667f9c64aa4268fa202fcc949703d6855148e9c8934135b25990de84f68e0942c5e7050322a3623e05dc55 SHA512 0d26fb1b8d0d50843da036a1f6f789ae2457afb9ab449d45be35fca79712b6d8a7974faa89bc5f6605dd8b738bb1011a6cd8d294dfdf118339f784083808d3af +AUX purpose-5.64.0-ecmqmlmodules.patch 1086 BLAKE2B 53d35424b064777fb64136e409de578137b3ae951e58873c26ca65692fdabef2d5b83e23fb2681f0c1c1cf8b58c9c2d19c05844ea7888958b0f5967dd89ea32a SHA512 92c9d08d64b5e85963a4df6dd7d4e9c31818572d3d5cf31904ee00ccd6566e0971dc1fa0008306db1fdda454f22fcd99aae1f8bac7beabe0333d7d8fbcb6d012 DIST purpose-5.64.0.tar.xz 154056 BLAKE2B c2d5b0e008cd888c312229783680e02ebcea7765f0c5038d4ac3b6d70357b1372e0a62a5d0e183a8daee38917ca12b4d01a59f7ea1172409d2e55884082383e8 SHA512 841ace0d4f1de6f78f2031e0b372ca08865d827a35db8a7d97c62acfa885e481cf1d05c3ea03ed2ed451eef3322f3bf5753366e9ce053e73d4d590e1ed52b464 -EBUILD purpose-5.60.0.ebuild 1034 BLAKE2B 4eabde15b9bf52cb6216576ec37fd3099057fceeb05e6b097f0e3cde5769ba5de88c861e7720c773b7788d93f787451e40b6d61a531e3452391b8806363f01e8 SHA512 1ff99641664ee97b56dedf36efc7dfd6c3101b7eedda35af98469602062cd92c815c4570128c05a9e6acef3b6454ffb77be5121884a3d46280dc6abc43778114 -EBUILD purpose-5.64.0.ebuild 1126 BLAKE2B acdda078e0e5fdf91713c7c6316128e71df1269128d3ae33329799aa22739bcb487fbe0475f761aefd0207453db0ff0e68e1be67e0cf0b5cd12c9797c558b279 SHA512 be0b2f2715bf9dd2f79d6097bdfc55d4791fbd2295495d2b99b9995866f5096dbca6306b3624492941935e847f2a6ebf3288bfb265037812131de274a65951c2 -MISC metadata.xml 345 BLAKE2B 0e6eede785554aad84ff8d6703b9ab698439d7c383b26f789ea3d6234014b4e4de329159a6264eb37375581106ffa1588d508d2616aac298af08644d1ad02183 SHA512 cee07f4f8ede80430680300afba2bbbba3f38559fec0b3d0dac805beaadf9605f94d4cc23a0f213bc56f6bd48aa5f4f39f010b87453351211ef1c6d53393f26d +DIST purpose-5.65.0.tar.xz 155964 BLAKE2B e357336b755b900d2ee1835a53464372104e56b8c5be11d9ea22afee245fe256d33186399a9ce759dbbfa8e05d638ed17826e005024b4cd969cbd2b199435dc3 SHA512 7f5bbbcfe2acbe6251e22a474cc4ec7bb20ceb14723b82d22f48d084d098067180f46bc2f87217878e913dab588f137d4dfca0803bfbdd9f42176ab76f02f15f +EBUILD purpose-5.64.0-r2.ebuild 1456 BLAKE2B 6daa3e2d9ea61ce76f0f872bcb2f9aeb0a0d09e0dc9be4cdd42806ee654a23aa7f8f8f5c37a599e8bc77a17cd989582709c45755e35d6f33b352d2bcf7da5d7a SHA512 aa650c8ab1a6e8343ac91f1ece62c8e69e57f68138cfd146d8153491c073049050a9d82b738b81f5a956665369844b379f9efc1aadc6dea5ea181b9e1a024196 +EBUILD purpose-5.64.0.ebuild 1123 BLAKE2B d454605565921ea5026ac39c6eb35d3eaf951ac86ecfb58bb80738fdb5d312cbf3e641013483a209a431cec3b9fcfb29395fde45dee5feb28288409d740f82ad SHA512 7b466546f2f63e01c0756b5b218528a4fffac1b42a2948770fb915ecb5ae54499823dd62884e160ba8c904d8f0419674defea2c4a8a921058f4291715d748ff8 +EBUILD purpose-5.65.0.ebuild 1456 BLAKE2B 6daa3e2d9ea61ce76f0f872bcb2f9aeb0a0d09e0dc9be4cdd42806ee654a23aa7f8f8f5c37a599e8bc77a17cd989582709c45755e35d6f33b352d2bcf7da5d7a SHA512 aa650c8ab1a6e8343ac91f1ece62c8e69e57f68138cfd146d8153491c073049050a9d82b738b81f5a956665369844b379f9efc1aadc6dea5ea181b9e1a024196 +MISC metadata.xml 441 BLAKE2B bedd6e101cd0b4233d383352c66125b30508c7bbb5f597bdd6854e02b89004e2e9aa968de63357f58fd5e196de40b7f1e4816572f828a7cc5307a657125bf21c SHA512 7d5fce42c371a15a6d05866d5d40436a05b8ec34538ce5fab7d4f47a9dd6ae4312ac4096e646df230ee611bddd040f58fa93f41688517b4205d3785f1ce56acc diff --git a/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch new file mode 100644 index 000000000000..2cae935c7329 --- /dev/null +++ b/kde-frameworks/purpose/files/purpose-5.64.0-ecmqmlmodules.patch @@ -0,0 +1,32 @@ +From 7ba45fdc2b9d0c599497495387a70d3d5ddad5c4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 8 Dec 2019 15:26:18 +0100 +Subject: [PATCH] Use standard ECMQMLModules + +--- + src/plugins/CMakeLists.txt | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt +index fa4637b..9790e76 100644 +--- a/src/plugins/CMakeLists.txt ++++ b/src/plugins/CMakeLists.txt +@@ -19,11 +19,10 @@ function(kpackage_install_package dir component root) + PATTERN Messages.sh EXCLUDE) + endfunction() + +-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) +-include(QMLModules) +-find_qmlmodule(Ubuntu.OnlineAccounts 0.1) +-find_qmlmodule(org.kde.kdeconnect 1.0) +-find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) ++include(ECMQMLModules) ++ecm_find_qmlmodule(Ubuntu.OnlineAccounts 0.1) ++ecm_find_qmlmodule(org.kde.kdeconnect 1.0) ++ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) + + find_package(KAccounts) + find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) +-- +2.24.0 + diff --git a/kde-frameworks/purpose/metadata.xml b/kde-frameworks/purpose/metadata.xml index 69186b245f38..6732ba335aca 100644 --- a/kde-frameworks/purpose/metadata.xml +++ b/kde-frameworks/purpose/metadata.xml @@ -6,6 +6,7 @@ Gentoo KDE Project + Enable support for sharing files from kde-apps/dolphin Enable support for system-wide defined KAccounts diff --git a/kde-frameworks/purpose/purpose-5.60.0.ebuild b/kde-frameworks/purpose/purpose-5.60.0.ebuild deleted file mode 100644 index 2be53a23f677..000000000000 --- a/kde-frameworks/purpose/purpose-5.60.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_QTHELP="false" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="+kaccounts" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kirigami) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - kaccounts? ( - $(add_kdeapps_dep kaccounts-integration) - net-libs/accounts-qt - ) -" -RDEPEND="${DEPEND}" - -# requires running environment -RESTRICT+=" test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package kaccounts KAccounts) - ) - - kde5_src_configure -} - -pkg_postinst(){ - kde5_pkg_postinst - - if ! has_version "kde-misc/kdeconnect[app]" ; then - elog "Optional runtime dependency:" - elog "kde-misc/kdeconnect[app] (send through KDE Connect)" - fi -} diff --git a/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild new file mode 100644 index 000000000000..409caa0c2954 --- /dev/null +++ b/kde-frameworks/purpose/purpose-5.64.0-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~x86" +IUSE="+dolphin +kaccounts" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${PVCUT}:5 + >=kde-frameworks/ki18n-${PVCUT}:5 + >=kde-frameworks/kio-${PVCUT}:5 + >=kde-frameworks/kirigami-${PVCUT}:5 + dolphin? ( >=kde-frameworks/knotifications-${PVCUT}:5 ) + kaccounts? ( + >=kde-apps/kaccounts-integration-19.04.3:5 + net-libs/accounts-qt + ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${PVCUT}:5 + kaccounts? ( net-libs/accounts-qml ) +" + +# requires running environment +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${PN}-5.64.0-ecmqmlmodules.patch" ) # git master + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package dolphin KF5Notifications) + $(cmake_use_find_package kaccounts KAccounts) + ) + + ecm_src_configure +} + +pkg_postinst(){ + ecm_pkg_postinst + + if ! has_version "kde-misc/kdeconnect[app]" ; then + elog "Optional runtime dependency:" + elog "kde-misc/kdeconnect[app] (send through KDE Connect)" + fi +} diff --git a/kde-frameworks/purpose/purpose-5.64.0.ebuild b/kde-frameworks/purpose/purpose-5.64.0.ebuild index a80a56efd29b..f6e3ee8940c3 100644 --- a/kde-frameworks/purpose/purpose-5.64.0.ebuild +++ b/kde-frameworks/purpose/purpose-5.64.0.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" LICENSE="LGPL-2.1+" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm arm64 x86" IUSE="+kaccounts" DEPEND=" diff --git a/kde-frameworks/purpose/purpose-5.65.0.ebuild b/kde-frameworks/purpose/purpose-5.65.0.ebuild new file mode 100644 index 000000000000..409caa0c2954 --- /dev/null +++ b/kde-frameworks/purpose/purpose-5.65.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_QTHELP="false" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Library for providing abstractions to get the developer's purposes fulfilled" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~x86" +IUSE="+dolphin +kaccounts" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${PVCUT}:5 + >=kde-frameworks/ki18n-${PVCUT}:5 + >=kde-frameworks/kio-${PVCUT}:5 + >=kde-frameworks/kirigami-${PVCUT}:5 + dolphin? ( >=kde-frameworks/knotifications-${PVCUT}:5 ) + kaccounts? ( + >=kde-apps/kaccounts-integration-19.04.3:5 + net-libs/accounts-qt + ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${PVCUT}:5 + kaccounts? ( net-libs/accounts-qml ) +" + +# requires running environment +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${PN}-5.64.0-ecmqmlmodules.patch" ) # git master + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package dolphin KF5Notifications) + $(cmake_use_find_package kaccounts KAccounts) + ) + + ecm_src_configure +} + +pkg_postinst(){ + ecm_pkg_postinst + + if ! has_version "kde-misc/kdeconnect[app]" ; then + elog "Optional runtime dependency:" + elog "kde-misc/kdeconnect[app] (send through KDE Connect)" + fi +} -- cgit v1.2.3