From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- kde-apps/kmail/Manifest | 3 +- .../kmail/files/kmail-17.12.1-applyfilters.patch | 36 +++++++ kde-apps/kmail/kmail-17.12.1-r1.ebuild | 113 +++++++++++++++++++++ kde-apps/kmail/kmail-17.12.1.ebuild | 111 -------------------- 4 files changed, 151 insertions(+), 112 deletions(-) create mode 100644 kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch create mode 100644 kde-apps/kmail/kmail-17.12.1-r1.ebuild delete mode 100644 kde-apps/kmail/kmail-17.12.1.ebuild (limited to 'kde-apps/kmail') diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest index e4b84c9caac9..c483d855558c 100644 --- a/kde-apps/kmail/Manifest +++ b/kde-apps/kmail/Manifest @@ -1,5 +1,6 @@ +AUX kmail-17.12.1-applyfilters.patch 1623 BLAKE2B 34cbf7cb63fef036f8f775afbb0c7183f91d7f433532b9dd4ce4dc58389d9a03cda0f537efce4fe2ad11b7b68b282db75d4dc41f5e4b15fcb71bd1357c2de1b3 SHA512 3ef62d848dc7efa3b8d295684ce6cee12ec076e0b41548ecc6407d5b4aed898bad9a2263bbe2d9849eacd4970ad243bcffebff2d25f5205f77d7edf8f9cad561 DIST kmail-17.08.3.tar.xz 4735776 BLAKE2B 7a83cc6cd7a00b4aa17521f4b3d8af95b8b6c1d229888a5d1b95279ab32615901619a816cc108dc56fa2009f7c52a8b8f8844762588731f30aec28de1ea7a58a SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7 DIST kmail-17.12.1.tar.xz 4752528 BLAKE2B 1693e819d48eaf10fc1cf61a6e487c47cb0682d5f9cc423501f4576d119ca3668f89a7dd98e379a493b06b204082cc8880c259403132dbd5ddb1ee89b5e091e5 SHA512 2c67cb9f67b11a532309aeea7386c516be413ec2a5670c4aa18ad241edbaf00fb6a7687f57d1771f0aff57208cf43969cc7270060dcd3f0f6fd73fc8aa43645c EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99 -EBUILD kmail-17.12.1.ebuild 3203 BLAKE2B 6f6087dc3b093c54c0c467d9284d01627ad77be64a688fc64bec6c94a526e69bf4a17b6b45032a806da1fdb319db7fb8b96de7431a23fc315d03d0d5825f84d1 SHA512 862190655ee234de81599e453aae86780a3164487a05cd45015d4a12c1fcd07a0ccb8882c942418575445c8cd36e251e594b8c54cfd2838926c478b90364dfff +EBUILD kmail-17.12.1-r1.ebuild 3254 BLAKE2B ccde7c0a6f49a80f5bb5d658c1de083208aea91c9a7c269e1e25467e0cc1781ab7a5bc155794967a67f4253bf51db5cd008e3f37e07584eed4c354c041eac6de SHA512 cac7ca7ac4d9fff3d8ed3986eb9d16c49c0faec7e84b5966422655ce749f6474a2e6bb53e7b4e6513005366060fad8c96df924b082f1dd5650f6810ccd424b33 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch new file mode 100644 index 000000000000..4952628ecc68 --- /dev/null +++ b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch @@ -0,0 +1,36 @@ +From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001 +From: Laurent Montel +Date: Mon, 15 Jan 2018 13:50:15 +0100 +Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore + +FIXED-IN: 5.7.2 +BUG: 388953 +--- + src/kmmainwidget.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp +index d0edc48..ab0996e 100644 +--- a/src/kmmainwidget.cpp ++++ b/src/kmmainwidget.cpp +@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions() + { + mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); + actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction); +- connect(mServerSideSubscription, &QAction::triggered, ++ connect(mApplyAllFiltersFolderAction, &QAction::triggered, + this, [this] { slotApplyFiltersOnFolder(/* recursive */ false); + }); + } +@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions() + { + mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this); + actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction); +- connect(mServerSideSubscription, &QAction::triggered, ++ connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered, + this, [this] { slotApplyFiltersOnFolder(/* recursive */ true); + }); + } +-- +cgit v0.11.2 + diff --git a/kde-apps/kmail/kmail-17.12.1-r1.ebuild b/kde-apps/kmail/kmail-17.12.1-r1.ebuild new file mode 100644 index 000000000000..86fcd8766e47 --- /dev/null +++ b/kde-apps/kmail/kmail-17.12.1-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." +HOMEPAGE="https://www.kde.org/applications/internet/kmail/" +LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" +KEYWORDS="~amd64 ~x86" +IUSE="" + +COMMON_DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_kdeapps_dep akonadi) + $(add_kdeapps_dep akonadi-contacts) + $(add_kdeapps_dep akonadi-mime) + $(add_kdeapps_dep akonadi-search) + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcontacts) + $(add_kdeapps_dep kdepim-apps-libs) + $(add_kdeapps_dep kidentitymanagement) + $(add_kdeapps_dep kmailtransport) + $(add_kdeapps_dep kmime) + $(add_kdeapps_dep kontactinterface) + $(add_kdeapps_dep kpimtextedit) + $(add_kdeapps_dep libgravatar) + $(add_kdeapps_dep libkdepim) + $(add_kdeapps_dep libkleo) + $(add_kdeapps_dep libksieve) + $(add_kdeapps_dep libktnef) + $(add_kdeapps_dep mailcommon) + $(add_kdeapps_dep messagelib) + $(add_kdeapps_dep pimcommon) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwebengine 'widgets') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + >=app-crypt/gpgme-1.7.1[cxx,qt5] +" +DEPEND="${COMMON_DEPEND} + $(add_kdeapps_dep kcalutils) + $(add_kdeapps_dep kldap) + dev-libs/libxslt + test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) +" +RDEPEND="${COMMON_DEPEND} + !kde-apps/kdepim-common-libs:4 + !kde-apps/kdepim-l10n + !kde-apps/ktnef + $(add_kdeapps_dep kdepim-runtime) + $(add_kdeapps_dep kmail-account-wizard) +" + +RESTRICT+=" test" # bug 616878 + +PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" ) + +src_prepare() { + cmake-utils_src_prepare + + if ! use handbook; then + sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die + fi +} + +pkg_postinst() { + kde5_pkg_postinst + + pkg_is_installed() { + echo "${1} ($(has_version ${1} || echo "not ")installed)" + } + + elog "KMail supports the following runtime dependencies:" + elog " Virus detection:" + elog " $(pkg_is_installed app-antivirus/clamav)" + elog " Spam filtering:" + elog " $(pkg_is_installed mail-filter/bogofilter)" + elog " $(pkg_is_installed mail-filter/spamassassin)" + elog " Fancy e-mail headers and various useful plugins:" + elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})" + elog " Crypto config and certificate details GUI:" + elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})" +} diff --git a/kde-apps/kmail/kmail-17.12.1.ebuild b/kde-apps/kmail/kmail-17.12.1.ebuild deleted file mode 100644 index 446bd9837650..000000000000 --- a/kde-apps/kmail/kmail-17.12.1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes." -HOMEPAGE="https://www.kde.org/applications/internet/kmail/" -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="~amd64 ~x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep akonadi-mime) - $(add_kdeapps_dep akonadi-search) - $(add_kdeapps_dep kcalcore) - $(add_kdeapps_dep kcontacts) - $(add_kdeapps_dep kdepim-apps-libs) - $(add_kdeapps_dep kidentitymanagement) - $(add_kdeapps_dep kmailtransport) - $(add_kdeapps_dep kmime) - $(add_kdeapps_dep kontactinterface) - $(add_kdeapps_dep kpimtextedit) - $(add_kdeapps_dep libgravatar) - $(add_kdeapps_dep libkdepim) - $(add_kdeapps_dep libkleo) - $(add_kdeapps_dep libksieve) - $(add_kdeapps_dep libktnef) - $(add_kdeapps_dep mailcommon) - $(add_kdeapps_dep messagelib) - $(add_kdeapps_dep pimcommon) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebengine 'widgets') - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - >=app-crypt/gpgme-1.7.1[cxx,qt5] -" -DEPEND="${COMMON_DEPEND} - $(add_kdeapps_dep kcalutils) - $(add_kdeapps_dep kldap) - dev-libs/libxslt - test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/kdepim-common-libs:4 - !kde-apps/kdepim-l10n - !kde-apps/ktnef - $(add_kdeapps_dep kdepim-runtime) - $(add_kdeapps_dep kmail-account-wizard) -" - -RESTRICT+=" test" # bug 616878 - -src_prepare() { - cmake-utils_src_prepare - - if ! use handbook; then - sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die - fi -} - -pkg_postinst() { - kde5_pkg_postinst - - pkg_is_installed() { - echo "${1} ($(has_version ${1} || echo "not ")installed)" - } - - elog "KMail supports the following runtime dependencies:" - elog " Virus detection:" - elog " $(pkg_is_installed app-antivirus/clamav)" - elog " Spam filtering:" - elog " $(pkg_is_installed mail-filter/bogofilter)" - elog " $(pkg_is_installed mail-filter/spamassassin)" - elog " Fancy e-mail headers and various useful plugins:" - elog " $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})" - elog " Crypto config and certificate details GUI:" - elog " $(pkg_is_installed kde-apps/kleopatra:${SLOT})" -} -- cgit v1.2.3