From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 7 May 2017 14:50:40 +0000 (+0200)
Subject: kde-apps: Drop KDE PIM 4.4.2016.01
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c50f0f9eef12c54abf315f26ba4b06438d37af43;p=gentoo.git

kde-apps: Drop KDE PIM 4.4.2016.01

This drops back 'veryoldpim' to unstable.
No one from KDE team is using it at this point.

Package-Manager: Portage-2.3.5, Repoman-2.3.1
---

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index c80e3923fab0..bccefa473e4f 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,4 @@
 DIST akregator-17.04.0.tar.xz 2254720 SHA256 a5c6389d7a6f83a81b3cb062653c667272df596215650c6fbd817a3a42f7fbb6 SHA512 6544fe124a6e82e6af06e66a8997f3cee3ae10fc993c9cad0a007b2c342d626a866794f4b060d0f019a5fbc345903c50a35ba9069b5de08cdd233ba46b4356b6 WHIRLPOOL 402e852db5cd2209782cee11625ec7d538ec6b63550144cbee3b33e091067e84da9dcb9db360d1871a308baeec8889051f15856db7a7ed9cd10d3862dbc687ca
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/akregator/akregator-4.4.2016.01.ebuild b/kde-apps/akregator/akregator-4.4.2016.01.ebuild
deleted file mode 100644
index dbf3a4ef41ab..000000000000
--- a/kde-apps/akregator/akregator-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	kde-frameworks/kdelibs:4
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"
diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
index 6285d80f1d39..a452155db0d9 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,5 +1,4 @@
 DIST blogilo-17.04.0.tar.xz 804220 SHA256 ab3951df4a110ef6d8ffcaf2f5c99da0df45239e983a9fdcdaabe8e864d83b6d SHA512 9f576294e62f04a2eeaa1652917d92faeaf54dc0d474032277e7aa3619f3f9b8418bda6b44c620e4cdb38cba6dacf31c1e5e11ddc55c5159ef1288cb9f03348e WHIRLPOOL 8568079bc31642aa6dcfff1180524d3f31a361fb857b26616850873665ae5541da93b008d3470ee51f2baabbdc2d932cccfcda237f0795c19bf240dfe676589a
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/blogilo/blogilo-4.4.2016.01.ebuild b/kde-apps/blogilo/blogilo-4.4.2016.01.ebuild
deleted file mode 100644
index 4c6bf03eb4af..000000000000
--- a/kde-apps/blogilo/blogilo-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/bilbo
-	!kde-misc/blogilo
-"
diff --git a/kde-apps/kabcclient/Manifest b/kde-apps/kabcclient/Manifest
index aa91b69d1bc2..2da6ebd9cbd4 100644
--- a/kde-apps/kabcclient/Manifest
+++ b/kde-apps/kabcclient/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/kabcclient/kabcclient-4.4.2016.01.ebuild b/kde-apps/kabcclient/kabcclient-4.4.2016.01.ebuild
deleted file mode 100644
index d833ea6d94cd..000000000000
--- a/kde-apps/kabcclient/kabcclient-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde4-meta_src_install
-
-	# work around NULL DT_RPATH in kabc2mutt
-	dosym kabcclient /usr/bin/kabc2mutt
-}
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 5db72eb0fac2..0fce347b4f2b 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,4 @@
 DIST kaddressbook-17.04.0.tar.xz 561852 SHA256 9f50478678b2b9073b8bc9ca3de5d8174d9d08aba2e9af248d78451b85edf4e1 SHA512 db9f61c87721ed3c4ace8b4063ab34fce31402e2f8c5c9c1a108cbee3e34c3af2de48b9f30b82edf0d81d3bd8006743cded1632a53fbab5c09f3de4f8fe9b095 WHIRLPOOL 40952cd3ab27f4103a5509a25b7a5318fdfa5713ceeaaed143f2c0324ccb39c82c8bc64d8747927364e721a6c9d1eb86c5692281513bb7ba7688d154efa6dd83
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
deleted file mode 100644
index 29f2f7efb47d..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.13.1)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	$(add_kdeapps_dep libkleo '' 4.4.2015)
-	kde-frameworks/kdelibs:4
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-"
-
-KMEXTRA="
-	plugins/kaddressbook/
-	plugins/ktexteditor/
-"
-KMEXTRACTONLY="
-	libkleo/
-"
-
-KMLOADLIBS="libkdepim"
-
-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 32913a86a3cb..3d7e1abd6058 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,4 @@
 DIST kalarm-17.04.0.tar.xz 1823760 SHA256 e7911fee91804f9e401a11ac0423f0a2fe5e04741146dcdcf08053c7cba30bff SHA512 1c7eba06e9998addb1ca36375f556f2ffbc401acaf8a6240b14ff245ec52eddfa503ea2ccfa608b743522c1e3787d9a5f4f6488e67803552cad1519efd907545 WHIRLPOOL 10b45398ced32722439925399ed6b6f9a7ef68725cae1b5e73593a8de643feb86e7ced15de7183b1cf0a205bd59b2ca205d691423aefd8173b0fbde196ec00d1
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/kalarm/files/kalarm-4.4.11.1-underlinking.patch b/kde-apps/kalarm/files/kalarm-4.4.11.1-underlinking.patch
deleted file mode 100644
index 87eadc8a38b8..000000000000
--- a/kde-apps/kalarm/files/kalarm-4.4.11.1-underlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt kalarm-4.4.11.1/kalarm/CMakeLists.txt
---- kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
-+++ kalarm-4.4.11.1/kalarm/CMakeLists.txt	2011-08-11 22:03:27.096295681 +0200
-@@ -130,7 +130,9 @@
- 
- set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
- 
--target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim)
-+target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} 
-+                      ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} 
-+                      ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim)
- 
- install(TARGETS kalarm_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
- #endif (UNIX)
diff --git a/kde-apps/kalarm/kalarm-4.4.2016.01.ebuild b/kde-apps/kalarm/kalarm-4.4.2016.01.ebuild
deleted file mode 100644
index 977a86739e92..000000000000
--- a/kde-apps/kalarm/kalarm-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-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 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-libs/libxslt
-"
-
-KMEXTRACTONLY="
-	kmail/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.11.1-underlinking.patch"
-)
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
-	)
-	kde4-meta_src_configure
-}
diff --git a/kde-apps/kdepim-kresources/Manifest b/kde-apps/kdepim-kresources/Manifest
index aa91b69d1bc2..2da6ebd9cbd4 100644
--- a/kde-apps/kdepim-kresources/Manifest
+++ b/kde-apps/kdepim-kresources/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild
deleted file mode 100644
index 2959aded0d9c..000000000000
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-IUSE="debug"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	$(add_kdeapps_dep kaddressbook '' 4.4.2015)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kaddressbook/common/
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="libkdepim"
-
-src_prepare() {
-	local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"
-
-	pushd kaddressbook/common > /dev/null
-	# create the kabprefs_base.h file
-	"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
-	popd > /dev/null
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware stuff gone
-	insinto /usr/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/{groupwise,slox}/*.h
-}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
deleted file mode 100644
index 2e39856fcf08..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_BLOCK_SLOT4="false"
-inherit kde5-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-SLOT="4"
-
-RDEPEND="
-	kde-frameworks/oxygen-icons:5
-	$(add_kdeapps_dep akregator)
-	$(add_kdeapps_dep blogilo)
-	$(add_kdeapps_dep kabcclient)
-	$(add_kdeapps_dep kaddressbook)
-	$(add_kdeapps_dep kalarm)
-	$(add_kdeapps_dep kdepim-kresources)
-	$(add_kdeapps_dep kdepim-wizards)
-	$(add_kdeapps_dep kjots)
-	$(add_kdeapps_dep kleopatra)
-	$(add_kdeapps_dep kmail)
-	$(add_kdeapps_dep knode)
-	$(add_kdeapps_dep knotes)
-	$(add_kdeapps_dep konsolekalendar)
-	$(add_kdeapps_dep kontact)
-	$(add_kdeapps_dep korganizer)
-	$(add_kdeapps_dep ktimetracker)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libkpgp)
-	nls? (
-		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-		$(add_kdeapps_dep kdepim-l10n '' 4.4.11.1-r1)
-	)
-	!kde-apps/kdepim-runtime
-"
diff --git a/kde-apps/kdepim-wizards/Manifest b/kde-apps/kdepim-wizards/Manifest
index eec0421df5d8..0a465788df7f 100644
--- a/kde-apps/kdepim-wizards/Manifest
+++ b/kde-apps/kdepim-wizards/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild b/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild
deleted file mode 100644
index 042b85965080..000000000000
--- a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="wizards"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM wizards (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-IUSE="debug"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep kdepim-kresources '' 4.4.2015)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-"
-
-KMEXTRACTONLY="
-	kmail/
-	knotes/
-	kresources/groupwise/
-	kresources/kolab/
-	kresources/slox/
-"
-
-src_prepare() {
-	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
-		kresources/slox/ \
-		|| die "Failed to link extra_headers."
-	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
-		kresources/groupwise/ \
-		|| die "Failed to link extra_headers."
-
-	kde4-meta_src_prepare
-}
diff --git a/kde-apps/kdepimlibs/Manifest b/kde-apps/kdepimlibs/Manifest
index eb7ae879258c..fdb838d90796 100644
--- a/kde-apps/kdepimlibs/Manifest
+++ b/kde-apps/kdepimlibs/Manifest
@@ -1,3 +1,2 @@
-DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
 DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c WHIRLPOOL 28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
 DIST kdepimlibs-4.14.11_pre20160611.tar.xz 2860084 SHA256 15ebde0f9683f42b89dc2ad6656bc71bf516e2b885333cc5438891217e59ddd4 SHA512 19560362f07328f3743b5aabdef74a55e3ac7f8016f1bb6d63aa792985b9b0c4d3f34e979df6022df31623ffb7f701c90f9262a70cc9326596429ff1395c4f6d WHIRLPOOL cddf5beb57f66e19b60baa896ba08879c1537d44cb35fb33776c439461411a1e0b07ec03229bc1d4a6d086235e50c19022411fe1d2a56d7901d8a6e9c1fbcbd0
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild
deleted file mode 100644
index b4669c59a4dd..000000000000
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-EGIT_BRANCH="KDE/4.14"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap prison"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
-	>=app-crypt/gpgme-1.8.0
-	>=dev-libs/boost-1.35.0-r5:=
-	dev-libs/libgpg-error
-	>=dev-libs/libical-0.48-r2:=
-	dev-libs/cyrus-sasl
-	>=dev-libs/qjson-0.8.1
-	kde-apps/akonadi:4
-	media-libs/phonon[qt4]
-	x11-misc/shared-mime-info
-	prison? ( kde-frameworks/prison:4 )
-	ldap? ( net-nds/openldap )
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}
-	!app-crypt/gpgme[cxx]
-	!app-crypt/gpgme[qt5]
-	!=kde-apps/kdepim-runtime-4.10*
-	!=kde-apps/kdepim-runtime-4.11*
-	!<kde-apps/kdepim-runtime-4.4.11.1-r2:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
-	"${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
-	"${FILESDIR}/${PN}-4.14.11-gpgme-1.8.0.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_doc=$(usex handbook)
-		$(cmake-utils_use_find_package ldap Ldap)
-		$(cmake-utils_use_find_package prison Prison)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
-
-	# contains constants/defines only
-	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
-}
diff --git a/kde-apps/kjots/Manifest b/kde-apps/kjots/Manifest
index 9f495ac85185..1f0260551c20 100644
--- a/kde-apps/kjots/Manifest
+++ b/kde-apps/kjots/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 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.2016.01.ebuild b/kde-apps/kjots/kjots-4.4.2016.01.ebuild
deleted file mode 100644
index c42d7a58e876..000000000000
--- a/kde-apps/kjots/kjots-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 16db1d4058ed..a1ef9d9ef9ee 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kleopatra-17.04.0.tar.xz 1841156 SHA256 cc73f7b4e2d3722dd5ae061d731438f93a3fa851cc7dcc3c9b1f63ca131d02d1 SHA512 622ce422e51944d58de5ba04ce846ac7409cc4d60d36b8a15e19e608a0a2b3183dd1867a89276d8a6bb4fcdadcc9f38cb0311ee8139dabc08fade846d0a7da39 WHIRLPOOL 6122a7ad32945e3889daa8eca322d422c815f617ad14f6c6560e259be9e3ba951259a9997775c20af561d3a6d586edd48c148c1f530432326382a5c79ea5a154
diff --git a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild
deleted file mode 100644
index b4a6cffedc14..000000000000
--- a/kde-apps/kleopatra/kleopatra-4.4.2016.01-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	$(add_kdeapps_dep libkleo '' 4.4.2015)
-	app-crypt/gpgme
-	>=dev-libs/libassuan-2.0.0
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-	app-crypt/gnupg
-"
-
-RESTRICT=test
-# bug 399431
-
-KMEXTRACTONLY="
-	libkleo
-"
-KMLOADLIBS="libkleo"
-
-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 6e81813b5210..18f5e633b515 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kmail-17.04.0.tar.xz 4377580 SHA256 2a00586e859cbca977fedc36e6992f26df8c8ce633020c259bdc3ee1b56c8e11 SHA512 3267c06a2257fa6ad2a978169a82e954708de71999d6b3ec0718c8d487f96dc8bfe56ea25395a488d4ad629fa2cc713d14b9b831bf4e445742c91e6ad308b900 WHIRLPOOL 7156ed06cf774db8c4fdfd866b6e5532926ac1d2c965133e9a2bd815481c1dbb37227531b22825e00be03bda07e495835d22e2077ad1f1e491d88b871d636eeb
diff --git a/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild b/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild
deleted file mode 100644
index 05893fc561ac..000000000000
--- a/kde-apps/kmail/kmail-4.4.2016.01-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="Email component of Kontact (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10-r3)
-	$(add_kdeapps_dep libkdepim '' 4.4.11.1-r1)
-	$(add_kdeapps_dep libkleo '' 4.4.2015)
-	$(add_kdeapps_dep libkpgp '' 4.4.2015)
-	kde-frameworks/kdelibs:4
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-"
-
-KMEXTRACTONLY="
-	korganizer/org.kde.Korganizer.Calendar.xml
-	libkleo/
-	libkpgp/
-"
-KMEXTRA="
-	kmailcvt/
-	ksendemail/
-	libksieve/
-	messagecore/
-	messagelist/
-	messageviewer/
-	mimelib/
-	plugins/kmail/
-"
-KMLOADLIBS="libkdepim"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.9-nodbus.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/knode/Manifest b/kde-apps/knode/Manifest
index aa91b69d1bc2..2da6ebd9cbd4 100644
--- a/kde-apps/knode/Manifest
+++ b/kde-apps/knode/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/knode/knode-4.4.2016.01.ebuild b/kde-apps/knode/knode-4.4.2016.01.ebuild
deleted file mode 100644
index 0d6435d0a0b0..000000000000
--- a/kde-apps/knode/knode-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="A newsreader by KDE (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	$(add_kdeapps_dep libkpgp '' 4.4.2015)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	libkpgp/
-"
-
-KMLOADLIBS="libkdepim"
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA="
-			doc/kioslave/news
-		"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index 108a9bcbe185..f0f9f8232eac 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST knotes-17.04.0.tar.xz 334820 SHA256 cc5813205e0ca214b9aa565f16f7107aa4bbea2330d6c31bec076999e12b3e14 SHA512 b9ec3d620ade284771fdb83873d8ef685373bd4e2eb74a737a6c83b89c4c489b2c212b4fc68dd1c3b41915a08d736f112b62c5ad0df8b8059c31be3c9936e1cb WHIRLPOOL e0d98194762a41c00eb4bae23c39a3130ba4566b505fc7e84163efe12d5219c5513103be3bac903f01a2b60b63759b2265be94aa7a68377d2e37a25460b6b10b
diff --git a/kde-apps/knotes/knotes-4.4.2016.01.ebuild b/kde-apps/knotes/knotes-4.4.2016.01.ebuild
deleted file mode 100644
index b1f91c13db08..000000000000
--- a/kde-apps/knotes/knotes-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +handbook"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="libkdepim"
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 3db3637cea34..eff12630ef37 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,4 @@
 DIST akonadi-calendar-tools-17.04.0.tar.xz 221520 SHA256 3578d824b54055f80404fde67e0ede910a7cb6aa22ec215673a178124daa6468 SHA512 27595ad1ed647858c70b9d9b4e3e32e8d5107fb1123d7c50ea49a7601f3db6b2c8d1d3b32c8818d756dec841a7650d5706d7aca29a4081f46f54b16aa96f3290 WHIRLPOOL 673a8099f7c6560a67c25cae31776a5c802cd35f9fdaac93c449fc00f3af36db0498bb713cfee9234f694db4fc69a1a711e12f8c48b89583bec3d367e1252e30
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild
deleted file mode 100644
index c79a5ff985ef..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-"
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index c82b0e05d051..469960517a99 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kontact-17.04.0.tar.xz 862864 SHA256 e60485b85f60930c8ec4a3fe9e93e7f7e3f450a3c463d81f6a5a247bbc1a5344 SHA512 7654b5a108ac8a655cc04080adc52062cb373b69b5b575ad43f21d26bb77056d252ce22d65923df8a8b9ee67fdcb3015970f983281b7594d1be37c73d29cb19b WHIRLPOOL 6dfd9b82cdd850db9d4d8445420798728edd5093b63b66cc13960b641f4910d2e1de85c2a38176d7e3feb67851cb5a919fe78d6d3c1d5e3952042c15bcd6132e
diff --git a/kde-apps/kontact/kontact-4.4.2016.01.ebuild b/kde-apps/kontact/kontact-4.4.2016.01.ebuild
deleted file mode 100644
index ac015c5a2575..000000000000
--- a/kde-apps/kontact/kontact-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-"
-
-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 34b30873c203..9b52bad1fe7c 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST korganizer-17.04.0.tar.xz 2344316 SHA256 3a34366cb3035beb33271197e1bfe655dd8a15793bf825e2cee0d21ab7eead8e SHA512 301010096749b7e6b2332d7b476f601b4d3a5ff1a9148f470cc8390174ee8c6b93eac83c3c5865e510b06ac49f6a6440ac7a80242348f7ec9b47515a102d97b8 WHIRLPOOL f92eebfe76ef58282322e15640c41689931fc61e7c7eb0156b47dbc3f03327be646d63e1521d30ce0c871f0bb02bf31b5482604700ba34ed55b1b4223338399f
diff --git a/kde-apps/korganizer/files/korganizer-4.4.2015.06-handbook.patch b/kde-apps/korganizer/files/korganizer-4.4.2015.06-handbook.patch
deleted file mode 100644
index a3050cce9a37..000000000000
--- a/kde-apps/korganizer/files/korganizer-4.4.2015.06-handbook.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/doc/CMakeLists.txt	2015-06-29 21:11:05.000000000 +0200
-+++ b/doc/CMakeLists.txt	2015-07-05 12:29:51.517209734 +0200
-@@ -32,11 +32,12 @@
- 
- if(BUILD_kmail)
-   add_subdirectory(kmail)
--  if(BUILD_korganizer)
--    add_subdirectory(korganizer)
--  endif(BUILD_korganizer)
- endif(BUILD_kmail)
- 
-+if(BUILD_korganizer)
-+  add_subdirectory(korganizer)
-+endif(BUILD_korganizer)
-+
- if(BUILD_knode)
-   add_subdirectory(knode)
- endif(BUILD_knode)
diff --git a/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild b/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild
deleted file mode 100644
index 4c67cb5afd34..000000000000
--- a/kde-apps/korganizer/korganizer-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer by KDE (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-	$(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
-}
-
-src_prepare() {
-	use handbook && epatch "${FILESDIR}/${PN}-4.4.2015.06-handbook.patch"
-
-	kde4-meta_src_prepare
-}
-
-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/ktimetracker/Manifest b/kde-apps/ktimetracker/Manifest
index aa91b69d1bc2..2da6ebd9cbd4 100644
--- a/kde-apps/ktimetracker/Manifest
+++ b/kde-apps/ktimetracker/Manifest
@@ -1,4 +1,3 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.14.11_pre20160611.tar.xz 14805956 SHA256 a9c3f5288efe0ccba3ffb88d4a63ac7b46a6b1ffe3c03b738ac6a53ef48e50b0 SHA512 5ed0d2f814a7aac7f9977840bcda8ba98dc66c8ffe921d30430db07b06de2850d76140a5e5fa44db09e3cb4cac09fee0d8e0e4c208b752d52aecb453a4dc1b08 WHIRLPOOL c6377c37b1a88a9d3958af5af081706e00437c3d0c28152a7e9353c49e376a3acdcdca0055d339f15287e6e101d6367a4d083b1a68162da9d4cc3d26178f62c5
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/ktimetracker/ktimetracker-4.4.2016.01.ebuild b/kde-apps/ktimetracker/ktimetracker-4.4.2016.01.ebuild
deleted file mode 100644
index a9880e24d1d3..000000000000
--- a/kde-apps/ktimetracker/ktimetracker-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep kdepim-kresources '' 4.4.2015)
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-	$(add_kdeapps_dep libkdepim '' 4.4.2015)
-	x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
-	kresources/
-"
-
-KMLOADLIBS="libkdepim"
-
-src_unpack() {
-	if use kontact; then
-		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
-	fi
-
-	kde4-meta_src_unpack
-}
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 2c3963ee5254..f84060134b39 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST libkdepim-17.04.0.tar.xz 342420 SHA256 8eea059dcb23c91daacecb24a317999ccfd65459ba193bb4799df9294f9a9003 SHA512 8600f503053d93badac6b898a1574dfbb041afcd42e027435fc9e6efc49ed9e3d0b16d394da274456971cfb8f5f2a32806355fe464d017aa4fdfb6ce1273e81a WHIRLPOOL 013a35e7f4072c5aa6a50e2e2e7a57493b80a251eab39b3e239e904632f6a9208e2552b51c6fbed0f0ecb430215980b2801b25cac69eb701874cdc8580c55a28
diff --git a/kde-apps/libkdepim/libkdepim-4.4.2016.01.ebuild b/kde-apps/libkdepim/libkdepim-4.4.2016.01.ebuild
deleted file mode 100644
index a54af65875b8..000000000000
--- a/kde-apps/libkdepim/libkdepim-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Common library for KDE PIM apps (noakonadi branch)"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-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 dc36d6f41698..e3fb88fec937 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,3 +1,2 @@
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST libkleo-17.04.0.tar.xz 291000 SHA256 d446f70b2b9c193e538f0c3af71b425d903aaca750db53c2f0fbc0c01a79a9af SHA512 08d9dfa2acc9a0d498deb7ee193ba7ae5930f2b01930c641bb43b2172d0b069e24fdf51abe5d49e2053d5d2cf7ed5f781832cb753688a9c7c96d18c170bd0d34 WHIRLPOOL bde7438718a70957767ca7d7fc33774d8ccc118c67029fb036ba794d87a7bc93016af62af607ade58db59c304258c6d47043995bee42d30b649fc2736755b2e2
diff --git a/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch b/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch
deleted file mode 100644
index 75e60fb60652..000000000000
--- a/kde-apps/libkleo/files/libkleo-4.4.2016.01-install_headers.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Install headers needed by Kopete's cryptography plugin.
-
---- /libkleo/CMakeLists.txt
-+++ /libkleo/CMakeLists.txt
-@@ -118,3 +118,64 @@
- install(TARGETS kleo ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- install ( FILES libkleopatrarc.desktop DESTINATION ${CONFIG_INSTALL_DIR} RENAME libkleopatrarc )
-+
-+install( FILES
-+    kleo/abstractimportjob.h
-+    kleo/adduseridjob.h
-+    kleo/changeexpiryjob.h
-+    kleo/changeownertrustjob.h
-+    kleo/cryptobackend.h
-+    kleo/cryptobackendfactory.h
-+    kleo/cryptoconfig.h
-+    kleo/cryptplug.h
-+    kleo/cryptplugfactory.h
-+    kleo/cryptplugwrapper.h
-+    kleo/cryptplugwrapperlist.h
-+    kleo/decryptjob.h
-+    kleo/decryptverifyjob.h
-+    kleo/deletejob.h
-+    kleo/dn.h
-+    kleo/downloadjob.h
-+    kleo/encryptjob.h
-+    kleo/enum.h
-+    kleo/exportjob.h
-+    kleo/hierarchicalkeylistjob.h
-+    kleo/importfromkeyserverjob.h
-+    kleo/importjob.h
-+    kleo/job.h
-+    kleo/kconfigbasedkeyfilter.h
-+    kleo/keyfilter.h
-+    kleo/keyfiltermanager.h
-+    kleo/keygenerationjob.h
-+    kleo/keylistjob.h
-+    kleo/kleo_export.h
-+    kleo/multideletejob.h
-+    kleo/oidmap.h
-+    kleo/refreshkeysjob.h
-+    kleo/signencryptjob.h
-+    kleo/signjob.h
-+    kleo/signkeyjob.h
-+    kleo/specialjob.h
-+    kleo/verifydetachedjob.h
-+    kleo/verifyopaquejob.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo COMPONENT Devel)
-+
-+install ( FILES
-+    ui/adddirectoryservicedialogimpl.h
-+    ui/backendconfigwidget.h
-+    ui/cryptoconfigdialog.h
-+    ui/cryptoconfigmodule.h
-+    ui/cryptoconfigmodule_p.h
-+    ui/directoryserviceswidget.h
-+    ui/dnattributeorderconfigwidget.h
-+    ui/filenamerequester.h
-+    ui/kdhorizontalline.h
-+    ui/keyapprovaldialog.h
-+    ui/keylistview.h
-+    ui/keyrequester.h
-+    ui/keyselectiondialog.h
-+    ui/messagebox.h
-+    ui/messagebox_p.h
-+    ui/progressbar.h
-+    ui/progressdialog.h
-+    DESTINATION ${INCLUDE_INSTALL_DIR}/kleo/ui COMPONENT Devel)
diff --git a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild b/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
deleted file mode 100644
index ab775e7a2c6a..000000000000
--- a/kde-apps/libkleo/libkleo-4.4.2016.01-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for encryption handling"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-	app-crypt/gnupg
-"
-
-KMSAVELIBS="true"
-KMEXTRACTONLY="kleopatra/"
-
-PATCHES=( "${FILESDIR}/${P}-install_headers.patch" )
diff --git a/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild b/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild
deleted file mode 100644
index ae2e4704ba3a..000000000000
--- a/kde-apps/libkleo/libkleo-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE library for encryption handling"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/gpgme
-	$(add_kdeapps_dep kdepimlibs '' 4.6)
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.10-r3
-	app-crypt/gnupg
-"
-
-KMSAVELIBS="true"
-KMEXTRACTONLY="kleopatra/"
diff --git a/kde-apps/libkpgp/Manifest b/kde-apps/libkpgp/Manifest
index eec0421df5d8..0a465788df7f 100644
--- a/kde-apps/libkpgp/Manifest
+++ b/kde-apps/libkpgp/Manifest
@@ -1,2 +1 @@
-DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
diff --git a/kde-apps/libkpgp/libkpgp-4.4.2016.01.ebuild b/kde-apps/libkpgp/libkpgp-4.4.2016.01.ebuild
deleted file mode 100644
index db877879505b..000000000000
--- a/kde-apps/libkpgp/libkpgp-4.4.2016.01.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_MINIMAL="4.6"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE pgp abstraction library"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"