From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- kde-apps/libksieve/Manifest | 7 +-- .../files/libksieve-19.08.3-qt-5.14.patch | 36 ------------ kde-apps/libksieve/libksieve-19.08.3.ebuild | 67 ---------------------- kde-apps/libksieve/libksieve-19.12.2.ebuild | 61 -------------------- kde-apps/libksieve/libksieve-19.12.3.ebuild | 61 ++++++++++++++++++++ 5 files changed, 63 insertions(+), 169 deletions(-) delete mode 100644 kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch delete mode 100644 kde-apps/libksieve/libksieve-19.08.3.ebuild delete mode 100644 kde-apps/libksieve/libksieve-19.12.2.ebuild create mode 100644 kde-apps/libksieve/libksieve-19.12.3.ebuild (limited to 'kde-apps/libksieve') diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest index ca2b2bd53c28..80daf81c30a4 100644 --- a/kde-apps/libksieve/Manifest +++ b/kde-apps/libksieve/Manifest @@ -1,6 +1,3 @@ -AUX libksieve-19.08.3-qt-5.14.patch 1332 BLAKE2B 128c2abb3814624c38e929ce028611e8bb8c9f5755e5d7396be1c9700cb83b6735d0d993beb5b1a61ebca818534243c89da04f02e9e2edc9a398c793e554c3c9 SHA512 f4d6da6434a50de22062ee64f6fd321a641459ac7a802a157aa7a7c09f570017bf276956d91bdd921404212232f416de3cb09fec73cc6d7934360d8ded4e5b5a -DIST libksieve-19.08.3.tar.xz 549664 BLAKE2B 53c6ce9dd0a30fc8be01003a6610b20ae624e5c481d931cd8a09fa083ba681ee3fc79cfb9d185b12315e69f972e055ae82cd9c829058822f11c6d990b544564c SHA512 f5aee4894b95d48868b08941198ec9370a3855178c2f48330b36473fa2584a43fd7943a9d91f0781a92e79de126d6e78349c8d97b28b96cd2a006126cee3131b -DIST libksieve-19.12.2.tar.xz 553448 BLAKE2B 59508fcbfa51a985f56313400eb33685fd766922b70b421f7e676df919069562efdf5d36fc4948970fe450ac87496194ddf27ef67cf86446d0ab5d1b0aaf8b85 SHA512 f7a9c8bf97f3490b25dc6ed84f859a70f51e2f3b3f6a31ff453bbdf1be9793b6987e2b27a9122645485018a7fdcb08831b405ace6d90eb5a9de244de18d6a1a3 -EBUILD libksieve-19.08.3.ebuild 1762 BLAKE2B 7b1cec8c0bb844cd992c185d90d1c09b462a58bc7dcc07d8d2e11b398c24518303b82e313ab5186994f948ceb7394ed4cbe7f4b08b27eebcca6928cd37ba0e0c SHA512 5546224c35191bd38c84d3f3982f5e282aa99b26cb1cc3519f763e3ca352aadab14121bb8f537faa151d8e818ee547128e063539867d97532804a8752b9b5118 -EBUILD libksieve-19.12.2.ebuild 1573 BLAKE2B 9699e0c44f9bc3e01a46031961fd580f7378f0472d98e8ef7d1dfed8afbc495f438a81a1db1febef6099edd89abec61baa1b47d6a0cb9a3f88b95146cfe61dd0 SHA512 89995175dfb247a56460c6734f42c91a9692a443e30ee87494191bf18072f376dd19f0f7f46341e72cefdc1b3ec827301dee6588542aea1fc2ed5b00f17b4926 +DIST libksieve-19.12.3.tar.xz 551400 BLAKE2B 15aded9786e737917dfbcfb86b91e503b1bb966d6afeb7c5242e60ddc4f1d432df8d7c0c9dc5ac1bd8c8ee85922c0b85f8c013fb322904b144c9b9608bd93706 SHA512 46fd159f8337e7e51948d12628a80a19fc8dfaeef0e56b97ad69afde54642f526477ca551cfc9ab4082236959c84619abf9984625a4e6f2ad6d14337a1d0464b +EBUILD libksieve-19.12.3.ebuild 1570 BLAKE2B 763a3e195af74809bd80f20f01521c679afe7380cd7565d55e2b6a08c53acc1565656b8fcdc06e379425526aec5e8866aa4540c4a9b84509911eb16bff4dbc8a SHA512 8ff64024cab49f96438920c3c4b7f7e90a3b7d609033ababd1850c01a9c2a97e38d86cace06c0cd9656cf04e119d7aaa7ca27d292ad3f5b16ac733987d91dcbc MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch deleted file mode 100644 index 403e58dd5f8d..000000000000 --- a/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 31b0ec79d4d58077bbb391c170fe9fef08d460a6 Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Fri, 15 Nov 2019 12:07:37 +0100 -Subject: Make it compile against 5.14 beta3 - ---- - src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp -index d4968dc..87305e9 100644 ---- a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp -+++ b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp -@@ -16,6 +16,8 @@ - */ - - #include "sieveeditorwebengineview.h" -+#include -+ - #include - #include - #include -@@ -61,7 +63,11 @@ void SieveEditorWebEngineView::downloadRequested(QWebEngineDownloadItem *downloa - const QString filename = QFileDialog::getSaveFileName(this, i18n("Save Web Page")); - if (!filename.isEmpty()) { - download->setSavePageFormat(QWebEngineDownloadItem::SingleHtmlSaveFormat); -+#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 14, 0) -+ download->setDownloadFileName(filename); -+#else - download->setPath(filename); -+#endif - download->accept(); - } else { - download->cancel(); --- -cgit v1.1 diff --git a/kde-apps/libksieve/libksieve-19.08.3.ebuild b/kde-apps/libksieve/libksieve-19.08.3.ebuild deleted file mode 100644 index 4e2e59bf36db..000000000000 --- a/kde-apps/libksieve/libksieve-19.08.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -VIRTUALX_REQUIRED="test" -PVCUT=$(ver_cut 1-3) -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Common PIM libraries" -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="" - -# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 -COMMON_DEPEND=" - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5= - dev-libs/cyrus-sasl -" -DEPEND="${COMMON_DEPEND} - >=kde-apps/kimap-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/kdepim-l10n -" - -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" ) - -src_prepare() { - ecm_src_prepare - - if ! use handbook ; then - sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \ - -i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)" - fi -} diff --git a/kde-apps/libksieve/libksieve-19.12.2.ebuild b/kde-apps/libksieve/libksieve-19.12.2.ebuild deleted file mode 100644 index 4c52f3fb2bcc..000000000000 --- a/kde-apps/libksieve/libksieve-19.12.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.63.0 -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Common PIM libraries" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="" - -# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 -RDEPEND=" - dev-libs/cyrus-sasl - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5= - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 -" -DEPEND="${RDEPEND} - >=kde-apps/kimap-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 -" - -RESTRICT+=" test" - -src_prepare() { - ecm_src_prepare - - if ! use handbook ; then - sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \ - -i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)" - fi -} diff --git a/kde-apps/libksieve/libksieve-19.12.3.ebuild b/kde-apps/libksieve/libksieve-19.12.3.ebuild new file mode 100644 index 000000000000..cda658c8160d --- /dev/null +++ b/kde-apps/libksieve/libksieve-19.12.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=5.63.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Common PIM libraries" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="amd64 arm64 x86" +IUSE="" + +# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0 +RDEPEND=" + dev-libs/cyrus-sasl + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5= + >=kde-apps/kidentitymanagement-${PVCUT}:5 + >=kde-apps/kmime-${PVCUT}:5 + >=kde-apps/kpimtextedit-${PVCUT}:5 + >=kde-apps/libkdepim-${PVCUT}:5 + >=kde-apps/pimcommon-${PVCUT}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 +" +DEPEND="${RDEPEND} + >=kde-apps/kimap-${PVCUT}:5 + >=kde-apps/kmailtransport-${PVCUT}:5 +" + +RESTRICT+=" test" + +src_prepare() { + ecm_src_prepare + + if ! use handbook ; then + sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \ + -i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)" + fi +} -- cgit v1.2.3