[gentoo-commits] repo/gentoo:master commit in: kde-apps/akonadi/files/, kde-apps/kmail/, kde-apps/kleopatra/, ...

[Andreas Sturmlechner]

commit:     71a8e56a346d252caddf155dd96c94d225e07bc7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 13 01:15:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 30 22:12:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a8e56a

kde-apps: Drop KDE PIM 4.4.2017.0 (noakonadi)

Closes: https://bugs.gentoo.org/634768
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 kde-apps/akonadi/Manifest                          |   3 +-
 .../akonadi/akonadi-1.13.1_pre20160203-r1.ebuild   | 126 ---------------------
 .../files/akonadi-1.13.0-mysql56-crash.patch       |  20 ----
 .../akonadi/files/akonadi-1.13.1-mysql.conf.patch  |  38 -------
 kde-apps/akregator/Manifest                        |   1 -
 kde-apps/akregator/akregator-4.4.2017.04.ebuild    |  23 ----
 kde-apps/blogilo/Manifest                          |   1 -
 kde-apps/blogilo/blogilo-4.4.2017.04.ebuild        |  21 ----
 kde-apps/kaddressbook/Manifest                     |   1 -
 .../files/kaddressbook-4.4.2017.04-gcc6.patch      |  27 -----
 .../kaddressbook/kaddressbook-4.4.2017.04.ebuild   |  58 ----------
 kde-apps/kalarm/Manifest                           |   1 -
 kde-apps/kalarm/kalarm-4.4.2017.04.ebuild          |  37 ------
 .../kdepim-meta/kdepim-meta-4.4.2017.04.ebuild     |  40 -------
 kde-apps/kjots/Manifest                            |   1 -
 kde-apps/kjots/kjots-4.4.2017.04.ebuild            |  21 ----
 kde-apps/kleopatra/Manifest                        |   1 -
 .../files/kleopatra-4.4.2017.04-gcc-6.3.patch      |  36 ------
 kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild    |  56 ---------
 kde-apps/kmail/Manifest                            |   1 -
 kde-apps/kmail/files/kmail-4.4.2017.04-gcc6.patch  |  42 -------
 kde-apps/kmail/kmail-4.4.2017.04.ebuild            |  73 ------------
 kde-apps/knotes/Manifest                           |   1 -
 kde-apps/knotes/knotes-4.4.2017.04.ebuild          |  23 ----
 kde-apps/konsolekalendar/Manifest                  |   1 -
 .../konsolekalendar-4.4.2017.04.ebuild             |  23 ----
 kde-apps/kontact/Manifest                          |   1 -
 kde-apps/kontact/kontact-4.4.2017.04.ebuild        |  55 ---------
 kde-apps/korganizer/Manifest                       |   1 -
 kde-apps/korganizer/korganizer-4.4.2017.04.ebuild  |  59 ----------
 kde-apps/libkdepim/Manifest                        |   1 -
 kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild    |  39 -------
 kde-apps/libkleo/Manifest                          |   1 -
 .../files/libkleo-4.4.2017.04-gcc-6.3.patch        |  39 -------
 kde-apps/libkleo/libkleo-4.4.2017.04.ebuild        |  27 -----
 35 files changed, 1 insertion(+), 898 deletions(-)

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 5e86e92bee4..9200d4fd330 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1 @@
-DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
-DIST akonadi-17.08.3.tar.xz 1427896 SHA256 54098782c6de7db9f3e3a30e26f56d71d8ffd8e8f9b42b9b393b1db30a035607 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb WHIRLPOOL 0c068bc1e2a9876d2535dd92074665eb588a6889c51ad1881fd96abc6bd09b302bc8edad77df6b6918bde39ab1b9016ae3bd74af0877e59efe207dcebe19d3d2
+DIST akonadi-17.08.3.tar.xz 1427896 BLAKE2B 37e19d5afb0911bf2002392e0579ea33429a5dc8ec5ddbf3c8e8fa5ec21b014dea5267e353cf5ab94927fa8444cacf9948c001de34a9acc730a891b96da7c0a5 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb

diff --git a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
deleted file mode 100644
index bdc92a8cd73..00000000000
--- a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *_pre* ]]; then
-	# KDE quickgit https certificate issue
-	# COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64"
-	# SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
-	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.gz"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.bz2"
-fi
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi"
-
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+mysql postgres sqlite test"
-
-REQUIRED_USE="|| ( sqlite mysql postgres )"
-
-CDEPEND="
-	dev-libs/boost:=
-	>=dev-qt/qtcore-4.8.5:4
-	>=dev-qt/qtdbus-4.8.5:4
-	>=dev-qt/qtgui-4.8.5:4
-	>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-	>=dev-qt/qttest-4.8.5:4
-	x11-misc/shared-mime-info
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch"
-	"${FILESDIR}/${PN}-1.13.1-mysql.conf.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
-			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
-	fi
-}
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, SQLite PostgreSQL
-	# reverse driver check to keep the order
-	if use postgres; then
-		DRIVER="QPSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use sqlite; then
-		DRIVER="QSQLITE3"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	if use mysql; then
-		DRIVER="QMYSQL"
-		AVAILABLE+=" ${DRIVER}"
-	fi
-
-	# Notify about MySQL is recommend by upstream
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn
-		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
-		ewarn "user configuration. This is the backend recommended by KDE upstream. PostgreSQL"
-		ewarn "is also known to work very well but requires manual dump and import on major"
-		ewarn "upgrades of the DB."
-		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
-		ewarn "Available drivers are:${AVAILABLE}"
-		ewarn
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		-DWITH_SOPRANO=FALSE
-		-DAKONADI_BUILD_TESTS=$(usex test)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DQT5_BUILD=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	export $(dbus-launch)
-	cmake-utils_src_test
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are: ${AVAILABLE}"
-}

diff --git a/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch
deleted file mode 100644
index 20496183276..00000000000
--- a/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp
---- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp	2014-08-10 06:38:58.000000000 -0400
-+++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp	2015-01-08 15:08:36.906134212 -0500
-@@ -76,6 +76,7 @@
-       << QLatin1String( "/usr/local/sbin" )
-       << QLatin1String( "/usr/local/libexec" )
-       << QLatin1String( "/usr/libexec" )
-+      << QLatin1String( "/usr/share/mysql/scripts" )
-       << QLatin1String( "/opt/mysql/libexec" )
-       << QLatin1String( "/opt/local/lib/mysql5/bin" )
-       << QLatin1String( "/opt/mysql/sbin" );
-@@ -278,7 +279,7 @@
-   // first run, some MySQL versions need a mysql_install_db run for that
-   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
-   if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
--    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
-+    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ;
-     QProcess::execute( mMysqlInstallDbPath, arguments );
-   }
- 

diff --git a/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch
deleted file mode 100644
index a090636e725..00000000000
--- a/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Daniel Vrátil <dvratil@×××.org>
-Date: Tue, 16 Feb 2016 17:26:22 +0000
-Subject: Drop mysql.conf option removed in MySQL 5.7
-X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9a9f7eaa38023f70c6fa85a87359a487ccf7a48c
----
-Drop mysql.conf option removed in MySQL 5.7
-
-innodb_additional_mem_pool_size option has been deprecated in MySQL 5.6
-and removed in 5.7 so MySQL will no longer start it the option is present
-in mysql.conf.
-
-The option still seems to be supported by MariaDB, but the default value
-we had in the mysql.conf was below the minimum allowed value, so the harm
-in removing the option for MariaDB should be minimal.
-
-If options supported by MySQL and MariaDB begin to diverge more in the future
-we might consider having separate config files for each database.
-
-* 2016-02-21: Adjusted path for 1.13 branch
----
-
-
---- a/server/src/storage/mysql-global.conf
-+++ b/server/src/storage/mysql-global.conf
-@@ -37,9 +37,9 @@
- # use InnoDB for transactions and better crash recovery
- default_storage_engine=innodb
- 
--# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:1M)
--# Deprecated in MySQL >= 5.6.3
--innodb_additional_mem_pool_size=1M
-+# memory pool InnoDB uses to store data dictionary information and other internal data structures (default:8M)
-+# Deprecated in MySQL >= 5.6.3, removed in 5.7 (works in MariaDB)
-+# innodb_additional_mem_pool_size=8M
- 
- # memory buffer InnoDB uses to cache data and indexes of its tables (default:128M)
- # Larger values means less I/O
-

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 2def514b11f..dd01ffd1fbe 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1 @@
 DIST akregator-17.08.3.tar.xz 2248228 SHA256 e6f5c2af78b3db8f9c3bb949afe9c2c18d8151aa138fe9b0219f509da447a4c9 SHA512 1415eea92cd26d6aa39e373d4177b09739479cb8f168f16ffaede7abf47c5a3b5a2e349bb583428ee210a44736cc4d27dde60fab69edf56e0621062512169ca5 WHIRLPOOL 2850c706de115483e34122a08affa691c7527420567201b775d8eff9ae11556a99e0f728f5f82d86172725af8b629d4170e0bc163ff98027f15bec89071b7390
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/akregator/akregator-4.4.2017.04.ebuild b/kde-apps/akregator/akregator-4.4.2017.04.ebuild
deleted file mode 100644
index 188a593480e..00000000000
--- a/kde-apps/akregator/akregator-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,23 +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"
-inherit kde4-meta
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-	$(add_kdeapps_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"

diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
index a51ade2a109..e79ced07ce2 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,2 +1 @@
 DIST blogilo-17.04.3.tar.xz 803228 SHA256 22dcf7b478d2918f9f58648df62fd9a35fc0202646a67c8fabb372584abc31fe SHA512 7d1fd9ead7c04b9429f5f650b7cb03bd000e90a26c03870583ccc813de65bbf6050b19c9cabaf12fa625289a6d30f24aac943c088159b16c765b28dbe14e2e5e WHIRLPOOL 876fa9af65396e48699f2b18429a27b2eee8d6a434f98e61c046e30bc6d9f0bdcd41a35109f20321653769e82df3281db13ade0d3458671c5a5195edce3b511a
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild b/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild
deleted file mode 100644
index def90ff9c3c..00000000000
--- a/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,21 +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"
-SQL_REQUIRED="always"
-inherit kde4-meta
-
-DESCRIPTION="Application to create, edit and update blog content"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 125dd4263f3..14ad1ad260c 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1 @@
 DIST kaddressbook-17.08.3.tar.xz 546868 SHA256 a5a401640ae22b895b38c503bfc07a7e08f32f9f4f8b2e582d469fb7f3a303b7 SHA512 baffd3f377dc33cc4bc3402f4f814f630efa1b152e2cfe02698cb0d2237011f7b3fa1c7ceff0eb83b5a10ef2ef038f5fa89a07609db8e009da2df3f080903757 WHIRLPOOL f535ff71b5af8489f843415d40ad8278f7f8c0886d68833518166a8b86cbe20d768f8646ab64eeb6b485702465a3e18a23afa659783004618d30e6b3cb12f488
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch b/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
deleted file mode 100644
index 5c7b55c5283..00000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-4.4.2017.04-gcc6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/kaddressbook/views/configurecardviewdialog.cpp
-+++ b/kaddressbook/views/configurecardviewdialog.cpp
-@@ -34,6 +34,7 @@
- #include <kcolorscheme.h>
- #include <kconfig.h>
- #include <kdebug.h>
-+#include <kfontchooser.h>
- #include <kfontdialog.h>
- #include <kglobal.h>
- #include <kiconloader.h>
-@@ -165,14 +166,14 @@
- void CardViewLookNFeelPage::setTextFont()
- {
-   QFont f( lTextFont->font() );
--  if ( KFontDialog::getFont( f, false, this ) == QDialog::Accepted )
-+  if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
-     updateFontLabel( f, lTextFont );
- }
- 
- void CardViewLookNFeelPage::setHeaderFont()
- {
-   QFont f( lHeaderFont->font() );
--  if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
-+  if ( KFontDialog::getFont( f, KFontChooser::NoDisplayFlags, this ) == QDialog::Accepted )
-     updateFontLabel( f, lHeaderFont );
- }
- 

diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
deleted file mode 100644
index 6811bd094a5..00000000000
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,58 +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"
-inherit kde4-meta
-
-DESCRIPTION="Address book application (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)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	libkleo/
-"
-
-KMLOADLIBS="libkdepim"
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_install() {
-	kde4-meta_src_install
-
-	# file collision with kde-apps/kdepimlibs-4.14.9
-	rm -f "${ED}usr/share/kde4/servicetypes/kaddressbookimprotocol.desktop" || die
-
-	# install additional headers needed by kresources
-	insinto "${KDEDIR}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${PN}/common/*.h
-	doins "${S}"/${PN}/common/*.h
-}
-
-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
-}

diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 6e6ed5e69a9..13e5da0bd78 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1 @@
 DIST kalarm-17.08.3.tar.xz 1823924 SHA256 4abc026242e832ed9017dc643c896edca4e91bb88937438e3376fa984aefad66 SHA512 827c2eeef667d42fc691fba0fd6d458fa245eb5fb9e6abb1926137c5e1a66bf309e0e9739cd9fb62f95a14d7f46f96f2ad864434edb1e8bbcccbf8172a5f4b6e WHIRLPOOL a210b9d2e41209dae2cbf141ca719f0722041244a39ac35b06c7bf4203aaa5fe1fd9d1ab9ad9dac1f16188b84e08cd6929360b01082d5a2bc85104ef881a3ea6
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild b/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild
deleted file mode 100644
index 984fe3b8e9a..00000000000
--- a/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,37 +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"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler by KDE (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-	$(add_kdeapps_dep libkdepim)
-	media-libs/phonon[qt4]
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-"
-
-KMEXTRACTONLY="
-	kmail/
-"
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
-	)
-	kde4-meta_src_configure
-}

diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
deleted file mode 100644
index 8ad7d506bee..00000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-LICENSE="metapackage"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-SLOT="4"
-
-RDEPEND="
-	=kde-apps/akregator-4.4.2017*:4
-	=kde-apps/blogilo-4.4.2017*:4
-	=kde-apps/kabcclient-4.4.2017*:4
-	=kde-apps/kaddressbook-4.4.2017*:4
-	=kde-apps/kalarm-4.4.2017*:4
-	=kde-apps/kdepim-kresources-4.4.2017*:4
-	=kde-apps/kdepim-wizards-4.4.2017*:4
-	=kde-apps/kjots-4.4.2017*:4
-	=kde-apps/kleopatra-4.4.2017*:4
-	=kde-apps/kmail-4.4.2017*:4
-	=kde-apps/knode-4.4.2017*:4
-	=kde-apps/knotes-4.4.2017*:4
-	=kde-apps/konsolekalendar-4.4.2017*:4
-	=kde-apps/kontact-4.4.2017*:4
-	=kde-apps/korganizer-4.4.2017*:4
-	=kde-apps/ktimetracker-4.4.2017*:4
-	=kde-apps/libkdepim-4.4.2017*:4
-	=kde-apps/libkleo-4.4.2017*:4
-	=kde-apps/libkpgp-4.4.2017*:4
-	kde-frameworks/oxygen-icons:5
-	nls? (
-		>=kde-apps/kde4-l10n-4.14.3:4
-		>=kde-apps/kdepim-l10n-4.4.11.1-r1:4
-	)
-	!kde-apps/kdepim-runtime
-"

diff --git a/kde-apps/kjots/Manifest b/kde-apps/kjots/Manifest
index c626f5208c5..7193696ec87 100644
--- a/kde-apps/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kjots-5.0.2.tar.xz 230608 SHA256 5359aefb7b44027d7abbdafb0d501a7b30695119d5d5c8a75cfcee98e428fae3 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225 WHIRLPOOL 18e4dd955e275bdaceed16a4206e4ac5116cb26f2d1d87d35ef8b676ea61679e0c168176a50b94e96dadc5c944b56604d595541d158e982cc1222e5b52f3a1b6

diff --git a/kde-apps/kjots/kjots-4.4.2017.04.ebuild b/kde-apps/kjots/kjots-4.4.2017.04.ebuild
deleted file mode 100644
index d0fd9bca0d3..00000000000
--- a/kde-apps/kjots/kjots-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,21 +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"
-inherit kde4-meta
-
-DESCRIPTION="Note taking utility by KDE (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-	$(add_kdeapps_dep libkdepim)
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 316d579cfca..ed014958009 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kleopatra-17.08.3.tar.xz 1889344 SHA256 a8bb8bc8d6b6352f2d312f79ee2846217ffa699bff419673ebf70cdc1dbcf46d SHA512 b842b71c7394bed7ed3383b037b2258c72056b81d678350f1f6f4cfa2f75e269eafd45b82b78c3f7cdda659dbd9b2dc273a8d3b0ddd5cdc774277355578bbfe9 WHIRLPOOL 31542305ee0bd561a98ad08314aeafeb308f13962086b3d60de6119d40d2603bfc88c0c2d39cd0b4f2cbb889057463f002f081f7c153cde0d8c27c02d3b3d5e6

diff --git a/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch b/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch
deleted file mode 100644
index 2960166dfb7..00000000000
--- a/kde-apps/kleopatra/files/kleopatra-4.4.2017.04-gcc-6.3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 0e75bb7dff48261f8754005586e3d1b22ecfc4d2
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date:   Tue May 2 23:41:46 2017 +0200
-
-    kleopatra: Fix build with GCC 6.3.0
-    
-    Signed-off-by: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-
-diff --git a/kleopatra/utils/stl_util.h b/kleopatra/utils/stl_util.h
-index 35024d398f..c02188608e 100644
---- a/kleopatra/utils/stl_util.h
-+++ b/kleopatra/utils/stl_util.h
-@@ -347,7 +347,7 @@ namespace kdtools {
-     template <typename O, typename I, typename P>
-     O copy_if( const I & i, P p ) {
-         O o;
--        copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
-+        kdtools::copy_if( boost::begin( i ), boost::end( i ), std::back_inserter( o ), p );
-         return o;
-     }
- 
-@@ -385,12 +385,12 @@ namespace kdtools {
- 
-     template <typename C>
-     bool none_of( const C & c ) {
--        return none_of( boost::begin( c ), boost::end( c ) );
-+        return kdtools::none_of( boost::begin( c ), boost::end( c ) );
-     }
- 
-     template <typename C, typename P>
-     bool none_of( const C & c, P p ) {
--        return none_of( boost::begin( c ), boost::end( c ), p );
-+        return kdtools::none_of( boost::begin( c ), boost::end( c ), p );
-     }
- 
-     template <typename C, typename B>

diff --git a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild
deleted file mode 100644
index 275e0cc95be..00000000000
--- a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,56 +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"
-inherit kde4-meta
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography (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)
-	app-crypt/gpgme
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-	app-crypt/gnupg
-"
-
-RESTRICT=test
-# bug 399431
-
-KMEXTRACTONLY="
-	libkleo
-"
-KMLOADLIBS="libkleo"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" )
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kwatchgnupg
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_QGPGME=ON
-	)
-
-	kde4-meta_src_configure
-}

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 33ccb0dc3f8..54950ec0954 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kmail-17.08.3.tar.xz 4735776 SHA256 ace11536c9f206fe1f6fed1ffe4227b8cc90d843dcbbaa8382e04c4b15c077c5 SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7 WHIRLPOOL 0fd3d26bc87f2f2505dd7b3a24b6f52080d3e5cf7f2a89fff6f57b163c5775a51a843cd49c1e7410743555e08203abf6f09004bc5117400067a8610ecc2f3513

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 e4a891b8d1c..00000000000
--- 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-4.4.2017.04.ebuild b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
deleted file mode 100644
index 3b8a9614db1..00000000000
--- 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
-}

diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 7b2c5201aa8..efcd6383e0a 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST knotes-17.08.3.tar.xz 334728 SHA256 be0ba0da39e043c6d50c2d6ca7556016a3488ff8a5e16f478983da11e57dc953 SHA512 8afc903cec73283faba5d0f908004fc965ff501aec78904dc2383ccab8956b343dd135f58214372262e509298e57bf9d816067ff1cf18d592acdec97204dfd0d WHIRLPOOL a886a11b12a985e7b770bf332ea72824a52b646f20d33b8bc71dd4930318917265e2f8fae9cb3e9a383a678886bcbb3d97e3fbfd2c8ba41846f8e1922e231d79

diff --git a/kde-apps/knotes/knotes-4.4.2017.04.ebuild b/kde-apps/knotes/knotes-4.4.2017.04.ebuild
deleted file mode 100644
index f8c320798b0..00000000000
--- a/kde-apps/knotes/knotes-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,23 +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"
-inherit kde4-meta
-
-DESCRIPTION="Note taking application (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-	$(add_kdeapps_dep libkdepim)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"

diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index a21443d7894..6daec2b93dd 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,2 +1 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 SHA256 7c4e1599998eb597233107dc4b1a21c8fd7aa802b7e0f914b762e0ad8daf65a5 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40 WHIRLPOOL 8b68c8bc2940141fb4d906f37904d3d9cd9604bcda626fa02aa9aa0e8f92670bf2d0f09ec74a76d1e07aa79fe83fba70da1b622f117de1aed5d9e21289a8c3e3
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a

diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild
deleted file mode 100644
index 5cc63eaa3ff..00000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,23 +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"
-KMMODULE="console/${PN}"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-meta
-
-DESCRIPTION="Command line interface to KDE calendars (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)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-"

diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 787adc7d329..69ceb24436f 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kontact-17.08.3.tar.xz 864628 SHA256 31a8dc56b96cb9054bc2245cc312230ad85089a88cccc906717f8d63f7db46c2 SHA512 9dbd0a967425a6aa9c8b24fa28bf71d9e32329d1c9ed7f0f6eaecdfa12340efe9fc991b3591f554a2f4e0da1322aef75026d38a5bbb1ad53114a17004c5445fe WHIRLPOOL 29cf584408a257b4a16a65ae8cbc21b1e4262b019f1ffe323d34042c52a3f211edc59f78ecad10bd28ff91a6f3e244d1301a25d059ec5d728b3f6bf1f8695434

diff --git a/kde-apps/kontact/kontact-4.4.2017.04.ebuild b/kde-apps/kontact/kontact-4.4.2017.04.ebuild
deleted file mode 100644
index a2c593d2c32..00000000000
--- a/kde-apps/kontact/kontact-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,55 +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"
-inherit kde4-meta
-
-DESCRIPTION="Container application to unify PIM applications within one (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)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-"
-
-KMLOADLIBS="libkdepim"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-# xml targets from kmail/ are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	kmail/
-	kontact/plugins/akregator/
-	kontact/plugins/kaddressbook/
-	kontact/plugins/kjots/
-	kontact/plugins/kmail/
-	kontact/plugins/knode/
-	kontact/plugins/knotes/
-	kontact/plugins/korganizer/
-	kontact/plugins/ktimetracker/
-	kontact/plugins/planner/
-	kontact/plugins/specialdates/
-"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+="
-			doc/kontact-admin/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}

diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index d9223512f8e..2645c49e38a 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST korganizer-17.08.3.tar.xz 2268320 SHA256 14a0ff02d6032407de2be017bdbce0ef6a273edecdd7b69bf8b6961ce00052db SHA512 1e9c037fdecc1b3cdc22bdbd45098cdeb8cf5a4334b0583601dd499f4b277229d5481363654373a2f5cc115c9741ac2943c651ce697616c9c970cf5aa873f88e WHIRLPOOL b132e068d629e1d5be4cddd86276a97bce0d5f9d99634dae9008e995c1b5d58131c891bded204b37729846c3e52931741d92cf5363cf9a80a1bf6a15a69d9d74

diff --git a/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild b/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild
deleted file mode 100644
index ec9f212bf2f..00000000000
--- a/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,59 +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"
-inherit kde4-meta
-
-DESCRIPTION="Personal Organizer by KDE (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)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-	$(add_kdeapps_dep ktimezoned '' 4.14.3)
-"
-
-KMLOADLIBS="libkdepim"
-KMEXTRA="kdgantt1"
-
-# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY="
-	kmail/
-	knode/org.kde.knode.xml
-	kaddressbook/org.kde.KAddressbook.Core.xml
-"
-
-# bug 378151
-RESTRICT=test
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA}
-			kontact/plugins/planner/
-			kontact/plugins/specialdates/
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-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
-}

diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index d0ce5e2458c..94c607c140c 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST libkdepim-17.08.3.tar.xz 339080 SHA256 256ac3ecc01142dcc8780be197d654f6cc8fe4b696c8599999f42806dbd7d2a6 SHA512 ceb4ae8f2151c1973a5aed7a8510c6a872cb479e5d6cee212977d18dec0645122c0b308231b77a2c35e6366a0452d9df42e8cef0c5bfb91934432ff61383a744 WHIRLPOOL 3fd07659ebcbd75f017e347f86bcd48e17b0ea172146212e45a4f901db68c6822555f06ac5b5ca46166cdfba16b811801f8fa9983f2f63aedd875106cf390eed

diff --git a/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild b/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild
deleted file mode 100644
index 6f650ca1ed7..00000000000
--- a/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-meta
-
-DESCRIPTION="Common library for KDE PIM apps (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-	kaddressbook/org.kde.KAddressbook.Core.xml
-"
-
-KMSAVELIBS="true"
-
-# the one test that can be run requires a dbus session bus
-RESTRICT+=" test"
-
-src_install() {
-	kde4-meta_src_install
-
-	# install additional generated headers that are needed by other packages that
-	# are derived from kdepim. e.g. kmail.
-	pushd "${CMAKE_BUILD_DIR}/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
-	insinto /usr/include
-	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
-	popd 2>/dev/null
-}

diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 426d7c42728..71f1b530c66 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST libkleo-17.08.3.tar.xz 291208 SHA256 67f90292be624073469d50374f7c2f71b300c787938a829098cfb683033bcedb SHA512 1b077fa9fdb56bd762cec5dfdf21a898de2a0ef24db79c0ae7ec9caa5f6af3a1d67e218a7b25fd879ef0d22a71448b888cdf6036da0ccdb041e1647520dbe11e WHIRLPOOL fc5e2d9183af8191190ab0070cb5fa20e25d5016ff5e764f1b48cf1a8edd2d31dfe1f1d9b1440667b44c63c330dc20cdc4c551ddea44a986162443b466a73f2f

diff --git a/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch b/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch
deleted file mode 100644
index 79023520d73..00000000000
--- a/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 272601864851e4411421ffe7fce764e01b5b1bfa
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date:   Wed May 3 00:16:05 2017 +0200
-
-    libkleo: Fix build with GCC-6.3
-    
-    Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@××××××.Org>
-
-diff --git a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-index 4d26eb8772..c9c4642c62 100644
---- a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-+++ b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-@@ -85,7 +85,7 @@ static QGpgMEKeyListJob::result_type list_keys( Context * ctx, QStringList pats,
-   if ( pats.size() < 2 ) {
-     std::vector<Key> keys;
-     const KeyListResult r = do_list_keys( ctx, pats, keys, secretOnly );
--    return make_tuple( r, keys, QString(), Error() );
-+    return boost::make_tuple( r, keys, QString(), Error() );
-   }
- 
-   // The communication channel between gpgme and gpgsm is limited in
-@@ -109,7 +109,7 @@ retry:
-       chunkSize /= 2;
-       if ( chunkSize < 1 )
-         // chunks smaller than one can't be -> return the error.
--        return make_tuple( this_result, keys, QString(), Error() );
-+        return boost::make_tuple( this_result, keys, QString(), Error() );
-       else
-         goto retry;
-     }
-@@ -119,7 +119,7 @@ retry:
-       break;
-     pats = pats.mid( chunkSize );
-   } while ( !pats.empty() );
--  return make_tuple( result, keys, QString(), Error() );
-+  return boost::make_tuple( result, keys, QString(), Error() );
- }
- 
- Error QGpgMEKeyListJob::start( const QStringList & patterns, bool secretOnly ) {

diff --git a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
deleted file mode 100644
index 54bbd999821..00000000000
--- a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-meta
-
-DESCRIPTION="Library for encryption handling"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-	app-crypt/gnupg
-"
-
-KMSAVELIBS="true"
-KMEXTRACTONLY="kleopatra/"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" )