From 22899eb46c1c332d9a8a995c0be0b965fb1bcfc3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 14:56:29 +0100 Subject: gentoo auto-resync : 25:07:2022 - 14:56:29 --- kde-apps/kmail/Manifest | 3 - .../files/kmail-21.12.3-speech-optional.patch | 69 ------------ kde-apps/kmail/kmail-21.12.3.ebuild | 116 --------------------- 3 files changed, 188 deletions(-) delete mode 100644 kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch delete mode 100644 kde-apps/kmail/kmail-21.12.3.ebuild (limited to 'kde-apps/kmail') diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest index 880cb2d16508..3d051f5af334 100644 --- a/kde-apps/kmail/Manifest +++ b/kde-apps/kmail/Manifest @@ -1,6 +1,3 @@ -AUX kmail-21.12.3-speech-optional.patch 2622 BLAKE2B 403556173723754264d00b6f9fda84b3367c9680c28327bb333b490486898a59e1b013afdc8f93b4d0d8cc60ca0f2998f768ba312350d58ab5682c528ffadb6a SHA512 788ca301d7677a30fbf53d43ec2da59d710fd6942ffa956f88d2288772f7abaf9611e57529727eb967570e6e4e1c4b987943ef03bfa58ab1dfba8d7081741563 -DIST kmail-21.12.3.tar.xz 7145316 BLAKE2B a901631e14b6d4e652877439594fd35a787699a2a8b3787323ebd49f109ef2c527984bb5791a428353f124bb01755a5e475c7c5b39ba1d0277bbfdf0a1dac001 SHA512 7656feaeca6ac664c7bd2402f4bd369c4ce924db812b99d9f27556e0112722eb18a3490ffcd26047653b84f14c2990be53967dc689f277557dd0deac56d03a60 DIST kmail-22.04.3.tar.xz 7153424 BLAKE2B a8a262baed424918532c053b24bec95ae3681fee052807518500b240f5d57e4ecb97b4b7fc08b6cf2f588458842e21a1165818f69aa28540845aca7840bd9622 SHA512 1003c3f24b79dfbbd8e551b770e27388994d63884550592ffcc86c660966c259b74bb21b21d9c09bacc585fde58de42b2e8c5eb985c230304c07010a67d52a32 -EBUILD kmail-21.12.3.ebuild 3571 BLAKE2B 8c283cb785143e54c95afcc861e30357c8e1aa39ad8873e8ae5db75ac7fb56ff3d5cef05c0419a4077694e89325d57b018d2e5c000fdcbf16455376a13739790 SHA512 1b7a45f486f434cf07208d3696f42411b47799d57ad78c969d52e899978945e125cd17406b7c8a560c4b784c10d8d5ac0d084c900e04aa83654d57238770f788 EBUILD kmail-22.04.3.ebuild 3521 BLAKE2B 84b04783a7bb7e0d8bc732866dad7a72e73123d6674f8ba7f3b3c244181ca0754f6cbd298c88bf3b794376beb275253f1d6051833ec173d0872dc087a59124aa SHA512 41eaf1afe18ef35a5a84c9e11080c67852aceab215c9a2078829a4bdc8adaeec2db15dd25482826e904e7296ab99d244fab01515ec5e173f607c4636e8753596 MISC metadata.xml 392 BLAKE2B d284f1f6d15ec099b824fc8aae970cceca3e558cbd7e4dc4b1ca93911394fd57834785936d1ca6626b4b4ff6b71613cd872b93e45b8701104978f80d8170e9e9 SHA512 872b0653ecebb83d93e152d510808ad85502024f5c162bb5c40a94aa76cddac615c0e930c04313c53a9e0a1a5c4b383829e302bb34647db46a698b47edc7fbdb diff --git a/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch b/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch deleted file mode 100644 index e0c7a4518c46..000000000000 --- a/kde-apps/kmail/files/kmail-21.12.3-speech-optional.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 817515f9278f97b3fa32bb434cb2bd26816a7838 Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Thu, 24 Feb 2022 17:28:35 +0100 -Subject: [PATCH] Make it compile without texttospeach - ---- - src/kmmainwidget.cpp | 5 +++++ - src/kmreadermainwin.cpp | 5 +++++ - 2 files changed, 10 insertions(+) - -diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp -index d6d0d40ac..37bbe72a2 100644 ---- a/src/kmmainwidget.cpp -+++ b/src/kmmainwidget.cpp -@@ -36,7 +36,10 @@ - #include "widgets/collectionpane.h" - #include "widgets/kactionmenuaccount.h" - #include "widgets/kactionmenutransport.h" -+#include -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include -+#endif - #include - #include - #include -@@ -2707,10 +2710,12 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, - mMsgActions->addWebShortcutsMenu(&menu, selectedText); - menu.addSeparator(); - menu.addActions(mMsgView->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection)); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - if (KPIMTextEdit::TextToSpeech::self()->isReady()) { - menu.addSeparator(); - menu.addAction(mMsgView->speakTextAction()); - } -+#endif - menu.addSeparator(); - menu.addAction(mMsgView->shareTextAction()); - } else if (!urlMenuAdded) { -diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp -index 4967459cc..85c488f97 100644 ---- a/src/kmreadermainwin.cpp -+++ b/src/kmreadermainwin.cpp -@@ -54,7 +54,10 @@ - #include - #include - #include -+#include -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - #include -+#endif - #include - #include - #include -@@ -736,10 +739,12 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, - mMsgActions->addWebShortcutsMenu(menu, selectedText); - menu->addSeparator(); - menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedSelection)); -+#if KPIMTEXTEDIT_TEXT_TO_SPEECH - if (KPIMTextEdit::TextToSpeech::self()->isReady()) { - menu->addSeparator(); - menu->addAction(mReaderWin->speakTextAction()); - } -+#endif - menu->addSeparator(); - menu->addAction(mReaderWin->shareTextAction()); - } else if (!urlMenuAdded) { --- -GitLab - diff --git a/kde-apps/kmail/kmail-21.12.3.ebuild b/kde-apps/kmail/kmail-21.12.3.ebuild deleted file mode 100644 index 8fa3ce1e72d4..000000000000 --- a/kde-apps/kmail/kmail-21.12.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes" -HOMEPAGE="https://apps.kde.org/kmail2/ -https://kontact.kde.org/components/kmail.html" - -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="pch speech telemetry" - -RESTRICT="test" # bug 616878 - -COMMON_DEPEND=" - >=app-crypt/gpgme-1.11.1:=[cxx,qt5] - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-apps/akonadi-${PVCUT}:5 - >=kde-apps/akonadi-contacts-${PVCUT}:5 - >=kde-apps/akonadi-mime-${PVCUT}:5 - >=kde-apps/akonadi-search-${PVCUT}:5 - >=kde-apps/kidentitymanagement-${PVCUT}:5 - >=kde-apps/kmailtransport-${PVCUT}:5 - >=kde-apps/kmime-${PVCUT}:5 - >=kde-apps/kontactinterface-${PVCUT}:5 - >=kde-apps/kpimtextedit-${PVCUT}:5[speech=] - >=kde-apps/libgravatar-${PVCUT}:5 - >=kde-apps/libkdepim-${PVCUT}:5 - >=kde-apps/libkleo-${PVCUT}:5 - >=kde-apps/libksieve-${PVCUT}:5 - >=kde-apps/libktnef-${PVCUT}:5 - >=kde-apps/mailcommon-${PVCUT}:5 - >=kde-apps/messagelib-${PVCUT}:5 - >=kde-apps/pimcommon-${PVCUT}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcalendarcore-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcontacts-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - >=kde-apps/kcalutils-${PVCUT}:5 - >=kde-apps/kldap-${PVCUT}:5 - test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] ) -" -RDEPEND="${COMMON_DEPEND} - >=kde-apps/kdepim-runtime-${PVCUT}:5 - >=kde-apps/kmail-account-wizard-${PVCUT}:5 -" -BDEPEND=" - dev-libs/libxslt - test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] ) -" - -PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional.patch ) - -src_prepare() { - ecm_src_prepare - use handbook || cmake_run_in ktnef cmake_comment_add_subdirectory doc -} - -src_configure() { - local mycmakeargs=( - -DUSE_PRECOMPILED_HEADERS=$(usex pch) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "virus detection" app-antivirus/clamav - optfeature "spam filtering" mail-filter/bogofilter mail-filter/spamassassin - optfeature "fancy e-mail headers and useful plugins" kde-apps/kdepim-addons:${SLOT} - optfeature "crypto config and certificate details GUI" kde-apps/kleopatra:${SLOT} - optfeature "import PIM data from other applications" kde-apps/akonadi-import-wizard:${SLOT} - fi - ecm_pkg_postinst -} -- cgit v1.2.3