gentoo resync : 01.12.2017

5 files changed, 2 insertions, 230 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 4748600a3fca..a5005d641d48 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,8 +1,3 @@
-AUX kmail-4.4.2017.04-gcc6.patch 1431 BLAKE2B f77aecad846aea54e45a8f9e3add528aeea63a7d63e2751b72071f0a7a1ab7d2c345ba21065f8192df6280c9b82f5a4e12a7d8aa6f5cc1da5f7a16069a595590 SHA512 f7f8424dc824a11993c3ff33c9cc1649ffecd975a097c130bf367223c63f695bae548779760a7ce484e03b0b0adabdc0ebb084f3cea0c50091e7592dce9fe25f
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
-DIST kmail-17.04.3.tar.xz 4374744 SHA256 ab5bf6a5ca881b2286a5eee48d2a496cda7d82752d811c078510a286e6dc8356 SHA512 73e88d622cd68c27b087ed388109020dee1364acf702230a2e1e40ceb185afeede2dc7ab1c28338ab3b88a8046836ab66f278932e14cef09472fd7472fb5fa9f WHIRLPOOL 35064cb09a7b4475df9606df3a3590581096656997be5c83c3593ef631656e3474d8551b6b58073cdf526dbbb121b94f0ab7bac528edde7731d6ec9125c97a28
 DIST kmail-17.08.3.tar.xz 4735776 SHA256 ace11536c9f206fe1f6fed1ffe4227b8cc90d843dcbbaa8382e04c4b15c077c5 SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7 WHIRLPOOL 0fd3d26bc87f2f2505dd7b3a24b6f52080d3e5cf7f2a89fff6f57b163c5775a51a843cd49c1e7410743555e08203abf6f09004bc5117400067a8610ecc2f3513
-EBUILD kmail-17.04.3.ebuild 2928 BLAKE2B 2be33de75418141aef20031625a6c9a06f8ee8c8936181dd3245a3e1d9b8fb2cfebdada5a635b7d03e56c993e63718409e59c8db2454636fabb84209bc6b2450 SHA512 cc8cfecc085bccabbc2283421418cf1f26276d632b36a697ff484e65fb07117be3c24af1f6a3d389e58ac665c7d808ba4d793665b7853d0d426b535f66ff8434
-EBUILD kmail-17.08.3.ebuild 3162 BLAKE2B e77ab8ee9d3cdc7517d1c9330772e87ef75a20e8c6a4448e76522d2e75784f7a8a0b0f185f617eee98bcbd207755dd952f97395a69726993f017da1ada01c443 SHA512 322e14a81197e1a79635df298c279e92c9e0b4462db4c37c50820958e82dbd2bc2bdf4228b651a57c552c2baa3724e4b5cf0a23abf179c36edb1a28db707635a
-EBUILD kmail-4.4.2017.04.ebuild 1459 BLAKE2B e756cb7775ed3d2281ae504ecb387d981b7df0d19183eac38517d22254b4007e644ed6589aab0e92958f3287ca609c375793d30244e008f2dba89334b7890411 SHA512 6aa97cad41a9412c20db0b682d3a3b8626d1ef79b5e11908aa4bfe583675474899051b0bd12b667f1677b6d236bfd1c74c9a74b204e6de723f1ddab4da98ccd9
+EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch b/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch
deleted file mode 100644
index e4a891b8d1c8..000000000000
--- a/kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/kmail/folderview.cpp
-+++ b/kmail/folderview.cpp
-@@ -1907,7 +1907,7 @@
-            KGuiItem( i18n( "Go To" ) ),
-            KGuiItem( i18n( "Do Not Go To" ) ), // defaults
-            ":kmail_AskNextFolder",
--           false
-+           0
-          ) == KMessageBox::No
-      )
-     return true; // assume selected (do not continue looping)
---- a/kmail/kmmainwidget.cpp
-+++ b/kmail/kmmainwidget.cpp
-@@ -1588,7 +1588,7 @@
-       i18n( "Security Warning" ),
-       KGuiItem(i18n( "Use HTML" )),
-       KStandardGuiItem::cancel(),
--      "OverrideHtmlWarning", false);
-+      "OverrideHtmlWarning", 0);
-     if( result == KMessageBox::Cancel ) {
-       mPreferHtmlAction->setChecked( false );
-       return;
-@@ -1617,7 +1617,7 @@
-       i18n( "Security Warning" ),
-       KGuiItem(i18n( "Load External References" )),
-       KStandardGuiItem::cancel(),
--      "OverrideHtmlLoadExtWarning", false);
-+      "OverrideHtmlLoadExtWarning", 0);
-     if( result == KMessageBox::Cancel ) {
-       mPreferHtmlLoadExtAction->setChecked( false );
-       return;
---- a/kmail/kmsender.cpp
-+++ b/kmail/kmsender.cpp
-@@ -575,7 +575,7 @@
-         i18n( "Security Warning" ),
-         KGuiItem( i18n( "Send Unencrypted" ) ),
-         KStandardGuiItem::cancel(),
--        "useCustomTransportWithoutAsking", false );
-+        "useCustomTransportWithoutAsking", 0 );
- 
-       if ( result == KMessageBox::Cancel ) {
-         mProgressItem->cancel();
diff --git a/kde-apps/kmail/kmail-17.04.3.ebuild b/kde-apps/kmail/kmail-17.04.3.ebuild
deleted file mode 100644
index 84ec5a614d47..000000000000
--- a/kde-apps/kmail/kmail-17.04.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.7.0"
-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)
-"
-
-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
-
-	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
-		echo
-	fi
-
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
-		echo
-	fi
-}
diff --git a/kde-apps/kmail/kmail-17.08.3.ebuild b/kde-apps/kmail/kmail-17.08.3.ebuild
index 668d37b9c8e8..092a76a3c307 100644
--- a/kde-apps/kmail/kmail-17.08.3.ebuild
+++ b/kde-apps/kmail/kmail-17.08.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmail/kmail-4.4.2017.04.ebuild b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
deleted file mode 100644
index 3b8a9614db10..000000000000
--- a/kde-apps/kmail/kmail-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-QT3SUPPORT_REQUIRED="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libkpgp)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-"
-
-KMEXTRACTONLY="
-	korganizer/org.kde.Korganizer.Calendar.xml
-	libkleo/
-	libkpgp/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	messagecore/
-	messagelist/
-	messageviewer/
-	mimelib/
-	plugins/kmail/
-"
-KMLOADLIBS="libkdepim"
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_IndicateQt=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-src_compile() {
-	kde4-meta_src_compile kmail_xml
-	kde4-meta_src_compile
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if ! has_version kde-apps/kdepim-kresources:${SLOT}; then
-		echo
-		elog "For groupware functionality, please install kde-apps/kdepim-kresources:${SLOT}"
-		echo
-	fi
-	if ! has_version kde-apps/kleopatra:${SLOT}; then
-		echo
-		elog "For certificate management and the gnupg log viewer, please install kde-apps/kleopatra:${SLOT}"
-		echo
-	fi
-}