Merge updates from master

483 files changed, 10256 insertions, 10 deletions

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index c4e2ad774bf2..ba4abbd44905 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5-functions.eclass
@@ -43,6 +43,14 @@ case ${CATEGORY} in
 			: ${QT_MINIMAL:=5.7.1}
 		fi
 		;;
+	kde-apps)
+		if [[ $(get_version_component_range 1) -ge 17 ]]; then
+			: ${FRAMEWORKS_MINIMAL:=5.32.0}
+		fi
+		if [[ ${KDE_BUILD_TYPE} = live ]]; then
+			: ${QT_MINIMAL:=5.7.1}
+		fi
+		;;
 esac
 
 # @ECLASS-VARIABLE: QT_MINIMAL
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 106383bb05c3..e071a82b5d0e 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -172,13 +172,21 @@ case ${KDE_AUTODEPS} in
 		RDEPEND+=" >=kde-frameworks/kf-env-4"
 		COMMONDEPEND+=" $(add_qt_dep qtcore)"
 
-		if [[ ${CATEGORY} = kde-frameworks || ${CATEGORY} = kde-plasma && ${PN} != polkit-kde-agent ]]; then
-			RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
-		fi
-
-		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
-			RDEPEND+=" !kde-apps/${PN}:4"
-		fi
+		case ${CATEGORY} in
+			kde-frameworks | \
+			kde-plasma)
+				RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
+				;;
+			kde-apps)
+				[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
+				[[ $(get_version_component_range 1) -ge 17 ]] && \
+					RDEPEND+="
+						!kde-apps/kde-l10n
+						!<kde-apps/kde4-l10n-16.12.0:4
+						!kde-apps/kdepim-l10n:5
+					"
+				;;
+		esac
 		;;
 esac
 
@@ -546,6 +554,7 @@ kde5_src_prepare() {
 				rm -r ${lang} || die
 				if [[ -e CMakeLists.txt ]] ; then
 					cmake_comment_add_subdirectory ${lang}
+					sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" -i CMakeLists.txt || die
 				fi
 			elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
 				if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 87713c01f196..a6ecfcdd1be2 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1 +1,2 @@
 DIST akonadi-calendar-16.12.3.tar.xz 115216 SHA256 0f147a81bd40b3e8b847863b2848b516efdf2dcf5642c49f62ae9c8e9419664f SHA512 dfc10af89a7d3895fc7155e2acc45404826e37416baf113d43631251f285b41b0622daae99731402e0f03023aa1be6299348a7bca715f2d8d374bf070d65351c WHIRLPOOL 5ccc017dad8390016c15cf0e5d43cb3c6fbbf40202aef56144591abb80de0f820403baeac9d68756421cb0b4999d55144ebd55b89d770467230efae93e50c91f
+DIST akonadi-calendar-17.04.0.tar.xz 279260 SHA256 09eec82f4bab3ebabc37ba54682fc1734b887dff8cf5fe9262c1278263ea5221 SHA512 26f18ea069a99a20c86aeacd7a58adb72afb7989ef95f736b5f4f78f1fa5bbaed197af5c642dfd880e1fcf1864fe50df573178cd8981f574c8e844b914dc1436 WHIRLPOOL 9bc303ef77ffde06d6e81056a5e213366df49a2c6b2695b91dc0e9a8d63f353c10442e335be5352156050bf224f9b8ed410eccada6f6599ef71eb37f4f79e0d9
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
new file mode 100644
index 000000000000..e31a69ddc72c
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi calendar integration"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 9c2aa8e65aed..79fbeab48b5e 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1 +1,2 @@
 DIST akonadi-contacts-16.12.3.tar.xz 149268 SHA256 54345dc2dfbafce76533a2b461fe11a7a266406516d6cc359202fc5c3e790588 SHA512 752674655df328a2e083fc475655e38e9a4fee7a0a78c44c08d62628a39a831c5be3cd3c63971959dc3000947bd4eafc0fd73a497682b3544c611a2c2f56948f WHIRLPOOL 70a9aac22d911192270d5582eb2265b8c04ee9a6c308859efe6c3ce3e6827d58508fa75fe8ed96a718010ed9ca4981cfe64252985120a59685e20c119218cc5b
+DIST akonadi-contacts-17.04.0.tar.xz 348192 SHA256 67fc0795c10f43c2c6a27ad5619ab044f3c527789a84ce8fbf6ce9652b06dc05 SHA512 8eed24cba8b85a9a05738a5fe5820d7fb4b785fbf12d58fb6830ba272a2b84908f7f65c48888d881f9080a5a502ece90ff21fdf27df8596967153b823025d206 WHIRLPOOL e8b3abeb17598cc4f1ac7361f3322df854cd3662cb91a757bacdc60792b02067d8e4c79b96121432c4fa414e3136afdd9cd6d516bbcd659ff79abf2b928288a4
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
new file mode 100644
index 000000000000..b31d26b669e5
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for akonadi contact integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE="prison"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/grantlee-5.1.0:5
+	prison? ( $(add_frameworks_dep prison) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package prison KF5Prison)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 174cde0edac1..56c2dd91c5d1 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1 +1,2 @@
 DIST akonadi-import-wizard-16.12.3.tar.xz 240384 SHA256 d8e518ae7876d46b5af0ad430b018c05aaf320cf4c05e1cce9a2c25b198ed736 SHA512 84c73164af8a58dda2792e15493d58b4de81c2851142f6dda4bd254d6c0e7f9b1c7029525bf1267486959abaabb555d891b2b46a4afad1d9b8bc8f97cbe9bf42 WHIRLPOOL 7c592f513e7c3280b9add21cee8b304b2e5b7f139a563fd70f6e9397ba7777625bdebc596f44ca103512e588abe4da1fd89a11beb11025e1b8d3276c8bd2a764
+DIST akonadi-import-wizard-17.04.0.tar.xz 433864 SHA256 bb29c6970d76831758d84e84397ef832fa4fcfbf8be3d385b8e9f152383a3329 SHA512 559afef7b58dafbc2f556d8c182d8e269f0a2508f3c1050eb53dfda0aca071a62b3159953d661710340549b60c2ea3e3aea2fb821149fa5b9acf72ebb4861c7f WHIRLPOOL 69f8b228e673f0cf9fd524094198e40301e22e957f8dfb6efe02882efbe4e94837df77d126aa84de88f9860d6e14c804f754747c55294a44f47337c469f98d3a
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
new file mode 100644
index 000000000000..3d4d6c2ae9d9
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 93465820dd88..a212b6211885 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1 +1,2 @@
 DIST akonadi-mime-16.12.3.tar.xz 55584 SHA256 073cd60dc5e535d69dedf98efababaad57cb455a929b322e4d0eb6e7691e5ef5 SHA512 17e86f5854fd8355a8bb7698532aaba8a67a7b67e4cc33b8dc5d707930ef2ae286318b2e8b1545db129972947e7d5165c421b9b1247bd52353680e4ee5d582a7 WHIRLPOOL 3a5f111bf80e8059fb7141b982e5fc7000484a12dd2e998d588f40d21c3b0efc9d4a29a81751ac6d4442929a221bacab3bac8465b2af5ecbef6620a0bfff9bd1
+DIST akonadi-mime-17.04.0.tar.xz 131056 SHA256 db86817e10a06d3c253c02892d07dbcc4519d07b42ffebefddbd74bdc2aa2daa SHA512 6c5c53719462151c836c0173ec2201364a63fa2f2b6603c414b21827fd3847b8550c83c04bbfdc3368adf87666f837e85e28c6644523e32ec607987aa0dcaf78 WHIRLPOOL d1115f44c54c056d7fb3891d941a776d3056acc79f9b3d957266f885d9951990bd76bb08a1c59556c7b901d193929af68fff93d759194a5cc635acf0c02453a8
diff --git a/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
new file mode 100644
index 000000000000..16d47ca42e93
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi mime types"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+ LGPL-2.1+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 4e2a02918580..155c3d175501 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1 +1,2 @@
 DIST akonadi-notes-16.12.3.tar.xz 19328 SHA256 278f9517d2640b99fd86dd5817ea15baea177adbccf3fd28a338c59cfeb40510 SHA512 0ff10a467586e65ae809451fe40b4dfabcc429ef80247c4e9d1b00ff7c72f17fd2ae64ef545aeeba641f788041256a4758955da35456e0fef7e0bc3e2b4f0169 WHIRLPOOL 95c928ce6e7c47d1cb82adaf0c299a99c84fd4556acbdc09abd09cc5e12176fb3cf016b9efafe62356d95662c629c53f596e1a1a7e402bd3411c3d393faa14ab
+DIST akonadi-notes-17.04.0.tar.xz 24636 SHA256 597ef6594abeaa5a5da5da983870a03dc1b16931e093c0026f1ee60069e2cc49 SHA512 f3ed6ad91e7c423427c80e2075d385766fa3303490ca1edf02e4c820ee8f0f0bc065511d207a95b3e8341187512bf613e340c5f209a07273f1d20dfb2c9a9b17 WHIRLPOOL 03293c7e6bf516fe1a6f8c1749b244b23082af078e825cdbcc2353749aef9e977bd9751b0eeb97cd320b274a54754b216c0692f9b547194e8594848628070537
diff --git a/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
new file mode 100644
index 000000000000..338eabb75a9d
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for akonadi notes integration"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep akonadi)
+"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 66e3adef788f..e335ab6d7945 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1 +1,2 @@
 DIST akonadi-search-16.12.3.tar.xz 72300 SHA256 f71f2c781f7916148a5e843b59e4157a4e978ef8fed0fe0d8fe190ef6a16c271 SHA512 17152163ae538b85bda9f59fae1e3a04849a345ce01c95bc5f18bc0bbd21e27ec81380c93569d72542171a4f2cab38d540c3e00ff58a8166891e87b5ac637862 WHIRLPOOL b3c0fbd32d8899bf125ad989995a69d0f526f6ef610e66f168ac1ece8a4757cc56d6faaeb78c025402d1903f3c01f4e746d342cf01a4b09edfabee0bb9400388
+DIST akonadi-search-17.04.0.tar.xz 78824 SHA256 e3864fb676f90a9cdfd1ec8267f69c39671a950b3a67cda5fa212bf48b05f8d5 SHA512 6ddb8222d0a09720703799848fb4630587b2cfd839297fff59df2ace5908ff7ac9d12ce41be734eb1055209b19221283a49375367976c79f4de6f339111e8e8f WHIRLPOOL af62acbfe88246e0f06d21017703415e4ab8b0f0adf301e9a5b9b88056812ea48b1a6fc3e8757946acde09969e2525a0be6b1d28777f5c4c0f46b00e18dae343
diff --git a/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild b/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
new file mode 100644
index 000000000000..684d88b3968a
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-17.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-search"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/xapian-1.3:=[chert]
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 53f916c1ef2f..61ea15829ec6 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
 DIST akonadi-16.12.3.tar.xz 1037568 SHA256 fc48a200c27331d5a9ac6bfb8d7d61f3c4240f133bb23c996c78493f24644b03 SHA512 b1e02f80d11aa6f6d116bfbd963dee952ad03acbdf451b3cd0f8ca4d0037cea9afcd3723b7743bf5beeeb8d0db865094c0178be82e1a74deddaa45834f57c77f WHIRLPOOL b14b453ebfee66d4bb3ab6806406765c74e6f0edd5b4d40346c038d29330afa2efbcb8794564c9a0bce0e693ec04ab540580467411ae869b3c30263d6ed69f7e
+DIST akonadi-17.04.0.tar.xz 1301104 SHA256 962f7694ff67e32b965a07da282d2af7a0777353b11f537c147c8777b03901d4 SHA512 64050b53515ef1fc6321bbe08e30dacbf4ebd945da2510605ad2a2f0f6baa207cfef0f5a1e29c7fa71458ece941593525425d6a1de244ee38cabff817d4da8e0 WHIRLPOOL 340d295553cdc62bd202a927b63a14b39d438ef7e537935b4bcabfd765bd5d9549d233617bffd2c27c71a7b509c822cf61f4e07f3a512196009f173d66677d13
diff --git a/kde-apps/akonadi/akonadi-17.04.0.ebuild b/kde-apps/akonadi/akonadi-17.04.0.ebuild
new file mode 100644
index 000000000000..41186be4ba32
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-17.04.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://pim.kde.org/akonadi"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+	!kde-apps/kdepimlibs
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+
+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."
+		ewarn "In particular, kde-apps/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+	)
+
+	kde5_src_configure
+}
+
+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
+
+	kde5_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-17.03.80-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
new file mode 100644
index 000000000000..0b5e381b155d
--- /dev/null
+++ b/kde-apps/akonadi/files/akonadi-17.03.80-mysql56-crash.patch
@@ -0,0 +1,40 @@
+Gentoo-bug: 530012
+
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index 50421714d..dfae09c20 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings)
+                                          << QStringLiteral("/usr/local/sbin")
+                                          << QStringLiteral("/usr/local/libexec")
+                                          << QStringLiteral("/usr/libexec")
++                                         << QStringLiteral("/usr/share/mysql/scripts")
+                                          << QStringLiteral("/opt/mysql/libexec")
+                                          << QStringLiteral("/opt/local/lib/mysql5/bin")
+                                          << QStringLiteral("/opt/mysql/sbin");
+@@ -511,7 +512,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--force"),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const
+     return 0 == execute(mMysqldPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+         QStringLiteral("--initialize"),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
+@@ -539,7 +541,7 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri
+     // Don't use --force, it has been removed in MySQL 5.7.5
+     return 0 == execute(mMysqlInstallDbPath, {
+         QStringLiteral("--defaults-file=%1").arg(confFile),
+-        QStringLiteral("--basedir=%1").arg(baseDir),
++        QStringLiteral("--basedir=/usr"),
+         QStringLiteral("--datadir=%1/").arg(dataDir)
+     });
+ }
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index bcd86371993a..1475824063e3 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1,3 @@
 DIST akonadiconsole-16.12.3.tar.xz 177312 SHA256 63339a45b85c6f7fd87f8a67da16bd9e070a562fe4a962cc6bbe78108cadaaa4 SHA512 e4cbadafd67744aefe40a7bed359390a285bbbed9cf3569114acf74c12d6b0337517fe7f01497ea878dd84c35e55e40f17b644825edc2196d5ced065d3cde8f1 WHIRLPOOL 7da1480ea8e865a35d048902b982f0a54baadb2f378343aafe9941bcec32a1d6ef125913a10edc9a960d216a3d8259a63918e9078f0c82c0c061a192e54bcb77
+DIST akonadiconsole-17.04.0.tar.xz 185444 SHA256 6dccfa21b11149f9786a30800aec191c24c1c0a846e92b4474fe8bf4c3fe4d05 SHA512 e59181f4e2b4f431c8ceba2ad4683815ffd067e6afec06a09ec2404ade719552d36dd11d3dbe78b004f88cd5da5f6895986b41083aaad0da91dca328a70a98fd WHIRLPOOL d67cd0e95488aac19698928aa8abf5c1811c6ebd139c31aafcf8017fb02c7769bf44369da81e82234f36541d7f5c23c705fa39c6ed4c2784a9ea18e0c138419a
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.04.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.04.0.ebuild
new file mode 100644
index 000000000000..8e7feb7fa08c
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Application for debugging Akonadi Resources"
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+HOMEPAGE="https://www.kde.org/"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 23e692f7dfb8..56e62e1fe420 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,3 +1,4 @@
 DIST akregator-16.12.3.tar.xz 885632 SHA256 488474dea3edce1c83e70e3440666d009c40390e7ee7edf893991b05cb78d2ec SHA512 bbe65e28abbeadc353b8b3db2aa4aa28925d1da12129396fff62b7d866f26bae386a282aed598db1f17e76f8abb86748ffc2c7a62929074218e745f46520a604 WHIRLPOOL baaf6be56284697fbf80e2a2798fc09f03b024b5e016b3f9d7e0d4400870cf679d7cd668cbd0de9c9638f7cc6092bb03d63c02beff3f5716cf991a2200fa26bb
+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.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/akregator/akregator-17.04.0.ebuild b/kde-apps/akregator/akregator-17.04.0.ebuild
new file mode 100644
index 000000000000..e4bfdab7a6ae
--- /dev/null
+++ b/kde-apps/akregator/akregator-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://www.kde.org/applications/internet/akregator"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
+RDEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine '' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	dev-libs/grantlee:5
+"
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index b237cb8ee22d..0eaee322bf65 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1 +1,2 @@
 DIST analitza-16.12.3.tar.xz 234200 SHA256 bc186173402fdc497a307be87f08638cb4ab80e1c6ffc1ff45c525be90d3e32a SHA512 fc5cfdfde841051be6b9014db7f790082d9ccf067e89629a7a0c2877254e3a466495e17f8ba638b9c794897e467198b8f753f03b941c932d617b7abefd25aaca WHIRLPOOL ef2a3d8877d02f1aeac5d54e335c1002f46452c5faa76120516f544f3c3ba9c164f500329c904bf2f0b7d3fe48753b40dfec7e4e79d075b83afaa1f0403bc17c
+DIST analitza-17.04.0.tar.xz 327828 SHA256 af57e441fcdfddda4fcf1d3345c2335c4d9557791a5fcef8455b488d19f0a2d7 SHA512 132d668c3cdafcebedfd1a6813db0420b66429b3cb99ceeb31585d080064774424fb2d012c947d006e5dc8923ea8adff28ef183655e050cf13d7b33446ce65b5 WHIRLPOOL a32686698b2eb52ac72b17bf47e4c877289a64dc6e5d20393830a1c9b55388963791552e42e291ed486cb48bf335e152dd5c92a19e5db6a3fe0a6fe74f11b74b
diff --git a/kde-apps/analitza/analitza-17.04.0.ebuild b/kde-apps/analitza/analitza-17.04.0.ebuild
new file mode 100644
index 000000000000..c81473f50d4d
--- /dev/null
+++ b/kde-apps/analitza/analitza-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE library for mathematical features"
+KEYWORDS="~amd64 ~x86"
+IUSE="eigen opengl"
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	eigen? ( dev-cpp/eigen:3 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -i \
+			-e "/add_subdirectory(examples)/ s/^/#DONT/" \
+			analitzaplot/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eigen Eigen3)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 3d662859c9f7..b6cb50cec900 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1 +1,2 @@
 DIST ark-16.12.3.tar.xz 1348616 SHA256 a0e54892a809d9b805aab95d33060560480a5575df2e8afbd6fc0eb074ee2b60 SHA512 2bb7c80758bc0a3322892b66cbe26dad199661e1bbbf71fb0ccc2bc1bea8dac8f267fc371baf55a4674e5bc67f86fb39587709d12e10e53988fa1a6c0e056956 WHIRLPOOL 35cd9f15f7a04b99b09fce32c6ce3819ed7b7c6e0d2240517ccf942a15622f0f10a19c758c5195c44ba9c5e4a451673073c0cedaad12d9970618867bf17d3126
+DIST ark-17.04.0.tar.xz 1884736 SHA256 93c320d077f65aa9175ea18150e29a2f4f6cbc0979b98b87dd575e105c126862 SHA512 a8313bb83ee2169a9e8be025082948912c920264c92f33538344ce2c751f6f4b033f80a7fc3eefd3fd8eaa4ae0524aa3eba0cc06182cf5b7cb21c6f6f57b98bc WHIRLPOOL 907e216fb1aeadc8cfb5257298c3c2b931fc935c07d1ef1659a772d62ab5279b1cd4e4b2a4178f922305de2651adc681286de8f65fa05699aefa4a70fedfa285
diff --git a/kde-apps/ark/ark-17.04.0.ebuild b/kde-apps/ark/ark-17.04.0.ebuild
new file mode 100644
index 000000000000..3ba7d3c0e61d
--- /dev/null
+++ b/kde-apps/ark/ark-17.04.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://www.kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 lzma zip zlib"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-arch/libarchive:=[bzip2?,lzma?,zlib?]
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake-utils_use_find_package zip LibZip)
+		$(cmake-utils_use_find_package zlib ZLIB)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	# not a typo, app-arch/unar is a real package
+	if ! has_version app-arch/unar ; then
+		elog "For handling rar archives, install app-arch/unar"
+	fi
+
+	if ! has_version app-arch/p7zip ; then
+		elog "For handling 7-Zip archives, install app-arch/p7zip"
+	fi
+
+	if ! has_version app-arch/lrzip ; then
+		elog "For handling lrz archives, install app-arch/lrzip"
+	fi
+}
diff --git a/kde-apps/ark/metadata.xml b/kde-apps/ark/metadata.xml
index 2fdbf33d963d..5ec30e7f0b1d 100644
--- a/kde-apps/ark/metadata.xml
+++ b/kde-apps/ark/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="zip">Enable ZIP archive support via <pkg>dev-libs/libzip</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index ca5f558b9f01..8a0f2ed96292 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1 +1,2 @@
 DIST artikulate-16.12.3.tar.xz 3652980 SHA256 fa24da78a4c34b14f01fae73f4d233ca4577a6b1c93e54840c26c7ec01337384 SHA512 a948ffba48ee7c902d5c1d7a73ee38efd727896fb25c5bade13c9223a34dd193ac9e4b49f2e570814eea48d8e8cb7a3ecf2ff01303e1779fedee4436f0f219ec WHIRLPOOL 3d0be12e551f9487e8596b12e8620fc67320b003f465e349c1d1c2663f979818c98785adaca64584073a2206c437c80b88846180b85167b417444b1c00f13295
+DIST artikulate-17.04.0.tar.xz 3742620 SHA256 f5fc8988dc200b6ce9810edf170052ee2aa339fe6deaa9e6a437377bc20adcf8 SHA512 2286a17f6e7efff831fc505d60b82c5f7487d6569984fee3b623e88acb5302ed2d625446280f0f50a7c232c46d8f14fe563b2b224764eae451ab324273976dd2 WHIRLPOOL c43a3d5dfb4fb16c0af069f5000fa2d580973312785229d11299403325be20cc68d1c807510de55e071a39276c6e600e128d35e1775556bc120b3bac5ea5ff4b
diff --git a/kde-apps/artikulate/artikulate-17.04.0.ebuild b/kde-apps/artikulate/artikulate-17.04.0.ebuild
new file mode 100644
index 000000000000..71f94a5043c9
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-17.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer qtmedia"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
+		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index e5bcf9f912cb..493ee7c9db7f 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,2 +1,3 @@
 DIST audiocd-kio-16.08.3.tar.xz 52068 SHA256 78988ef13f4228d94923d50dc54129a91d034ffcf014029dbc39bdb0cdedf8b4 SHA512 7eb3655a381c3f8de8c5f6267dcae10884ca65e58314735e2bc5604fd5547ddd6b65e6e93d1921bc1ca43f8b1c09fbfc01366d6dd33bc10056fec3178a0469ba WHIRLPOOL 7515e5b1429ac843b66b0d8a50b464c9f3da4138ecf6b8a33c7ae2c268779a94d159f62d462039f5088fe9f221bc82dc0060e9c64ee8c015dcf46b33cfdefb55
 DIST audiocd-kio-16.12.3.tar.xz 53604 SHA256 3e744b6fa67a7058ad37a0420d188d2ab0ab9b18924786b4b6c88cdeb388b52e SHA512 34b646b19c6ac3fc6286af4bbdab274b3c07e2af912edcc01591cb1b10f32d8c098a671debc56eb1bf7e88aefc70b60206195f428d33f7468b0720760198cf24 WHIRLPOOL e9405c38f7cb37e853dc181d09d87e54e5e9d0e1af389ddb131fee67938b1fe4f8788f72d9fa5ee398d6862d507c0c1b1843fdb5f64fe9cc778a59b01da012f8
+DIST audiocd-kio-17.04.0.tar.xz 249252 SHA256 bc136323dd9e04d8ec68b0e001b85a900ebbceb5ffdd71f23796be2ce87e0dbb SHA512 bc1bf2c8ec070225536f73500b3c8227cfef9facbdfc5811586354e1b6a2ddce44075b05fbbf106359ea48370b3df5cb67adf8eb6a2f3c87f240db5374073f55 WHIRLPOOL d3005167f8a9c240cc71861ad1ee2f6c142761d22a4428bbaddb4478196d1bc87a1734583e9560150499b4b16c016a333adb9c9a479fe789499895b30db544bf
diff --git a/kde-apps/audiocd-kio/audiocd-kio-17.04.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-17.04.0.ebuild
new file mode 100644
index 000000000000..1db713c9bd30
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-17.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="kioslave for accessing audio CDs"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="flac vorbis"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	$(add_qt_dep qtwidgets)
+	media-sound/cdparanoia
+	flac? ( >=media-libs/flac-1.1.2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package flac FLAC)
+		$(cmake-utils_use_find_package vorbis OggVorbis)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 49d29d6bb3c4..c3718ca93e09 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1 +1,2 @@
 DIST baloo-widgets-16.12.3.tar.xz 57172 SHA256 74bf67fd510fa4c8e6d682356be7417728caef4b7cc6349b8bd2531f1bfce540 SHA512 15c8a1c433715d4ff3cd0bfb9b2ebde606e36c8a051dadd760f6dc710022dcf7ef2b5b3f375258ceb713b5ee06b3550cc5d267f7aefcd785a5e6b0566d5d5223 WHIRLPOOL 6b2d6d7f74595b1da6c4c733ad584a6153919208f07c2b5ccb880249da2ab05655f142e7652f4611f9f50ab9d15fbeb434387660293c26a5ae2dd096fa770c99
+DIST baloo-widgets-17.04.0.tar.xz 152408 SHA256 bc22642dd325d90dc4d2a360eb88e3954deb2f15da97740e170fb3326417735a SHA512 dbfc8128346a51e9e741ccf5d439d38b04c7699e8a4de0e8e4db6ad16a29bd1c3d78019130bbbc0c9860cf0849220969e1ae754e1457037feb49a609c9ebc28e WHIRLPOOL 092c0cf49667d7ffbae043d49e8251b0672a141876a461e772297724399545654d89e4421e56c3677432db851b2ed19e9028f3b6ae203af774999b92d8a80c83
diff --git a/kde-apps/baloo-widgets/baloo-widgets-17.04.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-17.04.0.ebuild
new file mode 100644
index 000000000000..394435d1e32f
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Widget library for baloo"
+LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-base/baloo-widgets
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 114959b3f0a3..f779a98f4529 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1 +1,2 @@
 DIST blinken-16.12.3.tar.xz 562784 SHA256 eab1d6eb7378ecee95784311cf75552cd8956783f62062374901e2182653a0fc SHA512 7d4b7e9b47308d515a708b0847e383db542e53d966c1e09fee9883d094ecb0b7114a831188c69b16a5c83da81a5fea1967a6ede6675b028440b85cf2ad5641ff WHIRLPOOL 169a7aa404d6d132581186ff58e55dccf544b326b6e18f78a48e5bf814aeea49c8a79806e3db95bc269990d50a090a5ef19e41630ab52b7f9323c00df6639680
+DIST blinken-17.04.0.tar.xz 2505164 SHA256 501c17347362eb406d8d9f4a718d30c4fbc4006092446a48eea537693cdb3556 SHA512 c9d8f3957a7aab2dd8aaa7cf5673ca4f2a5211516df9c50fed8fdf73e3dd39bd5476e67e04b752efd1b5a3e5187cf2cf4ebba5e354c1aa6a8b6c30fe44de5a47 WHIRLPOOL b844d01d7f0a87c65cc88e19eaa273e1a6da649c3c8b040c863badd7d0d99c0da115f3f457d95f2c9d49a9fb7c4c8178ec3973aa8a85ad713c3c698c2c19320d
diff --git a/kde-apps/blinken/blinken-17.04.0.ebuild b/kde-apps/blinken/blinken-17.04.0.ebuild
new file mode 100644
index 000000000000..ffb1a279add0
--- /dev/null
+++ b/kde-apps/blinken/blinken-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE version of the Simon Says game"
+HOMEPAGE="https://www.kde.org/applications/education/blinken
+https://edu.kde.org/blinken"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde5_src_install
+
+	rm "${ED}"usr/share/${PN}/README.packagers || die
+}
diff --git a/kde-apps/blogilo/Manifest b/kde-apps/blogilo/Manifest
index 734d9d3845aa..b02390e0983b 100644
--- a/kde-apps/blogilo/Manifest
+++ b/kde-apps/blogilo/Manifest
@@ -1,3 +1,4 @@
 DIST blogilo-16.12.3.tar.xz 331264 SHA256 0e84a82b6e56dbd5733d9f60392dac35e7f3f85270deb3845c689d8eaa28d493 SHA512 14a46a98bb53a5133924751ea2e59ba43e3c7096adccbad72605916d731c22b38700f71cd1ce1eb5d04e8f72b3a60effdee19a88bf9fee2f33ddeaacd82b2df9 WHIRLPOOL 1236986115220ed0560530753052a4c1f286c81d26c858858dd3c4fd160e3416877279e606309f8feb2de4b3312690d909f1ef0439632d8d79cca49a8ca04feb
+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.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/blogilo/blogilo-17.04.0.ebuild b/kde-apps/blogilo/blogilo-17.04.0.ebuild
new file mode 100644
index 000000000000..7bce8d7b45a1
--- /dev/null
+++ b/kde-apps/blogilo/blogilo-17.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to create, edit and update blog content"
+HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
+LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="google"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	google? ( $(add_kdeapps_dep libkgapi) )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-apps-libs-16.04.50
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google KPimGAPI)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 11f0b1eaf359..68f87cd9b3bd 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1 +1,2 @@
 DIST bomber-16.12.3.tar.xz 715220 SHA256 81e4212601491714638ae60135fbcf2a440714090d71ccb81ff9ab2fab329ac0 SHA512 e3e60f646783fc2ac5e8958f07e2d8cb54469a2a1684e0b5a0330193787a81f7b4584ef49642f8f79ab38ee139eef8d241f54cfbbdb8c3ab5105f5e3b0f14cb5 WHIRLPOOL c8ae2f31b11a2027a0940c63e23e0459c68ba88551419dc8dd5c496ff23db71bbc09556d69b3a4448afda4431d550ccc0690ac5df7cbc31ec317614ac0a468b6
+DIST bomber-17.04.0.tar.xz 753956 SHA256 306d1dc6a4e61daf31c0974cafe07c3d6ddf53247fb69c525cbd16f4a7f8634f SHA512 cc7eba663ed18c83ec9a2eb6411aee494a851358262dae9a0a31c291d6e502f3ca44f7b2f6f9f1811e39bc70367620799a93ccc559acc6d886aa55f9fe0bedb5 WHIRLPOOL d01686eab022ca76d9d24ddf1a1b437a50a97abb23a2c891298d91ae1d67b70b70294e1bcf6243b6ae2bdbb03f984783588acb9ca8a449f780252ae0deaabd4b
diff --git a/kde-apps/bomber/bomber-17.04.0.ebuild b/kde-apps/bomber/bomber-17.04.0.ebuild
new file mode 100644
index 000000000000..bfc0bd1cbc78
--- /dev/null
+++ b/kde-apps/bomber/bomber-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE arcade bombing game"
+HOMEPAGE="https://www.kde.org/applications/games/bomber/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!games-action/xbomber
+"
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index c78f6e22979a..b106b735be1d 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1 +1,2 @@
 DIST bovo-16.12.3.tar.xz 139400 SHA256 c63b5d0c3446baa85e91a7c1b9ae9370a1f01b98a7c6b07510bcf643dc3b26df SHA512 a4f57d559cb80bd0ca64cdb95643da19b1745e070b775f3e4982a6b8b550fae78bfdc412ec45c0c57ce8e78302cb21e90d8ee17765be9499bb29bf3e4c122045 WHIRLPOOL 667a194447bff219fcacf7dd0fdd30060abcb7c2bc5d7800b4da2dc4e53e7fb2d857ce8b5179a94aeb022f8c9729388da48b9a173b57ff6ebc78839f9bee66c5
+DIST bovo-17.04.0.tar.xz 185388 SHA256 623620b1aac8f67dafe2e02b9e7cf2df63dc48021b5604bc533cc81fc071b648 SHA512 3f4aa164289acc2efa5fe271702b0f9cb64f65fc16692b4be2867ab92e79d6523a7b6109834b826dc14661ad3167da556ee64d22bd8dcb343afaee1284380be9 WHIRLPOOL 9ca097da9784520888da5c3beea1b5e9325a8bfa6feccbf6bede282d10d5c16db399b9c6d91e632d29c239230b6ad882616412bf847ca1ed99bade8ac62da4f5
diff --git a/kde-apps/bovo/bovo-17.04.0.ebuild b/kde-apps/bovo/bovo-17.04.0.ebuild
new file mode 100644
index 000000000000..a716c5fdc79b
--- /dev/null
+++ b/kde-apps/bovo/bovo-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Five-in-a-row Board Game"
+HOMEPAGE="https://www.kde.org/applications/games/bovo/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index dc53ad01339c..184f34ecaf58 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1,3 @@
 DIST akonadi-calendar-tools-16.12.3.tar.xz 61980 SHA256 87f47068abcd78dad54903c9c29399ef965bcce03d64beb41743de7328abf394 SHA512 2bce7a50a1ca13641752a191d43379444115c874d6ab852b83eaa5ea0e5ee7c357640755685f7175f98a5dcdb1bc04c08e3e224970c70f3dd324458920ea6d63 WHIRLPOOL 5693b938e8e13f60c06010ee920167a616105648ece8e63041aba24d08cf2a577bb1937fed7cb67ee946f46905f75c12c6018eb54667d99cfd84b755f409a095
+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
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
new file mode 100644
index 000000000000..f643c9261a30
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="false"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	cmake_comment_add_subdirectory doc konsolekalendar
+	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
+
+	# delete colliding konsolekalendar translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 9dba84ec46eb..6591d7bd141b 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1 +1,2 @@
 DIST calendarsupport-16.12.3.tar.xz 100400 SHA256 c0a356ca87e114215555462f84d21348dee29dde91028ff4a94757ffb9f86064 SHA512 55277604b5d839ff01108dde8c4696fa3f5cd29d341a4523bce6759af9580fbea78990b6c29528c372ae645e570c97c1f4fd332a693ec3866bc3afde920e96ee WHIRLPOOL 397f5bca7230bea783d6c3f748139da1d345f80c90ea77c61b2962c631b479375d1bb1eb3d4c6169cc5747f42a3c93b93ee515218deb5280db83615ea37b4226
+DIST calendarsupport-17.04.0.tar.xz 672080 SHA256 ca03a37c1d3b69ff75c7432d80bccc5b54e3a5f7af3e7dac3a0531454454ece4 SHA512 6b95ce0fa3bd8d71ceff06f719ebc74a81a00c1165c651a9ed956c1667534636fb768c5adda85086da1ffc7431588aed370a7f02985c9cd5370e8f1b2b147906 WHIRLPOOL c32afa186be3f542f4da2e87619d7c2ba4fa6c9b8d42334c80a6a6215f230f818c78f067c12e74b2e10640bcdd867bf58ea3815b4d257a2d2d1f0c36fb0ef981
diff --git a/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild b/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
new file mode 100644
index 000000000000..914f64623285
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-17.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Calendar support library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index a16a025216bd..8757f9e858d2 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1 +1,2 @@
 DIST cantor-16.12.3.tar.xz 378460 SHA256 888677129bf30474a2f2bfe46931770f411cf8823c944e90ba4ea16d9d4eefdb SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768 WHIRLPOOL d0dbd031450ed730fdcb382a6aba778e0b9928ada3fe7c144012e95a521d53f1c13fe34bbbc6d2339e10cdf60f464327f9583e1bbbd10c1ecc6f2f43d308df33
+DIST cantor-17.04.0.tar.xz 1059812 SHA256 bea7d26f787837808d9371a243a22ed96715331c69086cc9b638d31ae3f3c76f SHA512 0a21383d027b3126b8d3f06f15300fbdb35f32ee61b3b46fb085952cc6f8c2ebd27a220bb2f3c7ee11120defeb56d3e0d2da622f9678b50532b2ecec539c5570 WHIRLPOOL 43d4daf740ee6f89bb3250e9858f69ba3ad5a07176dbf4a35511acd9ff88619c15bead8a2885cedf50b23f14ba7e0c29520994c53139201acc3d21a54daca605
diff --git a/kde-apps/cantor/cantor-17.04.0.ebuild b/kde-apps/cantor/cantor-17.04.0.ebuild
new file mode 100644
index 000000000000..871d6529b367
--- /dev/null
+++ b/kde-apps/cantor/cantor-17.04.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit kde5 python-r1
+
+DESCRIPTION="Interface for doing mathematics and scientific computing"
+HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
+KEYWORDS="~amd64 ~x86"
+IUSE="analitza julia lua postscript python qalculate +R"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
+# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	analitza? ( $(add_kdeapps_dep analitza) )
+	julia? ( dev-lang/julia )
+	lua? ( dev-lang/luajit:2 )
+	qalculate? (
+		sci-libs/cln
+		sci-libs/libqalculate:=
+	)
+	postscript? ( app-text/libspectre )
+	python? ( ${PYTHON_DEPS} )
+	R? ( dev-lang/R )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
+
+pkg_pretend() {
+	kde5_pkg_pretend
+
+	if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
+		! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
+		einfo "You have decided to build ${PN} with no backend."
+		einfo "To have this application functional, please enable one of the backends via USE flag:"
+		einfo "    analitza, julia, lua, python, qalculate, R"
+		einfo "Alternatively, install one of these:"
+		einfo "    # emerge sci-mathematics/maxima"
+		einfo "    # emerge sci-mathematics/octave"
+		einfo
+	fi
+
+	if ! has_version virtual/latex-base; then
+		einfo "For LaTeX support:"
+		einfo "    # emerge virtual/latex-base"
+	fi
+}
+
+pkg_setup() {
+	use python && python_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
+	sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
+		-i src/backends/CMakeLists.txt || die
+}
+
+src_configure() {
+	use julia && addpredict /proc/self/mem # bug 602894
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package analitza Analitza5)
+		$(cmake-utils_use_find_package julia Julia)
+		$(cmake-utils_use_find_package lua LuaJIT)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package python PythonLibs)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package R R)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 4ebbd18b8f38..437312f61e43 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1 +1,2 @@
 DIST cervisia-16.12.3.tar.xz 474940 SHA256 733b2ffe27b8e3057adab3eac20858a2d6ee995bbce13860882c93bf9f2d2593 SHA512 80f740e2d93d52dc86f27aac011967229141236abbd4626504d9bd6b83e6550c822b22500bf401c10f784cbd5b90f428e2d502d73a064ec1f5a3234b854ba785 WHIRLPOOL 11d32c336e353e6e2d540713024f939fc2185fc8fb82f3f35fbb5ece1b110022718fe7ab8d968d896e7c571a8351d5302e4b83f360dadc04d315069a05eeddb6
+DIST cervisia-17.04.0.tar.xz 1904188 SHA256 36fe5d10e322be87b7cbf3ff5b54faab49cff42168cbcfb83b906a412ede3afd SHA512 7a34c3dd52d9ae7e27628b499ea71e63f465c66038810c8478141fe4942f5b1087a56a8d165ef9863a7f875413d532017081b7a91dedd989c176a2158cc56582 WHIRLPOOL ecf05d12bf1722a2a087e55e5df4b3a0711adde82b81823d77378dc380d688dd7063fef6ac25a7d3f604bb9fb60130b51bd78cc4c367228e99c41710aeb3e504
diff --git a/kde-apps/cervisia/cervisia-17.04.0.ebuild b/kde-apps/cervisia/cervisia-17.04.0.ebuild
new file mode 100644
index 000000000000..d0c43cb0adb6
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-17.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/cervisia"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	dev-vcs/cvs
+"
diff --git a/kde-apps/dolphin-plugins/Manifest b/kde-apps/dolphin-plugins/Manifest
index 6a8f7b52a31f..8cd9837ff040 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1 +1,2 @@
 DIST dolphin-plugins-16.12.3.tar.xz 61112 SHA256 a90bc65485adf95e230b979effda5addbf7464555551f3c957f98ec17fa55fa1 SHA512 5d276762bf6ac3e121dd6606bf6edc4079c55dd91e54ff855b32869811ffdfe68815691a78cd0d3d4fed969c02732f5535b4226f5ada0f8b6537b816e7d5569f WHIRLPOOL 7788e51134e9f73aa23f4d32e38373a410792b640b9ce78b2e0cc050f45519747cf29669ad2862774036f1bd78121bc00e60b2104c6fbae8b25df1f2388870c1
+DIST dolphin-plugins-17.04.0.tar.xz 186500 SHA256 58c4e67fa69799df8d28bc253402073be68b3349c3e755a221d6edb668b84056 SHA512 4e2c80f11d5c7674e7ab366858e13833da6ca347e866983ed306a3165d48fd8f51941e095e3af97b30f8e26636fbd89bb8a925d3d54d93f468b966a4c46f7a9f WHIRLPOOL caaa55d9d4b15f737aa6db8a1ea52b2278975124145f4a421d022d25af92a85c29bedfe5d6e8ad44d7bfb6a0a8e0c4fd341d21595f16339f6fa3c96dfe1b0ccc
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-17.04.0.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-17.04.0.ebuild
new file mode 100644
index 000000000000..a370260ca5a1
--- /dev/null
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-17.04.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+inherit kde5
+
+DESCRIPTION="Extra Dolphin plugins"
+KEYWORDS="~amd64 ~x86"
+IUSE="bazaar dropbox git mercurial subversion"
+
+# FIXME: required in root CMakeLists.txt, but:
+# kdelibs4support only required by git?
+# kxmlgui, qtnetwork only required by dropbox?
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep dolphin)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	git? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep ktextwidgets)
+	)
+	mercurial? (
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep ktexteditor)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kompare)
+	bazaar? ( dev-vcs/bzr )
+	dropbox? ( net-misc/dropbox-cli )
+	git? ( dev-vcs/git )
+	subversion? ( dev-vcs/subversion )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_bazaar=$(usex bazaar)
+		-DBUILD_dropbox=$(usex dropbox)
+		-DBUILD_git=$(usex git)
+		-DBUILD_hg=$(usex mercurial)
+		-DBUILD_svn=$(usex subversion)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	{ use bazaar || use dropbox || use git || use subversion || use mercurial; } && kde5_src_install
+}
+
+pkg_postinst() {
+	if ! use bazaar && ! use dropbox && ! use git && ! use subversion && ! use mercurial; then
+		einfo
+		einfo "You have disabled all plugin use flags. If you want to have vcs"
+		einfo "integration in dolphin, enable those of your needs."
+		einfo
+	fi
+}
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index fe60e540d5e4..883b5058e6c7 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1 +1,2 @@
 DIST dolphin-16.12.3.tar.xz 676192 SHA256 62f1392a25692bc7ff0ffba89b1949beba3cba0f78bdf6acdf97ac2897a46578 SHA512 99a6f35678918dffa7a55b453705186a92bf1b69776a7b80ef12553489e258f5776a5d7b2a5dd16cbdb2e6772a2a122fe10e74afb6233e7a939f8f925e1d8736 WHIRLPOOL e606fbb6567f0c67e952ac91e9e54fcb7734a493091cd6441f3ccb8d42739f680ff52c90b004d6ad5d3a97e0f68bb2b031b3d432be38ae20e9a4d8d01ffc5893
+DIST dolphin-17.04.0.tar.xz 4714124 SHA256 be98d39a63e1fb9a77d79fbb04019cecaf0452d0616d518518e71d2c3fbe2227 SHA512 dc5fbd343e5f8f43694d6c024f72c00a9fe3274f9b718c2c9d11b8ee36001a85162e109c3c71cc5c1b4dbf8746fdd4076f32f6732ebfc546d4c862568e4f6435 WHIRLPOOL 548f4c2b00b193ad231406e33df3f43edd22ce478f8d366a0a84801db1eaabc2f10b28cfd0767bbe85023a73585ab357d8e8952a05955c9f974b67caf4d60adc
diff --git a/kde-apps/dolphin/dolphin-17.04.0.ebuild b/kde-apps/dolphin/dolphin-17.04.0.ebuild
new file mode 100644
index 000000000000..6851edf8232c
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-17.04.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FRAMEWORKS_MINIMAL="5.30.0"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma filemanager focusing on usability"
+HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
+KEYWORDS="~amd64 ~x86"
+IUSE="semantic-desktop thumbnail"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+		$(add_kdeapps_dep baloo-widgets)
+	)
+	!semantic-desktop? (
+		$(add_frameworks_dep kdelibs4support)
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kio-extras)
+	thumbnail? (
+		$(add_kdeapps_dep ffmpegthumbs)
+		$(add_kdeapps_dep thumbnailers)
+	)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/ark:${SLOT}" ; then
+		elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}"
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 816bf508f6e5..543676ce8674 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1 +1,2 @@
 DIST dragon-16.12.3.tar.xz 479372 SHA256 996495362c76f98eac65dc7a285ebf7afc07cbc6fcf6820c0ba725a50d65a298 SHA512 abeba677c3cd93feee69b2ce3d884963bb929873c60e55aba7ba9e7547e781f3da6fb2367b541e3cce908aadc4a4ad0d5511755df513b9fe6ecff23460edc7ec WHIRLPOOL db095888f8fcddc308e9d35bae7c409562cdf2f5076b0bda3ca5e77c262365d4e6feb2e80a234511c9425b3c2396c372cd5217eedf256e8a56939002d7440b25
+DIST dragon-17.04.0.tar.xz 1461252 SHA256 01859fc1444480920acb186e111454eaa3aba279c7d76c770a42831589d4b422 SHA512 08bf493d4107d6f5223c9f6a1e56255304fe37123ec3aa1f01facba04d0d6968de016a47a03a70a1ebda68bcd892ea59c8739ee89e0a4224fa8755a7e3f484b6 WHIRLPOOL e6c2c64555d55afbfd2ceec2cb2ce7c0b4cff96286b1e5ab0d5ed130355d54dbb09080cbd008e3fdc6375a5a5cfd9eb53298475f9d44cf873f8c44d5506a3d12
diff --git a/kde-apps/dragon/dragon-17.04.0.ebuild b/kde-apps/dragon/dragon-17.04.0.ebuild
new file mode 100644
index 000000000000..c7321ec40d6f
--- /dev/null
+++ b/kde-apps/dragon/dragon-17.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A simple video player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
+
+LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index ed61e4c39061..f65dd0ee6f53 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1 +1,2 @@
 DIST eventviews-16.12.3.tar.xz 147360 SHA256 acfcbecfcead0a3ee9c52de135772ca8804cd643851c4a69fe1a5ac1b7fd127d SHA512 d8694c9f8f7a29086d0fa71e10f99de0fa078d0dfb6a0e1e55fa96da82540cc74351415fdd9c1bdf424c0969061ee8dbaf8dffe6e6b1ea15d94266b291b61bf1 WHIRLPOOL 23c8458ef6ac0a110ebbcf7b9f3af8dd5d1e389cd202e07b09fc95ab4547d39e752ab04ab08777965c3abb224b6db2f3f7773bef3a15033a858a500cbc1aac83
+DIST eventviews-17.04.0.tar.xz 434832 SHA256 00fdfb9fe5bf588717079e7bc27c87bf6f67c1c33d35cbf224cfa49d6ed9d4bf SHA512 4a86c9c02ec79d631abeb530158b603b5de7dc03e203dc8c43164549839c339a218fb7bb7378cb0a8cbc4458871f5d0e32fdac2997cdd89cf66732f45cb3fdcf WHIRLPOOL 2483f63a98a3d35d7786bbedcb9334e56a4db27e2da31bbc735886b449f25ed3f91f5d2ec5ba2e7afd4c2879146f048238c3a8ff43350aaadc7b0ed53fc392c5
diff --git a/kde-apps/eventviews/eventviews-17.04.0.ebuild b/kde-apps/eventviews/eventviews-17.04.0.ebuild
new file mode 100644
index 000000000000..e1b82038557f
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-17.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index d32324a2d9d3..66445faf8e0d 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1 +1,2 @@
 DIST ffmpegthumbs-16.12.3.tar.xz 21132 SHA256 09ff1e7b95fc34bd66bc8dc437c0a1562835f83dbb33f8c6ce41e85c50f39ee9 SHA512 b68a6bb76b62b4890d4247298015df29c0988ffa2cf02215e86f8c8d4270a3a9a1e4723ee769c302b6413444e039bacf143b58cc6f2d8a18c70fe5ca291af097 WHIRLPOOL aad3ca8dfb020f388dc6160a241064e92c256ff60abcd0fd234e0372cbaeb912d4f4e7b1b23da8718c0133d366134f5f37aa6b05de39236022f819410aded31d
+DIST ffmpegthumbs-17.04.0.tar.xz 21108 SHA256 f55508900e21e6e1e69e309d0c8eba845f4e9d2645ac368279c982d20149384b SHA512 29969f76fbacc8a93874ca9f1d9c7ff93b64ae602e6984f179a6ee16714ff256b965c426fd44572a5bbd65700ef7791111f04e05bd380b3024a585ef5a4ba471 WHIRLPOOL 154da87151219c707561d71f49759fd5d622d85522e4a8dbc06322f83e5c0052278daea3645c06d267aa08bc880e43d4149fe5dbe9757f030253a100641fe3e4
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.04.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.04.0.ebuild
new file mode 100644
index 000000000000..9377a8524138
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 9338be1f8002..13a23cc82dff 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1 +1,2 @@
 DIST filelight-16.12.3.tar.xz 212072 SHA256 3a8e0999d8ffc2edf0624482ecf1cc3b3586bdbc7e5431bc4b71e09f78e8ec8d SHA512 c24d41505ecc6344fc963943e46a194ba7ec52ddf994b61e67fdd72e1ce654f74deed38f46026189b922f540c3892910ba191828118d8536bd1388347332a526 WHIRLPOOL ee8a15cc340794f88edad08b95688dbf0298c517117a5b750106570169f0b63a4c248f023ef38a65818d7d264b3d3c9211593d7e9dfba1d50a820d06074964bf
+DIST filelight-17.04.0.tar.xz 653668 SHA256 e8d9ab11b62defc340752c5d8f75d148bc112c2dd5ad3d01d8fcabd7a640bfa1 SHA512 be972b781d90bd46acab5750e986182e7916b00c61d257d31bfc92b22668beb99cef0b03da87835bdf2a8baaac1578464ff9abf97c6740e5c2298626dacf6035 WHIRLPOOL 6502bd644933b21973fe2176b41f51b739d199d70b11a058e6f072767d4850fa93cf94ebec2b26d87c10916660e655139d5b0c3eb56a94a4cbeffa817982eae6
diff --git a/kde-apps/filelight/filelight-17.04.0.ebuild b/kde-apps/filelight/filelight-17.04.0.ebuild
new file mode 100644
index 000000000000..69f27db8ceae
--- /dev/null
+++ b/kde-apps/filelight/filelight-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="https://utils.kde.org/projects/filelight"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index 357322117a42..2837af76ee3b 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1 +1,2 @@
 DIST granatier-16.12.3.tar.xz 1238636 SHA256 e6d8b4e94f538fd38c45d5625582ef1a3c9e99a28fd20db3de776ff1a5f9779f SHA512 5f78b4f6d8d94697e3672abf510eb032bf75e4d716f11d5ef4fe6b54816917576abf7ae1014ba2079710f2280bad7fb68cfed1333c2493c4dd8a9bc3d057f3e2 WHIRLPOOL c1eea909be7e671e7f6a2d4d2a3f8adda7986265243bc700e9bdab139299c1b6448d89e986efc23493931c9ee91ae64b1aff4b55c565195238c0e8417dc4ef4c
+DIST granatier-17.04.0.tar.xz 1960664 SHA256 a86674245e10b8b257d71f8fb6480d8a5613d9e0202bf99cd57b1a1cb3bd5422 SHA512 6190584539eb9e4865ace09179912aaff4dd6ff6400a9bee5ab74236bb19dd6fcd4f8bf633c4a55c464a7a3067afae9ac8f29aab49898705a4811c93e4cecc78 WHIRLPOOL af751ce92b8e79c480aab03499b7d8f03a0e73462a54ae6c02797639806bbd7e24191cc7bdbab7df999db7d0910b694c692d65824c3c653ee7fb887545dffdfc
diff --git a/kde-apps/granatier/granatier-17.04.0.ebuild b/kde-apps/granatier/granatier-17.04.0.ebuild
new file mode 100644
index 000000000000..0efe6592e861
--- /dev/null
+++ b/kde-apps/granatier/granatier-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Bomberman game"
+HOMEPAGE="https://www.kde.org/applications/games/granatier/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index d289eaca1c52..57820d291528 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1 +1,2 @@
 DIST grantlee-editor-16.12.3.tar.xz 45408 SHA256 f1df143df3cd6754b51e08985534af65c1366a59c28bca9be17f0f571633f800 SHA512 cfc6d73926598ca53116307b9f6ad15cae4dafd07c66d16b7d82dd3030de49232fb6dbdebfd00ad917f0d28e4c4427445df73c3e8992cad5b2205275b18a14b8 WHIRLPOOL 4b46689dc825d74159539e2743d2cc764011bc8072135b85bd05731267de8a432b45d19d4500b729c0a670dabf63c0b48797dbff189e3a9af0afac95d626b11a
+DIST grantlee-editor-17.04.0.tar.xz 111384 SHA256 0b9825762e65d4b6680169dcddca35146632519c38aa732b88a88a914d7555b9 SHA512 7f46b526a326fbbf706b100b05fc3022623652e97eeb7fbcf9551757ecade3a1cc59c1d0099f179a0affa174d301a91c1101b12f0d6605c425fa148022742bc1 WHIRLPOOL bd44591f41979dbcee19bffda4cd81ada99849e8a8aa85eb411dff993e4cde5469bbf51ab43f93e05c646fb845f7ba9060f0a8c85b8c1aebd372fcd1e34d898a
diff --git a/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
new file mode 100644
index 000000000000..9a6c05721587
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 76927cf466cd..59c518c4bf55 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1 +1,2 @@
 DIST grantleetheme-16.12.3.tar.xz 44032 SHA256 135de45f766a4bb3a6831177f0e3bf6b48298bf0e0ac98b2d91697738551b3a6 SHA512 b5a36282e0406e67269c84401ba5122dd9c3694071730664b178f8b7593beb32c70ed092a39d44c1e7ce3977855de531da636a81e4e71296030fa18eb4ecf0e0 WHIRLPOOL 50711227a352fdd8e3e01ededdc9b6bd29ba0c89ecbca635d3d10d7437e8738767c01e00fef7263dd9bcf587539adbf335fac296b25b516d89cde6bd6789f4fa
+DIST grantleetheme-17.04.0.tar.xz 50892 SHA256 240ebec772d0361ad21a6396425ccb8fddb90ae219f1dabf30ad140a925b33b6 SHA512 4b2d2e002ab0c6b3f13d9c87f674851ba3087ecef38664619b90a877a54f9a20385e401a518525dad4113554e023ef5698e1187bac45a56ad857ee1c51302d8a WHIRLPOOL 951fd178d74dfbcd24e6f71ef13bf9f0ff05453e43312bffdac2f2db2fce6180cd62066ba1ac99e98f1cc2cb7e15b47257d1e4d6fc8a00afe5d9e6cd1aabc0f4
diff --git a/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild b/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
new file mode 100644
index 000000000000..d95faf975109
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for Grantlee plugins"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtnetwork)
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index f3c9d1a5a39c..0987956f60a1 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1 +1,2 @@
 DIST gwenview-16.12.3.tar.xz 2850840 SHA256 79bdbc28cf01e00188a19c590982e9da5e399215d216e05fca06a697385d2e19 SHA512 a8130e7f742f3121fa713ba32fd99f4adc45cb8cfd6b5597da95d8399f9b3082e1e37dbf882a9482f6578db28ec575578b33653b065a4b94f66460cb77e91431 WHIRLPOOL 7842d9d61edc924f0bc1e2447d96add61a4907b0c4cc6d3435931cd7d7e9e9880561d8051c89281250c8e5b4c2f006b694f4ccd5765170376640442b4a836d6a
+DIST gwenview-17.04.0.tar.xz 5902924 SHA256 4109bfef13d1347fdce0a3945ab130220d9f072cd2c5ddeec3c8bc41da0f9558 SHA512 5b55de2f761accdf2f42283bfdba3df44780073d2587cc6c9aaed7ce1acca417ad571a77ac7ca2f2f0ab5ba46cffc49a70e3f4c9dda7f19c3370af3ef34ac66e WHIRLPOOL ef0a31f91ea906c20f52a6762c75bc1ce124b3e77adf704bccab2a395fa522361b9a563eca1d12790c774ab0560fb4453db4b6d1a553ef67207cb5127a2f4197
diff --git a/kde-apps/gwenview/gwenview-17.04.0.ebuild b/kde-apps/gwenview/gwenview-17.04.0.ebuild
new file mode 100644
index 000000000000..050bf1145745
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-17.04.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE image viewer"
+HOMEPAGE="
+	https://www.kde.org/applications/graphics/gwenview/
+	https://userbase.kde.org/Gwenview
+"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="kipi raw semantic-desktop X"
+
+# requires running environment
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-gfx/exiv2:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	media-libs/phonon[qt5]
+	virtual/jpeg:0
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	raw? ( $(add_kdeapps_dep libkdcraw) )
+	semantic-desktop? (
+		$(add_frameworks_dep baloo)
+		$(add_frameworks_dep kfilemetadata)
+	)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kimageformats)
+	$(add_qt_dep qtimageformats)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	if use semantic-desktop; then
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+	else
+		mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+	fi
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/svgpart:${SLOT} ; then
+		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+	fi
+
+	if use kipi && ! has_version media-plugins/kipi-plugins ; then
+		elog "Plugins for the KIPI interface can be found in media-plugins/kipi-plugins"
+	fi
+}
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index c8fd75415c9c..187e120af471 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1 +1,2 @@
 DIST incidenceeditor-16.12.3.tar.xz 121148 SHA256 f76ec9ec5525000d917109c09136a9ac77feff0b9b6338e5ddde3eeb06a75786 SHA512 97c8fc87ec215b581986b129bd5965ba5cd5f51146e7d768e85e008befc420d9951e6a9298ac833f7d137c974205cfb06689057392203818c711296fa5b220ea WHIRLPOOL 86bf856960facacd1c2df5265b008f756fb4130069ebc622dd41e3786ad24dca3b8cf38a7737c19c2986e1b35ca2a948672e8772233e261741968558797c2853
+DIST incidenceeditor-17.04.0.tar.xz 523160 SHA256 871db40c324cddf0179419fd9a54200c60b92a9e7f229c535cb6dce23044d183 SHA512 1b9baebb42cfb4f141c362fe4f0d2a53d4ce25e5252e1943bba648d6db40ae86e8207a9af7058eb3f7dcd51220c853feb35c43adda4a3ff042b25e98b91a6f6b WHIRLPOOL 5d4cf0440409cfe9f9579858e7acf2f24c17c1f510936b57cf2c390d6b2c5cb4697471b55b7be922f2c09244e288d6d5ed420d76907f0205d6a543fa27d50f11
diff --git a/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
new file mode 100644
index 000000000000..a8b45470aae9
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Incidence editor for korganizer"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+"
diff --git a/kde-apps/jovie/Manifest b/kde-apps/jovie/Manifest
index db0324ad6c22..ed63904c602c 100644
--- a/kde-apps/jovie/Manifest
+++ b/kde-apps/jovie/Manifest
@@ -1 +1,2 @@
 DIST jovie-16.12.3.tar.xz 394856 SHA256 aa3b409710426aceafe0a3cd65bcfd376c5cf0d715383dddea9cf483ca230ca4 SHA512 0dc735e75b79c69d1a5a271a8003e2e5d7ad89f85b8eb09197b7b37e5ccd7f2fde19e2cb8f075ff192b7dcd11d3ded8a0e9c8e035722e8675fc29dd7eccea024 WHIRLPOOL d6b44d71a102a019e89832b96062a67a4c6e93d290cc30148ea549be38037ca14d844b569876cdc00d2a2e7ffa5c05c003c4f81e4cefbbc15628a79991e63587
+DIST jovie-17.04.0.tar.xz 394892 SHA256 d715686862d095c1f51152b2f42fc67d94b6cba4151d96d4cbdefd9ae0006dd8 SHA512 a394aa1034f5ce297dac88306778c616058b86b609ddc33b664ac73169696dcf355f0e8797fb55815ce8f8952e7d8350a8f354d76750c6bdaec2f06e8c81d4be WHIRLPOOL 828d8bdd878d5a2f6ebf6c01fac3974dcaad5bd497e6bdecaeaf36165e3cf041bb590efa3dbfe3139acbe1a8464f5b6796d8edbb43b417b58a14b90c3254643d
diff --git a/kde-apps/jovie/jovie-17.04.0.ebuild b/kde-apps/jovie/jovie-17.04.0.ebuild
new file mode 100644
index 000000000000..4a2bb878ea7c
--- /dev/null
+++ b/kde-apps/jovie/jovie-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Text to speech application"
+HOMEPAGE="https://www.kde.org/applications/utilities/jovie/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	app-accessibility/speech-dispatcher
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 012e4740be96..c458cfa55419 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1 +1,2 @@
 DIST juk-16.12.3.tar.xz 446208 SHA256 90c447f4972b13c07be58193fab7f77c7538c1a6ef53272d1455d9a98b8a4feb SHA512 4d6bcf5ded45e8734d8d5ae26b1ec521b60d31081bd1aa9fab48d4199399c4183a090542c4ad5f2feeb2b0ac0802869e1e602c8a01cc084408743caa19710945 WHIRLPOOL 3dde4e1a02774ef9f3a34d2816a0ca8fe60c5f7b2630cbd49230b7fc386e2058f593ce6871e60915c9edf5063a759a36cb7f7b4e00b5a3b1bd116cc6c349ff4f
+DIST juk-17.04.0.tar.xz 446240 SHA256 df07b6f5feb1abbd239ff5c7a8dbc2e8cfd155fdf63ec74fed2ac9b8288a8746 SHA512 1df006f30a0e7bfc8015cc88403c9353de5f577f94a4985d76512dfaf99fa5d169eb397956eeba7ba96f3121fe63a9d7dab29294bb96647b06433aba91ca2850 WHIRLPOOL 6fa51c5a565d1ec75d8b913cfc38b25f4567557d6e9c12878e1f8c805ac97bb391ffe6ca0cbb6f853cd3c700bff528daff08b5491b77298b0f108d68c5943fe4
diff --git a/kde-apps/juk/juk-17.04.0.ebuild b/kde-apps/juk/juk-17.04.0.ebuild
new file mode 100644
index 000000000000..4df28c533153
--- /dev/null
+++ b/kde-apps/juk/juk-17.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Jukebox and music manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	media-libs/phonon[qt4]
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	# bug 410551: for disabling deprecated TunePimp support
+	local mycmakeargs=(
+		-DWITH_TunePimp=OFF
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index dd6becef89b3..503fe57075f8 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1 +1,2 @@
+DIST k3b-17.04.0.tar.xz 10573620 SHA256 832b7a94769b4b0c33c0935adeb36e47c297eeb4801650da9b7ab1668b464a73 SHA512 451f5f1bf917b7c56304adacbe1bc1c49fc8e29c6ae49c52092f5fbbb95d93478e106de287e7fa8228aa5a80d5a1e4a28657a71def4e9e759299ae5da4d0ae9d WHIRLPOOL c99ac43e84474f44777c9ffedf20da27b77c93b905e97464c7efac89e5aecea33c955cce9ec4afc281f2fff6d888baf76e6147b6313a3fa586837bcb9a5d2a46
 DIST k3b-2.0.3a.tar.xz 9864468 SHA256 2d0bb2746802c1d3ad7ddd10e29234cf2053074f376feb200306a5570c39c081 SHA512 008d69f3d60dfcd39c787c8fb0b50cdf7b29f1cf551c2c0aa0b6e995ec9d67b26edcb0670d5cd428afcc4e2a60c9e6170a9316b90978dfcc3693d27db98e7472 WHIRLPOOL 5cc63f7355ead8585295c6be8909a07fb0f34df77c8feff14c42daffc52679e27fbb28f1b1912c1bdf22e9c79b4369b2af6f3f8592f25af0f401a59e2b3a2c50
diff --git a/kde-apps/k3b/k3b-17.04.0.ebuild b/kde-apps/k3b/k3b-17.04.0.ebuild
new file mode 100644
index 000000000000..5016ef4181d5
--- /dev/null
+++ b/kde-apps/k3b/k3b-17.04.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="http://www.k3b.org/"
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	mp3? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? ( media-libs/libvorbis )
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	media-sound/cdparanoia
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+REQUIRED_USE="
+	mp3? ( encode )
+	sox? ( encode )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	echo
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/kde-apps/kaccessible/Manifest b/kde-apps/kaccessible/Manifest
index 85a666ed7fe0..0b454c70ab79 100644
--- a/kde-apps/kaccessible/Manifest
+++ b/kde-apps/kaccessible/Manifest
@@ -1 +1,2 @@
 DIST kaccessible-16.12.3.tar.xz 20600 SHA256 6971267c94541dce628beb70e952863d2fe8fd83ed1f570b8679ac60f8254a98 SHA512 45bc1473ab1e77fbf154e17bf3d92c4bda289ad6be9be932e9ac090a98f26785a152d5661adb6ab56f8ee64cab00c08c9132c42450cb8792f41d2c5160ee2a87 WHIRLPOOL 190316b09cee16f6edb6270c810c28c01407a7cf550955e4aceec67de452f32cb722b9969af27d7da2a56cc342a9fdb345eec85cc5c2a06df6190cdf252d63e4
+DIST kaccessible-17.04.0.tar.xz 20608 SHA256 6328b4f844864267efe6082bbf4c6b0c481275f499b23a149d7ca23f41dd6c3e SHA512 a79464fdb761ece7992fac47a6b0da7fcbb847ec82133c90a276c73468f1240e2d9acde0b92a5f0fc2f7952a80070b46b3df99d6cf2e22e208687e417efd2e7f WHIRLPOOL 40384d4ae2e5c2dd084bad41b4d68f673640d9045f3e25a64fd61bc41aa1a7a4d49a859ab5aa58c527ebfe91653344691cfc9d1b7ebd6e5e7de85afa19a76df7
diff --git a/kde-apps/kaccessible/kaccessible-17.04.0.ebuild b/kde-apps/kaccessible/kaccessible-17.04.0.ebuild
new file mode 100644
index 000000000000..73c8799f2a34
--- /dev/null
+++ b/kde-apps/kaccessible/kaccessible-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="Provides accessibility services like focus tracking"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug +speechd"
+
+DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_Speechd=$(usex speechd)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 492f7d76920f..9d58b279bd30 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1 +1,2 @@
 DIST kaccounts-integration-16.12.3.tar.xz 46296 SHA256 02a675f4340b19976b18bb576339607fa6f185126e2ff27c07a938edf5181071 SHA512 f2b646b2c1b21a8990984fd447457f93ed2b9692bbdf352b9803c5a8f1b3e93909d1f1bfbf8c834e4402e86bc8518b9958121d2f568b9cd26c61056b6864690c WHIRLPOOL fbe500c8360ae09a9ee77382ffa5a7e0683ed4354b367308a0b629bcc81794da04c2bb3977df027d055b67df69a99a796cbfdb479753a046850c9fdaeb9ba0d2
+DIST kaccounts-integration-17.04.0.tar.xz 68736 SHA256 14518eef432ff042ac1f7e57d1c26c2b424ab6cebbc4c3ab9ec28ed608968156 SHA512 be593c4eb26400fca95e72e3f531f6bf96131f496684040816f730468b207d5bca5fd25472aa05dc5631737e5cc54c0de4dc3161d7a54930ce414ec5ff576667 WHIRLPOOL 25437505550e1f60d2a24e15c607865036da54446bcfb06a0ba0f5f2378ca355f371370d4262b83b4fbbfe7f5302a08c9e5930aedf9c547cf6ceacf5ab9ddabd
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-17.04.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-17.04.0.ebuild
new file mode 100644
index 000000000000..ffa2bd529195
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-17.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	>=net-libs/libaccounts-glib-1.21
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_plasma_dep kde-cli-tools)
+	sys-devel/gettext
+"
+
+# bug #549444
+RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 561c752fb470..8690d4634957 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1 +1,2 @@
 DIST kaccounts-providers-16.12.3.tar.xz 16972 SHA256 4296fca25b42e1ce7bbeaa190725253ae61bbfbafedf8d33b4c7e9a6a4e31847 SHA512 20567170c848a4bbabaa0029044e18f59c04a7e6843c04a81683df4574138e57995826b00b73093248462a78cfea3ee4a40c82a8bef209b34a69a2ec028190a2 WHIRLPOOL 22fc29aef69bc6a785a54ccae7a3a946cf2231f99499d12e9333675709dde3a15311bc7a1a25a306010f307d83a56f23a56e40eb5b12ebf45fec5f24e3b4bf9c
+DIST kaccounts-providers-17.04.0.tar.xz 31124 SHA256 834d4885fff8e5900a461a38220fcf9db807a6977ff0217269b3725973c029c4 SHA512 18b7b6b326d6d93980ecc77e83c62b8f60901113ed7140795f174056d0a3c05dcdf9141608e60efdeaa9e9b68ddff7fa1dc098d403a71063cdea1ace6bb1f17b WHIRLPOOL af212877bcd6ef1c0e9b290597746d7ecadc2531021f3b2f11c9c0251998492381ed9dcbe1843c3bfdde298477b1e86f8830d83fe758959ad8ac5e4d71c04af3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-17.04.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-17.04.0.ebuild
new file mode 100644
index 000000000000..86473b4d97a7
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE accounts providers"
+HOMEPAGE="https://community.kde.org/KTp"
+LICENSE="LGPL-2.1"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kpackage)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+"
+RDEPEND="${COMMON_DEPEND}
+	net-im/telepathy-connection-managers[xmpp]
+	net-libs/signon-ui
+	net-libs/signon-oauth2
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 684b6ab3e766..8ee8644d96aa 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,3 +1,4 @@
 DIST kaddressbook-16.12.3.tar.xz 164940 SHA256 300b448c8cd367b13cfb92aa7297a27775a2a3aa822b759edf11f10bbc5606a9 SHA512 48ca122c0cb8dabdc0dd0d707fa61ade73b3c6db0570ba140cb2f9743c27248fe96ad0817505677a1721b2d5ba70366bb98d3b290b8a2b51fa617b0e46b6904c WHIRLPOOL 45bb344a1b03a4fdcf65740e4072ef5555d77d80766ce2d36d27dec560ea51cc91f569294deb5aeee295613ba8248cd555cb4593d20ceeafcecc17e29910df2b
+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.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild b/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
new file mode 100644
index 000000000000..9a60ac95f413
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-17.04.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="prison"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/grantlee:5
+	prison? ( $(add_frameworks_dep prison) )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package prison KF5Prison)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index a21ea9306aff..f60fe541efe4 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1 +1,2 @@
 DIST kajongg-16.12.3.tar.xz 2528552 SHA256 accc4b1bc857495bc1d9fdc9aa3274f5a2aaf566b49741085640d36b059d9c77 SHA512 28daa6d6b06ea2eb473764b01bf8aa776be9e37def8d63970fa4f8c98c3c5c52d04de9be6259da3fbaebbead52caf61f9a72831439135babe4e331cd0f4ad6a9 WHIRLPOOL a753525bd01a8c58a9515ddfaf2393501088184d778387c70be3d43d84e95fb0d7a6e9d39ed2818e565d5c761593633a9493eca1103000020cf992dd16b07418
+DIST kajongg-17.04.0.tar.xz 4232900 SHA256 b68f9ccc282f0aa4795456767813cbbe98ce115181daf61b5d306aaab353eeaf SHA512 63426901c50381932a2df5c2fd835febf886263212b9f2bb0cf21adf00b7ea13d212a6a3bc0905e9134309c7fb6250cffd246dc55681055ff6f2b0dad793b2b8 WHIRLPOOL dc5046e3722099626ee12a41c885e031ce43ec201cfda9dfe7249913926b41f0bb25a251e1eb102be1767d7cfac5bdeeec4413aa4913960e9fb1f71f29d71915
diff --git a/kde-apps/kajongg/kajongg-17.04.0.ebuild b/kde-apps/kajongg/kajongg-17.04.0.ebuild
new file mode 100644
index 000000000000..af467a5aa031
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{5,6} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtcore)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-db/sqlite:3
+	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
+	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep libkmahjongg)
+	!kde-apps/kajongg:4
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	kde5_src_prepare
+	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+	kde5_src_install
+	dosym /usr/share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym /usr/share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+	fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 7db272ead230..a4ecc7c651a8 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,3 +1,4 @@
 DIST kalarm-16.12.3.tar.xz 566936 SHA256 1f5f78697197503ae716d247b8391a19cf2ae4eb03fb4cfa0a2be2cd441170d8 SHA512 5fe7a83acd5f7e6925c16e93d99afce20b84da05431290abfb6eb905991d34320bc8f6b30b9939d2c599cf147bbbadaf703183cce3d84e6d46c16cd1fdd4f407 WHIRLPOOL 4e2d26d80494b6c128f088f58001578026e5d73043e377a2048f82cafb9c5c53ed000626ce1553a417c95dca713509608f6434f9032809834df883a2cbc8246b
+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.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/kalarm/kalarm-17.04.0.ebuild b/kde-apps/kalarm/kalarm-17.04.0.ebuild
new file mode 100644
index 000000000000..bf7d1e3a6b11
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-17.04.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE+=" https://userbase.kde.org/KAlarm"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxslt
+	media-libs/phonon[qt5]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 468924771f63..3ff35d8ad5a3 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1 +1,2 @@
 DIST kalarmcal-16.12.3.tar.xz 87612 SHA256 79ed115271378110a25482c260ede827a32ab836f8951db7e121b6a5198c9a18 SHA512 9857b3f7aed45627ad9db2d869b4c2b13ec207f24ab273381130717cbaec72038e0136119101677bfb8f2067acda4229af24408c5d58334b6196ef61e7a82bc8 WHIRLPOOL 5eadc1fafdd67b7ec86f21b7b03a845f04f04ad69c368ac0eae407f00407ca2a5404e70fe837cba5427c9094fa8d5286ffd781691c5158ccc6c2683aa58fe69d
+DIST kalarmcal-17.04.0.tar.xz 504300 SHA256 8464258e576d23fcc43732203c8cf190cf77bbad54d4b46938e58fa9b4e0db8c SHA512 af0b07f14eaf0f62af9931b72272ad22c9408a2009008896e21da14b6fcc0da87be05dff6919b5927fb3e8337d502b070c4e02a6d1f9a33cabeeaf9e2c04f9a1 WHIRLPOOL f14d5129ddd0732f1f3896728542922c64e3ff304a72d92a838d9ff66afd37d55efba6107365300beef160dfcfc4de036c9894e322321f7f96201d50a0c9f614
diff --git a/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild b/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
new file mode 100644
index 000000000000..4b6dcf977296
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-17.04.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 7056243c07ac..48609914b2d9 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1 +1,2 @@
 DIST kalgebra-16.12.3.tar.xz 323292 SHA256 0b6781917d2b5cbe7b400b5ece5d163a846cfec3ff93aaa0a72d90fa4ab41162 SHA512 cc73325dac2b3efb7252de801f2e8f6805ea731afb066e02da97c1e25a2df3127a285d1f8836b3219d20e72bcdbe54883b4bce63045efa2596f762de5576b814 WHIRLPOOL e43ad7bbb8976d7d5fd537b33ed7118e9240eb50187d8d019d5e486338efd6c0205a0a52be486cae40a14d401103ab1e7786e75a37b74dbf2a73d1b3d16fcae4
+DIST kalgebra-17.04.0.tar.xz 689748 SHA256 044cb6dfc10692dfc29de170afdb2afacd5777af18c3f5341587e1f380e0f315 SHA512 d29d74318aed5112f07719f2602b99cc5008331c6d358928a35e5fccec551609ad7fd205347de227d1be350eb110c4435e201703b21128b6ff9c684ce00de8d3 WHIRLPOOL 1747a772b425d90cadd86b08d51d3a37dc2942d135b361e20a59c6ee6fe536ffd3a26f17ddcd923bfe1e045179665f1d5e5fb456a64a936c0c2eebbaf98db223
diff --git a/kde-apps/kalgebra/kalgebra-17.04.0.ebuild b/kde-apps/kalgebra/kalgebra-17.04.0.ebuild
new file mode 100644
index 000000000000..d3826ebac25c
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-17.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="MathML-based graph calculator by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/kalgebra
+https://edu.kde.org/kalgebra"
+KEYWORDS="~amd64 ~x86"
+IUSE="readline"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep analitza)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}
+	$(add_qt_dep qtquickcontrols)
+	dev-libs/kirigami:2
+	!kde-apps/analitza:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package readline Readline)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 587bf893dfa9..ee7bb3e91519 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1 +1,2 @@
 DIST kalzium-16.12.3.tar.xz 4589228 SHA256 11519ce92658aa09ef1d7fe84b6a60f3e4b9f2b64990ce1a03f9eeb01c968e66 SHA512 b5d062951d6fb60fcb5029fcf9d64fc492956d90fc76d0247202ea332d3b58c02d161229e52482583f6b735f1bb4afbe0f89ec2465d8adbb9c67b2c49ebe1879 WHIRLPOOL 828f3f7b016149a17eec3a86e6c83bacdd28239412388d8209981d777f5526345c097e88d3c3371953e1a79c246a6ea97759b3a557739cb5733afd02243d2d80
+DIST kalzium-17.04.0.tar.xz 24469252 SHA256 b39c816794b3be2af666e50cfc6ce3c0212817ef707f047ac63ab7893db0779d SHA512 f4f06afa239b185164d7cf5c16ab8f68155d43b09a74594e66825ac3d27ea96e4741576fed3e55b5e5fbdee9ae380f05c9c68ddeefd1e617755599d93035769a WHIRLPOOL 51c4121d1a0c1b5b68f7babefde1c33251cb65d41a076215a8a955a56b1e865b24dd1027b6311d2905a9d5dadeea928ed2d55e48e5487be1e37a0312a4a6fc8b
diff --git a/kde-apps/kalzium/kalzium-17.04.0.ebuild b/kde-apps/kalzium/kalzium-17.04.0.ebuild
new file mode 100644
index 000000000000..3d43b194149b
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-17.04.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium
+https://edu.kde.org/kalzium"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		dev-cpp/eigen:3
+		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
+		sci-chemistry/openbabel
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 7314628e47b4..53c76918d2e9 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1 +1,2 @@
 DIST kamera-16.12.3.tar.xz 37632 SHA256 f94d4a307ef8e4e4ce095e82366563ff062450d4187eec2ee5c5695d364ee112 SHA512 680791bd9c166a5101f1d3b2303d655e4e16f8edfb19982b0162034ef26db419768ac4d6c896eeef83b7cd6bbeb2499ed2428b3f807df0a503a3642c940e629f WHIRLPOOL 5462d3ea4497f6af4897f13dd4f3f5090f994674d427ad4e685aaf3b362b3c135ff0652f453d8af9bf531ad3c8240fdb38cad791042f5739cfe6a7dd1f504b99
+DIST kamera-17.04.0.tar.xz 96868 SHA256 69f5f6c7be89914170d7cf77dbecd911d8da6bbef7b5d68bf86ec8b99c41089d SHA512 b1dfdd1cf1af0dd244ae292cffe3bcf9b4222b6a56debc3e13a6fafb3816117bea1ffa3215f42e7a49e0f910ad47f3f32d52382d590bd427deb184f386e13490 WHIRLPOOL d4258323a6f69f1acf26823ccd6c6bcd536d60f0b0433bf382056bb2ea61ebddec997c363adb647435b40f5d289dca1da850a382b3a098194e494779bc45c453
diff --git a/kde-apps/kamera/kamera-17.04.0.ebuild b/kde-apps/kamera/kamera-17.04.0.ebuild
new file mode 100644
index 000000000000..a6330e36e9c1
--- /dev/null
+++ b/kde-apps/kamera/kamera-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Plasma integration for gphoto2 cameras"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libgphoto2:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 9c7eb044385f..24d3691414e4 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1 +1,2 @@
 DIST kanagram-16.12.3.tar.xz 5524128 SHA256 87f04c450b2e1d0c39792e3cba2940fb42afefa5226e575f19031ec77b9f70a0 SHA512 00dd72651027cf95b7f325232735a08062c0bb452abce5a4dfcec4d5c837a24852ff15d619a7698771503baacaf8ee50e92dfc5151e766e404112d69a75cc219 WHIRLPOOL a017887b85c2e5a5c6155ac9c17b35b7aa922e5a7c1ed40c516d4da7c81c42d350c1bf0e68c3a0ad27d3320a88532335d2b04d92f76e67f2f0126f16ee544cb3
+DIST kanagram-17.04.0.tar.xz 7606096 SHA256 f1803dee84e2ecd79599daa2d5063258fc4c41f6112876df15d26ec4b42c9364 SHA512 7c148473fa1e527acf86e71a6e080c7a28aa6f745460e71daaedf6fda121f5f8b69ce166ce252f714fbbee7475452bab12ec7c665ddcd3be309627dab5bd118d WHIRLPOOL c0550e745030cba4cf1a22ff6745d697cd421d0b1384380681111624ef055e1eb8d1e854b620afe3b5f3861a46fece5458dbde176ef960422706ac69d834f109
diff --git a/kde-apps/kanagram/kanagram-17.04.0.ebuild b/kde-apps/kanagram/kanagram-17.04.0.ebuild
new file mode 100644
index 000000000000..8967fbc33a7e
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-17.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on anagrams of words"
+HOMEPAGE="https://www.kde.org/applications/education/kanagram
+https://edu.kde.org/kanagram"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
+	$(add_qt_dep qtquickcontrols)
+"
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 0ea115152895..30b9969df072 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1 +1,2 @@
 DIST kapman-16.12.3.tar.xz 1790252 SHA256 8ffcca8e81ea4fd6ec16813e9108ecf36a34dcc1f757f605c957781cec6fc3c5 SHA512 595e7b1f3690ad349011353f78e7aafa1e83a3632fd8c6ec3ec54ad04efca0fe9f5554487b6c37505c7035f2deb69880adf603a13cf4de0ba870f0dd85df1c90 WHIRLPOOL 00d050b5761821f8e17ab7341e9570b59a485aba6579969ff367eebb42b5bb06abb67d34ffcf6ad5633ed1ff4d773317599890abd350161a7f755a0d727eb504
+DIST kapman-17.04.0.tar.xz 2524732 SHA256 98e68d4609f2e21319f0ea33755380943b75a30ce2d4e3abdda4c78d412cb9a2 SHA512 9a2379a503f0f2ebcf5f96f9f1e177056e3957dfd321a5bbd54536a1815796424364e21ee922d9ce30ea8fd52e9cb93b15be8ff86c6fea2555196f222f335e8a WHIRLPOOL 919d187f8599b834c62290ceb630c14dbe27567f9b1c20b8b558ea78e56f15d2a78a5f1b62f1d7fb30cc935905a6544699b17d0a9bcbda163908f4138661145c
diff --git a/kde-apps/kapman/kapman-17.04.0.ebuild b/kde-apps/kapman/kapman-17.04.0.ebuild
new file mode 100644
index 000000000000..2cacb25c2dd0
--- /dev/null
+++ b/kde-apps/kapman/kapman-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Pac-Man clone by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kapman/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index 358d8c5f752b..5f63d9917c29 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,2 +1,3 @@
 DIST kapptemplate-16.12.3.tar.xz 485820 SHA256 169500c34dfcc01d566b71d085e9c30bb93456c6b26d1e95023d27e87bbbd60c SHA512 c3ee5050fde9edcf9f41ce0f1a96e2788c11dfb1f48347a1958162b0f6efef2c910fc35049100c7eee0651ee3f1d8196c9e876fe823a257a7bf9369191bc72fb WHIRLPOOL 9b21f81712d2e811463e8a9cd2476144881e93bf95f29c9bf1c635a4d723d608536b9eae40468211cb4b171fabdf31fba22aca2fe4f18a327343a258a726273c
+DIST kapptemplate-17.04.0.tar.xz 494248 SHA256 688031802be5406e6c162823a8715b57ea9c152cd72cb6c4252619885248c2f1 SHA512 96276fc27e8f72328f6f317faab5cbe877fde55c376df884db8162f2f0c062c91d3ea6e0fee8e666ca855fa574b57fa0ff8ed9c1d9e6ab209d27006a625a1fa8 WHIRLPOOL e784ea7897276b580493081fa5e73306f205349b7ee786544e08dee849c30d53f7209c1dca49819f866563c781041dd42d7a83817d60ce01068a0af4ebdb52c2
 DIST kapptemplate-4.14.3.tar.xz 709680 SHA256 ba0c2dca9c92dbf1cce194ac4d7e9286bd313dec4b6214c67a8481e65eb43f21 SHA512 85dfba8b7582a2adb9a61b98afa782e58e5c5bc0d61595f7effd468e14a19e08251789917ccafac7396bdc1beb5897efd9042b4ed700ad875274b39fe266a441 WHIRLPOOL 9c8260f30f4761867eb2bc44b484599cb80ebf3ff3074e3d86313233b1ef95167b968a27b4c18875e2d50c3f3277e9d8ae41eaaeb0b6771d870359ec2e3febb4
diff --git a/kde-apps/kapptemplate/kapptemplate-17.04.0.ebuild b/kde-apps/kapptemplate/kapptemplate-17.04.0.ebuild
new file mode 100644
index 000000000000..bed94f726afb
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-17.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
+HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index f62d79f71e62..3c772aca02bb 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1 +1,2 @@
 DIST kate-16.12.3.tar.xz 1871900 SHA256 19e8c40985392b5640c022ceb577aa16541fdd99d389645e38b22d621c6d79b9 SHA512 065e7d9016ae4553365ca5fa60fb820fea973f673b38af0a8281b343df677026c9451ed24affcc310cd73f333ea4f9215766b85e9aba6d11c70893a35720dbff WHIRLPOOL 839124cd06b8ab82ba5d80cbe0dead82f722d501f46baa30c5313064e94452cc9b4bcb527eacd7785aa817c3f9e5bc426a9286d71ff521eb26c040e6aae43b04
+DIST kate-17.04.0.tar.xz 5213352 SHA256 6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042 SHA512 ab6cc21b0b8af99805d322de97cf7ba71e1092f589353a3b8b71e49c5bbd924ba18c2bf88a2783aa5228553b081b013451e68de4738ad54a51b7db76a9e18a09 WHIRLPOOL 52f224b02b0175097b5bea72686089b3c0ef13fbfa48c8c446c3d66fad951ed93092a8a9aec14bd0bebcfd0ae97e0f659bba1c444a603685f582d4f0d950bf9b
diff --git a/kde-apps/kate/kate-17.04.0.ebuild b/kde-apps/kate/kate-17.04.0.ebuild
new file mode 100644
index 000000000000..58d43628d007
--- /dev/null
+++ b/kde-apps/kate/kate-17.04.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Kate is an advanced text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
+KEYWORDS="~amd64 ~x86"
+IUSE="+addons"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	addons? (
+		$(add_frameworks_dep kbookmarks)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kwallet)
+		$(add_frameworks_dep plasma)
+		$(add_frameworks_dep threadweaver)
+		$(add_qt_dep qtsql)
+		>=dev-libs/libgit2-0.22.0:=[threads]
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	# test hangs
+	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
+	# delete colliding kwrite translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kwrite || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=$(usex addons)
+		-DBUILD_kwrite=FALSE
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index da6a00180a3a..75673f13bd9e 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1 +1,2 @@
 DIST katomic-16.12.3.tar.xz 1149356 SHA256 55de3245a93e78c98a251a2745c1ddbef5857d99ac90b7ecf8efbbc0b974b691 SHA512 a85fa6ad986b6504f6d76203a276f473b3e8ea1020f6ccf2cb6f83998f57ad1ee23a8d9d70e31c39ab50a7172fdfc7a07b898da58ba874f1c499c47e239ec04b WHIRLPOOL a005720b3fe8e0199fe85929cd6f92cf2a113845dc4b087410496aa68eae6103f153e22e5ad0548abce7e022ec287e8117f57d7f6287bc82b8b7f44b918aa10c
+DIST katomic-17.04.0.tar.xz 1236720 SHA256 aedc70b2a779e46c195950bf480246aba7733a416a6ac9b00f6101a565f52d54 SHA512 fe602f5884a75982964bfe9bcf1b9c407904a10ecdef521ef6fe16fdbe793133637330dd7e93d618fa76ca33be6973b774a576d3da11fa430209e704e7f27b3b WHIRLPOOL bfeb6cfba50c0427bf35c2cf15af4f1eae70b1cbd081aa2fd4d05161a73c812c00ee502386ac2c261a9d02de28f012ea49298186eea915444a14f977e09bddef
diff --git a/kde-apps/katomic/katomic-17.04.0.ebuild b/kde-apps/katomic/katomic-17.04.0.ebuild
new file mode 100644
index 000000000000..b900a5af477a
--- /dev/null
+++ b/kde-apps/katomic/katomic-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/katomic/
+	https://games.kde.org/game.php?game=katomic
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index d7ed23374d51..c92962259eb2 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1 +1,2 @@
 DIST kblackbox-16.12.3.tar.xz 222124 SHA256 68c7d15ca55846263c4536f6b7f6eb4266b901a860b67d96fe99eb62f04d6544 SHA512 4e8ed6651c00574d7d87fb155e2bc750759037e95df06e8ff90ba0602da55450a2f975cf979e77eb82a468c982f33cc1addaedbb88e2a356baf7c4410429b55e WHIRLPOOL e39cb76db1da3176f458b79157598f823f6b5c20b7ba952746306888762f0a8f5b37ff61b50eac41b070f5a496e3264432fc1e4c2a26b39a97491ff77f715a5c
+DIST kblackbox-17.04.0.tar.xz 402160 SHA256 2f63dbe37a26fc4312b57029c395f4737a56caf3cef422f8d405bc01d72d4cb7 SHA512 d5f8b6bc757f9adbeb22b911fd00c27aab18c35f0305356c8669c9030922bf19561c147094837577db04f07dcd68c3093a2154be5635039852a51b7c108cadea WHIRLPOOL 4361ce3606faadd13de915c6db41e286f5f830267b36849553ceb45526b230db1f317030731715033c7b48e2ecabd388990efd495fedfc6fc2622160bfe4cf40
diff --git a/kde-apps/kblackbox/kblackbox-17.04.0.ebuild b/kde-apps/kblackbox/kblackbox-17.04.0.ebuild
new file mode 100644
index 000000000000..3c76bbfe903e
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Blackbox Game"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index aa079b247f35..1e9e7da1aa13 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1 +1,2 @@
 DIST kblocks-16.12.3.tar.xz 1702320 SHA256 7c1ed38856a950d7e88780c4746b05ca2c57a941e243affe268876a23c5f6d26 SHA512 194705f1adb5c54c5d6f6e7e23555cbb70333b3d1c41f74f7d745e2acde8bf0065484cfbaca382d35b6881407a05b0dbe9ecbb816c551c2ab63e0a8d71f2b9c3 WHIRLPOOL a5e17f985b2cf076c4e41dce3b35606983e2970b5e66e527aaff026bba12d0ac518d53043199b78edebb191a2d107ae22a8fa78ebfefdbcdcd3161aec2412aac
+DIST kblocks-17.04.0.tar.xz 1750380 SHA256 8f5ec0b8beb2f2c1adbca7e4d2581d174134f32823ebead346873f0966c3c4b2 SHA512 5568cfae7973eef986fcdda2a163910ec60def795b32eee912408e7f68d94d123a7ab12c3b7ba5eaabd8bc575725e6f1c6f89e7618179614993ee1ee23c4ed42 WHIRLPOOL edc95cbcd3893e5b97fae2fd764d659bb006d7fd4e35e5c6fce3f5ff279b2e73177aaa699bf51e8f233f198e36840696b1db95de3235441648223311d2d4087d
diff --git a/kde-apps/kblocks/kblocks-17.04.0.ebuild b/kde-apps/kblocks/kblocks-17.04.0.ebuild
new file mode 100644
index 000000000000..4c79b75ddddb
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A single-player Tetris-like KDE game"
+HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 6e3b742dcbb2..792976a7cd9b 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1 +1,2 @@
 DIST kblog-16.12.3.tar.xz 43744 SHA256 7dd0b54e22349433a11db95c0a76d5ad396df465e6ab99e696c0bf761ed73860 SHA512 7e1d7c97b9bc9c2b0c61a0dbdcc30ff06a79573efac43f08c056899166b353295948b391933a390482f8d2f6a6000bdfe5b04f574e8b6cafd6b367959e4af8aa WHIRLPOOL eeedfd15d34bd95c1d73197250c021305597de9267e84432902dd936daf727d2c669bab14e702ed6407bf6a5eff6b9101289f9c4481d5a092beb63986db22edf
+DIST kblog-17.04.0.tar.xz 72516 SHA256 2b19f5fbc17a8a80768f88e523c1442aca59518396941768251947346211c21c SHA512 7c2a23460e932982782568b0be14617b8adf22d50c1d53d080b5ea6e182b88e38203bbf4023bffb234dffce4bfa1856485dcaba89490a3f1203578b12963aab4 WHIRLPOOL 9f42bfc3670b21a3e0fc76a9e11d5106db72f899594a5c945400ad43b4ec6587cf8d306114555fa538b40e8df42259096a4bbc84ce29912a6a36329c229c4754
diff --git a/kde-apps/kblog/kblog-17.04.0.ebuild b/kde-apps/kblog/kblog-17.04.0.ebuild
new file mode 100644
index 000000000000..033997642b82
--- /dev/null
+++ b/kde-apps/kblog/kblog-17.04.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep syndication)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 7e4d71757ddf..2acd4ba8dd00 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1 +1,2 @@
 DIST kbounce-16.12.3.tar.xz 1615332 SHA256 80c6cecf8cfe0de6251d66034435e4a1b165ffa8f36edc35130a1805f8d29b33 SHA512 47dfc40a56e9300159dc45698006a216484f1a1356ae6a64edf50cad62fd8ae993087910d068d8ad6f82d1c86f48943ac474a9a5e338b78a09b77da3124c6b5d WHIRLPOOL 35234fac13b92600908fcc899c29ab5d6b12e2a57db2ffbf5c3814e0e1bad7c0a5c940a08e64eaa492cb29d038584e8c2eb0e44fbef8516a9039b6d15073cb44
+DIST kbounce-17.04.0.tar.xz 3480828 SHA256 96b403624780579094db653627ca67c171016b3f708944fbdb7a4a8d61bd554a SHA512 ce24c27cfbf37696b215037b0eb196cc86c50fa5223a5b4e198c545fdcdab3b6d263213cd978a5dd222e1cf1c8f78c73fa7e8e289b7b689e30ae8ea54a532a32 WHIRLPOOL b7e1c9d2290c2cd633e2bd835cc0bec47f7415eceaaf3fccef1ae642cbe56708c797f37d56521501e217201f8bd3921a046825e9fd6a02357ce4a607ce9cc47a
diff --git a/kde-apps/kbounce/kbounce-17.04.0.ebuild b/kde-apps/kbounce/kbounce-17.04.0.ebuild
new file mode 100644
index 000000000000..c367fd44d5c5
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Bounce Ball Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbounce/
+	https://games.kde.org/game.php?game=kbounce
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index f72a3e1f6cdd..f7e9ce240e5b 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1 +1,2 @@
 DIST kbreakout-16.12.3.tar.xz 1987208 SHA256 696c90e2abcab35cfc860bacf917b4f514ba4ed4cfde4318ecef9d7c78ef5f7f SHA512 02c0dfa7cb5157c8b61e0848ef30e893e6dc59743e64a0083267b1f9f2016a60d8f9d3867d1b8383c3b742ff82fc9c40b1ae3efb1511f1e23e108abbed9e060c WHIRLPOOL 6109897ad5782b05ee6fd416224a8d13ca76cc8051d41d8fea061d1e07597bf8e5bbcaa44e3498090dd7c8badc773135454b8e29cd14080ed73f4fa999b0071b
+DIST kbreakout-17.04.0.tar.xz 2052392 SHA256 55ae4f9ed03376e42d8d7de8bfc960feeaedb793c7674d0eb77ebed57b354058 SHA512 43247a97e2f94949d13513d08295b0e2242cdcf99f0f89ca1b410622eba5d23eafbf43be9ad6737d37b0b0b6d23556d4a1bfbc59ec1b828b9b482433b84c5f6a WHIRLPOOL 62aabd083d17c18ecc9733b0c35481887b7633c1b39e9905c286f54389f46d31d1c890d9cff3c6284f51d469c703a1e427d0c96f40489033d297e69c222296f0
diff --git a/kde-apps/kbreakout/kbreakout-17.04.0.ebuild b/kde-apps/kbreakout/kbreakout-17.04.0.ebuild
new file mode 100644
index 000000000000..9842d908d163
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Breakout-like game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kbreakout/
+	https://games.kde.org/game.php?game=kbreakout
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 12175326f4b4..20f9a75ea9a2 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1 +1,2 @@
 DIST kbruch-16.12.3.tar.xz 717976 SHA256 523fd01f6c9c37784327c020d279d6e111983cc87add4ed4703561d463baf58b SHA512 95f3920ed95e10ec82bb5f7ddd6b48c774c637608d94c94aa3f51d9b55c1cb6b596003578e6f07c53676233f089435ac5a716a77fb58b28db1c452d74be0d4d9 WHIRLPOOL a195d8465802e55aed307fcd4c198108f897a3dde4b73846826b900a9b850d922c156b811f1c369ceb68ef169f97617044c273e2bb9ceb7fdafb25b7eda51c1f
+DIST kbruch-17.04.0.tar.xz 5601196 SHA256 6250fc4692f76c2c653329eabc9e59f65d3a929a8937ccff0c43cb8172ac3745 SHA512 b1b0b7f73bf4a1cb2c0fdbca4cbd733e154eb61eacf3216f5230c9c415c229fb68dccc1f720a1b6296696ccf7fe2c718b437590a9729f14b8f91c6c62e38f90a WHIRLPOOL 9c57d2a45a02d1521a393e02615e8d5dd52234bb5ab3958bc4915c82101d63f3e4afe6c8645259a8aa3692c0d134948970811bc30b88040baede36597366d8ce
diff --git a/kde-apps/kbruch/kbruch-17.04.0.ebuild b/kde-apps/kbruch/kbruch-17.04.0.ebuild
new file mode 100644
index 000000000000..884e1782ed87
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational application to learn calculating with fractions"
+HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index 6454dfc6bf10..800936ddd6d3 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1 +1,2 @@
 DIST kcachegrind-16.12.3.tar.xz 239960 SHA256 f87452fdf64beb3a0601bcdcac0dca2c13329e6149de26a5fe3f9af42d493e81 SHA512 57ef1d2a9b02f2001417984c0b57cd991060b4089b394f41309a8cc58af41b3b20fdcfc1ab7fc8da03568c890261fe3932113807b1741c10d29dddfdc156b0b4 WHIRLPOOL 56515fa72fa765084722282f83c1b9b8ac699967be4fec18f3642a8519d73544f19235c8438ae202d6659b28bffac78f4747e364fed02090d701d43f00310db9
+DIST kcachegrind-17.04.0.tar.xz 799636 SHA256 898cb809d15ad9ee4c3925edb88bffb62769b5a7f6b348d8c817b3692928158c SHA512 3b7d12f810f6d86412ad8cd90338a2a99a0ad3c11e34bd59d4219736b39541bf5ecaad0ce7fe993febb8e11bd232d4a2dacbf35bcf2bc37858b94a4ce6822bc7 WHIRLPOOL 9a0e5eb84012521186158b9a8a5d54bd60020387656d485054124032e0eec18603fab46ac16108c559e6fa1f8bcc546f63fd926e244cdf81e59391a74ba023dc
diff --git a/kde-apps/kcachegrind/kcachegrind-17.04.0.ebuild b/kde-apps/kcachegrind/kcachegrind-17.04.0.ebuild
new file mode 100644
index 000000000000..3f99250266f8
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Frontend for Cachegrind by KDE"
+HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
+https://kcachegrind.github.io/html/Home.html"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	media-gfx/graphviz
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index f05352f27a68..9165918e6b16 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1 +1,2 @@
 DIST kcalc-16.12.3.tar.xz 85068 SHA256 f755b263339d89b3e1358b665000d81e816ef125c09f2376183080585af86e1a SHA512 cdb8a10eedc49ef8a90dfe1ba23af5afde3a6c9158c169963260e23322c5ee6d3c54f5bea77cc55f619d80fd576670d14b57951bc9f58bbcaaf27cc8f2c69318 WHIRLPOOL 4dccd9441b950d0741828979ed7f35e95fcb92b159ac40541c373125c7be8a62b0736e02715741315f0ee66df91e884687f4e64378da35a18beaaaa7d9422940
+DIST kcalc-17.04.0.tar.xz 362956 SHA256 64797df0bbc383898f2170e8b430dfae0ae230a88a9f2004bcca2e0884659505 SHA512 a6f041485a9070b69615756889ac6b877351a4e53faa74d3dca86db925a27a9b9a2a789dbe70990b9dfdf3620eac6c6647f74085a0481efd4a9cc4ed8afebec5 WHIRLPOOL a94ea7155083de13e957e327d9ae349b6a62f9476126d564289c2c72d5fdadf2b0d2efdf98d2af3cf7dc4fffa2207f644eeba81acf87a2f26adcdc1f7b8e8f40
diff --git a/kde-apps/kcalc/kcalc-17.04.0.ebuild b/kde-apps/kcalc/kcalc-17.04.0.ebuild
new file mode 100644
index 000000000000..372176c57169
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
+https://utils.kde.org/projects/kcalc"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/gmp:0=
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
diff --git a/kde-apps/kcalcore/Manifest b/kde-apps/kcalcore/Manifest
index 70cdc692c346..7807fef0b4fb 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1,2 +1,3 @@
 DIST kcalcore-16.08.3.tar.xz 296308 SHA256 ec9d2f9af8431ae18c89c4951e1756352c4da176033e5094c89483203f3a9608 SHA512 ee408cf0e2ba5a44606094c46c5f64c462c6830b485b06c2a34b72b313b6ba941613f5994055eb1e0c8274f44bcc0e678fecfae7f60503dbae6740a5a4eb0fe2 WHIRLPOOL b528a40db38c1b170a732a70e247b81631168340f0bc596decf3ea38fa24c53c44f87225a1fd1d2f9ac91e3667ecf7d51fcad618520f4234e048da08a173e897
 DIST kcalcore-16.12.3.tar.xz 294476 SHA256 01a4068ce239522ef88eca3a3e2cd4c84a0029fbd7b826caac555e69f41e2426 SHA512 c441a24878790557db4d28c5992223da1ab30cf3a79ed9825e48f93168976ab32427fa25142afc5ae3b5635948580b9d83094ac892d8ec9252bdd018cd01858b WHIRLPOOL 61bcbc62f84903c4514efd773ba63e85cbbb7c8bb4d2326bc8b97560cf3b3f1eedec2a45287b0f6d42e1d1439963733b0ac024de55fdfe59469ab979ff9d5e06
+DIST kcalcore-17.04.0.tar.xz 294960 SHA256 40b27b562c2cead0f8960e10a3116540f6258d3d2d44aa88cc18fc3a1d80ba76 SHA512 cf731e01be51a7be528c77fa5fd5e1bc185c7d62cd5a6650ada58903323d6def6163a9cfd4698b0a83878cdc506ee2c56c7a1183825c4df13deb060f4ff4bfab WHIRLPOOL 56ef8a79bfd69ca2c99b6d480874161b6a8167542da1e4d9f1653e0775732a5bbb044ee6ed9e75fbfe518de00d459c190df6e722e62ab97321f188b47d74e518
diff --git a/kde-apps/kcalcore/kcalcore-17.04.0.ebuild b/kde-apps/kcalcore/kcalcore-17.04.0.ebuild
new file mode 100644
index 000000000000..ad5afbb3802f
--- /dev/null
+++ b/kde-apps/kcalcore/kcalcore-17.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for handling calendar data"
+LICENSE="GPL-2+ test? ( LGPL-3+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_qt_dep qtgui)
+	dev-libs/libical:=
+	sys-apps/util-linux
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 7f18615b53ff..8d86e8b4831e 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1 +1,2 @@
 DIST kcalutils-16.12.3.tar.xz 94664 SHA256 96288ad3a564709c1b2804ea18820d00cdaacad22ca0559d498407e592008910 SHA512 785d693d0f6bdc34e301d5d65fb1d9737658ea0eb3d5a7683032dcb188f063b9c80984641fc1298885ce93a55f74979a0251aa6dd227869c4198c3ec22bb599d WHIRLPOOL 9c6af4e066c61a3c2ca25334a1596d46fb996f8eaff69d767ee2e2615830f6234acf3d63ba9dc05748c72c475dac175f2928334ec1a09f22a00b9a71fe87742b
+DIST kcalutils-17.04.0.tar.xz 326796 SHA256 904933cdbad929e5db8b394bc1c7fc8366de275d80d56319568620955062c445 SHA512 a3f42ac6a992c6d19f97d871c7ffb29eb01f87f2233ca852a396eab3c858681318d3043dd1f5f7e2b32cb82991bd39d39e4b3339d7152da02646d50a07969af7 WHIRLPOOL 023b5f16a0af8b3187a29025d1c2043fdf6a306ccb0c9ad4d151e49943771ce100df0fda66181c209e621308c0e29d33f248d2cb61c383876f6fbeb18e2857f4
diff --git a/kde-apps/kcalutils/kcalutils-17.04.0.ebuild b/kde-apps/kcalutils/kcalutils-17.04.0.ebuild
new file mode 100644
index 000000000000..5f5833d82e34
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index e820c4279b5b..ad993c518b76 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1 +1,2 @@
 DIST kcharselect-16.12.3.tar.xz 83612 SHA256 56f029c317243e1b658007f14560f04cb5fbf3baab07fca60727799774c398c7 SHA512 732d2e864f33ef972c957d9ffd189055f4417933c83078b288d6d64f5401547d702af53561e09d72fcc8715486d0c7723c9cf2b4a38e7d3958c17ddb4bb3e56f WHIRLPOOL fea13ff7b1c060cbcac57e7e2e68e743663238927354bedc1a20cb83fdfc0f09a7478f4cf0b58cc6008bf4eb05156fca2e73965785a497af42eeee0bbb45f5a6
+DIST kcharselect-17.04.0.tar.xz 350448 SHA256 030e18dabc7867fe96a1105a0d2b02a22f3da359a6908822efa70ce8a9aa26ba SHA512 5ccbbe9c4f679238852d1c7f2e3b49bc639d8238ab1f4345239f94f329dce10af70b61da48bb867c584e64e7e4b62113ea3bb9173c61d52f37b1dfa683020a95 WHIRLPOOL 100daf0e39669230cd38fe0ed8a0190c411b32b3f6eb37fe8ddaad7a1fccdbb1b557ef79339263253391482803215806a629a580cc3a8512c15b1162ab988ea2
diff --git a/kde-apps/kcharselect/kcharselect-17.04.0.ebuild b/kde-apps/kcharselect/kcharselect-17.04.0.ebuild
new file mode 100644
index 000000000000..5af27e1b900f
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-17.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
+https://utils.kde.org/projects/kcharselect"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index eebe0a3e3d2d..e0ada5f12a0d 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1 +1,2 @@
 DIST kcolorchooser-16.12.3.tar.xz 4632 SHA256 cbb30cc704837e88553546e7a0ea3b5c3f875fbff114a0bfa9838a3f68dfd38e SHA512 a4bd649fc5483800ad611e8b658d69e27dfdaa22f2a084813c92b29a778bae60aafff1bf161305fd94de4036dad8ae7410f6142c2b6c63dd76057f2d873c6ceb WHIRLPOOL fe267d7ed8199537c7a14d4394bb484f0f8c60524f769011d54f0db4ac9c0f0863576629beaf30be9d3abeb7acc362102f2a8d15adb50ef46068be5195a936a3
+DIST kcolorchooser-17.04.0.tar.xz 16164 SHA256 40718354ce27719cab1c3baafdbc080f89fa03a4f64048959d7ca2c4621e84c9 SHA512 5ff953f9c4a1eceebc907d34eccacffc796dbf1e9e5fba5525bd91e0cbfa0d696c108b2a602747dff5ace28520e1b1b4cbb933368ee11c99759f7501a7f8bed7 WHIRLPOOL 6d64aad803e603b98bf5ce07fd751d32668c778440d24dc9818be29517928243836cb2bf903097e50b51ac47eb575e24696241f080d34de01cd7333d463d51a1
diff --git a/kde-apps/kcolorchooser/kcolorchooser-17.04.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-17.04.0.ebuild
new file mode 100644
index 000000000000..f24e9e3722ce
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-17.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE color selector/editor"
+HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcontacts/Manifest b/kde-apps/kcontacts/Manifest
index 8f8359a3f034..b474210a9940 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1 +1,2 @@
 DIST kcontacts-16.12.3.tar.xz 147868 SHA256 fdeb328e81acdfb7f8f947ec6fc3ec3ac4c8fc46c35f579fbc6294c4c478e990 SHA512 3d3fefc47b81aa2dbcd04eca5f58609faeaa940b39ad4766b7bf35b988bbbbd7b0cab00fa0fe3ae2c660160f6269faae0fa9adf547a911e8a05e3962a06f87e3 WHIRLPOOL 6ed36f98719147ad5abe5aeba27f229ea8af6fb9f8e6c9a97c88fe55298c080139fcd651ed06ed04dcf7037185a040c3db21112586408cc532190e2d6dee63bd
+DIST kcontacts-17.04.0.tar.xz 207332 SHA256 30bfc01174075bff8500d543b8082dfad96289a89cd271bff6d86fa4c46caa98 SHA512 ee7b57135e30fa1a5c16368a1d332e71651ace45a1895a6e5a5b106b473d01438db32514b8a8ae1658dd5f74eea8ad21aeb1b08bdfabfe14d0813f8dfe8f84f3 WHIRLPOOL c2b426a4cb2bbb06b0688374d16c392ac472bd211175c70eeb909a2685008f2ee325d3ae3335f9ca8657e2014b0be14db08d8afd7f9584eb68b05389af350bba
diff --git a/kde-apps/kcontacts/kcontacts-17.04.0.ebuild b/kde-apps/kcontacts/kcontacts-17.04.0.ebuild
new file mode 100644
index 000000000000..488e5f5b6f9f
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Fails test because access to /dev/dri/card0 is denied
+	sed -i \
+		-e "/ecm_add_tests/ s/picturetest\.cpp //" \
+		autotests/CMakeLists.txt || die
+}
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index d49a531d3b1a..c4454cb1c852 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1 +1,2 @@
 DIST kcron-16.12.3.tar.xz 139648 SHA256 bfa774343fc8d0ab9f59f6fa366947cb412281c706eba418e30e587c60621d72 SHA512 1f5e93c788d910d082a729cae3a7f8601b83e76893e62d0b6e757b085d35b4005e44f4888664a2869328203850d1ce191bb8daaae9d739563472ce1c6dab0285 WHIRLPOOL ff36e0c1d138b11a897b5e41aa54f3086657aa4ef34338eebd62060b19f43e8d24470a32fea0aa9fd0cf598e833bac618fcb58aba6edb88ebea8ffed622d9c3d
+DIST kcron-17.04.0.tar.xz 1057292 SHA256 e0286cd1c4768f663a544dc191a24ec6b864526b52750a98c8fe056d0729dc6c SHA512 5a49c9502416dc6f26af8c2f370b0554903bca4ac825802d6b5c0ab9be3ffd6d16cec2e492bab84cb7362033789118d15ec86a71a12d0ec1b393ddae278ada84 WHIRLPOOL 6878a21029d8767769e994e84f3c0fc9a8831a2c1fa48b66eadadf2e5748cc6ccca5ab69fb92da7c546874e5bd08d3741c5ce9595482be7f925734e53b125771
diff --git a/kde-apps/kcron/kcron-17.04.0.ebuild b/kde-apps/kcron/kcron-17.04.0.ebuild
new file mode 100644
index 000000000000..b3abd110ded2
--- /dev/null
+++ b/kde-apps/kcron/kcron-17.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Task Scheduler"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!prefix? ( virtual/cron )
+"
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
new file mode 100644
index 000000000000..ca07e33edc78
--- /dev/null
+++ b/kde-apps/kdav/Manifest
@@ -0,0 +1 @@
+DIST kdav-17.04.0.tar.xz 37772 SHA256 4c80964fe6db32c90b28ef371898013c5d1869c0aaf4084d59d9e774235ed10e SHA512 399c78a3fcc7a5107dca8402dd92feb412b1277a1eb8ab70f6ec6e029d92aafd82f4a5cc2997920532051d2dc96a57298d80636bc7853bd1c02f40c0c8cc6753 WHIRLPOOL aaa32147c6d72ffda3ba1ab0d38f26d98ed33fb46ff5eb2705ac8ca77e683e200da706bec5b6b6639be5c4514f3b2c14385a5a35ff8e1a187b4bc08c0ff3e7eb
diff --git a/kde-apps/kdav/kdav-17.04.0.ebuild b/kde-apps/kdav/kdav-17.04.0.ebuild
new file mode 100644
index 000000000000..a73018540d33
--- /dev/null
+++ b/kde-apps/kdav/kdav-17.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdav/metadata.xml b/kde-apps/kdav/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/kdav/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-17.04.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..882d6b072dab
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Meta package for the KDE Applications collection"
+KEYWORDS="~amd64 ~x86"
+IUSE="accessibility pim sdk"
+
+RDEPEND="
+	$(add_kdeapps_dep kate)
+	$(add_kdeapps_dep kdeadmin-meta)
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_kdeapps_dep kdeedu-meta)
+	$(add_kdeapps_dep kdegames-meta)
+	$(add_kdeapps_dep kdegraphics-meta)
+	$(add_kdeapps_dep kdemultimedia-meta)
+	$(add_kdeapps_dep kdenetwork-meta)
+	$(add_kdeapps_dep kdeutils-meta)
+	accessibility? ( $(add_kdeapps_dep kdeaccessibility-meta) )
+	pim? ( $(add_kdeapps_dep kdepim-meta) )
+	sdk? (
+		$(add_kdeapps_dep kdesdk-meta)
+		$(add_kdeapps_dep kdewebdev-meta)
+	)
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 30f252b9ff1b..adabda1ae33b 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1 +1,2 @@
 DIST kde-dev-scripts-16.12.3.tar.xz 312276 SHA256 ca5f12f629e3ffb97e10cd5b94ec671d71c7a0e8035ffb3e4a17a4c7816d2d4e SHA512 daa86990845292918e7097d82f41bbe5e402967366948337e0ca48a0c66fbdc52ce6431b8f0b7e69b55134a430efd415855bffeca980a9e048c888668eb0a813 WHIRLPOOL b3cd03d31e600cb83b52b7884ed06a7c6721ad0d0ae91f8ad86ea5558931d0880d4cde3b34fb124bc28ec4b052966a7b18229193c83ec0550f196cd1a55fde6f
+DIST kde-dev-scripts-17.04.0.tar.xz 315364 SHA256 1f8f1d0625fdfe89940a321df61c7504bded205d258a25cfe4cceb0f0d39d3e8 SHA512 605e3a0b2050d84c0fc5037d8d305fc35c5dad5fdf6c5bae3176c7e0dc54b8f5873c247eb616269cbf0a90e1754a93ecc856b2af4e7ddd8ebe2063bbb1a9c04d WHIRLPOOL 96a2073cb268025bf0fa250dc6477b68dd8a5b842c319650f09bb090030f6ad75aebe967864cf99303f588ff25d303e8dfc3ba40a94ccb4b958f321300e1bb33
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-17.04.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.04.0.ebuild
new file mode 100644
index 000000000000..4d3986b2e7eb
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="KDE Development Scripts"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# kdelibs4support - required for kdex.dtd
+# kdoctools - to use ECM instead of kdelibs4
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdoctools)
+"
+RDEPEND="
+	app-arch/advancecomp
+	media-gfx/optipng
+	dev-perl/XML-DOM
+"
+
+src_prepare() {
+	# bug 275069
+	sed -ie 's:colorsvn::' CMakeLists.txt || die
+
+	kde5_src_prepare
+}
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index df6911e18624..030b83e0311f 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1 +1,2 @@
 DIST kde-dev-utils-16.12.3.tar.xz 51744 SHA256 363ef942c784e523a174a6ad5c55dcce500a7e2dbe57af5e41e2efd2fca16b6b SHA512 8b51ae678762045ffa972507a5742f98bd4ea7672cdac693bac785eae203e373434744e9a86cab40d104af5a47e2368ff4ff9e464be35efed44d9a33321ace36 WHIRLPOOL bec4a14c1f71d3eb7415ca25554cad5430eb8316a71a5927c6d6a880e64d12b5117a8773e67c7f960580e6702abf28ea23e151c508abb990c99561c3d916fb5f
+DIST kde-dev-utils-17.04.0.tar.xz 52392 SHA256 429611764be9089ccdd521634e4b3c0ee7eef0e3ac8d2cace56f9921b1eab80d SHA512 4059d5ecba34f69a890766e41848163b9af548a93860328d178e016664881e70273db8834ce97e138864e2209bd51592958500960ba6adec27f623adab3896d4 WHIRLPOOL 701045cf8ee5d0f3edf4889e7c39c3a12cdc6ca3c0db3c69611eb9e5e64f07956a6af66a68e8ad04cf8f0f02d954baf653fd4cce6e4d0234c3f1ee6f6910b7b2
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-17.04.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-17.04.0.ebuild
new file mode 100644
index 000000000000..e508673f2b61
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Development Utilities"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kde-meta/kde-meta-17.04.0.ebuild b/kde-apps/kde-meta/kde-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..7f258031a0d6
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kde-apps-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kde4-l10n/Manifest b/kde-apps/kde4-l10n/Manifest
index 557b43185c35..cbeec18e7b01 100644
--- a/kde-apps/kde4-l10n/Manifest
+++ b/kde-apps/kde4-l10n/Manifest
@@ -1,55 +1,110 @@
 DIST kde-l10n-ar-16.12.3.tar.xz 3168468 SHA256 a3042d3598f77bca795ed97f4cae6c65cd7c737ba7ca58cf0e8a28807fb2d1a8 SHA512 c4fed629b5f003298597b8b37f0a76d0d56910c596a71d5e8d119f560ecd5a50348424ec0b873bd81bfaf43768d42b5abab91be2d49bea6e24102c2296990244 WHIRLPOOL b9f0e98b09511b568b94da36d0eeedb240fcf7099c7f6718725f4f2d6ab34b3223abd4b132a481dc081fec7b473c3fe65811396f7938ddc7479e8a0af1f8cbc0
+DIST kde-l10n-ar-17.04.0.tar.xz 645312 SHA256 46b619c2b2e32decd93cd0b5f0308fdb4d576d0c0c2cbdd496bcdfab443544fa SHA512 07c0b2287b74c8223ee9689063e5d7e336a96102c6663b611675772a4fa725621abcbea0e3911475e489dd3e61eb6f32807e1b6668be3a208582c3e388acbbd9 WHIRLPOOL 170fa3aac2442b1f758539d5921d1c0cf69c1acc0cdc349c16b66836792c32b4a65b4fbe941e500148182eff69165c97c09e2b9fb4f855a3ace5aac64e3bf789
 DIST kde-l10n-ast-16.12.3.tar.xz 1685132 SHA256 23ac9748cb24e663cf8a018eb58a552d801b3fa25e3ff329a82a6e545727b115 SHA512 5bfdfb59c0ace7cf6cfd6d330d0949ab77a2c3a1bbfa24ee48f751c2c73a47ca40e2c7b17088b92308bf3edf66caa30ffa7f7194b371e7aa6b472b944d041125 WHIRLPOOL 05ef922e49855e7127667841695cfff7582771ad9712cf4ac11f43bfdb35670d2afec64d2cad2b4c598bf1492081d869f6a7f80091e7b860f27351f17c53cbd5
+DIST kde-l10n-ast-17.04.0.tar.xz 472280 SHA256 e0f1388662cb2373d3d5b35d86884158bd3715b68edb322febdb4562486babdf SHA512 b7ee3341d8aad8526eac59c850a60b60612061c698a2d85789b2a3a3d419d1284f6039af973965b952199ea98bb9939023fd23d2105edc32b36d72d349559c4d WHIRLPOOL 3fc688717c8109d8a3385e2db6e3ef5c24d2a9814c438898b5ab62772ee53019caa59cd2f9a5a878e1f8efd7f55be96eb8134f0a3d7c13581795a60dc17ee3a9
 DIST kde-l10n-bg-16.12.3.tar.xz 1844368 SHA256 62c869067af2b2cde4190d2b7e97225c3442980c0073bab1d2f78b9841f998b2 SHA512 dafe821d494e7c48caa24fc6e279c7a40dcd815816c8a3c7ed128d1c84946b434337cf242ccf6bfdfb70648754bfad87183e6a430eb5e0c4943d41595d4b3943 WHIRLPOOL 82c636269220532fd8d1099e1b94536f55fd4ae6ebcaa01ad15c25eaabd4ba45a663ed1a85a7895770fe1e7fd65e86d74a33ab95c1766dc516901c6d1e796f54
+DIST kde-l10n-bg-17.04.0.tar.xz 572116 SHA256 613ebc3b40f9a0ad56193548a54e1a1e77086f7f781ffdfdf50fe4acc5711789 SHA512 fd578548bc26a3917b4109683d05b316dc126b60d24d87f75ab814e68d503695a1d5e9796933ad5cfeddb39a6ea4d779b7a75c056826e819b757d0bc83f6ba3c WHIRLPOOL 017f20c6ff73225419648ea5b993f6dbd0bf2949ea255cc056498af4e88cd4492d2b453c6d65288faa7850e8ab5359c24b267e6d82239b74080dafef64135612
 DIST kde-l10n-bs-16.12.3.tar.xz 2234336 SHA256 bbc9dee9bd6dc86ea9596ea347ad0a7af9f62f8a0ac95a3702b0aa1e29c1d7d1 SHA512 8f71cc29de8a9d56131ef9ecfeeb8810c3d7bf6fa17111e0e6ee86a4225960cbc27a1541e0283b025332117f55d0106858fa5fa802057d1d1a166f7e5226c5e5 WHIRLPOOL b206483d1054bc72f105307c25a9db5c07308f02275998fbbbc97d6da0f102cef5b00d33605fdc01f275d90ab59f7be66dded1b746c24956a37cd26e1bd77716
+DIST kde-l10n-bs-17.04.0.tar.xz 694968 SHA256 34f5a60c93da6a0dbbdd38f031b2e4d30889f27b9261a88bfbf757a7681472cc SHA512 d784ab81c4c11267f059d4a5a06113a43ec20277c2784c6de8226a422c44be20a2a978735cf39ccd7544771fed5eada1c9ab6aff3d8cda330ba005169fde0d74 WHIRLPOOL 3789bd1093f5afb4ef5555e3d72d445e83d6acaeae55e20b12bcc1d46eba5db4267e08312a6cb38371d6f87b6f2c10ca2bdbacf0bacb42381756a38709fe1d12
 DIST kde-l10n-ca-16.12.3.tar.xz 20343472 SHA256 ba6ed776cdfc66a9d8772c079ec2210e2e328ba4e987e91fb138f678db3b6dc0 SHA512 3e7fc3485055997595bf43b7c41a9b2e0f4da6f5183dc0dca3c50670cebeef6e8d18fda4d30cb5bff2df3de845160305d681c5b28a621efba8979e55d3ea2002 WHIRLPOOL ac2c2bd65343450426a462c9d545e7c64205ec818987413cdbc44e4a092e7372705a2e83089808eef94d78f2d87b906734dc50a1d01a197e398bb3854db11201
+DIST kde-l10n-ca-17.04.0.tar.xz 4395788 SHA256 c93d8a0790d755dc9d4c53958db3f066c50a3cb144c26bd0dfe266754c5a83ff SHA512 790762d197bb2130ccb9dca8d9ba66fbaffa2a3e1f3cf579abde4d8f6820f4241ce55538aebbdc2c330c516e2005b6eeeae047296684ec65f6d14f519036df07 WHIRLPOOL de93af2344baee47200b881e5109a66ae442bb79251b00715ebae266c4d5116e38157b1cb30817af87b5fea38ba0a859ebfe0ab08f9b8a7de89575ad7f0bf8ce
 DIST kde-l10n-ca@valencia-16.12.3.tar.xz 2064844 SHA256 c052abfc0664aae0e41152eb1d7be225e3173dc96cfaac011a9812648908e101 SHA512 ad20bd0d83c42a3d879bafc28b3e6cb8ae1f98fcc37b3348f3f12d471dd5a354b3e8efbb7ac7f3acfc1a3ce107390f06a1848db31e614d5d2e958a3fc0ebb683 WHIRLPOOL 0739d8396263fe86e5f326b655482c9c571487c2d4a43fdfddc53ac3382f243b56a635367ca7456e7a57afa36ad8a95eba897c60164cafb2287dc047cae9e16a
+DIST kde-l10n-ca@valencia-17.04.0.tar.xz 673388 SHA256 6d0cd138761f1578ab06618b1577f3d29afc87873973c24e9ae06f6bc9cf6638 SHA512 e0c4963f12641d094b0573d0171160d7dcdc53e5cba8567228a26b1682c095de822c303b06fba614dd410bfc7011e5eb52e891502f1094f590ea7028ab176f95 WHIRLPOOL 38fba8136a02c37598aabd67f28011f241390cdbc78965d3e0f8b409947d49df5e18b52511b10362351001c7f58ca7f15609066ffa5bce96f0b0ba31d2fe2748
 DIST kde-l10n-cs-16.12.3.tar.xz 2915652 SHA256 21b96e7c9a816026fd8b8bd8e8df79d4a847b7c48ef9f7c6c981dff01605745b SHA512 44da8cd647757288d8b667d796c4f12b3cd44152817adcbe8db0f865814fba0628a30f575a32fd504b492f77f861daf6d81fc14acd990f3efabc30cc38474749 WHIRLPOOL 782f7d9b45fd59ebfbf68e4b7db14dbf1df6c58cb5d63d7413c618aca436ff519f1ed9ac8c7a27680db640b4a67863ef1d40c7d8a643f8ee0a6c8fb980b3442e
+DIST kde-l10n-cs-17.04.0.tar.xz 641876 SHA256 1a3af701ac4f370552033b45871d083730b700275a1896d52075fcbb79074888 SHA512 0ad3e0865d8d2a6b2bc55578cd856d8ec15f521a5ef258a15e5800107399fd9d265be3f38f265e53d67d328b725e37a77ac0a9c06edfcc8b0a776c18ba346be7 WHIRLPOOL 6178773e4d18f2e2ac6c08de78e9c1e8d442589dd1f08c3e45718b935b250749affe288b1368c76e532ee31693d2a3ee578d3bb3d26ddac75bd7987a80425149
 DIST kde-l10n-da-16.12.3.tar.xz 12542184 SHA256 f8e285123ccc1d2e6eea9ca9217e66499bf8951af5ab37a5b00fbb82c1075baf SHA512 e632e821558d1f865e9a1c3174c591170774769d4129520ee1f1ebb925690dea294fcefa1d7885fb2a87ac31c5580a4d10802ced30cb47953f297f5ddacb5a87 WHIRLPOOL edd61704044c28906fd3e9d2e53e576ada7f46d621e07ac1d27ebd77fd04308615ff4f46e2cc81277565144f8840d3aedd8307858036931195a08fc0d0d7f8f7
+DIST kde-l10n-da-17.04.0.tar.xz 1034212 SHA256 1783cead48438b1abad8e10216bf173a7b66dcbe569b85fcf97e697f79fc2c16 SHA512 7631513ca9ac17e1897414b778310c779ed336d5d90096aa2fa80e747d1b4a3818eec9e3b233f39a7bcb8a22fd3caed834118603c0b1d944c1711251d5c10913 WHIRLPOOL c57918602a5365d7eb245fb6eda2609b6dc3c77c93f787955bdd14f3d672380669c357ba5367cc7b7faea89f739aaca130ac650a92394883bd4bef16b2c97000
 DIST kde-l10n-de-16.12.3.tar.xz 31963896 SHA256 660a98fe83ad38299a401fe588079fe050b29d54a2d30e66e36b67836c70a67a SHA512 8ace10c9b392a1283b8a516f7dd518eb9ce1248803d790537e234221684e37677d24a4e46c5b4a5258ee61ef78908a93379cd7b34c0771cd90c456f59d3bc214 WHIRLPOOL e3f3095806675443933cebf697b41d5fe47eb5aa9ed54bf56a63255b5ded523244e9a743aabeba3afe48ff678a53801facbe31e8235b5526eb588608692bc2fd
+DIST kde-l10n-de-17.04.0.tar.xz 6234388 SHA256 6d71613767a738b782fb809998855975deccba27d87cb514aed2d2f48b3ad1a1 SHA512 937fc14eb1b1a0a97aeb66ce36bbf990e5c96e7d5776c9773b911aab5fb318c0d6e99bc083d4a75db4d4f7d6781d8c4cb03a06f9b15c200359ae14a3956b486a WHIRLPOOL bf2e58035683f16593db0229a1713f1913087fd3950bd20cfe07db3b3b2459c12c06fda63d7400b8b213b357eb97ce8d4991ef9409aa15800558e31e51f5010d
 DIST kde-l10n-el-16.12.3.tar.xz 4235712 SHA256 cce01a5675ba3554e7526277e1760221de25562c28fd28f2f0096751e00ca5b5 SHA512 f956bfa2d16baa73b83ee537296b121381fc6c242528d1fd8e93e5ac8f4936b1b3b33ec0e2440da2d27cbac34aa8bc483a3f181575dc86808aa10f24d7424aea WHIRLPOOL 6f22ac967aeef633ecdfbcd388ae512dcdd185345cc764d66aafc063568cf2aabc8700027224ccbb44375de93aa9bdb1feee88a4d69bf6540dd4c1727972379d
+DIST kde-l10n-el-17.04.0.tar.xz 861748 SHA256 23404c037eeca8732fd0f20dc0a90750784efd2083816dbc114188acae99d812 SHA512 a349917d451662ed5a7c1946477a8fabd1019dee14228c5a230a7cc1e90d0893375f01f0861aa8142d3516bb8d5e33e82a4857d13d8a50633b28dba70f01a451 WHIRLPOOL dfa19e836f905c5824342c9ccb93eb0607753cf1c4e9b28558e911ce225b400bb83153cf848086e32be75d506dc8d4581174e20a1316328654b185d972ac3712
 DIST kde-l10n-en_GB-16.12.3.tar.xz 2995748 SHA256 36246656f1f39b8815a27b3a0a6368498ff0bff89cf717f6138480a9ca748679 SHA512 dd3380ab07e9437ed355525513e5daa24474425a8e428259a4eda878a7b819d9d661412047827554accac230145285a46b6d3b31448cba6c3885a15a1541bc2f WHIRLPOOL 7a304a78c0e9734d91fea9e247b00f9749680b550900769495ed48a00e73db37c185e052d648a59fd1aef119dd5b13a234996cd5f0562113f905be81d425e49b
+DIST kde-l10n-en_GB-17.04.0.tar.xz 598480 SHA256 2871a88da111d4b70ee411d2335d47ebd050abf79b1bffff944f8bcd37e31d28 SHA512 364c1b48234dc1419ec6788fa47eb4cf9713a2f1efeb5d6d61d0575814a068cb1e0fd6305bd8f6f2befacb6a6d618401ad2137ea2668690f7a52738529822f37 WHIRLPOOL 6347a0b4689b83ebe6b5de6d11d234d39a1a767021d00850fe2193e60b258a388e7daabcc20d0fa24d5862b6f03b4e53fc72a367aef4dea3e9796fe4ddfaa79e
 DIST kde-l10n-eo-16.12.3.tar.xz 1651016 SHA256 019090012b6f9505bf098b5a59d160e7bcedd28834955948205de8a455b8835c SHA512 d669298f8ec0d46e58f76716ecef5474b0f876ea81d1d32848337c1da037a981d0f4507d95b831c23ea6bde21fd275ea612d2c682d3d33e419e3e3b0c0d530d9 WHIRLPOOL 3b41845085b5b15d6a815ca2c2dd565664de0f6125d645a726fd01353952445aba37f2d33da88dac4e5c2e3e71701490700c8b8983a357a529d0d5549e7a2d0e
+DIST kde-l10n-eo-17.04.0.tar.xz 582736 SHA256 22e59e03f9990ad3aadcd13e50f9ecf0a76610ac21d8d9d424cda300392e6e31 SHA512 4c288efc10c7f7ea939d6fef5fd3f046b6375212fb6f6c84a41767395dad11ed3237582892dfe39ebe0092cd79aafbd86a32535022de1042f3c3e4b8441c9dfa WHIRLPOOL 109dbf5483cb59f20d6c1d2cdc99f97da0459791d8660b0587e6e4bcfd563fb33982741680a9d9c3f0867a97a39e63470dd57de24e52b87cff94f5082e5980ef
 DIST kde-l10n-es-16.12.3.tar.xz 16795576 SHA256 e19262d0fe74408cd01826a611dea8f9df2370b059734fbc8c8bc5aec2dc9aa4 SHA512 d5d60cbd2bccf4b63cc71566e40ca2f1f99290781888ca60b45fb44e82835c80aa8b2104a78e7cf5135d1f5b45cd0bb85b8576fb4546bb81ca0b26479a053111 WHIRLPOOL a7a9c4dff038c8cb694671edcd6421a9e278c3caeee0e37331e7004c255a2713cb8e9bae9ee2ba739f1441354fae69993ad60b94ff78099c8b57b3b4e442acb6
+DIST kde-l10n-es-17.04.0.tar.xz 2973768 SHA256 1326a7840d96128a61a0dd96d5c4c5a4f11eaba6a74ac2191780832254ac52f6 SHA512 754ba7fff8bdf96d666f651b52e146f8c366e7253a34cee47ee27c3cb8b98098ee6ec9f71da6f65e44ce847894d631df941a31820ec5e8f94adf6b576eaeab56 WHIRLPOOL abebc7326fc09d4fe2a463b3ebf02230251883acf913d3f75da03b29b878c53d60f6412459d395644fd438e039cca74c264208c8ee6b2046bfa09cdc10d88a24
 DIST kde-l10n-et-16.12.3.tar.xz 3238652 SHA256 f3927454e0abe398d448d10df9c4da8fefc2b7d1fb433a598425cb130acb15e0 SHA512 f40d81f4bcbde0aba5506e6482846a59a3c65177685f0cf6b6919763b885b78c9e8488f5bf2ecb2fa4cbcc97c275a44ade4aeb81bedc701f70a85b366bcb85ee WHIRLPOOL 6961dea6dc467e6721abdd30b536970fdf2b82d5aa33b823719baafab3fba61545b82be03e0ce3ae2f0d0bd4b2f44f2d53aaa72c45ff4736bbf017fc88543ccc
+DIST kde-l10n-et-17.04.0.tar.xz 1019148 SHA256 ba28c72f6335b127dee45a1332abe9cec724488273ee1d3cd819c834de6f7ec7 SHA512 d38e56e97dea3b62bf93f8ff8a0213375c96fb70e9cbbbe3e3aa277eb7a2934bee9d9a6218c89900a3a7c93fa2cc163ad07857f5302066c3a54d58f55b5a33fc WHIRLPOOL 5f288f791656543c8a05b17feaec183c188a19fe068b1cfc00e9ab140d2bc542e0e5d1ba31e2f742e5f261ca8f4fd2e08593af91e9ea089bc2d178d69c71963d
 DIST kde-l10n-eu-16.12.3.tar.xz 1853868 SHA256 086413b4752731a685bdfc6d63a39b226de047a90dcdde406d7a726e3d9dfc35 SHA512 985f84a60be451582bf6d3e37d05ba917ac4629ca333998d8ee1eda6a5b0f56974c9a59de44cf96c6ba58d039dd1a452fc5b26b86e3961f51a2d9687d6ad8676 WHIRLPOOL 468d677be4dd8486bafc7d5f8910486fa366797cd5576d319afde78ae7f0675c5c941ae13baa7e0b7732c3422406d0eb8da233a732bb1d89b09ccd468a506789
+DIST kde-l10n-eu-17.04.0.tar.xz 665760 SHA256 254d925bb18f1c3cfc14a3cf4733d3218098ed47da9bf6301077fb0f9f46725e SHA512 723ac3e9d6312392824e50084c71e2cad2c05bbe33ff4adf6e329c066848a8a9e4d9c8d8543b08664bb29bc1efd859ef3e819738b2b1ff59cb53d5a728804f9f WHIRLPOOL 1e0e1be26a764c4f283c2b43c6abd6ad1f85d9dba5b29770701afee4b0b8f75232f8d71dbcb1120f9eb8bd8c085dfb7f3f14954426bf001b55b3d8e9c768db10
 DIST kde-l10n-fa-16.12.3.tar.xz 1716344 SHA256 ab556e97029d8b3605bd6fccacc95a0afe48ae824e9f3aee556dec261ebe91fb SHA512 d8d8ff8b288cc368ec7df522b062b07cba6c546df96963e3ac35da5ce03859b2be0e4878e809977221ffa0079e7347a2b138f43246af4d9c712302de4ab216ad WHIRLPOOL a1d04085bf19e43413004dd92811523516ef15d87aab19f8be8ee8720e9f3704f4c6c56c7cee8302c8b1dd950a2f983697930e970c1ffee0ce553a2bffaa1b4f
+DIST kde-l10n-fa-17.04.0.tar.xz 602996 SHA256 9168fc8d666956a111cb209ea5034c0bd9158b4e6e14de81b121199a4d8595ea SHA512 a2b3c179f4c8d4fc13a641f82de3afae32ee3058f53718af88373e6275ac4afac1dc8bd390df1875bd08d67076789b095abc0c6f6c351d5d56be4822aaa0219b WHIRLPOOL 2109eb8c264b6eca76a4d107f5a396a28bd4aceffe16362d3b38f4b1e8815e62775fa5a08ac6af10ed85d860ac78b46aa9f9fe254e97e3e8bc52376f55bbd187
 DIST kde-l10n-fi-16.12.3.tar.xz 2569720 SHA256 496c888bda5924e3f743cebd436f58e156dcd116e700e908aee060a6369df985 SHA512 bc6eff32caf94a550ceef45126e34a05380560dd45b84f40b15b545d48d7797655ab1509d6fe947a9beb7b237cac675d1c82aa53fdb605cdfc9d624ed86f7f3a WHIRLPOOL 409682a822b53f9ba705c2ccdfe33015e208372145e3868c7943af4f398c3c254ab37a4c935c4ef0be354fa826c92a5030c4143e2870bf8023f41c7b3bb6c044
+DIST kde-l10n-fi-17.04.0.tar.xz 731024 SHA256 6d5cd44cacf11d41321a7f6c997807116d4aed809b3112e2b110928d639c07fb SHA512 c9b9f84a039a45e95948d37a18d61d6129701b7f4f9d8084a41152d610dc22305932c6dc7ea134c72f0e25bb0473e89855825c7ef52b837366b3a7f44df5c809 WHIRLPOOL c0aec2b2610a9753f39b7334c56448643197b1d956fa447f7e71c5c6b903fee135827210ae9665b8877a171196db7ab1d6467d5329647800d296739c845f13b7
 DIST kde-l10n-fr-16.12.3.tar.xz 31232976 SHA256 9571a472e3e0dc9742f3ec224f02a54a0051ab7d95999ebb3da9844b6322a863 SHA512 0448b95b99a8f9af9d0e09b10e4e785aba0fc4fbd97a70372e56ceb2885ebefef64850611be2c364022e359bf3e209b678abd8a26a72f466702be07617441504 WHIRLPOOL 78836ce1eb801771459e2eb4fc0ead4dd8fbbd9b551ce96acd5b31a7737551a17c08e92c953df4da9a3528a0dfff6f83a4e960c26d33770396ebb93181d8fe8c
+DIST kde-l10n-fr-17.04.0.tar.xz 6575896 SHA256 c2aaf7f5fa1e1ffd94a32e72014e4a7cc8d0c1976031984cfb1815e78f33516c SHA512 0285e477f2312a7c49fc4d81bbb62a66b909ce7459818d734f4a25b955627317a67e811eb0014eb6c24625405b5a72db951d8df24f9c5e5bfd449a0288be5115 WHIRLPOOL 84e70c805e743c9083b2f042e7d52ea701735381b0ce6db9ce1fcac8b526e789925922c4a49a7bd261307110b4d356ea2ae83fce0f0ea18ba79d5b8655d44991
 DIST kde-l10n-ga-16.12.3.tar.xz 2667372 SHA256 356805aa99c9dbd37b3c587e6bf7b93125f8ab0cbd90e89f011af7455015891b SHA512 852849b10a47ca71d97b3219b3e933a77e215e0874d561f9b33afac8b8f81296c79d04030a55132a27a8e09d74ee4c10295af9514825ee13de9a98106816446b WHIRLPOOL 3c4f54f676f482192c14c84841bcc014514447cc93aefe2d0e797e1a8f285dd1cde9bf47d966e213e4c4900fd6da14ed25e10aa6d8499eb2aa0f98d42f1e8745
+DIST kde-l10n-ga-17.04.0.tar.xz 632700 SHA256 ab48b2405ef49e01dc6bab5acb0ee9262123de78cd05e6cc7c2ec834710b3e61 SHA512 5720530cf114c74b07f04f8beea7b3c4c802802111dbc88a05685dcd2e739a68080849807b094ba2bacade8bbd4702e542ca4682f05df5f71fb9f553ff85d711 WHIRLPOOL 47eccbaa7c2b71b561a162ec947481fc7f68780242581e51b8c3e5cda88a86bf77445c8e604d78de9650b6ac5c721365cecb29010ac8e4491987730330224d81
 DIST kde-l10n-gl-16.12.3.tar.xz 3312960 SHA256 7b0e7b7c48f600039005b396763ef9b27d3342831859dc6b9caed7856bf3d2cc SHA512 07445eb830e00975787ed503c3e5f782b4c3a1325a429931207fbbb51e274499400b5924f42b529298ff17362a2cbdf292d54d4012e7b3d952e331ef50c9ec95 WHIRLPOOL 98672ef10f4e09cc1c55731d31467fc87b98b1d48d69a2c13c4de5a53c036ddb48e571d44ae5543dbd15bb0ad2d72691ae1c7c43421f5b1b1e5d82ee9b65c9f4
+DIST kde-l10n-gl-17.04.0.tar.xz 828404 SHA256 9e0121f98badbb15055e2a292cb15873e09c99570f08970f38b6da3677221785 SHA512 aa53ddd70ea1a46eb86ac18d0db94bb8c49272fdd447d134e72d946d7b43814e198387a2b16e95f20972a5526ce1d39e142e451913f137552263a4269513e373 WHIRLPOOL 00f94dfa1bead0d5758ed9b01810a35f203907cc2d549acad4b0b2513238529129bccc63571e2ddcd2a9f109c9b610c1602e86308b577266341f3751e044d707
 DIST kde-l10n-he-16.12.3.tar.xz 1945428 SHA256 dea897d5d7b716f69ff7a3f43adf3aaa8295f5c2395c0148bcbc976753e3c1e7 SHA512 d4eda017c62bbaef5a68fc38aedcdd249436f9047603d009638e567c41cffbae64f1e7902a60898657436aa1218c094e2548c2913ebea8a50a35bf1a85b56737 WHIRLPOOL 25c21a9c440e93d46a95b30cfd1c2612906f7115a12b56b8b5d691aca6a63245751c541fc8e140c61026284d28395f42304d7d9f92817b230dca2574b4abddb5
+DIST kde-l10n-he-17.04.0.tar.xz 504832 SHA256 ada6eb5db30d8f42be1d12813e53d682f3bbaa646ee0e53aed4d633e3963412d SHA512 61e3f2a9b32bfcd1eb11a098220560b9368486b36828709b3b921787a2a65e85decb3b7367ab3de1c409c8bf625171087fbfbda24227cf493b45ddad8b9f37f9 WHIRLPOOL c8c58d97323bf9c650d27963fb1f1fba55e32999a6b70463e9ffc06db3d197c9680c48abb79e1c43eacf39f84302ba0dd133bf967c6d0f946247bb1d8488ca1e
 DIST kde-l10n-hi-16.12.3.tar.xz 1618904 SHA256 93b7fe41135eb5e4c0b7a6332c8658995db376cfd80a664b5883a188b38a92e3 SHA512 3b1369a0beb370bb83f04525f1b1cdeffd8c3ff1df0b58396b41675304684b79515319cd37e5c1425b21e1ebd87ad2d746c118f7d00f0de3255a8c167527fbe2 WHIRLPOOL ac29046190bab2fd8950d18aadb9a714364ca939fdcd355792933971f93fb0a775a041175eb14bfd4375655e924c4fd5bb867a3df288d5c0acc69a2046c323b3
+DIST kde-l10n-hi-17.04.0.tar.xz 555716 SHA256 77418c61f01ad16267728d1701ced9b3e98d2ef35d226a3ab890beb48e61c73f SHA512 6679e6d9783d34d68add7611d97563a552ea2f5fc9dc02486e205d59d30e2fb1dad257cca1b30be640e47a53923a1ff5b38eb3d369be75c659d1d446530c0c0b WHIRLPOOL 6e9296ce778f89c400b243c9497213da07d34e6237548637930301ab632fe80de06a167bc04dc5f2c0a2dbadf6c62f27af5a0efd2314a3da43ec922c4c0bf2f4
 DIST kde-l10n-hr-16.12.3.tar.xz 1788224 SHA256 e1761f78cd1170f53e84309bf652a0940060b29a904fa7a15219ce1b7cdb7778 SHA512 f6c6f459a5679d3eeddcf176f6f1ae0935a9ade8d9e19c7ba7ed0abe517f4f4a8028cc53ef07fe8da9bfb92c3d985d5aea74ac8555ad67d5c8c4d927ed9ed7b5 WHIRLPOOL 519df40b9397e62f657cac51f5ed43fb9ffee7b29a506d7abca8c52b2a980f5399c3df3f987eef7ceaa2b73def76093ed9838ef84dfafe148a001de4aaa222cf
+DIST kde-l10n-hr-17.04.0.tar.xz 563264 SHA256 27f308c10283b3067db1b92654ca648c8d89e05e1c99dc5b20229e42fdbd7718 SHA512 dfe8f0274896e88b304ca4608b288f7f71aae85ef1ec22d0603e9eafa5911156351fd913db910ace1d571eb81208a2055f07425c1e8084b059765b39dcdfba0f WHIRLPOOL d1f14d97bbba2d20e4821337dbf6c1098cecb846c6e7b4b778afecde08e8505fcedac29e0f63902443b158007485d83b5b1141702248281501d9cebd5b36948d
 DIST kde-l10n-hu-16.12.3.tar.xz 4100364 SHA256 fff2a46b41efa353f1d7c82341d617735a4eb64c5b3ac38e148e480628a03700 SHA512 42ff277b16e93cc6ba6a873c1dbe6e702e5ee59f81f62432da5480daef914b595580d18d98dc65bd38eadebb04a2f7b091a30ea17cf7da1b52e7686c39d17518 WHIRLPOOL ff7ce48b4823ad9ca747ae6bf17de396cdda11ad5ada6f0f6d939a48d98e9a73fcebcab60d9d8a8d9445fd5e53bbd80f13b056ad91138e35ed22991b16832825
+DIST kde-l10n-hu-17.04.0.tar.xz 723100 SHA256 627dd98bf0aeeba1d4232006d32c35b1a1ab65ba363b50ccce6a1738dbea26ac SHA512 e6fe5463d4e3f621b6bcee0cb1176d779628e18390dffe4e83f3ab825b5ea3c8f65ad77ac44eb266d8755a1141db22af5063984c919f2caee5b657cafc24deed WHIRLPOOL e70d2fd4266ac24ea646edfdffc7075dd2b22b2b6d425824b4c57788f2f7d46fba963365b79756920fc984c7c8f09021c21dba98c1ed81fe2236c75117e77cdc
 DIST kde-l10n-ia-16.12.3.tar.xz 1210884 SHA256 d964627f9922829f0b718a19aa27f8a48d27cc6a20bc26196726e7f8bbc9e926 SHA512 5327f159e25fa8b7c56994ddca3a1e4c3584091592548e81f8462d7430f8a341024144896fd516c0ac1961a15e46d98bd163917b66f5fb97be07764388a6aed9 WHIRLPOOL 09190ae882d685d95c57f27c33861c5f5b8f514bb279141b2aaaa3010803005538d2da6535e1f20f8cd3de4ab6d5eaabb0b648b1d50e64975563d8eaa4846d84
+DIST kde-l10n-ia-17.04.0.tar.xz 480892 SHA256 5e7f2bba6eb8febd713cf98c49f36cc1a778f9a2a7890aa451ee15a69898bf3e SHA512 4680fcf4d342a95b76603bc45616ebe82ee310588433cabb9c00a490be4ffc621ed29066441e92e3aeab237899ec27c6fba361d243463efbd58a8171444791ed WHIRLPOOL f49bb6b3cf7d1880f2a1fa850218ddc645bace4256b55095529ad9e9d88e947b5ce6e8f3e169a6278f0ed1349c120a5ca93c3c22b9f56e3d6fa300c87701c900
 DIST kde-l10n-id-16.12.3.tar.xz 384876 SHA256 2a9b842eb7d6b68a3c95221a0a56aa20d9bca9287b372823564ad20048a656cd SHA512 7ff783ca6bf2e3bfac51d17a925ff3f99fec15b8e2b0de972f0c90cff39e465b31a4318804cda30338494356d48b8243812d4d5e0a4e1ba2d5e720565ac6d210 WHIRLPOOL 39c47c9f759363f5465e2a49355e0a3b6af2b94664f8197d7498d76c2fd874efae57b2f02275644d707bdadf7ac959bb904358ee71ca325e758c39e285b906d6
+DIST kde-l10n-id-17.04.0.tar.xz 188580 SHA256 4cfbba8d516751264a88776e3f4b39942aea28dadf25728505c09083dd55bab1 SHA512 41303c4bc51b72030390219131bdbfcf2108a09243c7c3292d1b7f3acfd8f898b4f0ab5a88fef511230f1f5b5ba4ffe567b1ed9759bd643fc9629e56a8a5bc93 WHIRLPOOL 089bee3d3e042fb03515ce90b1d1455ebef2ddf3b099a55eba65f0d91e3c531796b954758c7f4a6751d0e691ec77ec233190d9cc33b24ff28c9550fe05fa883d
 DIST kde-l10n-is-16.12.3.tar.xz 1610460 SHA256 db8c2375a253dff7389467c4aa4017e275222f77372d023c4faba76d65d74981 SHA512 8faf11dce9e8585a56c35925589219c0548fc5ad4dec367cf1667fb38dda592a02e5f6b9f473f58ea4890cc01bff90de56daced5a57324924ea2dbd3ac0c54f5 WHIRLPOOL a953052f4f7514ffa3aee9661fb8df9cfe902b12bf5b9e2a14b9d1623f3442e0682a17940e9b4fd073eae201477207c6b088734b898908a1f3e46675cdaf6f84
+DIST kde-l10n-is-17.04.0.tar.xz 547144 SHA256 eb739f49b332bd0ff763187813a7815b377fd41a479e4ccd81de3638b94f3a3d SHA512 ec8a50e273fb65d82f93f22dc1780c84b9c7b199257aa94f149bd0fa13494a53ac93e174b2eaffddeddd038b6153ee9f588e61c00bc079016dfa5492605abd6b WHIRLPOOL 17c1f7cd2f044ad5b814fdb46539d3fd489fecbc5022b99a0a547e6d35796d2e776b88cdbae370012544bc6fafc5cb2c55e3712aa03988d623c7ccfa859b6b8f
 DIST kde-l10n-it-16.12.3.tar.xz 7866724 SHA256 3eaba4b8f268aaa8ba8f8f0937a44f9b3fe3e34c61bedef86b86ff11e90ce738 SHA512 4eb36e84451c59d8f68de6029d2d1bf085a0e2a33c4d1dfde0f376a762058f92265795edbc33d9c79dd53397a9728f072f8cbd93f7ded04291e128ac10aa3da3 WHIRLPOOL ecc99e4b2fd5fa6eb164fefe8edf2fae7ce6b208a7e4851669734a91c68ad93922efb54dab5a9a0e636431863c5429db5e90c11e9f4be17832fc867da94cc868
+DIST kde-l10n-it-17.04.0.tar.xz 1134832 SHA256 0dcd76eb85069512e937c456351503e4dc1666790662c5c0111fba4ff72b1842 SHA512 c6768596dcddb6c80a0b3dd0acc08b3d056a6b4e0041dff921277603fe4a11b4799021796a2dfe845215053d176bd1b357845c2953347a0a1085f7b92293ef34 WHIRLPOOL c5637ac99e3f045359e1b84381523b8fd893e61e9308830cb7d501bf29e5ec7649ffb986ea3a3483b6e03313499ed5836531eaf2ffb568611bcd7430979180ea
 DIST kde-l10n-ja-16.12.3.tar.xz 2067728 SHA256 db9b58e260d1d89bc205ee04f291c792a8c4c8105cae36697b644440c6ce0adc SHA512 828f7a60ba71721d7d50e98b2037de2ce4254dfaf62732deb30b460e43dfd2a5be82d32d24d03d91ddcc21703ba0139a60635849dd341c6f73da45184b38ddb1 WHIRLPOOL bb6d1ac7bdf79ab6cafec9b9546ce9f16dc0c35b10199efdf42fa32d28e9604a582b1c7b56c9b450f092a50d48d44313a93c3fddc56307e82ed922f1e15fb059
+DIST kde-l10n-ja-17.04.0.tar.xz 620012 SHA256 1c39cdf1367b5d3ead25fc222e02ce1dd0509aeee5ddeea02e38a1daf4573f91 SHA512 a18853de866e3f6279a2cbf45327d353cf481676a0972e0a22ccc070cc7bb9e0d0b9ca1c29eaeffbbcc8f3adaea97403ec97cc0c0fe1feb5dfc1fa8944df1846 WHIRLPOOL d3e2b9a6f5615bcb832628095a83ffe19e8aa6a302947fbcf1f1607dce1cdd32621f8ffb2774ca81848b6227bfcbc8560b74ccff3fb2802bb22cc41a3424289e
 DIST kde-l10n-kk-16.12.3.tar.xz 2357216 SHA256 252692409bc4ea40abf90d937898cea7d28245f8530911d1127576f8d95263c6 SHA512 7ec0c03cb4966c8e151743f65b7c320431a59b91f067d7a29a5e25aaee5ddede500c8d66f666c28377870ef35a285030c764f2d6654fac3648bde15ee854f683 WHIRLPOOL 614d2492dcc3a68a7b74a5a244c4b7942a86c0b93360451d6d46f97865a744da7f00eac6d88aeed273e30c75ab440b68272887d3527e1444968c3df96e3bbc0c
+DIST kde-l10n-kk-17.04.0.tar.xz 717604 SHA256 c93e0990bb6a348c17d323329dfc96184775fe943fe0d0d2127d0028e47498d8 SHA512 6602cecbac249317fad4f2a97d4beb296c41c77871bdeec7a98e2dc04b7008e2bdef174d24d1e65bc1253c7e3d51ea0fc2a29ad487419eb5cb3caaadcff10026 WHIRLPOOL 41a26e9cd3a4915e5e060cbdd6d8586669ab735262978b5c6e4d6de8d78c9c402bcf93876a563f3c6fa231d2c4fb9dd7cfe74d0050bd81ee51d5ea4d087d3ba2
 DIST kde-l10n-km-16.12.3.tar.xz 1976668 SHA256 3a77d568337a8126fe7e95021995f65686652d66e8d4dc6faad3c483f67497d3 SHA512 072223718ea0100fe3b599684bb84cf8925351d89e218ce4e9110dc0be845e2828024229b15647e26be268be313b1b4683f8886764d7592222b70d248e0750d3 WHIRLPOOL 0b6eb89f5887472d8bb6f3efa9e26ab5c2208de5e4b2907f7635b325b33451c5b5b30ce088f9d6adf32879a6e88bc3e55ad1b269136dbb5bef85218ecb0fa9fb
+DIST kde-l10n-km-17.04.0.tar.xz 656584 SHA256 7e473ad851508409813c8076a4122186a1b9558f4ff15332dd3fee3c73a9a0ad SHA512 320e496d3f2181610a254a0c03433039a5db9ef490ab3f5398ab4b8e8a5fd25e6ae191dcd031002a8f23caa94cddcd124943029974db1ddcdfcb30e365f66a12 WHIRLPOOL c68fb30adc3700297029b7f3fbd9604cbc601826ab77b95ec6e242eb989ff6d74afb89571948c14f2398824afbfd04e9105668768b629bb5c7814d721c883558
 DIST kde-l10n-ko-16.12.3.tar.xz 1718252 SHA256 9e2c133ac00350000a7e35e888df26ae44023c884517e0b490ddf767f39d1030 SHA512 fe3299f2b981f455068457fd616b65b43bd331c3181e5d70c4976d11b6c40204ed5698f5b5b02500c1212ba5d88e86c0821b8c5f9c6cb0f5fdedec162d626af5 WHIRLPOOL 46135181635717337f89500ef0a47d318102a62227e6330d3aabab19b13aeeaa6dbb3d8a70af44d71fc6a6cc68a4f9c5e30f26b69b3b9d426a6559559d3c63ae
+DIST kde-l10n-ko-17.04.0.tar.xz 546704 SHA256 49239f25825abb1633e95ee28e9e0a20df220c10ce24c8b42401818aac624082 SHA512 f1baa78e0e0616d72d5c653892ab580cc71429ebe30482b7d801bb5e78af3115a2ea6c5f1cfeb4034b8cd9ead7279f8ae970acf6574bb9680a22ea4566764ff9 WHIRLPOOL e5c36a7f1e7ddca98b57cde787202e1a66ea7133eab004b0cec96096536633ee7f947a6fc801f658b88436d603ebcaa526d69937e48dc865d4b7e1d2d8c12f24
 DIST kde-l10n-lt-16.12.3.tar.xz 11955020 SHA256 e7fca79f111b30e3bdafef263df035e02026a3edd941d6efedff2e1db1a0a211 SHA512 c4e18764024f7fc36431bd34f5989f1fe18367825913fbf36996427cd802b210162c90ef77d9e8ccf5d02a8aaa31e472511ef891d298d5f0b43aa51e051cba1b WHIRLPOOL 915e5db0cf1e46fb069df9b09c42e2120eb9d1e7cd71ed227508619b2c0fa05048525c70f88cfd571fc80879e34055e505e05d3dca6d369b1d6ab0abe4193f89
+DIST kde-l10n-lt-17.04.0.tar.xz 615000 SHA256 8940c07c9d0189d3c2a640d92a45c4eccabfb10353108132fcac19f38e00fc50 SHA512 d7df1437597e7f61a2d8380469afc4540051eabc7d752deeb64935548ce23fef3a3f1779db96b25036a56083ecb95ac63595b5c8fe6c0ef1e81c66de924876f3 WHIRLPOOL 2cff20ddf1da844566d2cd50b9d6d0270f02717f1a2d5b8e7808a97fd758da626f247c4fa4f98012196abfdc14d134684eb0bbf4fe3a0d73770b918259761d0b
 DIST kde-l10n-lv-16.12.3.tar.xz 1969748 SHA256 226045b4888f41f2daa31fced167c8fab5a3fe710f8c4d396ca39398cf1dc1a9 SHA512 a41b81da173f92b095458d48efe217475480543287326b940c6bc31d0452ddc2cb641f9ee8dba71b247573c6eaa842b6151b64e03a437eb9873f8b584831f2bd WHIRLPOOL 271c4cf2cc893f6d663d47ed6c83346d9f24bd37e56b71962b25a4392ccfa5351b44373b9a13eb86b77c9a9ca57de513ceaede9b74771d4b5ec14459eccb0977
+DIST kde-l10n-lv-17.04.0.tar.xz 640620 SHA256 50745537b8d50df3b321e4022c32619b7954af1b10dc768de7b6f4132f3f747a SHA512 14b64748733bc1efb770657a188aa7392cf42cf1beb0969c7dce1069e7ad319de5e32a2742220b6cc7f2b9f38b625c32262e60ba80df9e192a56a550258a78cc WHIRLPOOL 0e488f7d09e0268e007bd4d2e77468253b83ce079effad98f178cbeff123c2276be456c7e89cc878a1cf41813d1d19d6841bfc335747006f275f167c8de92dd1
 DIST kde-l10n-mr-16.12.3.tar.xz 1646608 SHA256 5d4d4cea3c883934a3f607ea6d5ad3b7ad7364dc9bffc7896a17a71e82a5e899 SHA512 6add7f1fa90859cac41f6825f13a8ef7b715dde9ac473ab26f246d0b5956fbcbf5bc1150c03c33f2379aab0940dfbeb65a891d1541118c0e6e8b6fb05760f8cd WHIRLPOOL 936adab73ce4b95d40f7d7f8ce9ced4f10f75fa300848006b16282ef22c774a0ca8951c41d942f9af1ed848fe401036c1b49c7afaf51a2e879a637dbc8904c1b
+DIST kde-l10n-mr-17.04.0.tar.xz 525020 SHA256 6df281bd98d17071216430e25fe4b6545c7be7d4a393eeeae1632a420e9e8d4c SHA512 815ebfb2183aee3b8f8bd6de28bbc0db79ca20f02bc3805604e79dee06828388fd3139dba259d0b1ff664f2107dce73662c5cbd3a1dc2e643fefa649c2151d96 WHIRLPOOL 7ad0be1981ebed240bb9ab534c01c0271ee2b43e5b09828ffd368d70ef606df4f754db8d257b62a351ec515170e4db875e9ae688d1b0a3c6fee1222a904a6eb3
 DIST kde-l10n-nb-16.12.3.tar.xz 2160388 SHA256 aeb131d96fd39ff06113f0c240c66d67de0d5ceb094920845f88af683eaa3c24 SHA512 5cecca3c6fb383bf0152ab6ee3e15715695b1f9463b420bb0d334b1eac2b00ad2ec438cf50530843e167ca07fc93fc7126c4d75628e622d64c448a9694e970c7 WHIRLPOOL 3dcae05e22a336b461a291ddba29842ae9cee81da3a08491015262f612e6d710261d64c5235135aa463ce3a78218b439595e8ad78cd4c76f8b54d3d4392af86c
+DIST kde-l10n-nb-17.04.0.tar.xz 688308 SHA256 26291bec3fb1196da4c809914b5c4f19efb8de70864de1e64eef32119ad61dbb SHA512 13f9ca986002e2df93aeafa5efabef300d553d962e808399dab4d93c81c613f25d4fe5cb12d3f14e220976a1ce809d205365aa4e002563780477bf0eb40c9813 WHIRLPOOL cd2fbe4d37c872590bf18f34fe27016fa0b2b1411dc313ffb9c3e7011b4aff575f30bbc4151e635a24bd53f724c66b76bf008c18e09d65fc2d7484879a3c2eef
 DIST kde-l10n-nds-16.12.3.tar.xz 2999256 SHA256 8cedbdf2df869b23183a2eab781ee3ce76c563b095b31ea703788f968be05614 SHA512 18f1499d16ac024d184ac6320c5f4acc8291448235b77852e7d7993d379f2e33e8e64734816d0b02b0b8a7dae2da3e05c12c612a7beb609617bd1c966d8dad98 WHIRLPOOL 1fd1f4ab4fec2b6f0057e349f958f1012995d249167401806cde5783b88b50bfbf2b2b9e30af96d5f4f7fae0a759719c76dd66f9f882119632f4a33ecf971962
+DIST kde-l10n-nds-17.04.0.tar.xz 751632 SHA256 94e2ed229ae08f549b5cd98c7ab7b18740c27eea4b5e9796fd311f3536f23f77 SHA512 83386ad8ecef5e929a80c3064783962622bba9d1793f5ef8ef10c373202256fe178d0fab276260fa8fb1fc2b157b11be6097ef5c9c611ab842c661478093c51b WHIRLPOOL 06b63b954f31d8ddbbf4facf4cd7131e289f1cf91620925c8c2551f6724699a72e70514e5df967027bc8d44b03c429d52e67214b2a58e7483707e23f66872297
 DIST kde-l10n-nl-16.12.3.tar.xz 13080108 SHA256 f1ef286e2b270dd0d2c9140c366b1813d1a3ff810b3bcd185d820470b0bcb42b SHA512 3811580e196c02b1a6c331f8399c82ff18922c3d0e9b7658ed7ee81f351b24c057bcd10d7694996ddd283c1c0abc9c20fbedfb260c25d867bbd4e2a2814350ec WHIRLPOOL d5041e39f0cbb0714af859027690735077413f7c135d2ac1b7c13340750206b033b0b3f1574093fe3a3d0ad408e1152a48ceaf830b61d651ce49ad4d6fc6d923
+DIST kde-l10n-nl-17.04.0.tar.xz 1846032 SHA256 6a6a6632f5fe65d964c5575a1393d3013b42822465f262d56da33e55fc8bd384 SHA512 4d24566dee52dfaf9bb1da7d74acf9f61ae858793014a0e6d67ee5412b83883df1ad949dec408fa857b0c96dc59dee3aa49eabadcd0ec2fed9d6ae1888033aa2 WHIRLPOOL e70c38b8874e64652766c9edd94e2e300420bcb7f5361fbd28d6e639c3ba5d2e402cbc000ccb1398f360cd0c38401a7eca7d096dd26050215f8b8dbeeaa31f97
 DIST kde-l10n-nn-16.12.3.tar.xz 1706732 SHA256 286c00f3ef64dbe8dc562a3bb26da2b79ed5336154ea27a46a9bcf43e4be8862 SHA512 9985a7bf08e408b9293b9bb8ef623ecad6f8fcf3aa1a7076e750deef077494e56200faca6ae91881e83d48bcdc6cc8e5a91b3bcaf3361056843b7fc22faff942 WHIRLPOOL ea5dccc5aec624d8362b3d79d9cbc19121ea927f3ccdb6df818e8b60b6b9718ba287bec25d0101748915844b9fce5aaf6719a205ef0fc5052fc7915142c161e7
+DIST kde-l10n-nn-17.04.0.tar.xz 634620 SHA256 a7a488f62ba842775b6220ce133f543aebbf729b8cafb35f343a34ffc0a832c4 SHA512 85f0eb6b8bdaa90f9b72227249f9ca64b2fd8e980d1dcc768511e2fc9eb25db4a89b0cfc90ddd79396693e8ceb1fd8f4cf84f492abf641a9634cc71a7204b654 WHIRLPOOL 364840c36b019ce8e8b2fd46df4fe1184e885f1ec24a62bdceb8c9b3c166b817d618282148c9a130d8d0e5fcc8af3ace478ad8366027f5f6e7867eebf4f49909
 DIST kde-l10n-pa-16.12.3.tar.xz 1691484 SHA256 9559b4a1593ecab3c38f140f6ec05696f1c63bf2e18964a4470aeeb9cab25a64 SHA512 fb3da4763ae3556434562e9af39788e26b1538e04abf7bc9783ca84a82d9ee0809bd75f3704312683035ca9a7bc4b1c08881b2c6e89c702383a9a8e359131e37 WHIRLPOOL cb49bb757f98b69a66da00ea869a2723defa7f117445a8cb9eeb0c8dd61f577f07fd9128e94c1498c140787e6d337feca94993a4b152189f09b6a68a88f5e49d
+DIST kde-l10n-pa-17.04.0.tar.xz 517372 SHA256 bb20afe6d632eb53b227f7a7900a67770e849c5f3242d4640983d3c7cd3fc396 SHA512 1fb2a13907de37546b3fe0a3bfe88610ee46a4205079037cf23706d973c751d49073734117277c604f2fa7514781c52c6c97b36c74bb09e11910fb82bfe9453e WHIRLPOOL eefbad3ba09a88b8844108a1add6ae1ebfb8592db31bb0f503b4b54972fdb907d79162eec8b500804d979671016c505e02046d003a6e1618f555224ebd7b82ce
 DIST kde-l10n-pl-16.12.3.tar.xz 15449936 SHA256 05f38dd9f147d8678b904cbe2c4c898207b27521f943423bedc33a7e465ee8ae SHA512 d811a13a746b214e49bac901394eac619da96f77bb8d1582074c7662839c031ecb9632a2e074e8f38e68ba50a410c5ec0888ea104a42f0ba2603a2d64faa5ffc WHIRLPOOL f11dd88ef980313268ea987bff4edaec384ce8ba093325eed189eb03b5183342574d7b6b878ae7d3778c2b6424ed48b7d774f194dd5af09fcbe91af35236a90a
+DIST kde-l10n-pl-17.04.0.tar.xz 2031120 SHA256 42932d997b8feee73389f7683d669caa30fa5f300a80433f192b962d92a58a59 SHA512 b4067fa8ad6fc48aed7a266ed27e85cef38cd7a1d6529ed7122900796d3a129144570c292345f4c2ae04994222219aa83785e739ec610841954a0f86d246550b WHIRLPOOL 54a69b49f3e6e354a7cd896a150a7654ce9c0fb52a3f6726e7943e0bb122e9aac9c019e5b809eb10f4b8d2a18b96b046bd52682607378c420fd01b1aaab0d18c
 DIST kde-l10n-pt-16.12.3.tar.xz 3352820 SHA256 0662e6079ef25b62cd05372260e2c76179be37920b4820b2277ce0848c5779b8 SHA512 95f5c3dc20fcb0d76079a4a99a92f3b246ffa0e3e14fa4ca4230d0b47eac431e0dfb26159ff469945a54e8cec07bac86d88487ff0f7c33a6aea1b0935f6dea2a WHIRLPOOL 332530e0c8dde8d46d96eaeebd36912f134565fc0bd4f987127475e86f049b732e5b030112bda11ecf135e1547f6f4c7dae1e2fe21b9e4982c3b34b45ab03be4
+DIST kde-l10n-pt-17.04.0.tar.xz 1041376 SHA256 d624ca3d316690a71677dbe518b37bf7cceb69a5d0fc91f86d119493b6fb46c1 SHA512 72ec3ec6c355cfccc93d71ef31236d981a3ea2c40dcf0a1f63455357d6676858469245e0a68e66ace3bcbe9bb794cc98a957b221e0f6427b9ca89370eb5a642f WHIRLPOOL 05c13b007eb20243d8ee13171045b6ea297b48369903d1bf1a02cfc29ed269ebb5e44931bbc6c59f2980c622ae17e5e5586a523e5535cf953fb3014509c7e6d8
 DIST kde-l10n-pt_BR-16.12.3.tar.xz 21078488 SHA256 da18e9e28e77a14c5dfd2eb5c56c588599d9fdf07d35c7e6d979214bca6d001a SHA512 e128b53e9fed8fdd73b3764104f65e47295201a1b1a4a9089c3d57c70547242d0739faca291fd29bd29c1fa6bcbc26e88f8d195ff5a602783374b3cd22a82c11 WHIRLPOOL d3eea6f886bb00f44afd4b7f95b10707774b915c572d9818a599746b61e9dee8b071e98270ca0cd79547deb8c10f110a6e9a9379ade3f3e0d3ae056ff6db6c2d
+DIST kde-l10n-pt_BR-17.04.0.tar.xz 4129592 SHA256 0ac1881da77b651ff5af7dc9030242695ac5109ae9b4ac801e9fee7813552658 SHA512 a07fe7251fb21ef4beddae9c5e8806e1b1b0a93182da3a60b90b55ef72eb561c49b60a4ee153c739f8575f90af598ec1b18a13afa50692cb2830cee767645398 WHIRLPOOL db0677ba4808973651b53c4d2eef0c8983e96b8e380abed40db7ffc0363b9ed05e62a3bec54fb3e31005d3882a0ea6958b6414ca2d77bf0ecda4e44031d3181f
 DIST kde-l10n-ro-16.12.3.tar.xz 2834952 SHA256 b07338da9824145e5fe1a10784def208e0dd1a5555d0396e5a1f39090a9c6b9e SHA512 c2ac8327a04681571b5d76d754d100031b709fdc7682cd6d5111ebc3cad8e8bfdaec45801735604720e7c5fd3bb92e2d9586f841d1cdc210e36694f908202c0d WHIRLPOOL 02747541b2c90d1e48b514b631abe0becaa9afdaa8a3181716db19332732aa0248cd2070b36a3085b44785c3f9d043a4b7df71e04e3232caf6dd1f4458b024fc
+DIST kde-l10n-ro-17.04.0.tar.xz 713308 SHA256 aef657257ef117951b4379c601c9d894d352c705b48e8db0b6c6366e67df7a3c SHA512 eafa694ebae3d184b2511d8e672c0468fae1f5eadb2e0231810d8e9101d0bd0ee8b3ba01b1f5c9ec6baf6c1d85e796b0142bec6c6f9cd2fbed3cae547bf51850 WHIRLPOOL cdb11f43398cec72f13d1dd809fb1e24ceabb933d222c50bed26ddd83723d6c4851029f423d11db73db3bdda0d90f0d9d33e8af291f4364101aa9e2e1ebea341
 DIST kde-l10n-ru-16.12.3.tar.xz 21414548 SHA256 ea67d4fa07bd640146f3f89ae6a155bba6766c87bb72141fadd644823c7ff089 SHA512 dd5cb10d5b62d9cbfe74e93d68ba84a9038465d8771083103493dc51f42bb8360840d07448fdee224f1eba150654c0ef442978d7ada39dc3c67bb0de2ea9b255 WHIRLPOOL 4b296d235c53e98ae7a8cbe44881b34049ecd4aa73196d42fc4e445edb614120b14fc948dda8e004182c99b78469dc903d737941e0eae331772de22f112779d7
+DIST kde-l10n-ru-17.04.0.tar.xz 2829596 SHA256 e1ea0ef8bc39b2a5516497856f2b4ecab662a7dbfac49007476446a6fafe1738 SHA512 cf5a671d33891409debc5c3e76b8e0e6eab5772aeb96b2cfd4157594057d34039a70ecfc11377c0d5f41e5a0d26b584debf46ac7118a1aeca9423693c74cc357 WHIRLPOOL 04c6a81c5309653cc971e060dc8888b22e76cf4e8a101e7d5bfdee1664c3eda296317e937c1c626fa562fe1aa49d5afa19422b1bb1f4e35a4b126b68029d31d0
 DIST kde-l10n-sk-16.12.3.tar.xz 4399916 SHA256 967dfb2a4e7adde5ab888d43abcd86f262b5bb4c7626d06be282eb6b45658141 SHA512 0ec0bfc56c8e7ebd63df21b9d998aaa2c55eb4dcb2ab888c328dd7524bce29bebfd255475f2f22f4d52ce6b275e5443260cbefd6e2c2cd4ba4ffcbccd927e417 WHIRLPOOL 006d9f41fffd7636a7313508af70aae35cf3f82054fffde6f99a35d20ec0e4f3043d949387b0504cdfae9682aca0ac6203e34ee46ae81282b3fba19bd1853dda
+DIST kde-l10n-sk-17.04.0.tar.xz 677544 SHA256 e1170f267ca01937e3d32fa38532d2dc6d6856d463afe480262a12cce0e87e74 SHA512 b531024aebb289386c6c1464dda0c4baacec577e66d8dbbca8d6e48f70cd4ebb32d217333c2890a7debf89affb488beb8420a5a0da56f9786dffc58410e84aa3 WHIRLPOOL 6e2b4c0f9d7475de5cd1783d1ab6b8f6559f5e0c1b17e592fb03c3f6c9caf1801db20c7777191f87b38661de12116649dd8635237f8747872aae1f39bcb3ccf6
 DIST kde-l10n-sl-16.12.3.tar.xz 3023540 SHA256 80ab818a8a69fdd5ad45d7db7f6fdb3f5e7cddb04590d72d3799ee0bc873a009 SHA512 7bdced085dd39aa7198352e557770e22b309a8bec2b9304cb99292d4f0d9b0e6a32a646cd298b2057c51003df8c0380540668fd338d76fdfb82ba2205a701361 WHIRLPOOL d72b98baa5ffe7c021f3d95e46f83a0a97372c1b5086e45a1b1101d2817cf39ab8cdc4c4b0ed5ed70b5c49c58cf4d258e6c5159982305983adfbf4dd25fb2d27
+DIST kde-l10n-sl-17.04.0.tar.xz 727428 SHA256 3457e95fcd309e3e20f2716a74b25d427d2cdea73adb5a9e81061b06c219b23d SHA512 1aaf4c04f9d07c182ac26c8270d9e3fc8fb93f5543f1c4ec9d33ae628bac4e4b64e84b41dad9d4a1ff1b50ed0fe0c998465213a121f27ada1c1084000911dc6a WHIRLPOOL 304688c06b49f14913964eb47c6cd6f9eb2088e109e6eedeabb534632f0723a811d04d87eda3a822c20c4337a3785ee008d9b5882d5fbc49352cc3ec46cfaaa8
 DIST kde-l10n-sr-16.12.3.tar.xz 4273600 SHA256 9f210339268020a049afb695ca5286178c2869414de50f82259f49357d2304fb SHA512 de2bcfe0e6ea3cf1059c1485b0eb323ac3479e22a594bcfbd5aaad6bdbb57d5570d8e0b2d14e878c8ef5c9d763c4e0e4e5285219b7c39aae8cc6760ceb329560 WHIRLPOOL 03c9690a0bc76872ca20c1b5650f24edf75c966a40eb6f40d7e5d3b0f08e8f30e5db650b74ec814f00ec09fa6ce331bff34ce4f35bf76261e04749b59b60e21c
+DIST kde-l10n-sr-17.04.0.tar.xz 2648484 SHA256 03afac02c8968c45ca09f38b6728f535b72d34ee4f8d2199d2560dcf692222ea SHA512 ec2cea7d8dc9a6628aa67c8018e4014fa2022b42f5494e747c44c621b7adc19fa58a0d4d73fe1bfe8ed38b0b6e4439e3d8f5c3e17a5a87b1819119410cf27056 WHIRLPOOL 9ddce95ec54f31dd6bea2f121b78a4478235f10d84c7dca3f669db89f09d6ba91efa56de51d0fff5f5e00ed4737244d3c4966afdc0809fa2d660b444a0e24599
 DIST kde-l10n-sv-16.12.3.tar.xz 10840852 SHA256 2bd3f69e87061dda4764496b7af6f1ce263d581a014585228c597269927e0ae1 SHA512 b4fe837f7d913936a73b43008b80b10fec88a6e25de3c2bc6d3cd6761e65f600468223a5bd31af77d8f309a423a5625ba57ef51b6729aeb28c13d13cd41733dc WHIRLPOOL 28c7c9b497cb4699a45db44ba1a63cb9aa6c7e46deaf864f4b2f03f4d92eeb19c48bfc031e53670ab8dd76f3e5ad4b7abeebac2c78c0322214a2d9de33756b34
+DIST kde-l10n-sv-17.04.0.tar.xz 2532196 SHA256 c45e96cb680f50017fff2f22cc6980c83016120aa0dc655102701f67ae5407fe SHA512 fbb78f940426de4a6999b9dc8000c4037ec4577a95ff3c9d9620b8cb886c461635d23f9531c9d67c9072fc1c4353ef4d3faf4fb3aba681a5f1aae5f516939591 WHIRLPOOL ffb794c09d09fbb23c4ad4e945a22f9e824fac179161c8bbfd02418c55a0f4d701fd5498a65e19abdbaf2f7db3c388509fb35a3b836e91644c583374b171b7ad
 DIST kde-l10n-tr-16.12.3.tar.xz 3003836 SHA256 16c427d059d34f38860803a6161d5dc1cb6d4b22a27cc741558b42b8146844d0 SHA512 32a863d2d9cb470736cd2aba49f5b81b22a54d21ab616ec7020ed835a4c224d0c72ca9329a4c912444bb2d5d9a6d451934f470976e5532754842c33e820042fd WHIRLPOOL a58c14bd8399619f12abc9c382a574e860da8a2c2dcad57195ae136ba3692dfc9b4f5809c12552c49e82e1d517ce0b58027664aa5ccf14f951af3cb9789c4654
+DIST kde-l10n-tr-17.04.0.tar.xz 1460592 SHA256 c2fba4c7d6e26e4106ea4b3abe6871110eadd0f842a5d91210f77c351d2f1a71 SHA512 6458c96bc4b7e7e5184bcc877389e5066f21934669c02be9c636833ab7ab2ce75304863b6f2fdf9a83f1da1849dd6c913a660d2c04020d79b1783f3b4df3cf3a WHIRLPOOL 66808c980280fdb2b9ef96b1301d579e56938b2c3a58094af0892810a7a530165ed291e41eea9bbe8c90e089637f1487357c788a871752d2e2577c0fc766387b
 DIST kde-l10n-ug-16.12.3.tar.xz 1621292 SHA256 d60244a5b0e55ab95947cd4e75868a02edcb4fdaf831b85d78e979c9cd086469 SHA512 c96b20a021ca78ffe14d0e351441a0c76f36b3ca9de96e97aa22c189f7140aa2d3cb54c9c8ce340976a8d9106e0049e986f0d96efe68b1df035205af2372ae3f WHIRLPOOL e9088da4aa22ddf6a6a553dc1b52fb2d8d225f50c56394077b8b183d8ff222e350b2c006b49b40e1727efc7b820f7a7012a029f54b79fc6d2c46c8ad12088adb
+DIST kde-l10n-ug-17.04.0.tar.xz 542096 SHA256 938bd6bca9ad5299563d92a186d10d892ab04b8e8e8f8a6dbbfa3c570be4da01 SHA512 3b46e3fb150759e38db45936234171a5678f5eedb3e35f87921d4195e2d64d2663673d0532363d63030e01c1d7a1408426b828d58b210f98e386695bd6812c21 WHIRLPOOL eaec616c00fb39b5dc980a72df1a0e5d36e0dee561d85d3b318fa272922db9af6cf5d4cd7886a56a2d78a244c227d2539c7fe1fff027a652e973e99dac22a159
 DIST kde-l10n-uk-16.12.3.tar.xz 24087960 SHA256 bf2ef1ce317c2a3599c54aa9275e30e0c1f964cc046eb057687cc5bbfac6771c SHA512 96c08d9458d5e2c16eb509942906d2953f200c92f115c9ffc1a981c5bf1dea430d5108120e27ed38a1e8af32b931e6ac6077fea471b62a92d9da17ddb32b6744 WHIRLPOOL 44413785caec2401b4369b1c97edf3f6c5dfb2ab69fa8832d70e46db816af015189809f4db90709d86e30d155523437ed5dca9b85a7a1415eb85bddb5e6fcfbb
+DIST kde-l10n-uk-17.04.0.tar.xz 4602204 SHA256 51f3902eaa4249de63825418a27bff593cc200246660eaaf6dda02ebc519ae7f SHA512 afdd0d0471f826630f4d819c0006f94dedcc3dda30ed497be25d5d3c094a24827839f2acef08acbca0596cded339549e7c6a123167005772a6ea0e4c24edebee WHIRLPOOL 8bc5ef023acfb31d872a3be2e680bf0276ceaa59eb5bd8a71a6ca059e2749eb56b7f6df3a4f8791096e9dff21e2f5d31a05e46851fc9dac4b25b2e0344f61763
 DIST kde-l10n-wa-16.12.3.tar.xz 1532200 SHA256 2ed713d8b79c82783d2a8573ee7a2cd34963938b4cc3aa3271f0fc4b92d01593 SHA512 b91c0446402fbfae334f1d1db88e26aab8455f6fc1ba125e36297871ada049c016eec59d81c3085509fd24136204b3a736a8468df2d4ea9c8208eedbd233a991 WHIRLPOOL 2eb62361064e4d9a5f36db91c7daca1dabe4943cc4ad3dd630ef3de63dbd8ebad361fc5ad0f3d66bfc313d59fdfa11a2a3e0d847b015cf8a3c1199bccbba5145
+DIST kde-l10n-wa-17.04.0.tar.xz 413476 SHA256 103ad905c70d1e47a8dc0011a1bc72345d05055f119be44bc02e8038ebc1845c SHA512 e0bb9336623f74ad2321aec17cea54c9066487e779d101357237e7ea346f4e677ecdabb2e7c05446228437bfadeca73ab93f49318ae1dc8be17b4d56a589fb6d WHIRLPOOL e96da9a1a5a8b7c70c83201e3001790cea739c42a05544170a163a035b41bf22690c981de685b020f61d249b4acea6a04438fd4a6c1b729499ec2f42fe98fd41
 DIST kde-l10n-zh_CN-16.12.3.tar.xz 2697240 SHA256 81bc711d17fa744ddf40057884793548f742df8d3ad8fd9f6857f211d8130907 SHA512 32712ce3e7180191b27a3d1bddb9556056d41d2edae26f64ea4e9bf0a1e38bcbe4a04111887712f08287764d4d45b59ae81e5cb4e82466cc4d1f340f87ddd8b8 WHIRLPOOL 1813ab1e780109bb0e0ea68e3f011fc22e36a82d0742013864d4f059380311702e5e55307d308941254796e188e95d8d2965fc8159e440c85ae2342a5bbd4b01
+DIST kde-l10n-zh_CN-17.04.0.tar.xz 667960 SHA256 9a6523d6c75023105a1bc81892a7fad8cac3e4042d0f3d687c6e347367737328 SHA512 5b0d88cd5c99be1d7d4171fdb7a20d9e0e1596c6b2df2b7da0cc69bea940f61a2b853e1ec0709fe10b126f9b93ec58ba310c15c4c3a8ea1b6c33e1275ad8cd51 WHIRLPOOL c1fa939a6d4b7a4f8bb6bc018c45fc4c92fbee30e85f530dd10b90001cc9fbd6b77a2f986d68949da09f0d6a061e0c5b273a72a2ab06542b64afc2ea05d58ed4
 DIST kde-l10n-zh_TW-16.12.3.tar.xz 2450236 SHA256 70bc617608417a7c6bed2eb580b11f198d5b14470c1e19c34c8694bc68b73d29 SHA512 63485c594f0a49e6cf090c00904c8b4a41b655c79cc5d610960d0fd396b0390f1818eca3e5775ace97ff6f2921b074e0a6fce0763ff79bb239f4f16836c68482 WHIRLPOOL a7b977b3af3a51a57fac15b47e32929f8e4f81a99c82ebd2d9f80593b6a1242ff9ddb41e1227ecd8c295624b6b5a2501c1ef6c69de1c8a71ebb49c6c3615f28f
+DIST kde-l10n-zh_TW-17.04.0.tar.xz 731640 SHA256 bd07daa7f454061b66c2667b4dbb89e85a46a92a9552c5f5cc29adb23045ac55 SHA512 212c4c0e6ca94f5014f4c94f4ddc425eaf168882a686479f4e9b2d15ba17b15f2012f2a70af79764685da084440662c3f284ef7a14ffaf53c55e89bca4b372cc WHIRLPOOL 7798a71f25938a794bed806b6882137da8a6bfc890f46c13f5e99ec42df88ecd521f7c85bb2de080756a2a7f2491ae0f4116c7357d60ee73de74f904931a3f8e
diff --git a/kde-apps/kde4-l10n/kde4-l10n-17.04.0.ebuild b/kde-apps/kde4-l10n/kde4-l10n-17.04.0.ebuild
new file mode 100644
index 000000000000..f5397b5a76ef
--- /dev/null
+++ b/kde-apps/kde4-l10n/kde4-l10n-17.04.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_HANDBOOK="optional"
+KDE_L10N=(
+	ar ast bg bs ca ca-valencia cs da de el en-GB eo es et eu fa fi fr ga gl he
+	hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt-BR ro ru
+	sk sl sr sr-ijekavsk sr-Latn sr-Latn-ijekavsk sv tr ug uk wa zh-CN zh-TW
+)
+KMNAME="kde-l10n"
+inherit kde5
+
+DESCRIPTION="KDE legacy internationalization package"
+
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	kde-frameworks/kdelibs:4
+	sys-devel/gettext
+"
+RDEPEND=""
+
+REMOVE_DIRS="${FILESDIR}/${PN}-16.12.3-remove-dirs"
+REMOVE_MSGS="${FILESDIR}/${PN}-16.11.90-remove-messages"
+
+IUSE="aqua test" # TODO: Drop aqua as soon as possible
+
+pkg_setup() {
+	if [[ -z ${A} ]]; then
+		elog
+		elog "None of the requested L10N are supported by ${P}."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${KDE_L10N[@]}"
+		elog
+	fi
+	[[ -n ${A} ]] && kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	[[ -n ${A} ]] || return
+
+	einfo "Removing file collisions with Plasma 5 and Applications"
+	[[ -f ${REMOVE_DIRS} ]] || die "Error: ${REMOVE_DIRS} not found!"
+	[[ -f ${REMOVE_MSGS} ]] || die "Error: ${REMOVE_MSGS} not found!"
+
+	use test && einfo "Tests enabled: Listing LINGUAS causing file collisions"
+
+	einfo "Directories..."
+	while read path; do
+		if use test ; then	# build a report w/ L10N="*" to submit @upstream
+			local lngs
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
+				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+				if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then
+					lngs+=" ${lng}"
+				fi
+			done
+			[[ -n "${lngs}" ]] && einfo "${path%\ *}/${path#*\ }${lngs}"
+			unset lngs
+		fi
+		if ls -U ./*/4/*/${path%\ *}/${path#*\ } > /dev/null 2>&1; then
+			sed -e "\:add_subdirectory(\s*${path#*\ }\s*): s:^:#:" \
+				-i ./*/4/*/${path%\ *}/CMakeLists.txt || \
+				die "Failed to comment out ${path}"
+		else
+			einfo "F: ${path}"	# run with L10N="*" to cut down list
+		fi
+	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}")
+	einfo
+	einfo "Messages..."
+	while read path; do
+		if use test ; then	# build a report w/ L10N="*" to submit @upstream
+			local lngs
+			for lng in $(kde_l10n2lingua ${KDE_L10N[@]}); do
+				SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}"
+				if [[ -e "${SDIR}"/messages/${path} ]] ; then
+					lngs+=" ${lng}"
+				fi
+			done
+			[[ -n "${lngs}" ]] && einfo "${path}${lngs}"
+			unset lngs
+		fi
+		if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then
+			rm ./*/4/*/messages/${path} || die "Failed to remove ${path}"
+		else
+			einfo "F: ${path}"	# run with L10N="*" to cut down list
+		fi
+	done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_docs=$(usex handbook)
+	)
+	[[ -n ${A} ]] && kde5_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde5_src_compile
+}
+
+src_test() { :; }
+
+src_install() {
+	[[ -n ${A} ]] && kde5_src_install
+}
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.04.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..6516931f0f09
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep jovie)
+	$(add_kdeapps_dep kaccessible)
+	$(add_kdeapps_dep kmag)
+	$(add_kdeapps_dep kmousetool)
+	$(add_kdeapps_dep kmouth)
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..cf7adfe385df
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cron"
+
+RDEPEND="
+	$(add_kdeapps_dep ksystemlog)
+	cron? ( $(add_kdeapps_dep kcron) )
+"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-17.04.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..0f02605d7e23
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep kdecore-meta)
+	$(add_plasma_dep plasma-meta)
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index dbc89f6c99a8..6dbc5ed2f3be 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1 +1,2 @@
 DIST kdebugsettings-16.12.3.tar.xz 28876 SHA256 e50eb71ecea80cc99d97317a67221cd7d176352ed0278ef810dffa46369d7056 SHA512 ed4439dc3a5ac5dbcd2f85f630f785ee703ffb7fb077e0763013c5ac949ae4e15a40157550629d4414aefed7c57d9271264a11421003ce7b4d16801d82ae62c3 WHIRLPOOL 55135be31c2d0c8ce83e46dea5dce003215327d4276d320d6693fe1e48db3624df6986405dfaadbd274e57f59ef552a5a17da8183b180fe6581ba33c999c89e9
+DIST kdebugsettings-17.04.0.tar.xz 46332 SHA256 1583d8019fb14543471c724a24b32d6c62fc26987c92a4dd76e394b3adcd0d90 SHA512 bcaf41ee1b3255245d8a549d06046149baf8dec39de8c82c0bb3e407c87a6aa636f4a6989b9213bef1969e482ba6fe480578c6bc6b759d2c0553659d6aedd634 WHIRLPOOL 6cba742a609bf495928441f266a79d187e5e8584d9f73ea3ece5540ca9867387dd694498371d815ca9324a86cbc0d0c4f4d5bc612ea57342bb667626b2a6085f
diff --git a/kde-apps/kdebugsettings/kdebugsettings-17.04.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-17.04.0.ebuild
new file mode 100644
index 000000000000..6cd953689ef4
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-17.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Application to enable/disable qCDebug"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kdecore-meta/kdecore-meta-17.04.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..28f407b337c2
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+KEYWORDS="~amd64 ~x86"
+IUSE="+handbook"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin)
+	$(add_kdeapps_dep kdialog)
+	$(add_kdeapps_dep keditbookmarks)
+	$(add_kdeapps_dep kfind)
+	$(add_kdeapps_dep konqueror)
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep kwrite)
+	handbook? ( $(add_kdeapps_dep khelpcenter) )
+"
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index 6bc9dde4f82c..a1fa37484cab 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1 +1,2 @@
 DIST kdeedu-data-16.12.3.tar.xz 96468 SHA256 b5ecf56c2f5a31d76e8d56e74ff36a2ee8a0863328198b53044d30576e551f6f SHA512 1fbecd369b3ae3f59d1f55bca65a0d04aaad844e65b43b5643a78c7dde6d58f1c8caf6c8866ccfd118618e01c491c240d6a6799f4dd16235d26d44a6e3eb352d WHIRLPOOL 7bbc63457f23d49f4dec9f1d8cf7001115c7287df0e33c22dd0dfe277bad49cb28fd8bf235b236b4da8809654d9f7b7aba934b48c7b6e23e35e88d2d87bb227d
+DIST kdeedu-data-17.04.0.tar.xz 798820 SHA256 5eaa48889845ff90e5a36dfd5f3d5c299824d020261b7b8fcc1c6c5cbe881dce SHA512 909159ec57d30ec35465be1a2a246598adcb495ef0aef539f497f0972733edf53afbbdd3a3adab89fac282045188c4446e3462766a0735f9fe0dd8a129b60333 WHIRLPOOL 92352c3cab31ced97d0723dfaed097cc093ba8a6001a5ef0a2019b325ffc19c83ed2ad49ae71f644d79c8d856407d8422d98acfde120d5860b254a1e78bbd43f
diff --git a/kde-apps/kdeedu-data/kdeedu-data-17.04.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-17.04.0.ebuild
new file mode 100644
index 000000000000..55fac9a2dcee
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+"
+RDEPEND="
+	!kde-apps/libkdeedu:4
+	!kde-apps/kde-l10n
+"
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-17.04.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..1897d3fd1210
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
+HOMEPAGE="https://edu.kde.org"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_kdeapps_dep analitza)
+	$(add_kdeapps_dep artikulate)
+	$(add_kdeapps_dep blinken)
+	$(add_kdeapps_dep cantor)
+	$(add_kdeapps_dep kalgebra)
+	$(add_kdeapps_dep kalzium)
+	$(add_kdeapps_dep kanagram)
+	$(add_kdeapps_dep kbruch)
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_kdeapps_dep kgeography)
+	$(add_kdeapps_dep khangman)
+	$(add_kdeapps_dep kig)
+	$(add_kdeapps_dep kiten)
+	$(add_kdeapps_dep klettres)
+	$(add_kdeapps_dep kmplot)
+	$(add_kdeapps_dep kqtquickcharts)
+	$(add_kdeapps_dep kstars)
+	$(add_kdeapps_dep ktouch)
+	$(add_kdeapps_dep kturtle)
+	$(add_kdeapps_dep kwordquiz)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_kdeapps_dep marble)
+	$(add_kdeapps_dep minuet)
+	$(add_kdeapps_dep parley)
+	$(add_kdeapps_dep rocs)
+	$(add_kdeapps_dep step)
+"
diff --git a/kde-apps/kdegames-meta/kdegames-meta-17.04.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..6d311daebafb
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-17.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
+HOMEPAGE="https://games.kde.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl python"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep bomber)
+	$(add_kdeapps_dep bovo)
+	$(add_kdeapps_dep granatier)
+	$(add_kdeapps_dep kapman)
+	$(add_kdeapps_dep katomic)
+	$(add_kdeapps_dep kblackbox)
+	$(add_kdeapps_dep kblocks)
+	$(add_kdeapps_dep kbounce)
+	$(add_kdeapps_dep kbreakout)
+	$(add_kdeapps_dep kdiamond)
+	$(add_kdeapps_dep kfourinline)
+	$(add_kdeapps_dep kgoldrunner)
+	$(add_kdeapps_dep kigo)
+	$(add_kdeapps_dep killbots)
+	$(add_kdeapps_dep kiriki)
+	$(add_kdeapps_dep kjumpingcube)
+	$(add_kdeapps_dep klickety)
+	$(add_kdeapps_dep klines)
+	$(add_kdeapps_dep kmahjongg)
+	$(add_kdeapps_dep kmines)
+	$(add_kdeapps_dep knavalbattle)
+	$(add_kdeapps_dep knetwalk)
+	$(add_kdeapps_dep kolf)
+	$(add_kdeapps_dep kollision)
+	$(add_kdeapps_dep konquest)
+	$(add_kdeapps_dep kpat)
+	$(add_kdeapps_dep kreversi)
+	$(add_kdeapps_dep kshisen)
+	$(add_kdeapps_dep ksirk)
+	$(add_kdeapps_dep ksnakeduel)
+	$(add_kdeapps_dep kspaceduel)
+	$(add_kdeapps_dep ksquares)
+	$(add_kdeapps_dep ktuberling)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_kdeapps_dep lskat)
+	$(add_kdeapps_dep palapeli)
+	$(add_kdeapps_dep picmi)
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+	opengl? (
+		$(add_kdeapps_dep ksudoku)
+		$(add_kdeapps_dep kubrick)
+	)
+	python? ( $(add_kdeapps_dep kajongg) )
+"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..7c80c71ed844
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
+HOMEPAGE="https://www.kde.org/applications/graphics/"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls scanner"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep gwenview)
+	$(add_kdeapps_dep kamera)
+	$(add_kdeapps_dep kcolorchooser)
+	$(add_kdeapps_dep kdegraphics-mobipocket)
+	$(add_kdeapps_dep kolourpaint)
+	$(add_kdeapps_dep kruler)
+	$(add_kdeapps_dep libkdcraw)
+	$(add_kdeapps_dep libkexiv2)
+	$(add_kdeapps_dep libkipi)
+	$(add_kdeapps_dep okular)
+	$(add_kdeapps_dep spectacle)
+	$(add_kdeapps_dep svgpart)
+	$(add_kdeapps_dep thumbnailers)
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+	scanner? (
+		$(add_kdeapps_dep ksaneplugin)
+		$(add_kdeapps_dep libksane)
+	)
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 3f56b62e6d92..6efb4c88e0ab 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1 +1,2 @@
 DIST kdegraphics-mobipocket-16.12.3.tar.xz 13404 SHA256 829362ad385784ad389d05fa73ddd538f8731b5ff9c6030bd287ab1691b7f81b SHA512 6b6da6075124fe0ba0c0e8f74b35f4ac6a887c2cae5da6b76d3e21e95ae71e0dfe35860ceeba70c73f6a5d5aa00420b0d9dd28310a95a688665b6fdfcc3b981c WHIRLPOOL ed8c3b125aa2bfd91738f3879885da683bf262e323c37cfd552653f8aceccc0db0c471273da1ae725eff924dc8e710a8dbc342fd380d65e4254f1258054db064
+DIST kdegraphics-mobipocket-17.04.0.tar.xz 13408 SHA256 03795ec8d2709c00123a87097132ae63bcc2b649953b278dff804f76ae514749 SHA512 cda8ebc86fb0b039d410cbd382ba18e3cd6c13e83d9e5d4b211dcb11e6d2a948a856d1127accec39a7a2621460e63d50fba80692242db0274f95506b4af344d5 WHIRLPOOL 1d5b4c29886244ceb10b87cc0b4ef0eaaad074886aaffba6bb0fa838e70cd06b87af9bc7c782c394dab66496b3dcd61e1f0a18456b84a34dcb684d3f731e76d9
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.04.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.04.0.ebuild
new file mode 100644
index 000000000000..71bb409bcca4
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library to support mobipocket ebooks"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+thumbnail"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	thumbnail? ( $(add_frameworks_dep kio) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_thumbnailers=$(usex thumbnail)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..c9fabbc9b4c7
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="
+	https://www.kde.org/applications/multimedia/
+	https://multimedia.kde.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ffmpeg nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep audiocd-kio)
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep k3b)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kscd)
+	$(add_kdeapps_dep kwave)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index e0751ed8f17a..655a75fce74f 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1 +1,2 @@
 DIST kdenetwork-filesharing-16.12.3.tar.xz 28116 SHA256 07f677cbaaf8ea5b4e172f769fec4bb7657b180adabd4ba5680e2aaf0ee6850c SHA512 aa5793ffc0ff3c33554e0e0f4c8167a0d1cce03a72c4f1666cef89b37ae412b98caaaf916f76a0c15ee45e64e2528fbe871bd497c343d67e039deb1252b17cfb WHIRLPOOL 2ba0f7afc68f049acafec21c23d70c3a1eab0bb8ad7c30a43ff57cafad83a364b0be69c226b6e55feb5b14c1214b11be56f0cd6ca06f8478bc2268b35987d8ce
+DIST kdenetwork-filesharing-17.04.0.tar.xz 336448 SHA256 8c7c517496627496f2ff47405582cee4199376d3e5462b8ce5638b6f7b20d69c SHA512 c8c355e74b153e11bca588355f987c559c060224d5b2706b5c98a119827f626f4a6bfc33b3c73b8b92b3abeeaaeb09cd3bdd49079b7933004493237158066e52 WHIRLPOOL 6fd1c52960b3b1f8b951ec6f9ef124a8045ed00e2d7ee25a786843196c7248eacaf1cd3928711d9df5b2b345ba2ca1977e3ff28fa8d8462a240051cd26a8fe35
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.04.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.04.0.ebuild
new file mode 100644
index 000000000000..575b4fd41215
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kcontrol filesharing config module for SMB"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..4468332895a9
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-17.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls ppp"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+# FIXME: Add back whenever it gets ported
+# $(add_kdeapps_dep kopete)
+RDEPEND="
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep plasma-telepathy-meta)
+	$(add_kdeapps_dep zeroconf-ioslave)
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+	ppp? ( $(add_kdeapps_dep kppp) )
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index eca82e368866..5770e913cdc0 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1 +1,2 @@
 DIST kdenlive-16.12.3.tar.xz 6623112 SHA256 a04d5a957bedc31834379122e597ba55e1474246376d661c535979007a76eafc SHA512 cb30948b999fb2c95d64e97f12f96cec460bf12bc5f5b9b8bc850ccc58bd34fcd709a2ea94c5373e04fc1e4fd82a48e58f5872c268f771ba6f83c47fadabd553 WHIRLPOOL de92f61d298190576d085579841af6569040b2bae2368eb2c545a59489ec1d4f48ecf2f7c4fa1352563e38a27f875943dcd455ec979ff05a0d35c83b4bf767f3
+DIST kdenlive-17.04.0.tar.xz 9356848 SHA256 e4944e52ca5cfe2a66dcff39fd12be7aa8e696167fd514a70e90b9f2fb1fa94d SHA512 02459ebc3fc5d667edfa877575def7dbd18359951c9684f3af1a5048e81ee9e6ebf50bbe4a3cda703351314d57f0f436a8b16f2c6dbe53f31cf0a14cbdf1c8fe WHIRLPOOL 1886083d4fdee1412ccbf9d9005721e8a39f465fb83686d89e14c9192b32e815b687d6f97092b90c90582aa149f6e9ab5d6cb6a8e32837acb24fcaa1e2cbfe5c
diff --git a/kde-apps/kdenlive/kdenlive-17.04.0.ebuild b/kde-apps/kdenlive/kdenlive-17.04.0.ebuild
new file mode 100644
index 000000000000..563c0c6efd41
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-17.04.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui 'gles2=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=media-libs/mlt-6.0.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
+	virtual/ffmpeg[encode,sdl,X]
+	virtual/opengl
+	freesound? ( $(add_qt_dep qtwebkit) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	v4l? ( media-libs/libv4l )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
+		-DWITH_JogShuttle=$(usex jogshuttle)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package v4l LibV4L2)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 34f7541f5f57..8d17d02cd27e 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1 +1,2 @@
 DIST kdepim-addons-16.12.3.tar.xz 332412 SHA256 b5bede3a4b4c29905e93159d18c5fcb6f536e8c1097b25db09fa7877e23e15c3 SHA512 9c05101f39a82fd595e8e4dd07a401301679b57ef2515bca3f022df210a263e7a568553d5dacac87254ab8bee03eb005cae3cfaee15fefefe957d30d97c26ec5 WHIRLPOOL 4aaf03fb1cdec97fb420b50861658160d8d69d75a5eaa374b930695131b06f33c830b18712ffc24f20eea2d0b9842d1413064d45ad90c99f6cfafc4bd9283ce8
+DIST kdepim-addons-17.04.0.tar.xz 1924848 SHA256 adffa921aaab52048c7ef52750f875cc7c801a93dec95a351456406b6e7a1e07 SHA512 63d84713ace01451f08845a550549b11aa8360b4ba9037446b933a0223393a04ce177ed5bd59f5b81ac5b392c3db52298b2acab4539946c1de0480e6722acd5e WHIRLPOOL 0044a4153145179c6aa84578513dfee37fcd43a03259157308fcfb015b2c36f53223c7058d810a4dfa222c849ce3920f6414ea8701cdcb66e58b9eed2a63d7fe
diff --git a/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild
new file mode 100644
index 000000000000..d67d72ba461e
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-17.04.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 884974f9d80f..1b2e7a588246 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1 +1,2 @@
 DIST kdepim-apps-libs-16.12.3.tar.xz 48084 SHA256 fccbece968597c910dfa11a418a557007dadbf53dd0e82f4ea38de73c6d593e0 SHA512 4c4b7a802f470b92acfbd5d961d9f48896c02891ae26c9852b585f7cdcddff3537bb15c22e0db4e39f4f12996571ccb9c7d17d1d5dbd31effa57e52d92d1318c WHIRLPOOL fb373f25a4d0d656306b98f0a558af5d0c5ed9d92895ecee4054d27b16048657e7b6004e93659d2942bdb923da6d40258845ef9c828c35f5d18b959ea36cd3cd
+DIST kdepim-apps-libs-17.04.0.tar.xz 72808 SHA256 76b43cede6b3de2971f6904a9058a9e30f4a74a060d6e67d717cfa8f58602f0a SHA512 766eef3d70b4b4a1de00b58a4b8343d771874df83f1a8e9f727a249ec36b64e1eddcba719901348b9d7ed90d31e62fd15a35fda3c15dfb0c451acb2d7d1dfb9b WHIRLPOOL 3b1a0e78e1045c2822af130e830767d5f30086168e474a26ff47d4ff21323c619f13714601aea201a2e176deb28e68a8f22fc5aef43b9b2ad1cc0b2f379772f3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild
new file mode 100644
index 000000000000..cbb67bc0ad31
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for KDE PIM applications"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="prison"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-libs/grantlee-5.1.0:5
+	prison? ( $(add_frameworks_dep prison) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package prison KF5Prison)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.04.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..df9da495df59
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.04.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="google"
+
+RDEPEND="
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadiconsole)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-import-wizard)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep akregator)
+	$(add_kdeapps_dep blogilo)
+	$(add_kdeapps_dep calendarjanitor)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep grantlee-editor)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kaddressbook)
+	$(add_kdeapps_dep kalarm)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kblog)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-addons)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kleopatra)
+	$(add_kdeapps_dep kmail)
+	$(add_kdeapps_dep kmail-account-wizard)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep knotes)
+	$(add_kdeapps_dep konsolekalendar)
+	$(add_kdeapps_dep kontact)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep korganizer)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep mbox-importer)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pim-data-exporter)
+	$(add_kdeapps_dep pim-sieve-editor)
+	$(add_kdeapps_dep pimcommon)
+	$(add_kdeapps_dep syndication)
+	google? ( $(add_kdeapps_dep libkgapi) )
+"
diff --git a/kde-apps/kdepim-meta/metadata.xml b/kde-apps/kdepim-meta/metadata.xml
index 2fdbf33d963d..d52095404d1c 100644
--- a/kde-apps/kdepim-meta/metadata.xml
+++ b/kde-apps/kdepim-meta/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 9510058a77f5..403e0cfc48b1 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1,3 @@
 DIST kdepim-runtime-16.12.3.tar.xz 738376 SHA256 e1ad03f80737bc4afaa101f108430b011ad2e2c1349e477a66ce59bc901fac48 SHA512 493ece3861d98c171d74a3749e57b7b04b1537c2cf1c3a1cec002d93468ab6e87edaeb9aff623dc684303807da58c38e256901e86fd0e49362c0a6f5281848cc WHIRLPOOL b7e3859429ffacf2a48bf7227cd0beae48d4ab44fbee4886db55f62b684b3e4cda9274183da94ab72d37b5483a0dca281a6625a547f4c36969162f56929182b6
+DIST kdepim-runtime-17.04.0.tar.xz 1492136 SHA256 b46d3db769de31b758c49a881b8e0b1869ada82f39ac282c28280980b1a59201 SHA512 43a0e4973ba15a26b7e7f77ecda3883479650a759b8754d05ce237375d2f10b9b57b5512e54b1a5bf7ef131adb5cfee1a7d9ec8285668e7bcf42c1bab53a647f WHIRLPOOL cd96098787624b50ae177dbbccdb9842697cf882ffbce020528012372d06c63f95637d6168cfd6bda5c7bf4d5795e8988c9f7467e36a3ecadd8fd73c939e18ee
 DIST kdepim-runtime-4.14.11_pre20160211.tar.gz 1655057 SHA256 00d0c78d84850b1619c22550fd938c0e016d1765a04623bac25dafffc6105b49 SHA512 6aeb3b35dc84a1cacc18619af5f7ab65175a31fbfb9a1d11d30dc98c6dcd3f40ebd18a90d2d02421b6a38fdc4b4d77f9fa6853c523a60910e92367f25932c45e WHIRLPOOL c14c3f9b85b7b157a9f274f4c74c687ae0e85e8b3ea6aa0756c640ff8f5dbcb3311366e3ff6c490a29ed7697a7a51c75ca6de6cef8b3ebf28f7da640e7eb149e
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0.ebuild
new file mode 100644
index 000000000000..d6b96d27b118
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="google"
+
+# TODO kolab, Qt5TextToSpeech
+CDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep kalarmcal)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdav)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	google? ( $(add_kdeapps_dep libkgapi) )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libxslt
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-kioslaves
+	$(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package google KPimGAPI)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index 8a41acc29d9c..c51813fe9830 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1 +1,2 @@
 DIST kdesdk-kioslaves-16.12.3.tar.xz 361716 SHA256 12eac5f72e47a8e676cee45394a989963f572563debc014d30c688a006b9f89f SHA512 9d0e885dab3c23fde24845e19dee9e10d94ac32e8eac68b3bf37f33eeb4bc838e33c6045957d3c2aa37523bb5402391c9956efe8b68c862f03b261fb80c895a2 WHIRLPOOL 8d987c3c9754a96425a923f4a0be93442ad337b89a47f9a79c8a880cbde9607379dc45eb7454ba46c4c46055ab1de24c19020cfbf57e4de55eb78c092c7bf862
+DIST kdesdk-kioslaves-17.04.0.tar.xz 41180 SHA256 18acd2550a8031e1a2ffa7926ce4272590f6f529ab209b9018f14432e617d2e5 SHA512 5bfe11bc896bc887f6d4e162cfae3eb406fa2792fee2818952a1eeab2843ef5f81893908b65a43a666493db93fbf42c0d9526ac9514b34fe03f13cceba533e0b WHIRLPOOL 19e9622a86cfb6a992208ba453a205320b8f65d4bf39db60b3f64a703ac713efa42f3f379fbfad3efb32c9d60262fdd2f02829ea32a41b85f4e7fccb262de185
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.0.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.0.ebuild
new file mode 100644
index 000000000000..80d32b7dd965
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	dev-lang/perl
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.03.90:4
+"
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-17.04.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..604f788e879a
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
+HOMEPAGE="https://www.kde.org/applications/development"
+KEYWORDS="~amd64 ~x86"
+IUSE="cvs"
+
+RDEPEND="
+	$(add_kdeapps_dep dolphin-plugins)
+	$(add_kdeapps_dep kapptemplate)
+	$(add_kdeapps_dep kcachegrind)
+	$(add_kdeapps_dep kde-dev-scripts)
+	$(add_kdeapps_dep kde-dev-utils)
+	$(add_kdeapps_dep kdesdk-kioslaves)
+	$(add_kdeapps_dep kdesdk-thumbnailers)
+	$(add_kdeapps_dep kompare)
+	$(add_kdeapps_dep kross-interpreters)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_kdeapps_dep lokalize)
+	$(add_kdeapps_dep okteta)
+	$(add_kdeapps_dep poxml)
+	$(add_kdeapps_dep umbrello)
+	cvs? ( $(add_kdeapps_dep cervisia) )
+"
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 702b5d3cb23d..339f8853a17c 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1 +1,2 @@
 DIST kdesdk-thumbnailers-16.12.3.tar.xz 11484 SHA256 30e969535fb07786469815a4f9d37fbd05a8f7f3c9a29cc496559a80fd355a5c SHA512 00f4e110761a6ca00656a3139eb717fbc695ce485653a3882ac36bb1da47e77590801058e015e867315c7c529543d96d284ec5c559b9ae09f4b1019fd4bebfbe WHIRLPOOL e9ceb0a8e5d0fd05f3a0b18e58889f024ea8d3a3bddb918a17405ebec524dc357ee19ec46f628219e91bac993a2fff62420940ff04d5320ce53d6fb49a0dac5b
+DIST kdesdk-thumbnailers-17.04.0.tar.xz 17144 SHA256 099de619bc780fb4b13c8a5c4f9bd4f4824d554f5deb436d78030126cc7cb990 SHA512 cef0db0a9306f8ca085a3df29aca8770d964107be9033138bff5273a7aea1b0644a5918894fdbb4468d3fbfdf1a335b41772b3e08d2f2ca1ff78b5affd5f3d19 WHIRLPOOL c0c4eb9582f12b46b3ed605ac737c23efe2a752dc1307486ca14e5eae5966f1d527d34f649b6d57d3dda74c418053c9b1ad9a1a9d04ab055dbcf936d7e6d7e6f
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.04.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.04.0.ebuild
new file mode 100644
index 000000000000..13ef975ebc7f
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Thumbnail generator for PO files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-17.04.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..d2f16d01b86c
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
+HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
+KEYWORDS="~amd64 ~x86"
+IUSE="cups floppy lirc nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep ark)
+	$(add_kdeapps_dep filelight)
+	$(add_kdeapps_dep kcalc)
+	$(add_kdeapps_dep kcharselect)
+	$(add_kdeapps_dep kdebugsettings)
+	$(add_kdeapps_dep kdf)
+	$(add_kdeapps_dep kgpg)
+	$(add_kdeapps_dep kteatime)
+	$(add_kdeapps_dep ktimer)
+	$(add_kdeapps_dep kwalletmanager)
+	$(add_kdeapps_dep sweeper)
+	cups? ( $(add_kdeapps_dep print-manager) )
+	floppy? ( $(add_kdeapps_dep kfloppy) )
+	lirc? ( $(add_kdeapps_dep kremotecontrol) )
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+"
diff --git a/kde-apps/kdewebdev-meta/kdewebdev-meta-17.04.0.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..e19083b802ab
--- /dev/null
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+# FIXME: Add back when ported
+# $(add_kdeapps_dep klinkstatus)
+RDEPEND="
+	$(add_kdeapps_dep kfilereplace)
+	$(add_kdeapps_dep kimagemapeditor)
+	nls? ( $(add_kdeapps_dep kde4-l10n '' ${L10N_MINIMAL}) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 4c5fa57ba244..8c76b700ee46 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1 +1,2 @@
 DIST kdf-16.12.3.tar.xz 144000 SHA256 8569720871f0c06a47dd93f1f6c18bf854b92592bc5f0dafeebd300ac38a0294 SHA512 f9a5612682341fb2bb4c1f3adefecbd7daef66dd42d6d1ad3c01ccb73251b4fe0191c66b3a4cb642ea999a10b60528de7897d0caee330f9c3ef4466814e21027 WHIRLPOOL f5c8a847429c48cdab5ac8bdf2229b3f9cf8900a027af5bd9f78392da791199a060675aa8e21d8ea96e80ace65da3ea02f6cd758da5699bd6c3dcdaa0815a6b9
+DIST kdf-17.04.0.tar.xz 529664 SHA256 cdadb6d4a52296ade91d8967e10af6f4d3465b3506c030230940083352b95bad SHA512 bf8a7d3ddc6976091ba41735b94676739ec6b136e7f00e8aa600bd672ef60d75a59a2ab38adcc33849e8c25f9266629115c6c26a18ffdb0fd2a6f5552cbf4616 WHIRLPOOL 47b7b6ea47b70aab6ba31a8160e1611d2b4019a118de5b920b83635988e4114fa4ee439c17a88921dcd4bb623ea0eb9d268a1eefd580087ed166495ca0c481ab
diff --git a/kde-apps/kdf/kdf-17.04.0.ebuild b/kde-apps/kdf/kdf-17.04.0.ebuild
new file mode 100644
index 000000000000..9cd62335f961
--- /dev/null
+++ b/kde-apps/kdf/kdf-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="https://utils.kde.org/projects/kdf"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index e54fbda7dca8..3630d773229b 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1 +1,2 @@
 DIST kdialog-16.12.3.tar.xz 31952 SHA256 b0c267d0e17c438be50eac36482db2dce11ce6160cc372c56c59a65e7e562b98 SHA512 f74f73ac2d021a5487e7f5e55dca6248a9c99e773c0bb453c136ec4ea34f5c65db63b08f6fdeba5e52b2e42d867732e5d1b3bb75a684236122be597e7bf3dfa6 WHIRLPOOL 72fe0f1ba97432bbba6ff377d9ced911882b2be48946d76dcb2e389aee76bdeae64a04b788d0db4b97c10fb813dc5107af3caddc46f09cb1bf3423dd4235d0b0
+DIST kdialog-17.04.0.tar.xz 92840 SHA256 0b82511ad2b93645067d0e284f8751504b83584b0eb94a95cc89a454a775b46d SHA512 e6c33f1e1d657b43c071526277b226df131685057102fd33009fd8c9f879c861b083d79d7ae9d7ed2f72924aeab8d988ad99d9d1ad5d11ef62af97e0ab376382 WHIRLPOOL f1b83ef646a316451cca05cade9d498df3578dedebd600f1e19e8d27fc29da2ae87ab659508d42deedf826243f77fa6eb9f8cd5a8f8eb06f3c22d17d4af2ecdd
diff --git a/kde-apps/kdialog/kdialog-17.04.0.ebuild b/kde-apps/kdialog/kdialog-17.04.0.ebuild
new file mode 100644
index 000000000000..76010e0f8189
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-17.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index cef5a67b5b96..a4389b0e19aa 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1 +1,2 @@
 DIST kdiamond-16.12.3.tar.xz 4555008 SHA256 ee121bd9ff51e206fd19c39882f9a8b82a0ebb46851de1e904f0969f9f4db061 SHA512 e8b5361709b83f112beb9ef7eb92f845c274f2b2bfb8955e46c24f373c8dbc324e45382d6c84e56002c36d0f81011a9cc0c511af751381074df1c34b9cf16cf3 WHIRLPOOL 444c2b517f4c400e5a2b7b009e1fa20943658ee64184339cd27c299949d3e1f50b28549790756e21669fe33797284addb8ac89065bda8986606c6b220d03cb5a
+DIST kdiamond-17.04.0.tar.xz 4608496 SHA256 7c248803da1517e837dee9334a241ee3b119d0b964c927dedee723719faf3508 SHA512 02f6c22fc703cd117b34ae096950592a449ad206f0e5a1816ba98b2a24cf2818c97bb4ab68401b49c0c170cb3b7b4f084bf2412d7367f08301c02b102ce2c6ef WHIRLPOOL 8b2e8a6c22fad4b71909575e0b8e1d9a9b777798b155c3d8cde17228f46fb464110430df885dbc376b9348fec57e9f83f39e10fbaa9a25266bf4891c9ddcf26c
diff --git a/kde-apps/kdiamond/kdiamond-17.04.0.ebuild b/kde-apps/kdiamond/kdiamond-17.04.0.ebuild
new file mode 100644
index 000000000000..11caf8e09b13
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A KDE three-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kdiamond/
+	https://games.kde.org/game.php?game=kdiamond
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 166dbc0465ae..d93f3f4ecffa 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1 +1,2 @@
 DIST keditbookmarks-16.12.3.tar.xz 64068 SHA256 5628972b3d82b144d5da855049539a183b646664c4aebcae61424a4dcb92c336 SHA512 4df209179344195b8816d16a168bfe7bb0d5a61b9e6ad2af5fc0615e03e472801e41e5a8e44c0f97dbde7e4d7220b9530b3cdb235a508746672a325a270f52f9 WHIRLPOOL 8fe9269c552c1bac044e21fde1a6e9442734c0644bc04e69bf5c9b8eb9e150b307c787255735f6b4ac1de4c6e5123e57f596d7ac196396db8070e3f458b02335
+DIST keditbookmarks-17.04.0.tar.xz 182732 SHA256 e80d4b3b4848d3919452884ecf971181e29aefcb638e086f9e66ce3289594ab5 SHA512 f93c8cff428192f642416a3199869e87506593d6f0f3c7daa56dc40cbaaab5b3818911da9e211c493f638add12d3d54bc7c38febbb05f81da16c591e6028c1c7 WHIRLPOOL e138dfc26542763f9795d1cf538a849fb5f6c329d165c684bebbccb6a6bc3a952318c7a8678e99182c1f481facc557430dd918775dfadcf2b071801179b6199f
diff --git a/kde-apps/keditbookmarks/keditbookmarks-17.04.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-17.04.0.ebuild
new file mode 100644
index 000000000000..2a30d5dec5f7
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Bookmarks editor based on KDE Frameworks"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+man"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<=kde-apps/konqueror-16.08.3:4
+"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}
diff --git a/kde-apps/kfilereplace/Manifest b/kde-apps/kfilereplace/Manifest
index 5c513c2892c7..afaf5752251b 100644
--- a/kde-apps/kfilereplace/Manifest
+++ b/kde-apps/kfilereplace/Manifest
@@ -1 +1,2 @@
 DIST kfilereplace-16.12.3.tar.xz 763584 SHA256 4a72bd3160b82d7e92e267d6ef508adc5cd9a28abd1b0fe7498f4b3feb4ad53f SHA512 e36743b2b920bbf155de48845763f517342e23c8cb1e802eea64cca34de33a3489e3a1845c3193efd435819c24ee86d84400f5ac79df91ee089c8b4451c0b5a0 WHIRLPOOL b120816744f1c25f26cacc6f778c8936f5057915ef3d8d127795b8819ecc261ef602d61e48f728098d2d47ee3a581e80cc436024b290f96c1a4d36ff3ad7f676
+DIST kfilereplace-17.04.0.tar.xz 763572 SHA256 5e736e9eba0171b8555bd70cd84751ffdbabd8d4a732cd18973ee83bd3362c5f SHA512 4db32f2ce8c5913c36cb7692173942de3a8b164260f847da5513d79c0a96c90cac4abfb2ad30b56335627a1bac2fd298475b7afff8e23d9fe64017089bbe5698 WHIRLPOOL 2c900824a10d1b0ea0576b22d842362270f020caa22629f2d6ef95891945ae5a34c9083eee5d10941472c637f244fbf9e9d85df5f8a266c5f05304c703cb0906
diff --git a/kde-apps/kfilereplace/kfilereplace-17.04.0.ebuild b/kde-apps/kfilereplace/kfilereplace-17.04.0.ebuild
new file mode 100644
index 000000000000..dbfd840699e8
--- /dev/null
+++ b/kde-apps/kfilereplace/kfilereplace-17.04.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Powerful tool to search and replace in multiple files"
+HOMEPAGE="https://www.kde.org/applications/utilities/kfilereplace/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 290afc3bc582..01315921ac81 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1 +1,2 @@
 DIST kfind-16.12.3.tar.xz 61924 SHA256 523f98df8bff0cf9fa8b7454b6b2ffe33cbd18b1834ba34fdaaf9198fbb0f9b4 SHA512 e89d2199abdbf83625bd3f9920e5582813cd6e0953ba350f445299990e44953657ad8215af7d1cf1e7767520cb92aa61781627dbbf4a84648ca58819a8e003e7 WHIRLPOOL 715a487986131cc5fea15d7d5873e1bcb85ade7895b87d41dc8f80963ec452af0cb884d5108bc81f15c4166fb296f87494930f4395a62878f9041e682d3a346d
+DIST kfind-17.04.0.tar.xz 210148 SHA256 021840fba37bee4a907a023a352d21360000b28e3b932fb33b38bb1138f51422 SHA512 d37205fe66ffc7542c5f40a41a744649b911f2b28bd154913aad3a8839d01682605687433668dc9f7b67d4cf9462a8167bbd4b57f2d113849d0669aed57071aa WHIRLPOOL 2e8b5dc8f630bb9b15cc67c4de2d9c11dd8e7c9093d157945d2f5557bfde370ea338a786f5613469cf734160e991c8a1f10373df4e3182c1afeb3dbe18cde6ec
diff --git a/kde-apps/kfind/kfind-17.04.0.ebuild b/kde-apps/kfind/kfind-17.04.0.ebuild
new file mode 100644
index 000000000000..1631993a36ed
--- /dev/null
+++ b/kde-apps/kfind/kfind-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="File finder utility based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 43bbe41f52c2..66640bd8f5e4 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1 +1,2 @@
 DIST kfloppy-16.12.3.tar.xz 53572 SHA256 f74f3cc1f88182debe868ce2b390183a56b2daaed4a3575ff96d8a86e5cdaf1e SHA512 218b87056c3b6181d02612737020cf2305f165553a31ba7704465d25fbea6df3268f6981e4077244102d20a93bb02fd295a6f2bf65338e28f84c2c9cf330a6e6 WHIRLPOOL c2f334239fd26e0220e993dd65df0b4f374083544557e624038fc38d0c71c791dcc862473d4c0fa6401e2169705458521560236cae3489baadfff09cdd15b3f4
+DIST kfloppy-17.04.0.tar.xz 198924 SHA256 16e7c7e5e39bd426838d6e5560d5457ec0c0dcce70200948b6110f8f622e21b6 SHA512 733c8cc01b549c9f6e398d8b27ef4831be85a407c31c6e247194620462544a68add66b77bdc72c366efa6ac856ca0ed858a7242a8047e3378cab57635d242c18 WHIRLPOOL b41ff56780ce57029888f4e938ecf3d3bd32f8b388ee45dcc79190297e9e1682f6d4fc2bd70cd5333e290dca69e2892bf05a3b828a7d7ddd9f3065e07a105cee
diff --git a/kde-apps/kfloppy/kfloppy-17.04.0.ebuild b/kde-apps/kfloppy/kfloppy-17.04.0.ebuild
new file mode 100644
index 000000000000..38f9879ef1fa
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
+HOMEPAGE="
+	https://www.kde.org/applications/utilities/kfloppy/
+	https://utils.kde.org/projects/kfloppy/
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index b85bf9612c60..9f62b43bb27f 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1 +1,2 @@
 DIST kfourinline-16.12.3.tar.xz 460216 SHA256 4f931a875a0282e110b5a2bad49f8eab04ed29df5b6611d10bb1f4f73400ec20 SHA512 f7aa70e7dd668053ffac746692fb9023f56f68a27745321bdbfe20e3998ee439f1e70dc5cc2ced3b289187105919bb89988e32970253d9a975a9ec98b39cf11d WHIRLPOOL 3c5ff14f93f2b255b028be96bdd9cd1ce2516973548833bec2854a3aae3061a7ba308c984f3aa8653051bc6ce498082762681001a57b6e956a469b13e2454dce
+DIST kfourinline-17.04.0.tar.xz 573880 SHA256 a2da94f58f1f46f33d2cd67cb5dae132c4dc8077e0d9a10ebe6db9368cce3285 SHA512 6bb78eaef91fbaff0e332486eaaf2fb681268091b55928975f2c19e51eaaf649960e3471b553b90177c27c7c32bc0441974180467c43f1b0dabbec5197fc9568 WHIRLPOOL 8679e8f3f4ea32717d5606a396824a6d79a8557becd92542d7d53f4ee4a164613e008de8ab804bc1c4887f6d5af9b6b4d72886c5a26d14a8bd1f0025a2020f52
diff --git a/kde-apps/kfourinline/kfourinline-17.04.0.ebuild b/kde-apps/kfourinline/kfourinline-17.04.0.ebuild
new file mode 100644
index 000000000000..f86801c323d7
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE four-in-a-row game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kfourinline/
+	https://games.kde.org/game.php?game=kfourinline
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index c08c353be9fe..ee4ec4b823ec 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1 +1,2 @@
 DIST kgeography-16.12.3.tar.xz 6736024 SHA256 af5c8d17c4054b614f86b67f9e36eff556cab307156e33f8adf127212d00d3e6 SHA512 2ceccff5b6193b036efc66984691a7f89f2aaaff052809519b974485556e98b4747ddb5a3d986c9a87a0471ef193585963c2e304670002e87dfe784ce4ba2bb4 WHIRLPOOL 06653c24e925a9913f85a1c61a9e0f06e3a7a6bbcce72257e324252681e276b42605ec76c7aa2e210c5f6d9b7e25717dd0d982190c031423cf4d7872ba935d87
+DIST kgeography-17.04.0.tar.xz 10987488 SHA256 7f5844f029547b242994d5023044813285a9c25fe04aa6e0632a2a51c6be7c9e SHA512 3e64ad1cfa54cd0198106c9e2f27e91afca93541a654ca7e20c57e293f316ab2268ca630ee41034011a2e100d42fe7efc3675bcab57fad307ced493d7c4771e5 WHIRLPOOL f1b22d3b5f6f95f53ae964fe6892bc9a83e450d7a9aad280343a4740d70cc103528a766d74ed1eef810d01ae103f2ed59ab35c1e5e277c7f4a3a4140e76e480d
diff --git a/kde-apps/kgeography/kgeography-17.04.0.ebuild b/kde-apps/kgeography/kgeography-17.04.0.ebuild
new file mode 100644
index 000000000000..97161ee6d910
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Geography learning tool"
+HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
+https://edu.kde.org/applications/all/kgeography"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 478a993a2748..df058baa1c52 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1 +1,2 @@
 DIST kget-16.12.3.tar.xz 1082008 SHA256 6b22b9b6851792ee35951f2153ac7326e961c8e5acbc28dfe7ad3d43359d1641 SHA512 eebd14c2f7a40f040965e192f0435ec14926bf7e97bda757eb339cf4a49ed2636ab072cbdec0e4d7d08395461e8ae1863de77d18a2f267d3d8019586d776b511 WHIRLPOOL dc2469458399e37658f824c4f9248326501ee54a41bbf1bced4d5fb4418c8583c314fd81e0523b722e8d56065f7749f2b30180e876df00e3321cf54ecd52eebe
+DIST kget-17.04.0.tar.xz 1081868 SHA256 c73e1b1e2fa48809ebbb5c9fb82e85384a85ce739d1297b9443a25c3d2ce7524 SHA512 f6709e9ef5203ac5d337661a251e476e323a6155654282cfc50cdad36d965b7ea899612387eeec3e9e7741c797d4272db3b1a5f7d328e3ea33f0c228659433d7 WHIRLPOOL 9b5eb888973ab11be61fa5576f872b124ae24459c43ed2985f662273a93d448be83a2560eb210906089da11c0e88504c919f4bf4b86934d0bb9ac9714768a9d7
diff --git a/kde-apps/kget/kget-17.04.0.ebuild b/kde-apps/kget/kget-17.04.0.ebuild
new file mode 100644
index 000000000000..f970b6e8a3db
--- /dev/null
+++ b/kde-apps/kget/kget-17.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Advanced download manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kget/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug bittorrent mms sqlite"
+
+RDEPEND="
+	$(add_kdeapps_dep libkonq)
+	app-crypt/qca:2[qt4]
+	bittorrent? ( >=net-libs/libktorrent-1.0.3:4 )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_KDE4Workspace=OFF
+		-DWITH_NepomukCore=OFF
+		-DWITH_NepomukWidgets=OFF
+		-DWITH_QGpgme=OFF
+		-DWITH_KTorrent=$(usex bittorrent)
+		-DWITH_LibMms=$(usex mms)
+		-DWITH_Sqlite=$(usex sqlite)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index ad423562e3f7..2eeea6360a27 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1 +1,2 @@
 DIST kgoldrunner-16.12.3.tar.xz 2202692 SHA256 e47774c442477e736f392159da602a68e2fc7595aabb3dee1f4b0e857af91309 SHA512 82bde84e3b2f1edc27cc826a5c3624a1861da3343f176a35cccfde1b9dd96205fc59098d72270e69c371c08b460852ac32eca7d022223aeff469580541fc9139 WHIRLPOOL a3ded15210e6b07d09d31fc80691719ba002785fc9ad333f1133298b0701331c69bbd057552b831fcc73c36ae1a7db2d0ad2a006af6dfc1f35ae8a903ece3a0e
+DIST kgoldrunner-17.04.0.tar.xz 2202636 SHA256 099a389e3eb842e384cb758561c790146da3e3514a13ce5f9396069b696bc4c6 SHA512 aed5d08d0249487af4f1f6e8868d657605c4b893ff25c864c237966b25e4b2dcf5ade2447032bf73a79c488325c2f553c8152197681a305781489021ff4f268f WHIRLPOOL 55091962b577bc4e05f358d6f134b1b2ddb0d0cb01a360a33f6486d2c341100a9b1ffe6bb079f7e2734dc22dcd845f569a2a5b79d99efe22f65da19b2314fca0
diff --git a/kde-apps/kgoldrunner/kgoldrunner-17.04.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-17.04.0.ebuild
new file mode 100644
index 000000000000..c04356beb477
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-17.04.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kgoldrunner/
+	https://games.kde.org/game.php?game=kgoldrunner
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 9c8dd91acf91..e9b6a3dc1a32 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,2 +1,3 @@
 DIST kgpg-16.08.3.tar.xz 810340 SHA256 1724c0fe639c8c89c17a8a7f9d2d30bf9701bb3194684a68a664b3b8e908799e SHA512 84fd34ebc393ee2c500a5ac167256fa54d98f48aace6ba150a0dc611d3161b5931e52f19a81ec70fbc7ef9354991c7cd00872ed88fbcba99642064b1d83c3296 WHIRLPOOL f41c10076eca9b05166a1357b96602a99e763076aa49ae18201401b5747e1e0b937406438ad95563ca048a4e1d44716373bb84d6ea564d4f0d52161d4ea9f322
 DIST kgpg-16.12.3.tar.xz 817636 SHA256 bc6b7c037eedf2e672a34d07c7c1044785e8a7dc3e38d4a6b671832b64097029 SHA512 0045343e4dcc1ec73e018c912bef54e3c2a71c424c5588569a62d180eb4f1c18aa9846d45a4eacc938cdae57091b882cde5ce68a6da09807dcadb01f3b5af461 WHIRLPOOL 50d676f47e3c1985ed39da300f12e6e1b3af8cab1693ca295fb523c8220f3112417fae2de3432bc9a3f6bee06e03ff890415596198b98789fe2c8303c3a2b875
+DIST kgpg-17.04.0.tar.xz 2823928 SHA256 dd50e61a2946b2fe91a803c9fbec71f5d69a5de77dee4aeeb8c5fe5bc6f737c5 SHA512 7c9c705befa2bad7c63339516f724420cd48d93cc88b099354f976fc8ab6ff2aebe0251f69a868f1e0fed0de95be452fc18b4d81efa9ee478eec15e35fb6bbdd WHIRLPOOL acf00e9e3612704b48b401f0385a17e64ed1da4df6cb998186bf2a2483b6377569a9feb52d6b726e08fec96333f8b86f88e293f92c63271c3101861f17c03abb
diff --git a/kde-apps/kgpg/kgpg-17.04.0.ebuild b/kde-apps/kgpg/kgpg-17.04.0.ebuild
new file mode 100644
index 000000000000..b5eabdcbb2e7
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-17.04.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="gpg"
+inherit kde5
+
+DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
+https://utils.kde.org/projects/kgpg"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	app-crypt/gpgme
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/gnupg
+"
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index e1857a637373..a5f9b136cde9 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1 +1,2 @@
 DIST khangman-16.12.3.tar.xz 4272212 SHA256 3fe04b8ddd85c52cbcb5dc4acc6573ea06f778e2acd3a38254c31a95f28bce0d SHA512 ad95f2b3d8b0f048c530c07fb300d790037c19601a6cf21cddbbe3ebd88c14b1b0133408a014801e54317b4132989d555b8a40cd5acee2b341d58fc98e8e7f2a WHIRLPOOL a3d249c1ccd43296491bc519517105e97129af199581951ebe486862581577307e76929b03936027725ff03b27d18e3dc1e4f7cfdc8cce9d72c50e0e577b2c43
+DIST khangman-17.04.0.tar.xz 6297092 SHA256 2d2d143531bf10a07dd2f92fa5d0e853055341061116ba0a5a9cd30a3756ad91 SHA512 e41303f43b3dd341b7d225725da11f050171ac82efc9c62563eda6640fcf8a8f9f6aa382db03eabb661e9a646d60dec3641369d6f9b120aa36c21debb28fe840 WHIRLPOOL 54758f9de2cb9e955307898f74e26992e88560cd578da9c8934ba758387f04969fdbaba7b5366b9faf46bf610690432792c0f8b5af07d50945326ab2d94f03e7
diff --git a/kde-apps/khangman/khangman-17.04.0.ebuild b/kde-apps/khangman/khangman-17.04.0.ebuild
new file mode 100644
index 000000000000..94d7e41370a8
--- /dev/null
+++ b/kde-apps/khangman/khangman-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Classical hangman game by KDE"
+HOMEPAGE="https://www.kde.org/applications/education/khangman
+https://edu.kde.org/khangman"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtquickcontrols)
+"
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index b60333da4e77..926cb365ff0a 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1 +1,2 @@
 DIST khelpcenter-16.12.3.tar.xz 1464904 SHA256 a74a1997feae8abdb3c00ad6afbc9cb1679a6a9ad4afe61f5ff0eb25a5641d80 SHA512 c40568e0540540f0b34b117106436d81422559b0d43a0d2a4530a7adefc8a1659a55c6af2c853f8e1e200102980b79d24b9cd8fdca8c8fc8ecd224c3bf648d0c WHIRLPOOL 099e33bbcd4ea56794263827f8459b297e8df5b2f480a454ca3fe3a2b8eeb76451987082d6c5c4c60669a15bfe4da59400fbadc289902187142f2254b8ef80ab
+DIST khelpcenter-17.04.0.tar.xz 3008684 SHA256 b6cf699760ed6e2061b6ae8eb1651408f524396087e6ecac91e7f1b55160a883 SHA512 f5a657788002b4a8a3e3751442b9c1fa6d764bf1fbadf56c80df9be47c29f059afd71477026fc16499e7ab8acb45a9fcb5a86158a92cada27cab7e82d98d5b4f WHIRLPOOL c50eeb4a0ea84eace8ff1265011c4cbaa5a22adaf7bce777684ef8adf72da9fae5a12f820954db5d6f19b4903ce00d813d8a7cfcd0b27ea42c0b1129d9a6873c
diff --git a/kde-apps/khelpcenter/khelpcenter-17.04.0.ebuild b/kde-apps/khelpcenter/khelpcenter-17.04.0.ebuild
new file mode 100644
index 000000000000..637ecbbefaaa
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-17.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxml2
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
diff --git a/kde-apps/kholidays/Manifest b/kde-apps/kholidays/Manifest
index d467b8b72988..1f43c0651451 100644
--- a/kde-apps/kholidays/Manifest
+++ b/kde-apps/kholidays/Manifest
@@ -1,2 +1,3 @@
 DIST kholidays-16.08.3.tar.xz 175788 SHA256 c9b65d292115b641edeff0db0d060d79630d23df569370ddce886f230a13ab43 SHA512 6718fe59a6ce183d44cf1480797ffc00de2e8f1c6a98096a51515fb0e017521edae577306169b5138241a6fd98fe7c7c936bdcfbaaae8d20db971aae8a2c85cf WHIRLPOOL bfc73fca863eba0aa40fe8a7ba94fc81c246f35052fd18e21a93d26f83bdfe1f2ae91d8131677446f75f0cbc129b3a7febdf15e76c7e3aa8fd4b05f68f195c3d
 DIST kholidays-16.12.3.tar.xz 176868 SHA256 4d8d84c388489e6f990101bb8c6a8666362dd68fc9131b9d3f70d86a2f9e3c26 SHA512 21338699f7b5a8e6ea578a817ee986ef003f806ce7ac11897654594c82b52601e62c1cd49154822cad749c21f67e9d765916fcc20be3e2c116c0543ce274f37c WHIRLPOOL b2be67d6e4e969f629907f9619f94de53eaed58d28a3bdd68846e31c52545728ec3809d9c7aeeb91f84fe0c053678e6f204618962e0210f573717698b5078533
+DIST kholidays-17.04.0.tar.xz 222480 SHA256 67e14241fa15301efd83f6fafe4acaba617c7f64f11dc46ab73ae5bd4ea80d4c SHA512 55c24e4516df9be6a21c5f5ceca214ec679ed9e8ed47e4dc71859e02b9dc77b2125488e5b0a31bcbdb37483a7cb4448a988c67b271571911d1afc38d3671e2e6 WHIRLPOOL ec6feab482e886c03d67ae6ac0105f0285397005d94e689ea02fd982132772975dc36808162448cd1784c2cbfc1eaa05184992a103af1c56c9d0e1266bf19b7b
diff --git a/kde-apps/kholidays/kholidays-17.04.0.ebuild b/kde-apps/kholidays/kholidays-17.04.0.ebuild
new file mode 100644
index 000000000000..16371373edbc
--- /dev/null
+++ b/kde-apps/kholidays/kholidays-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library to determine holidays and other special events for a geographical region"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+"
+RDEPEND="${DEPEND}"
+
+# bug 579592
+RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index af91d3cf454e..e1248cbee6b9 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1 +1,2 @@
 DIST kidentitymanagement-16.12.3.tar.xz 38284 SHA256 772fa8b0e1d6b80a2eba13dc44260c4239399c9b8ad83a81113b1f061b6743ac SHA512 ef1109bdea2f6affbc3a252d524546b244284b2d8727ff287298d818a7084610b5709c5f0a53d2c14bcba86a1571c802fe3b20860d2b6c0f9bcf1195357dd15c WHIRLPOOL bf45b1ea599cf10de21d3ca08071fa717910265bdaf1a3762a645fef07b50a045a4db4ef6166b1be880da6f2d65351f70e9968e86b18adc13013c52397114b91
+DIST kidentitymanagement-17.04.0.tar.xz 148044 SHA256 dcf1a929d71344f88cb6bac86cdee0d916eddd89604b8c0384e8fd00199035ef SHA512 8e824529bdf9f09bd8349d0904a2d718d40a5fb81fba13f04db8653c4eaf1e5955bd1a3f7248da7d6bdcfc075628f616ee72f8563ee5fc2733ecd980b47a996e WHIRLPOOL b19e842c853696cad15cff0657aabd328db83eb54eec9d612819e6c051e5eac9eefd5302a82a81b52c941486b512e5ec411156a7eba779eb643c0c605ae968bb
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild
new file mode 100644
index 000000000000..1489f5a6bd8b
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for managing identitites"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 42f450b7551f..b9c9576d5210 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1 +1,2 @@
 DIST kig-16.12.3.tar.xz 1517896 SHA256 1c3e53df5f1a47d396d6072e5532699cf78127a81d104ff6c7ea6acb787fd43a SHA512 b7cda3ac927cff4e71efe0cbdfba3c60a8d1b0050f926e3791aee493419b4af05165c603a82d51f55c80ac05476d3c44d46932415fac3d575bf77a45ec965b47 WHIRLPOOL 60e93cfd73e2c6073a2bb3cbbc9a8138f75c00c256463dfd703ac9821b81e46393ceedc60376eb76ff76be006ffd45c265679e7f114c777d7c9ae0efbe2b96b7
+DIST kig-17.04.0.tar.xz 3586468 SHA256 232133cb904b74f9406799ca1edaf0111816d42c459598c83c97925ededfa42f SHA512 1734aea67b10201b9324fe45d1ef04c1b0936fc68e1b301972d2617baee563f4603e3c0fe29f6cbe344d180fa56a8bfc86804aee5a3717326728fbe1aada0a5c WHIRLPOOL 642a5067f4ee4e8d9ed24844b10fefcde40a8c275783ea0b9c6f6107c9d11ac3757af11264917233bbecec295b184805ccd9032bc26234c3586ae62b649dd37a
diff --git a/kde-apps/kig/kig-17.04.0.ebuild b/kde-apps/kig/kig-17.04.0.ebuild
new file mode 100644
index 000000000000..c28dbdb68ab7
--- /dev/null
+++ b/kde-apps/kig/kig-17.04.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
+KEYWORDS="~amd64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	geogebra? ( $(add_qt_dep qtxmlpatterns) )
+	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ktexteditor)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	kde5_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake-utils_use_find_package scripting BoostPython)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 49ed1233fa2c..7e2c21a7b281 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1 +1,2 @@
 DIST kigo-16.12.3.tar.xz 1439208 SHA256 16aec61a27eb829c7cef1e6a12889832e0533c67073dd80942e9fc2f43fa2d23 SHA512 b9e4695e04067353bd9b1078b79665b3a8b0315a4a5898f80d9f72d88f303d24f58fd7cd78a98a8e123cc27cc96b15fb280353c36804d0cd37cf1a2221999f3a WHIRLPOOL 668d9e1cf55ee1eb25fe10e8513c4c6a71a60abb84b1eff251271ef568d86120b6a1862c97fdf2e1bc2cbdd1546118a374e3a019fb57ef927f7a7486215c35cb
+DIST kigo-17.04.0.tar.xz 1439224 SHA256 2af6150b8667b0ec48b1ef49758f9af8700c5c53fdea0e09a8b7736bcb3e20ee SHA512 b6cd5cdf579eddd8b4d67e406e5d6a62e8d26a83ecbd7556c285e4e7dcac25f9c0d6cc41f954351ab2ac204388dcae80a3757338f8d531737f63bcf9b0926005 WHIRLPOOL d8a3f4580bcd0e13af7a62599396c0f8fb0d8e43276aeb11b70fc6d4ee00698135b551d9b19f95ec7446366e5cdc0ad68b36b635211c4bf46401462592de9406
diff --git a/kde-apps/kigo/kigo-17.04.0.ebuild b/kde-apps/kigo/kigo-17.04.0.ebuild
new file mode 100644
index 000000000000..12be5f6dd70b
--- /dev/null
+++ b/kde-apps/kigo/kigo-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kigo/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}
+	games-board/gnugo
+"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 9b3f4fc5035c..068966b474dc 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1 +1,2 @@
 DIST killbots-16.12.3.tar.xz 964036 SHA256 cd4a383a92ff145aab02c0aeb48d30a3fcb971e968e8e820bedc2e862a8f9653 SHA512 fbcb4f883beec162b8057d58c624195b8322601220f41fc49675da607f000590e26b293bfc2851491860d657a24e6ddffdbfed0de3973884e7826bb5d8d2673b WHIRLPOOL 4b369b4fedcaad7384c05cc474965503a0cfc6a6399b01b5be8e6155f1d86b325f4a95f7ecfbbe2245b9d9fe9036190772ff5d2049aadde30f1745e6de93e9c0
+DIST killbots-17.04.0.tar.xz 1166680 SHA256 013c2ecd42d2cc536172a088d6296e40bfb6bd0bd1aa0b4d9d979e9e88089431 SHA512 f7202ed5958998772abdc9f7e01224abf1dcca1396931caa6f983a9b5efdba26a1c45f6522ddd457dc42fc561c8c4ef470711e16e370ee1a8135c525bac14bda WHIRLPOOL 785f647187fb5b76061d54b8be2761072252b6706f65f4242b789482ba63c923b52e553aac65d2eaa0df9030c24794c4733fdd4b1eaf370fe72e2210ab43773f
diff --git a/kde-apps/killbots/killbots-17.04.0.ebuild b/kde-apps/killbots/killbots-17.04.0.ebuild
new file mode 100644
index 000000000000..4304fd185af4
--- /dev/null
+++ b/kde-apps/killbots/killbots-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Kill the bots or they kill you!"
+HOMEPAGE="https://www.kde.org/applications/games/killbots/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index b3cfd65ea273..af3afb891c04 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1 +1,2 @@
 DIST kimagemapeditor-16.12.3.tar.xz 407064 SHA256 2cb210a29313e3d04672e920133c737ece340d3d598f5d72f373f86524fbc20c SHA512 ff94227418ebc26f0a6e3bbc260316f33ab698271f61ef24262e9b4bd88f7c274b3cd2c0088d25bf408d80db2589f7290d954b1651a32d0a7432e14dacb73bda WHIRLPOOL a37a1ad986a4374ce2dabf65fa0c1c2d420d2bfc5334b6caec44e3a5f6322005db9c1c94d18f80f85861dd1448b827e85fde81b480a3ff468c42d68fcbc072cb
+DIST kimagemapeditor-17.04.0.tar.xz 407048 SHA256 58f1dbe9ee4dba8881fb460f89d7e11ed685a81c72551c074b5a6dac814402d9 SHA512 6fc0b205c73610217538b378498fb2deb119d179159dee264c1f2bababba365f88a3b2f110b475d74a10d2fb39cb4c8cb352ae0197439ea0da70783964109c78 WHIRLPOOL f52fcdca2dc89d39700960b59788e1212323ce29ae4603e89be2c2b9ec298e0fc7c9c9ce6fa78e469b1bedf0ea9571e48d3459cbaa42fa456347d3533c606c18
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-17.04.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-17.04.0.ebuild
new file mode 100644
index 000000000000..ef8ea75537f7
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-17.04.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE web development - image map editor"
+HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index fceda5bf156d..3493dbc17c23 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1 +1,2 @@
 DIST kimap-16.12.3.tar.xz 92400 SHA256 aeac3c5205378a868c7f3754e4d98cb81acff21ed5bc5ad69500140f4f509bca SHA512 b45013c95db1ab200966e08c4192b35b8e4dc963565f3b9ac7c7b9212c910e5e604d5dbbae0ecbca0ed6618b445d97ae0c950ab62d75af143aa43151e175d89f WHIRLPOOL 6994a75820aa7e8c08436cf757022fcf0b3f4b6a9cf7506dc79d9127507e94e80d69a6e3d548252450ccca1a244aeaa5269f3352d7c567c5ec18fd24b2bddc35
+DIST kimap-17.04.0.tar.xz 119376 SHA256 711c59793b08e156745b75192b6ee914dcbe838f34012e5ad3cc5f7a5b8feaf5 SHA512 bccdf59a83a7db5b775a4ebacbaefe21c2635b504527b11602fc90d624816c59f8f7a5b6484bbf5971ddb7e1a8767afc00a0cb7dd33fc9b42ffb1d4433c2c455 WHIRLPOOL eafdc2260ea22a0134cd2483aa82707dc2f37a917ccbc741640382f8ef303fab761c977db4b2ef372f1ac40689f59d157c3edef14593ab98361e257cf8cf9f99
diff --git a/kde-apps/kimap/kimap-17.04.0.ebuild b/kde-apps/kimap/kimap-17.04.0.ebuild
new file mode 100644
index 000000000000..e21b4517c405
--- /dev/null
+++ b/kde-apps/kimap/kimap-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	dev-libs/cyrus-sasl
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 1d98d1f93ebb..44f127807e4d 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1 +1,2 @@
 DIST kio-extras-16.12.3.tar.xz 279872 SHA256 5af7b4dac320ed6d0897c8940e6043ef45a4e1d3a4f9f12e8513215633a5d7d5 SHA512 1b0f0f025deab5f14479e47c29ff18974de461a605055a8c684a588526ef8fff9903ce853e56613db4346f426929e37f4409450221503ce3bce2d812f8f1f4fe WHIRLPOOL d74655e6cb631455720bd001e33d75f423e84aebc6e38ad808b5c2c51ae850b0df8bb7130e98b7aeb8ce63b89722fdd76bf2bb62913756749b3f48dff9605d7e
+DIST kio-extras-17.04.0.tar.xz 552700 SHA256 29eaece2047390e0582040e86e26b455d6c0e2f1cb6c5cf4d5f4a3f470806acf SHA512 6b1fd17b6656e6312c5790f333bc5d825bb1cca1023eba6425162534c5451f0b04bc4d52da59d65e7fb6a4b5e264843de20e9a74b71ed76b9d378e0daf849a0b WHIRLPOOL c4faac8fc7dfec550646bb52eed5ceac43444a7b7899e2e3ec5ec01e708f11f5dfff3d603783643e54e8782bfe6b0cadf885ebf49c4b692a02914e26d86a8040
diff --git a/kde-apps/kio-extras/kio-extras-17.04.0.ebuild b/kde-apps/kio-extras/kio-extras-17.04.0.ebuild
new file mode 100644
index 000000000000..1d36be3a9288
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-17.04.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+QT_MINIMAL="5.7.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities exif htmlthumbs +man mtp openexr phonon samba +sftp slp taglib"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	virtual/jpeg:0
+	activities? (
+		$(add_frameworks_dep kactivities)
+		$(add_qt_dep qtsql)
+	)
+	exif? ( media-gfx/exiv2:= )
+	htmlthumbs? ( $(add_qt_dep qtwebengine 'widgets') )
+	man? ( $(add_frameworks_dep khtml) )
+	mtp? ( media-libs/libmtp:= )
+	openexr? ( media-libs/openexr )
+	phonon? ( media-libs/phonon[qt5] )
+	samba? ( net-fs/samba[client] )
+	sftp? ( net-libs/libssh:=[sftp] )
+	slp? ( net-libs/openslp )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	man? ( dev-util/gperf )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package htmlthumbs Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package man Gperf)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba Samba)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_find_package slp SLP)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 3296a21bdce2..cdb1ba9f67b0 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1 +1,2 @@
 DIST kiriki-16.12.3.tar.xz 259160 SHA256 55d4ca59cd5695d88862d57781f580d459dedcf72e7fa11465d10814f6175790 SHA512 737e0b04d4334450b21230fcc7d321642f1a832eed075e409524c2b95f0c8b0b5348a1b20a603a7803135a4c26ced7ddc019724e88b6cee676cad943c89140ba WHIRLPOOL 0bf1465c77df691b00adf3f953719bdc98d619f4a2bbd4340cabce16090a251b88ed388418e68a476f76b8dd91fcccfc42ab2d2c2d6543e40883801cd01d8fae
+DIST kiriki-17.04.0.tar.xz 326368 SHA256 d540da8e2b93f9f44da164c192ba451cf8858c11bf9ccd57d2b0d3197355bbf6 SHA512 bc42f89b0bde97fd32a58156a00fd391e51f576bf0ac3492a4a833b2295056984e3192244902b12a8fee86cb6bcad4dec38047bd4381be7e9ca39edde7d7b2b3 WHIRLPOOL 2894ff5b74155b7137d24beeb1b0d6da22d2f5be3cc6eb5f47f3772b13272e994e274a5af9229c4f93f8a9b1a263c46fcc1abba866882c21a2a87f828d3d5720
diff --git a/kde-apps/kiriki/kiriki-17.04.0.ebuild b/kde-apps/kiriki/kiriki-17.04.0.ebuild
new file mode 100644
index 000000000000..d0784c55f7b9
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="An addictive and fun dice game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kiriki/
+	https://games.kde.org/game.php?game=kiriki
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 6655ec6836c7..f4ef9ee41d6f 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1 +1,2 @@
 DIST kiten-16.12.3.tar.xz 10631168 SHA256 c40b0df4c6f1afa75f6da3fc44d8467ea210cfd36dc91d69f8e5a6b3c77e7c6a SHA512 2d2a8db89592d1067dd3d722b38f699d26b64c8d2c01aed7f4e7d4a4ee80c576211683d5ac53c4577528b6e07a86cb9645e06af146832e95cb25090111d72d31 WHIRLPOOL 704149fef6f3bbfb1e263d6119855f19b6d41ea483cbcd0d815d5f635abaf2a9b1128eb6385dacb389022fe70825d8b1a8c30486448738943ab81519c0ed9dc6
+DIST kiten-17.04.0.tar.xz 11553912 SHA256 f09dcf6162ae5ee5d091684c7dfee75a96590720f917a08f69edfd8bc9edccc0 SHA512 7d25635b4f53dad848215866c196ce96bfbc7d14788dd65e1579898a6f34b20f9561c0b49ed339ed2cdd0025d379bea49e720ef6c914acdb6e6c181c28a36f6f WHIRLPOOL 209534397b4f8893fead8051de7d86079e254c76be728fdf842e681aef2766b08da7ecfe1d75d799e9bfc4779d0f70745d8eea9586d502cc1c7f9e1f79ba5d61
diff --git a/kde-apps/kiten/kiten-17.04.0.ebuild b/kde-apps/kiten/kiten-17.04.0.ebuild
new file mode 100644
index 000000000000..8ea0613b9c60
--- /dev/null
+++ b/kde-apps/kiten/kiten-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Japanese dictionary and reference"
+HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index 9761ca5cff06..e85133733e4c 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1 +1,2 @@
 DIST kjumpingcube-16.12.3.tar.xz 138360 SHA256 3f6205f51b8f1f422d7720ead2a862d13cb0f4854d515f96b5b0e9fbb30a31ba SHA512 ddb399244b78501e682e65bdcb01a74bebeca87e9cf4e412a3fba6b1a6f3618791160ff859e2f8664a778f5f6833e5468c21fcd72ccdd844845dc43eb6faa768 WHIRLPOOL 1f62819cdad53f5a8ddb098460955e44f9215bfff9114610c34141925bc29f9de1df11f9b4a68a26619d7c3af0993049cad7377623743d6a340487b8e326e5ec
+DIST kjumpingcube-17.04.0.tar.xz 292148 SHA256 8ce329386f8f66424f80aa6d285dd9565e79f5f87abb7372dba2fe00960e5ad1 SHA512 8ca39b85ab848a1b461c82ead10480c4c851dcfcbd0f05699b0fa392db7a3ae371902f0feba972547ed1a8458a58bd6a0e24b7517dc3f7c017632148a36ac3dc WHIRLPOOL 3458fc058baab385f0e972270d4e2061c79aa6eb11b80f252c5b8846abe1c41ceefda3d236f475f2a45e3c6d57d335b7e5afe9ae6609324c24b50b36b9cba066
diff --git a/kde-apps/kjumpingcube/kjumpingcube-17.04.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-17.04.0.ebuild
new file mode 100644
index 000000000000..ef0ad95ed6d3
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Tactical one or two player game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kjumpingcube/
+	https://games.kde.org/game.php?game=kjumpingcube
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index c1348ad1d93f..e7387161e2e7 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1 +1,2 @@
 DIST kldap-16.12.3.tar.xz 59924 SHA256 ca8a429bdb18762ef333408dcc3ac407bddb0c6dfc2aa2b1fdde6ff65baaf728 SHA512 69f5fae2d7e20a9542ac8f97ddf812be12ba0c28ae4d50336280517941aa4b8acf79ffb426d4863a37b425aee321d2f10a1f33a1586c20d97a68b00ad03f51a1 WHIRLPOOL 823bf406ac9a5c49876441cea2d49e529d6636c63ac26cbb48b8c4f49a3aad6eb370cb2c14fafe6d6795d848b2c467055e18dc3433e8bd2c18e5cd95af0ea613
+DIST kldap-17.04.0.tar.xz 154416 SHA256 2bc53f4800293c5e943b419c597e6b28ff0117b93be4a67bafb19e6e45d4292c SHA512 fd899271010f634d1ab88b9065a92a88d742f61323e07169684b3d541843e368011f82c642274d39c2c49e45ae709d6fb73147a969e691ad313baebae4a8e249 WHIRLPOOL 337d531a224d54adb5b31fd0efd1c638b1f9398752d70665dd7dd4aa7ea33de5e7220510afd12e99b49a521e1a3baa3e3b30e6afdfb1b30c90d8039f32dc5da5
diff --git a/kde-apps/kldap/kldap-17.04.0.ebuild b/kde-apps/kldap/kldap-17.04.0.ebuild
new file mode 100644
index 000000000000..2121461ee526
--- /dev/null
+++ b/kde-apps/kldap/kldap-17.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for interacting with LDAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+	net-nds/openldap
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-kioslaves
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use_if_iuse handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 108b2d04f0a0..f4e28a135867 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,3 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kleopatra-16.12.3.tar.xz 711196 SHA256 8a9b54d3cf79dc2d6c481792c8865a50990b08653a181038720522d9fe3342c9 SHA512 16608aa9ca4f58bf1a08e105ecd8dc8d5e8fa8b96e5c0c3e373d8d1192d372908bc94f49e5c882dc51cdd80f3bf10663137ec51e078e3862a9343e924c286a7c WHIRLPOOL 6a84979fd6b038f7295a7cf176c1d3fc69ca02d1634aef3a183681c1bf9fcfabc022ee6e3c995ac9012ba402988ffb0e0c7784d54a28772818eecce2a50fd914
+DIST kleopatra-17.04.0.tar.xz 1841156 SHA256 cc73f7b4e2d3722dd5ae061d731438f93a3fa851cc7dcc3c9b1f63ca131d02d1 SHA512 622ce422e51944d58de5ba04ce846ac7409cc4d60d36b8a15e19e608a0a2b3183dd1867a89276d8a6bb4fcdadcc9f38cb0311ee8139dabc08fade846d0a7da39 WHIRLPOOL 6122a7ad32945e3889daa8eca322d422c815f617ad14f6c6560e259be9e3ba951259a9997775c20af561d3a6d586edd48c148c1f530432326382a5c79ea5a154
diff --git a/kde-apps/kleopatra/kleopatra-17.04.0.ebuild b/kde-apps/kleopatra/kleopatra-17.04.0.ebuild
new file mode 100644
index 000000000000..762f245f32b8
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-17.04.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.7.0
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index da0c452b11a4..b70c4c79aed3 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1 +1,2 @@
 DIST klettres-16.12.3.tar.xz 2716728 SHA256 70a07913c3f445a62486ada29166f1620374d5328895d394a93c1f9efd1f7354 SHA512 c22361c28bf6fd718bb17266845a79d4b6e21f3295e8260d69b5b896fab22bf469b27ba0d89e0bd7a56bcc395212ce44f530a7be495da62d8d8523c081f8c01d WHIRLPOOL 6a5fb2692a5fdd7c3773c092656905e02be405d2484e7f39f725e5e00273f36e160ec50a10bdc6679eeca3f9a1d599898337323aa9ca4f3c2eef14cbb941c926
+DIST klettres-17.04.0.tar.xz 21710388 SHA256 498353db35767c24ef0ec344e000ec49b7fc96d07ac835daadda5bcb42f52a52 SHA512 74f060cedf86da64c4c574c39c640baf64b5e5c3cd0e3918b7859c0b7f35684e2231401123df8afe773c1317dff36514f3867497e84f93a4804b2d3d1b94c3ff WHIRLPOOL 803c5a7d1c66f3f8853f4daf42772dc802bf0310ad707a2fe36556a6b8453d0854cce0d797ba35f8e27179c5f63b6dbb56eac1e70325736150f38155357c030c
diff --git a/kde-apps/klettres/klettres-17.04.0.ebuild b/kde-apps/klettres/klettres-17.04.0.ebuild
new file mode 100644
index 000000000000..ec491297365d
--- /dev/null
+++ b/kde-apps/klettres/klettres-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://www.kde.org/applications/education/klettres
+https://edu.kde.org/klettres"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index d778b9eb869e..2402f51df627 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1 +1,2 @@
 DIST klickety-16.12.3.tar.xz 665568 SHA256 82e032e4e50d9d3bfa0e35a12641192c6a234634caf884450a5a52d6b9413556 SHA512 c2e048952f3bf6e69200593a4ae0475246ba720f40d62e48da951881cfa42484ad03f7fcaedfd8f1e62fab0edd462ad893d4b2eaa609c3022887c49789ba4b71 WHIRLPOOL 50301034485b8cb29649c06b48bb85509fae9c04287233e1bfa053d4ce9f8f22c7f08bbee901736b5237fcba44770ad04af7f1957d733b0c92731033c4a87613
+DIST klickety-17.04.0.tar.xz 1409944 SHA256 8d252feb7caab5c71aae701d45777495293e5a28bf3fa4b6400011d513783297 SHA512 42194dd21817730d8e73f3ff53cab59778d73adfe9946713d93588b5390011489fe851758ead3e90ed82053fed95d25e326108b3380c46e411f7d02a8024a76f WHIRLPOOL fbc9fdf1bec9e83e83448c8d2da731252b61beb3ee84d605cfcb7f309eea728c4acce1bc6eeaa16a36920c7da454f865ed7e80f98266272b0043d3c86b7b2241
diff --git a/kde-apps/klickety/klickety-17.04.0.ebuild b/kde-apps/klickety/klickety-17.04.0.ebuild
new file mode 100644
index 000000000000..edd9fa7a6785
--- /dev/null
+++ b/kde-apps/klickety/klickety-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=()
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 0cf6139d75b7..afe31f1141f4 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1 +1,2 @@
 DIST klines-16.12.3.tar.xz 1134840 SHA256 b10df35cf9a3b022fe4af8d11bfa8dc5c2f4ec9f575481a2dbe922ea61b12a0f SHA512 11d1c1e56589a4d5e25baa08b4b09f1757ffc19731563addfa4c9d274569a61030ff31c1ea844fa5ba61980b94d170bf43fa2df6df6a5083fb4d8a12cddf1e1b WHIRLPOOL e87f3cbf6565ad54911a31837823431961c87125c4ce17fa6db82b3dc66412c5f7feb8317464b31758967715d95b41eca632707d6c7de3137f80b8987ec2604a
+DIST klines-17.04.0.tar.xz 1667508 SHA256 8bc32836314618986fb371d0a0dae85cd60d2484cc85fe032a55d6845a1aa047 SHA512 c3f758a514a68fe7c2615795314d1518c0b9887795031697cec463dbc53aaa1e589664e783c69d0c896b94bb03cb5bfd6185dd866d547587396a49a7a571ee90 WHIRLPOOL e2f248f8312b3e47ca512342bd56ba6db56ff928c8b764b8e314dc5598ee99df6356e913a99ea0eb400a2db7d62b184a03c1fe9ac922442e067804211e54f53e
diff --git a/kde-apps/klines/klines-17.04.0.ebuild b/kde-apps/klines/klines-17.04.0.ebuild
new file mode 100644
index 000000000000..78c62d674dd2
--- /dev/null
+++ b/kde-apps/klines/klines-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A little KDE game about balls and how to get rid of them"
+HOMEPAGE="
+	https://www.kde.org/applications/games/klines/
+	https://games.kde.org/game.php?game=klines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/klinkstatus/Manifest b/kde-apps/klinkstatus/Manifest
index 858f8148d361..03a3b7c27a60 100644
--- a/kde-apps/klinkstatus/Manifest
+++ b/kde-apps/klinkstatus/Manifest
@@ -1 +1,2 @@
 DIST klinkstatus-16.12.3.tar.xz 450924 SHA256 5357eb982120297899faa648d2dee586f674562ecdfc47cdbfce4c940680b24e SHA512 7700dc12155854306a0bd1b35c24e7e74a9d50bd8e354fc8faba7bbda0ae1099dfbe679b923047a340469a695cdd810bf6103d4b579ff4c13e89285a3cd75e5f WHIRLPOOL acba8eb292b6600f4aa18cee53b14a4cb1eb7e358ae6b085c6ac738ee8d4f3652b9cad6735057e562bed05324b6911951e585693e34166fa6b2a5ac19e068100
+DIST klinkstatus-17.04.0.tar.xz 450984 SHA256 19e40db198420e82a9a504385d22263c5cf9a4b799a9586e509035742b954d80 SHA512 ee5beb993c04f6015b08c9c37f23d77941bca5a884418ba0225709414975c0eaa3e7a336bb58e1bc471c4b39b9f7bdec666795bb03ff222255df5bb4d4ac535b WHIRLPOOL 28aa8bb9df8daa3073dd1e63820cc3cf4ba4fb393bb588f844d1fb81d3a4c887689e7c8bce424391e879ee20caee698789641d76f5d113705c5500cf6b4a4456
diff --git a/kde-apps/klinkstatus/klinkstatus-17.04.0.ebuild b/kde-apps/klinkstatus/klinkstatus-17.04.0.ebuild
new file mode 100644
index 000000000000..cbdc907c3da7
--- /dev/null
+++ b/kde-apps/klinkstatus/klinkstatus-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE web development - link validity checker"
+HOMEPAGE="https://www.kde.org/applications/development/klinkstatus/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug tidy"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+	tidy? ( app-text/htmltidy )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibTidy=$(usex tidy)
+	)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! has_version dev-lang/ruby ; then
+		elog "To use scripting in ${PN}, install dev-lang/ruby."
+	fi
+}
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index bd1502903082..08591830cd02 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1 +1,2 @@
 DIST kmag-16.12.3.tar.xz 86536 SHA256 31c27879e36509a6621887d82ed3cc9fa785a9e4a1352d3e25f09412da4e9bd2 SHA512 77e97233d113e31a86ad6cb8a21084a714ccffbe795d409a3785db9e0abf2a14f239156d42f83ad2a20e071b58cb947facde269850a25ecaae051f639bdbd57d WHIRLPOOL 38a9f02f89bea51189d4c5aca78c8e9838e3669331a3b84af06ded32ae42c356441538274c78c793e81978fcf8cd7228bd02f81b59dcf80a8afa103097fe4076
+DIST kmag-17.04.0.tar.xz 86576 SHA256 9d820cf67a03a817ada8b60075653b7e9b46fe2c823d33e22e6a7b80904ddac9 SHA512 b283783e0cb862afbdce2ba40900b15ceff98eb0a6971969fe12580c959a955ee00ce4786a30e36fcad501b7d6b0f55fb6050d67190ae65417b096df872f6faf WHIRLPOOL 1f894db4b1395ecfd13aaf2559ab3969dbcebcce49b8b031db80aa32d14b3494eaa4048fdc6b7eef55714c2cb77f22fa68cc2d32751953149dfc206556e5699c
diff --git a/kde-apps/kmag/kmag-17.04.0.ebuild b/kde-apps/kmag/kmag-17.04.0.ebuild
new file mode 100644
index 000000000000..d5e5620c680f
--- /dev/null
+++ b/kde-apps/kmag/kmag-17.04.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep kaccessible)
+"
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index 813369cdc126..c908de620d46 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1 +1,2 @@
 DIST kmahjongg-16.12.3.tar.xz 1013052 SHA256 b98830646d4ee95bc80a7bc95ca99bf1ce8f5b6ab878fa54033419db67e1c377 SHA512 b7c8fd621fbbbe9fcb5e76029b5ce03b17597ca60ec637029a5b51352fc489f6b3151499e43e884ca2fd2909ff750d7804862a0288ec602d6322a642065ff982 WHIRLPOOL 2f24ca3d4e80215436301a495ba247dcdc88b4716e8d78dce863027ac98d8249aeef19ddf3a06e69b40c28dfad32af26b8c2102ad4c1c1f9a41a4f23a0a81f66
+DIST kmahjongg-17.04.0.tar.xz 4087716 SHA256 4c6d9d6067492a00af601a8ecd580a34904bfc7b8503d818b37df94c1bab39cd SHA512 1d7e93858acec6c3a34c68bb3db6457eb488344b48e0a78a02c6f34f078fd82f3a112634a81ac8a33f8072315eb03417d707e2334f65bdc4c953f49610ff08d0 WHIRLPOOL 116f51c90702fc09ccd9c5407e1c9a3fc2437b1b6abd6c42df44529ba5da3d1615fdca9d5a8c89b97e4d13bfa41754ebbf876243368c5e740fcea4f982f800ba
diff --git a/kde-apps/kmahjongg/kmahjongg-17.04.0.ebuild b/kde-apps/kmahjongg/kmahjongg-17.04.0.ebuild
new file mode 100644
index 000000000000..d02fd81c0770
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-17.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A tile matching game for one or two players"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmahjongg/
+	https://games.kde.org/game.php?game=kmahjongg
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index ded4e220fd33..8a45c68753fc 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1 +1,2 @@
 DIST kmail-account-wizard-16.12.3.tar.xz 61728 SHA256 f40a121d0acc88cdd57464cdc2e3573df66ba4a3dfa391bdc5806a3498d82471 SHA512 e8111589d49c258c1922e65dc319a98969882c55f935be02c6786e6a246f2e8d90121e9571a04a1202e6064a53f5aea1a91b6d0859e7942fdb3ba6fa382a25da WHIRLPOOL 2e42449cb7838b7dcd5a4898cd3ec19234387f25a6740dc2a16160d072ece35b917b74cb3f41b4ccea9c2ac48ba312e6a480972e454612dde1c83e80a3b4f63a
+DIST kmail-account-wizard-17.04.0.tar.xz 150168 SHA256 a3bd60267665c529aa5b8de777d80e74342cb8a7eccda6b9cc286480d27b850d SHA512 73050a7105a779b11a7d6523926ca02b30ede5c8070012e9f0c35760220aa97390c2fa85b51a53ad6a9494f073124d89676e4a608bb143723efd036d1146d81f WHIRLPOOL 77c631f8df6fe66328f00fc60a62710b553611ba3e5ace01f785dcb3e81b6f548c0092ea25c56d636349a4025b343745f2a6239b8c511afd1f4566dbfc6a4202
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild
new file mode 100644
index 000000000000..3e9dc52a63ca
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-17.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-runtime:4
+"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 147ffad21668..28a6a75e7b81 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,3 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kmail-16.12.3.tar.xz 1529516 SHA256 60819808749d21ad8e8dee78da10602f676c14defdb1a4b8781e9d294a62d0cf SHA512 601a1e44fbbf5a9787c91f7f058e9740bc049dac625c1c09afdb90ce41e2a9322043e49af3231f8452fc22a4cd2bca661e87f9ff43ea56f304f9d59a46f80853 WHIRLPOOL 29bb196d90c376557b6e98859f58bc3630261fc8efacd515bc3ee4e90a0bf5be866be5501c4fb4482aab7b209d2dbed196eb801748efe4ed3e1b2deb92c489dd
+DIST kmail-17.04.0.tar.xz 4377580 SHA256 2a00586e859cbca977fedc36e6992f26df8c8ce633020c259bdc3ee1b56c8e11 SHA512 3267c06a2257fa6ad2a978169a82e954708de71999d6b3ec0718c8d487f96dc8bfe56ea25395a488d4ad629fa2cc713d14b9b831bf4e445742c91e6ad308b900 WHIRLPOOL 7156ed06cf774db8c4fdfd866b6e5532926ac1d2c965133e9a2bd815481c1dbb37227531b22825e00be03bda07e495835d22e2077ad1f1e491d88b871d636eeb
diff --git a/kde-apps/kmail/kmail-17.04.0.ebuild b/kde-apps/kmail/kmail-17.04.0.ebuild
new file mode 100644
index 000000000000..def0a8834871
--- /dev/null
+++ b/kde-apps/kmail/kmail-17.04.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.7.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
+		echo
+	fi
+
+	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
+		echo
+		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
+		echo
+	fi
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 9635677a6214..8cd399ba1657 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1 +1,2 @@
 DIST kmailtransport-16.12.3.tar.xz 91264 SHA256 5eab088605bae959167528156930908921c11bf57853c7ac04cec2eaa33d7cb6 SHA512 1598b866a5440a6dee3872e782b1619a98871327370de703cf27d71077300ebc129a6b667ee8291a8261d201ed9356292da679b0abe9db9a3f3efae462940eb1 WHIRLPOOL 70cf994affd67ca66f9cd224cf3dcd163c6974a3cbe40efb6ff19946a38686d0573427f1689f279a515ec3b97318157966e54b816286d8e0292a2aa14b260d38
+DIST kmailtransport-17.04.0.tar.xz 228932 SHA256 f2749b59600d03d3b922255a6500bcd63784906f9a16327080a1f0a66aa60319 SHA512 ea0ac2468229a2d3bafd48485f7a30c675dc0454994de4346f2b1f77476e0fba5a59bd387591f3219c3967272ce0cd81126ce3b0aa155dea5b8d61fbfe94ed96 WHIRLPOOL f2089612a10955ac03126a7f3570216d8ab4b2feda0800843ad2e88c55bf3998d52d5c6863c08cc2f365e426b1900e0868ed8fd9b09d6fda6c8d75692bd22bf7
diff --git a/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild b/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild
new file mode 100644
index 000000000000..4b9bf10338fc
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-17.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-kioslaves
+	!kde-apps/kdepimlibs:4
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use_if_iuse handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 5987e7116005..e9e87a806992 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1 +1,2 @@
 DIST kmbox-16.12.3.tar.xz 24408 SHA256 44d8c5eb2c73643b935b62f8eeb35ffd82af71ac817e265d1124268727711b4e SHA512 3d32a5193d08aa74fff07a01a5f180ea7a429f41af59d06897c9638096734d7cae788b3514f969fe3f57e03b17224d7528bdf79c53529807fc40d9dacea78a49 WHIRLPOOL 6a96218c4e61ac41ce754c9b00d11ad96b00b3f42acb47f178178d56a3724218753c23352cd7c54dd1a822b3ea70e1b471aae2876810d5659248756eb4659e54
+DIST kmbox-17.04.0.tar.xz 24628 SHA256 d8e7c04141ab16e6c07ea1c0a48cfc8a3de36d01d47b7ac5cc5bc19ebd182e00 SHA512 885c625590e76fd92a23f36e74ef582cb05284eb887fdbb18ded639e09b1437305694bca789d314c25520e70748f022191253134a76be34d5f467f81706a9725 WHIRLPOOL 33a3d101518639291f542b52a8da17466e3c7016cdd2df794c39332fa90e44770f45ad4c5d6eb7939c467330b7c91fa1108e116d9c8e46e081f511e938bb5b51
diff --git a/kde-apps/kmbox/kmbox-17.04.0.ebuild b/kde-apps/kmbox/kmbox-17.04.0.ebuild
new file mode 100644
index 000000000000..af4bc864b1a5
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for accessing MBox format mail storages"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="$(add_kdeapps_dep kmime)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 294e5ad50562..7cc38a31a703 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1 +1,2 @@
 DIST kmime-16.12.3.tar.xz 122592 SHA256 40c874c98c0eb0c76e9a5015aab5d5ed791c1e0bed138f412fb496031e80eb3f SHA512 990ec249b9da2d1032f2a84fe4187cbf3580156e6fd956e92b6536c70a19166f02b7212a79fd5cab8a8f87cdf1d73e373405c6ae5660671d4e224f5e982ddb2e WHIRLPOOL 057296f027e5edcd9ae559008bb22189e673f632626a809c9dc8d9371a7d47b0303515f1fa09b60b47714c5cce1f34a4c7a3285b509e52616c5a5c0a5738a4c7
+DIST kmime-17.04.0.tar.xz 145356 SHA256 1707f2c496d0da01ff5eed5d4df93634f51d1790aebfdb99eeb70bb4adfadcaf SHA512 54b3b2fbfd9613bd582cf31a69b7a39472906f2ca036ee05d573938b8553aa5c1ed6c3111fadc341dc1fe3aac112ce057721d2ce5b60d9f01c8125f67db6d06b WHIRLPOOL cab6604f39ac95feb9fbcba5184f84cc37de8044fe62af782af6a72df6c7f8ffe00d456fc73a1e009b4a1050f48f0e28f96a78e04eaba4b45954547782a0f9d5
diff --git a/kde-apps/kmime/kmime-17.04.0.ebuild b/kde-apps/kmime/kmime-17.04.0.ebuild
new file mode 100644
index 000000000000..5e61a5e188b7
--- /dev/null
+++ b/kde-apps/kmime/kmime-17.04.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep ki18n)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 77905e33880d..73cb13165a6f 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1 +1,2 @@
 DIST kmines-16.12.3.tar.xz 662604 SHA256 76df8b5760ea85a0bf8ec192ec6f25d6ab387336cebb2c7d85fd4ae04ff7e637 SHA512 35f20ff1c8eb1b3a7d31d7836442080204ecbb724c0d6dda4f0915db1e46519c72d6b23695a98d05303b03bb341267c48e567c7d3273711360af5fcc933e46f0 WHIRLPOOL 08312b945a8fe85497a68a43d5825f14892f49f151a66f376865ce44ee8fe66c3fb256bd4032da67e77fcd8e9c42c28a7f9db62a0e92981aa30dab64a421553b
+DIST kmines-17.04.0.tar.xz 883692 SHA256 fbba3f9ee78a95e1af69617fe83b31ccd811aa9f48193be8d11c6129698b3580 SHA512 f296623ba0ea86ec66278b94b5a2db6ae0794238a1e0977af0b2ae222c1df2e3fef26fdc6692f6ef8a261b963f1739602bda6abc87b58df0f8b5ba2f802a32a0 WHIRLPOOL da39a5bdac8709fe01050135eb7c37f77a8c71b32a0125580f9e1033e58650bccee687b81afdec0a11c14eabdf86c33c7ed63164f7fb7ae72c3dabf815a2b728
diff --git a/kde-apps/kmines/kmines-17.04.0.ebuild b/kde-apps/kmines/kmines-17.04.0.ebuild
new file mode 100644
index 000000000000..31268cd81cce
--- /dev/null
+++ b/kde-apps/kmines/kmines-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Classic mine sweeper game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kmines/
+	https://games.kde.org/game.php?game=kmines
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index 7219a07346ab..73d1d66fdd99 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1 +1,2 @@
 DIST kmix-16.12.3.tar.xz 388792 SHA256 44fa5657a831146bcaf565563073dcd92f82ed14c4e3416a3242983f949d04d7 SHA512 a62398a597a248d0b49ee5feaddf6ce7af75192ab41699677c71f2398efac0dd1997147425e315404bf30e07f6e69c93c80c43725cc1a65d9ed35c648e2e44c9 WHIRLPOOL 3209908959321d89b91911b43006d404c08abb80c7505ea8879890f800bb9fa8e26e8a443b7b0721e3f99caddadda7ea7abc51859bf63bf01bace288518143b7
+DIST kmix-17.04.0.tar.xz 388764 SHA256 a49c2f4911f366e03dbfe41bbc3a38be49681835c99fc82926b7b89a03a0d563 SHA512 5937145b02f86461317989b5e9dc06b29da6fbaa6119482881a29d63cd08dc147d32e03522439e8590375cf3582d8e55d2387d98bdbdf2b2705801f19c830fce WHIRLPOOL 20fd8c2b7eb4d1adb5a06dce9e92869e16e54827023e38e886a48209b31e0e3d205febd1471458190fb4b9150847c72955a8f2f7a0fed67a1223005781b36484
diff --git a/kde-apps/kmix/kmix-17.04.0.ebuild b/kde-apps/kmix/kmix-17.04.0.ebuild
new file mode 100644
index 000000000000..23ae34c6a5a5
--- /dev/null
+++ b/kde-apps/kmix/kmix-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	pulseaudio? (
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKMIX_KF5_BUILD=ON
+		$(cmake-utils_use_find_package alsa Alsa)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index b988f6c472d9..f978f45189b5 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1 +1,2 @@
 DIST kmousetool-16.12.3.tar.xz 36140 SHA256 efed807d01bd935e0245dd32e5889bf06d113134d233068cd5423893a4d4e898 SHA512 ef91a91da4706916ab60b33b136d1b5bc97e0ae5b491cd94016520a34cc457a3f322d6b4dcf52653f82a446927f264e433f5ac5d3416a40e76b14955ab915b0e WHIRLPOOL 189fd4fbb2fcbeb2b0d4cc3abe14174d7fbfcb5546503d910ce13e5a6cb56e34981350403ea276ae40781158a09baeb9174d86cd4fa86457d146f743bbe68f3e
+DIST kmousetool-17.04.0.tar.xz 36184 SHA256 1ae479bedd875ab18a49f8a14091f322d24f37d3c81d82dd3f083c15465e1e32 SHA512 de7f85e83d5a82c093cfd5d9256c55bd459adb39b3a72232fd8aaa7f08011c5cce5ea7ee8c913a8d7d0bd79d8490da8c3248ee8ffac5cf143fe0477f2391f54f WHIRLPOOL dcbab95b995e3f4694b8f04a648362d2d1d6fb0f01c5c14dfcae687bf6301687c935bff5c8b4567f3413f7df62017bee4c5ac50816af48d927f25d4dc9fe01d1
diff --git a/kde-apps/kmousetool/kmousetool-17.04.0.ebuild b/kde-apps/kmousetool/kmousetool-17.04.0.ebuild
new file mode 100644
index 000000000000..ed8816c79ab4
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-17.04.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE program that clicks the mouse for you"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	media-libs/phonon[qt4]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep knotify)
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index c81bde192f53..d2f49e2302b3 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1 +1,2 @@
 DIST kmouth-16.12.3.tar.xz 277648 SHA256 a2482f991ff49dcbfb2626a8c4435bf41babb6360ca93af6fe68b9197493dba9 SHA512 798337687eb8cd9c1dba52ec1a0a0682b277dc21d9638f324288e54e34611d299566f497b87d54a2edd01305142fcc2af63f303e5c2b5a8fcac264688f192b11 WHIRLPOOL bab719b1fdaa019b5453005b5db6787a7bfb53d2f0623fbd3afcf301fe3065d9c799f0d5302b5c154b20ff8516d8ea6f2a9b819e8b4373521eb62cc58d223d6a
+DIST kmouth-17.04.0.tar.xz 277656 SHA256 ad1bf0ca8c0d53557edddb1009db65a5e60adf44ac80ad09ae872e06f379054c SHA512 17765e1441b444ac48d88c4400e1994a0996d0fa4d67c4fb2ffffc4ca23dfdea2c1c7869df270d69d4da7c4904e558f2ec2a43298d512ceb9938994e85e98c03 WHIRLPOOL 0e7bfb418021893d14a257bc939227c1d2dc3c3d7422e864bb257456619fa224c01646c00bed2d686e47d0cfcf0c868102e977548b4c7358c9f06b78b8a52608
diff --git a/kde-apps/kmouth/kmouth-17.04.0.ebuild b/kde-apps/kmouth/kmouth-17.04.0.ebuild
new file mode 100644
index 000000000000..9b47d4afcee7
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-17.04.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Text-to-speech synthesizer front end"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index bb9f87c39bcd..e304adaaac85 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1 +1,2 @@
 DIST kmplot-16.12.3.tar.xz 571684 SHA256 df2f4f1f19008b845bbe3722a72ef40975eee5194445dac545c8108d6323700b SHA512 40a64c19c99a3dee0127d89518623f23a85f700ca0b385d30806ddeda18d079da3cc56428c6801e3371c25542a196208134b5fa3531a0869178a4cce4503611e WHIRLPOOL ca92cc30d646e07200da0463a40f0c39eaba3ca79c7e9a14334d16537818d07c6734498ea7f66fdf39a97c7f67730ece53a3bc6af220c587ac1f3054c4b371c1
+DIST kmplot-17.04.0.tar.xz 3029428 SHA256 32d893d36efcb60ea48461fb55307488438eea761cd4eb27b888c29a7d9d7ad8 SHA512 5717e672a1a7149cdf7871a504a0cab751b2880e5b3684c0da62f33136635bc4219e860067885a6aa4690e7bbf9d131d933bec2b6ef259f36ef7ef6b0c15fc54 WHIRLPOOL e83ea3cd38152b995f4eb09f34cf37249031fd5c345d4389a2d443d9d737868624827de5f85e1eea7690f9258b76acb8c869493841e85b82a387309ba02643ff
diff --git a/kde-apps/kmplot/kmplot-17.04.0.ebuild b/kde-apps/kmplot/kmplot-17.04.0.ebuild
new file mode 100644
index 000000000000..b1552a6dc169
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-17.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Mathematical function plotter"
+HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index 44cddabc3a9a..4409fc15986f 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1 +1,2 @@
 DIST knavalbattle-16.12.3.tar.xz 1109032 SHA256 6f4e1fb585746a561c9136203a0ebee88952b043f7840b80f92b211360fac404 SHA512 164898e75fce61b3c5e70c18ca2ae95874488907e4902f399dcae907d6c40f8fcc818e65baddb3466c7e50c1c460e3aa7f3100701dc6671780e1fda454f8b0e4 WHIRLPOOL e3a3eec0b6eb381bab7d08c15e757441ccb67cb431e4a9fe6549ee692005355b3b63bfc0c39f2035ff856bef2fb4ce0b362db80f41dd25899f4f0bb9ce5ab122
+DIST knavalbattle-17.04.0.tar.xz 1220784 SHA256 5db670fcaeeae91bbe8775a0f4e90e91406c18749109685b4b6c3deb681a7e54 SHA512 902d8a494ccbeccfdc966f94c243ef3d71d65030e0f4637e6ef18ddcd25855f3d9d567e3c831ffc3be36e170621494a1ecb802c9f68e59b77a297a1273513975 WHIRLPOOL f9feafe40d345da24e2beef7baa9f31bd3d86d60102034a72c665e68eb46f1408a649c9611734b79481fccf8038cbeca01975c07fe663a88b53be447b9d8cd27
diff --git a/kde-apps/knavalbattle/knavalbattle-17.04.0.ebuild b/kde-apps/knavalbattle/knavalbattle-17.04.0.ebuild
new file mode 100644
index 000000000000..0d122b31b150
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-17.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Battleship clone by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/navalbattle/
+	https://games.kde.org/game.php?game=kbattleship
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS )
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index 18a75fb3bdca..8c57219b8cd8 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1 +1,2 @@
 DIST knetwalk-16.12.3.tar.xz 904512 SHA256 7317d899e878829978cc8bc003a9ffda1138c7dc7c46e0fedbc3076233605bd5 SHA512 d0bd848bbdb61301fb819e3fa9a216ee646d5da2800d81414f79d2ad00045887803d86c70ebc21f36cf1b842146654a957c8b3d821b422951e7248ed89bae74e WHIRLPOOL 35e4de524ae576b059fc839e17f1196fc9e5b3c9bd2d870f4b574ac1898e4077ef4f7a663194de9a4d45a8a7da442629f9c7a71d0b878c265d8431f12b145e89
+DIST knetwalk-17.04.0.tar.xz 981412 SHA256 506399ca1c32ec54fd46344112d68a4d6855e665f0fa7f8261044fb1a5caabfc SHA512 a7b4ccb9c34ac1f5333da7508a66996561085bf3ea10f1d11733dd0162db82508fafdc2857467b97fbdc495b592f85946e0a4d58b2029b282520b75a18875b75 WHIRLPOOL b4af7e480859a11306839240059066423bba5f2a463dfcfe54578020da30514c2b01cb15e5556ae533d6d98ef54583b5a74367e9655617ba52ef0b5736fa4355
diff --git a/kde-apps/knetwalk/knetwalk-17.04.0.ebuild b/kde-apps/knetwalk/knetwalk-17.04.0.ebuild
new file mode 100644
index 000000000000..ca144683321e
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
+HOMEPAGE="
+	https://www.kde.org/applications/games/knetwalk/
+	https://games.kde.org/game.php?game=knetwalk
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index a2ef9029f7ba..1f30115dcaf7 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,3 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST knotes-16.12.3.tar.xz 163236 SHA256 685d48962c7dd9db8fe30f6d219ea76897baa85fcc99907d5c70a8633f4addfb SHA512 247086b15f9c5bfc93116345a03bf04a942a0a4e88847a8f9effa9298c8c4e62c048157216932ccd8162a1e946caa28ce51492ae05533f00967b59ebd6330a8f WHIRLPOOL 6c5d7947fe1a46f7b45e956e0727016bf9e7c5edbbea6481dbf49e9df3b0f52476eaea54e8fa1eb6fbc6cf7c9239a362257efd630dbebb99c4d7613c11b7aa9c
+DIST knotes-17.04.0.tar.xz 334820 SHA256 cc5813205e0ca214b9aa565f16f7107aa4bbea2330d6c31bec076999e12b3e14 SHA512 b9ec3d620ade284771fdb83873d8ef685373bd4e2eb74a737a6c83b89c4c489b2c212b4fc68dd1c3b41915a08d736f112b62c5ad0df8b8059c31be3c9936e1cb WHIRLPOOL e0d98194762a41c00eb4bae23c39a3130ba4566b505fc7e84163efe12d5219c5513103be3bac903f01a2b60b63759b2265be94aa7a68377d2e37a25460b6b10b
diff --git a/kde-apps/knotes/knotes-17.04.0.ebuild b/kde-apps/knotes/knotes-17.04.0.ebuild
new file mode 100644
index 000000000000..1bac61455b13
--- /dev/null
+++ b/kde-apps/knotes/knotes-17.04.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://www.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+# 	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index d77cf693a8b7..58bb4b237984 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1 +1,2 @@
 DIST kolf-16.12.3.tar.xz 768284 SHA256 a5ddaeb9b7805124c287b2af977cee254b0d30c316542627465964ca90f3d18c SHA512 8ba27de31febf53b8b3f69e9765aee93194b4b44b3038a4f64e698451574b31e986c6bff440cfb68cb451c8cb16f4f5d282aa8ad84579b14b44aefb6849990f3 WHIRLPOOL 5ef417e8913d5c38df06cc5a677de82e66dacc06c19f7a9b24fb8fa9202d3344556edc145496812c1d5195e3e84ec99fee2ef56805fca1b3f86c6b29cddc648f
+DIST kolf-17.04.0.tar.xz 768204 SHA256 6af8fea09dc0eb3eb0f1f625350f3cc766e5e6387ce1d3f66bebd2ad44f17be7 SHA512 c4bb78f0bf00e87346e8a4c7b815e3b60bc9afa4ad4a81abd92220c920792906f5286ab12f131abc6764f68d4c9305c1d283056d47d78d5efa581afa3c263aa6 WHIRLPOOL 3ab6132fab44f206639b13d0b48db96013a8d849eb0b3b6c5a0f79f0208383063abbbff56129e8e28b02997cde2e30ccb7fabce190e7e89307968464e9864a92
diff --git a/kde-apps/kolf/kolf-17.04.0.ebuild b/kde-apps/kolf/kolf-17.04.0.ebuild
new file mode 100644
index 000000000000..6b1aebed0ddf
--- /dev/null
+++ b/kde-apps/kolf/kolf-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Minigolf Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kolf/
+	https://games.kde.org/game.php?game=kolf
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 0ce62d20693e..711650f5fd48 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1 +1,2 @@
 DIST kollision-16.12.3.tar.xz 226740 SHA256 348a71e3fce1cfa08cd072b436c7656c8f5ba717a827fdd461cae8972ac6964f SHA512 0f690bf29d6f954729828adbf1a9381459bf6670445c3e9712fdd046ffef24487406200a79a3c520c3d084bf5a4bbe00f1ab08b0a76d32f4ac9ae52bab664520 WHIRLPOOL 2acc1dbc67b9253b18c8ec464ca5fab56697103c0f410a101d1b4d6cf38d3f2d3807bc41923a5ae6a0935fdf441a9f02c0aed2c19e6d0c573e0786d1dd8a2487
+DIST kollision-17.04.0.tar.xz 271924 SHA256 3dba0469bd7d54757550bf9fe05a43a670e0b9bc0671e7e880f4fa9da44468a2 SHA512 8ce47c96429cddb0a1240457fab64b863cfe69e56c5d69cd22a68c0b3a290dbdab7bc2745a09c836b8397369beb4b83c01b95f610d51c733934bb6e765dcdbc5 WHIRLPOOL be0fa2c2b4fdc12e49c4d19dea94eecea43bb125bbfa2669c9750f5484c305249058bff652de8612ae9f86f07a6d0ba4323367989d090a4baba5828d8aa65cd0
diff --git a/kde-apps/kollision/kollision-17.04.0.ebuild b/kde-apps/kollision/kollision-17.04.0.ebuild
new file mode 100644
index 000000000000..1a2f4242c9db
--- /dev/null
+++ b/kde-apps/kollision/kollision-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kollision/
+	https://games.kde.org/game.php?game=kollision
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index cb227a9f97cf..ee729e9cabad 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1 +1,2 @@
 DIST kolourpaint-16.12.3.tar.xz 879332 SHA256 ebb3dde7bbcdc289083a873169cb08e013fc02517e8914cf7a0ceebf96ede3f9 SHA512 7d3a6fd104dd8567a5bebf092d507e4f03ad6f53216e4246477508be1854ee60624c154c81c47647ad83be4b498f1a3d248539ecab30ba75b14b7c3936a305ac WHIRLPOOL f4e7b73602d7f0cda5972fec0e86cf8698524e6c54e78b11e8b03983549154398c01e140a933f80e1315e4750ec42cbad01593da5e6d269004854f985955e5d4
+DIST kolourpaint-17.04.0.tar.xz 5552260 SHA256 b01fc3a2a43f2225dd35bc147b283567b16406772d08b82c2fd40e8a41bfbce2 SHA512 7f287f9b046fc5c6475b8da4da8172b3d9bc2939e9ef56a3ac837ece67a5fcc2c57bca61d4bf70ec5ec7cc97b7d691bfc68ca28656ce9b6a9ac2b65891f36023 WHIRLPOOL 37f0d92c89add7ecacf9c17cc23ef56a6c65e4dec7273648ef46a914c8a33e584a072675f6c774b85815ff09bee0eccd86869b0663d043de689d4d9de5afdef0
diff --git a/kde-apps/kolourpaint/kolourpaint-17.04.0.ebuild b/kde-apps/kolourpaint/kolourpaint-17.04.0.ebuild
new file mode 100644
index 000000000000..8e7b57d9beba
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-17.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Paint Program by KDE"
+HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
+IUSE="scanner"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package scanner KF5Sane)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 5af919fc1d17..70ad71224455 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1 +1,2 @@
 DIST kompare-16.12.3.tar.xz 237568 SHA256 5ce9ad584ffb10b5b66e80fdd86f526109f814dc5a45b9ea2cfdb6d88920e6a3 SHA512 4b5e9793f6cf7473af5c93e019173f056941b87aa7aeefb171bdc33513a5f7cebe5877cbd3a7d2f6f2431b2c4c0677a47c9b54e8eab8dc7a2a01459ab3a219a3 WHIRLPOOL 53427421bfcd782aeb521e1ebba3b9c46854feaec993015ba1c0378885e29dcddd153c93dddc826d436686c09206346611d176e85e3e0e4f5c5cc6209539a98f
+DIST kompare-17.04.0.tar.xz 708056 SHA256 ce7875a28eb51caed325a2d63194c70acb17c112df14f1b4b7d8e70d4f0f3d1a SHA512 db71e1555a1de5cdb712688637fde42117f9e7be6bc69abee9167524bef6071e3ba88624718f3f14acaff81b928bed44996c7da45544d2719a1d5de710a8c00e WHIRLPOOL a68b3006703f594697ab16ccae2afc7b211217e891fe68606beb33b9feb2bab92d011d738cc8d59406c25582f0fd4f929a469a7a84900f3025f40a903612c93c
diff --git a/kde-apps/kompare/kompare-17.04.0.ebuild b/kde-apps/kompare/kompare-17.04.0.ebuild
new file mode 100644
index 000000000000..903d62f4586f
--- /dev/null
+++ b/kde-apps/kompare/kompare-17.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A program to view the differences between files"
+HOMEPAGE="https://www.kde.org/applications/development/kompare
+http://www.caffeinated.me.uk/kompare"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkomparediff2)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index e4da73f4d486..180c5605554f 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,2 +1,3 @@
 DIST kde-baseapps-16.08.3.tar.xz 2051000 SHA256 47e9bb15c64495392625d69af9ac7e00644caa52c98c7187489a7c569ec842a1 SHA512 6606430c2ec5ab934d253a009bbc2c1df4e9d1f8b54dcf16dd9f1894449d7c734641f17360b906a3a7667ac7083ab712b8498b44a20c137d836dd1dab8963649 WHIRLPOOL b65a32a9c03424ed6718db4b5fea85c28690074f450f49df1c581d77e03cc172004dda5aadd39de087e6ff0d101ac1f7587a960e20f7d4faa56f2b45a6ee7643
 DIST konqueror-16.12.3.tar.xz 1172012 SHA256 e52654a1bb2c0be317f8ed80dba3147bc4d2126abce209ab57c6e69e64159bdf SHA512 cef6fe2fbade73a89d8f8b7932ae0dba42d98fbf1160dcc888339a071d72084aeb847fc74a22ae4a39b21fd0cef24a60832e343885c0e673b418482faebad93a WHIRLPOOL 1afb257eb10cff77e71d1479972d25029727dd1a6202173422203f9e309767a80150b713a104dd7848c66ad86c342e1c6a1d7bf28c705051a52e9a120ed1d4c3
+DIST konqueror-17.04.0.tar.xz 7783204 SHA256 95a6358da4cfd9589b66b78116adce29c0f69a5964e81fcde3862e32b1653833 SHA512 8d6c00a4df41a7feec82b63647a64fabf810dad8ed40647178d98529bfcfbfc228a05649f5b1e267644cd21db1efbc8fe43362a2dfef25bdec5b4cfee336336a WHIRLPOOL ae83fb5f379d2c68e0ec0fad1a96d22da0747268500963532fd2caadb04142cd731ff30939c1538fd4165ca31cb8a34c6bbfe7097831dcafe6f85f99bd870efb
diff --git a/kde-apps/konqueror/konqueror-17.04.0.ebuild b/kde-apps/konqueror/konqueror-17.04.0.ebuild
new file mode 100644
index 000000000000..5ce93213cc21
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-17.04.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+	https://www.kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities speech tidy X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesu)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/zlib
+	speech? ( $(add_qt_dep qtspeech) )
+	tidy? ( app-text/htmltidy )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kfmclient:4
+	!kde-apps/konq-plugins
+	!kde-apps/libkonq:5
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tidy LibTidy)
+		$(cmake-utils_use_find_package X X11)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+		elog "For bookmarks support, install keditbookmarks:"
+		elog "kde-apps/keditbookmarks:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/dolphin:${SLOT} ; then
+		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+		elog "kde-apps/dolphin:${SLOT}"
+	fi
+
+	if ! has_version kde-apps/svg:${SLOT} ; then
+		elog "For konqueror to view SVGs, install the svg kpart:"
+		elog "kde-apps/svgpart:${SLOT}"
+	fi
+
+	if ! has_version virtual/jre ; then
+		elog "To use Java on webpages install virtual/jre."
+	fi
+}
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index c0954ee5157f..135e425a7ef6 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1 +1,2 @@
 DIST konquest-16.12.3.tar.xz 405696 SHA256 6eeee2fca425bd16c86df2626bde8c3f95d35035e36e109e64b53611f94d1fba SHA512 276c3d5b8fed00945459c6db6905d598533c47b507a5599c46d4728f7c06661f92348a38af498d789b2975f0b03ffbad8eee6ac69e6319c63ccf2561fdeb7174 WHIRLPOOL 84163ebee94e7dbfff8e1bd00a38a3f337b5c3e7a3e4632b693f742c4e4c539d6bf743bef5436b0d9d41d1d77b2260099f8a568662da59f3916d73a187a8fe6b
+DIST konquest-17.04.0.tar.xz 405700 SHA256 0b28b5273e93be7f8a48e2b5705d654fec229b0077a1041808678a00fe80f539 SHA512 77c271657e7c68cc4afc2b22ff0bf219b0b8a64a3b3eb255692ca89e3ca21927c3d870e4bfd97680718aea76d3943d55cbfddf3d02d4a9f9a99d508a3b088db0 WHIRLPOOL 06bb6e6ce92e3359d3641bb9b2abf968bf1fe2a459d419ac6056e6f74a4118a87e7a18fb295059dbb5f63eaac191385f38e09f4a488568a25b02c01404f2b6cd
diff --git a/kde-apps/konquest/konquest-17.04.0.ebuild b/kde-apps/konquest/konquest-17.04.0.ebuild
new file mode 100644
index 000000000000..79fecbf37d11
--- /dev/null
+++ b/kde-apps/konquest/konquest-17.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/konquest/
+	https://games.kde.org/game.php?game=konquest
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index da99ba5d1211..caa44ac4e846 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1 +1,2 @@
 DIST konsole-16.12.3.tar.xz 464016 SHA256 47b65c2886990274c2dbdfa21c920849899babe8381230fb9d7a69adb7cf6782 SHA512 c6ce7e10434949cb90183361780322a44f720e304ed14203522d1ae3ad843460186b0abb11432ce99b1299a03ec590f4af4f90aa13238b7e457ed7517c8f2934 WHIRLPOOL 5ef70c51d59e45fb417d0dbda5296f31159b7ba51e10bb375d86d0ef47612f98f1e20a78dcb73140f45bfa7ae3a5a838c3c121a2874af6c1e551dd404cb25b12
+DIST konsole-17.04.0.tar.xz 1007968 SHA256 90c8256322060bf99dfab1a3d21f42870205050445502fb543d9e2a5a2d22a06 SHA512 312c4fb0ce40309d040701cd9b80f3e3806c761a30d587d13d8c52f6d3fa9912315d93d47ea308d3bd95dff3f0778d368d8f1df320e9cf6b40fb9ee969bc1e6d WHIRLPOOL 941c8780ff7a45c506114a90298157fe91a151181f67be2e5b52a29e6f51362a8746b1119904c8f5111e863f693223b53ca11cd8e66d44b6001de4dee5713e3f
diff --git a/kde-apps/konsole/konsole-17.04.0.ebuild b/kde-apps/konsole/konsole-17.04.0.ebuild
new file mode 100644
index 000000000000..090b01376b88
--- /dev/null
+++ b/kde-apps/konsole/konsole-17.04.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 891e86ef85b9..c9d55be96ba3 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,3 +1,4 @@
 DIST akonadi-calendar-tools-16.12.3.tar.xz 61980 SHA256 87f47068abcd78dad54903c9c29399ef965bcce03d64beb41743de7328abf394 SHA512 2bce7a50a1ca13641752a191d43379444115c874d6ab852b83eaa5ea0e5ee7c357640755685f7175f98a5dcdb1bc04c08e3e224970c70f3dd324458920ea6d63 WHIRLPOOL 5693b938e8e13f60c06010ee920167a616105648ece8e63041aba24d08cf2a577bb1937fed7cb67ee946f46905f75c12c6018eb54667d99cfd84b755f409a095
+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.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild
new file mode 100644
index 000000000000..d1b11741c694
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-17.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KMNAME="akonadi-calendar-tools"
+inherit kde5
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 72f0c64151ed..10e5df4fe2fb 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,3 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST kontact-16.12.3.tar.xz 823840 SHA256 fa92b67a108ff73b1cd7e9bf22e32cfa99c0d359128e343418a3363355e24472 SHA512 a0ac727c60a8be3777711969a0135e38a25bc1d913e64893138408e72190c6f2cc303d2956ee7bef6b9bcc4717db7135f075f1b7b446ac2fe8564b4fe3193253 WHIRLPOOL 417e03865aa8b9348425c66f7aba818d2cd39ae03e12a693fc69535b06a9c58f8ef480a9853a392b3af7cb029f97e3322d2a471353acf0c7cb48aa680d8bcbf0
+DIST kontact-17.04.0.tar.xz 862864 SHA256 e60485b85f60930c8ec4a3fe9e93e7f7e3f450a3c463d81f6a5a247bbc1a5344 SHA512 7654b5a108ac8a655cc04080adc52062cb373b69b5b575ad43f21d26bb77056d252ce22d65923df8a8b9ee67fdcb3015970f983281b7594d1be37c73d29cb19b WHIRLPOOL 6dfd9b82cdd850db9d4d8445420798728edd5093b63b66cc13960b641f4910d2e1de85c2a38176d7e3feb67851cb5a919fe78d6d3c1d5e3952042c15bcd6132e
diff --git a/kde-apps/kontact/kontact-17.04.0.ebuild b/kde-apps/kontact/kontact-17.04.0.ebuild
new file mode 100644
index 000000000000..9070db9d5e30
--- /dev/null
+++ b/kde-apps/kontact/kontact-17.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index af495cb35736..22f5e85ea3f4 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1 +1,2 @@
 DIST kontactinterface-16.12.3.tar.xz 25036 SHA256 28cd70909b70b517a2196cc7a0adbbba586b7480ef6bd138cf3380db47dfb058 SHA512 4c8733ce70ce447bf498c7b48ec303a4cea80e70cdcd5b06f07410a98dd5ba8f2845ac36a0a666a43e0a6a8e972568578a659423ef4e69fb77856e9776bbd457 WHIRLPOOL fc1097f7442032ceb1198546916b091e597208e13dc8dbb0a609959bcedf8134b384714d31da8ab8ddbbc473ee9ca8e061ede37372bebd1ea1f800937a33816c
+DIST kontactinterface-17.04.0.tar.xz 32608 SHA256 864afe8905f7d9146bfc259f0d393964bb0d69614472218a765ee1fc5c2dad95 SHA512 6eca00e962dd31003a8298d54b08fbcdb2ef5af15049a27e3b2da8b647446fb293efc470c613c690ac2bf65a33e6c624e1a95c0874c570e77fb9b41b8e4eee11 WHIRLPOOL 963890f473e5c892e363af30e0320311b3b3cc44e39c6008096b084cac7c3beab64e91682d93fca1416ce96241e3dae24d7dfad03107032785322edc4977d3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild b/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild
new file mode 100644
index 000000000000..d76cacbfe397
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-17.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 60aca3428f1a..7e22c41e800d 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,2 +1,3 @@
 DIST kopete-16.12.2.tar.xz 6339196 SHA256 2b0a73771f842998a2d39050367f89686409ac798592e5c191197acd9c5bc02d SHA512 fff8ab7e190b9f66f367c354f4ed75ba33653d7a7e4b42f577ca999a8c9c85f4cf09bb261b079b9d6e9108e3ef8ad9195305c82cfaeb8fe853c57236f4d30391 WHIRLPOOL 2d9905cd83e656723ce745c36685f34ffa75eb1d28e34e2ca83a4dc514f77a0cb6a4e5f70aeba72553880047c86c2343381cb7dcd95d23629dafe5d87b577ce5
 DIST kopete-16.12.3.tar.xz 6340128 SHA256 61be9e45cb08e42a00bdc0e99f5d7ad7872299ac2e104124a3c0d939422376b6 SHA512 00327485a367e0daa69dc67bfe0e7cd12293fe57bcc22d48fe0872546b3f757dbd2e349c557ad89452951d59340f615b66a7d4155a7b29fceb3d404d0b6006b7 WHIRLPOOL 9e061459783e15751d795ef4b4d16ca387d8fcbdb745f5ded141c3a7ddbd3a52066e4c7e892d71a838db36c8ee514d17dce1e9861a57d9ad11792e7cfd440c61
+DIST kopete-17.04.0.tar.xz 6340128 SHA256 50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1 SHA512 5323362fed37f99cc9a45eead13b4fcf2346cddf270f73716858cf38b36043a56d73d51035e9007975e92f96df4814b0b282cdcc13107cd75e4e8d8273effa59 WHIRLPOOL 6246e2f1b47ef46965b20e361da4b8a5deb8699956369d9ec8d3408b4f7eaacd958c124f80f4f638ecf5ea3651dd1fe6b370330d31c2cb65630052e8fecb8346
diff --git a/kde-apps/kopete/kopete-17.04.0.ebuild b/kde-apps/kopete/kopete-17.04.0.ebuild
new file mode 100644
index 000000000000..be9563fab702
--- /dev/null
+++ b/kde-apps/kopete/kopete-17.04.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug ssl v4l"
+
+# tests hang, last checked for 4.2.96
+RESTRICT+=" test"
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	cryptography: kde-apps/kdepim-common-libs:4 or kde-apps/libkleo:4
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes cryptography +highlight
++history latex +nowlistening otr +pipes +privacy +statistics +texteffect
++translator +urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	oscar: NO DEPS
+#	telepathy: net-libs/decibel
+#	testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
+testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#	telepathy: net-libs/decibel
+#	irc: NO DEPS
+#	msn: net-libs/libmsn
+#	qq: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	$(add_kdeapps_dep kdepimlibs)
+	dev-libs/libpcre
+	>=dev-qt/qtgui-4.4.0:4[mng]
+	kde-frameworks/kdelibs:4[zeroconf?]
+	media-libs/phonon[qt4]
+	media-libs/qimageblitz
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	cryptography? (
+		|| (
+			$(add_kdeapps_dep kdepim-common-libs)
+			$(add_kdeapps_dep libkleo '' 4.4.2016.01-r1)
+		)
+	)
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt4(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		net-libs/libsrtp:=
+		net-libs/ortp:=
+	)
+	meanwhile? ( net-libs/meanwhile )
+	otr? ( >=net-libs/libotr-4.0.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2[qt4(+)]
+		dev-libs/qjson
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+	jingle? ( media-libs/speex )
+	latex? (
+		virtual/imagemagick-tools
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+	winpopup? ( net-fs/samba )
+"
+DEPEND="${COMMONDEPEND}
+	jingle? ( dev-libs/jsoncpp )
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DWITH_LiboRTP=$(usex jingle)
+		-DWITH_Mediastreamer=$(usex jingle)
+		-DDISABLE_VIDEOSUPPORT=$(usex !v4l)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			jingle) x2=libjingle ;;
+			xmpp) x2=jabber ;;
+			zeroconf) x2=bonjour ;;
+			*) x2=${x/+/} ;;
+		esac
+		mycmakeargs+=( -DWITH_${x2}=$(usex ${x/+/}) )
+	done
+
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF -DWITH_sms=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; then # || use irc; then
+			if ! has_version "app-crypt/qca:2[ssl]" ; then
+				elog "In order to use ssl in xmpp you'll need to"
+				elog "install app-crypt/qca package with USE=ssl."
+			fi
+		fi
+	fi
+}
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index c55ea8ba6c85..9c050d936d1f 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,3 +1,4 @@
 DIST kdepim-4.14.11_pre20160211.tar.gz 18551484 SHA256 b970c0c04652519cc7e88d818b3a29e7b356a73f449f7f6e5767d60e5b2a17e3 SHA512 e7fcf14353e457e9b3ec2d7eefa18ac0d9bc454ecaa682dcaf1585a6a36968bc8d7ea6ab61398a8d697d9343f0cd87472a906d444f814cd44956b6499826bb1d WHIRLPOOL f66fd74138ce871f88ce211c3b6af287cddaeda493e42c3b683938c274482d1f09a3ae659d380d4e19f5e5da70f5724ddd48723acf5846f6a1e9c01a79803e7e
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST korganizer-16.12.3.tar.xz 830624 SHA256 ea193a9effd4395d4b5bfcc48e927669e80f29d15665e891825cfe17c4a0449c SHA512 a1a249c0a01dd759eeee840a43c285a93911e5ad9e37b21ea8932a5cb24a07edf2b46a04c39246c235de4cf802ac759be23d2408f7dee4ba7f1170dcbefc15e5 WHIRLPOOL b7a30f7a4711ed4a95198488b29baac8d98969ed4e5b93126384fdf0d9a270af84c7fef754171988ee134e511c72ca411b0f50473a9f74fcf6ab07020be777d7
+DIST korganizer-17.04.0.tar.xz 2344316 SHA256 3a34366cb3035beb33271197e1bfe655dd8a15793bf825e2cee0d21ab7eead8e SHA512 301010096749b7e6b2332d7b476f601b4d3a5ff1a9148f470cc8390174ee8c6b93eac83c3c5865e510b06ac49f6a6440ac7a80242348f7ec9b47515a102d97b8 WHIRLPOOL f92eebfe76ef58282322e15640c41689931fc61e7c7eb0156b47dbc3f03327be646d63e1521d30ce0c871f0bb02bf31b5482604700ba34ed55b1b4223338399f
diff --git a/kde-apps/korganizer/korganizer-17.04.0.ebuild b/kde-apps/korganizer/korganizer-17.04.0.ebuild
new file mode 100644
index 000000000000..67bc6e6a9e71
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-17.04.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="X"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-calendar)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-notes)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep eventviews)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kholidays)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep designer)
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	$(add_kdeapps_dep kdepim-runtime)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index de9c93b34dc5..e80eb05904a5 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1 +1,2 @@
 DIST kpat-16.12.3.tar.xz 3274944 SHA256 f563d321da86fef470c15717aa24b554fce50444c1eb289cf351d37cf0d91b13 SHA512 1051b218ce8ce9106f0b05b0fbc68dbc08838fd404677092e80f0959734de18de4758256f91249886a90e4c1e76ea34fa040ff8a761b20e429bfb8ca747fac76 WHIRLPOOL 725f3da48a486ad130045e7d2250a5a79d8c79f12869a8138e238625548bb2eb6b95c83436e51d27c2cc37b9f9e748a46d0f98146cb19e785ce4f24f0632741a
+DIST kpat-17.04.0.tar.xz 3566520 SHA256 7e27c3c1a631b2376b06ccbf7ec290592f47847e31f169bd968cdefeaff82715 SHA512 9498396a6c93f4b25aa726df0bd6843da483bfbcea02841a1dda143fa821295772b535b3b2bf4e78483d082e48af0fe7fcac1998ff15cca02a1610323758620a WHIRLPOOL 241e6b3fc475ee7f73d2fe28ed8d25247e98911d9195125b62468770b716350e6797a076e9153d305518058a984d42e3ace9e7964fe1cb46471d08999bab71d9
diff --git a/kde-apps/kpat/kpat-17.04.0.ebuild b/kde-apps/kpat/kpat-17.04.0.ebuild
new file mode 100644
index 000000000000..cf64aeec2e90
--- /dev/null
+++ b/kde-apps/kpat/kpat-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE patience game"
+HOMEPAGE="https://games.kde.org/game.php?game=kpat"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index 5bac1d3ed31d..a28a8f8aaf81 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1 +1,2 @@
 DIST kpimtextedit-16.12.3.tar.xz 79332 SHA256 7ccda0f1a0ee199af670f9894c4573f3f0bd727b13aff8776c1381f3114d3f1a SHA512 a4cedc8be9b48b732fa9fd92ab70bdbc1ba489172c9329f67b96220b8ce4f1ec7aa34da154490187e2ca26cb4245fdbf432c74e45c381096b3bbbc945e26be27 WHIRLPOOL 9d26031d90e5de7b1c67aa69f3fa31927df2a78b8f51fe1c0f42e4b992c9d9b08679602fe70f4a4a4f80a82cd252ccdfff6636c30c1e5067e520e78b061d02b6
+DIST kpimtextedit-17.04.0.tar.xz 139312 SHA256 51907b639c37eebc7dfbddf3275e5c81dfd79a82ca12c20dc46f06d4009ba080 SHA512 52be8ccf08f44ecfe2bfc900a40b3937b50b5f8b0929ad3e13295bdb6bc7b674147daf42a576be6c174f79d046fcdfd76eae9e66c1ad7dfabfbdf9e44861a15f WHIRLPOOL 9c50369526c94625daa3a8a920a18fa966e21c6c42b684b8dd47c790abb42a23772fb77f7b28633df45f9b849d399be89d1c1b792aa5ae74cdcf119fec5cdf8e
diff --git a/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild
new file mode 100644
index 000000000000..7097aaa285fc
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-17.04.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="A textedit with PIM-specific features"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/grantlee:5
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${RDEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kppp/Manifest b/kde-apps/kppp/Manifest
index 9a3b93346b92..b71a7669d0de 100644
--- a/kde-apps/kppp/Manifest
+++ b/kde-apps/kppp/Manifest
@@ -1 +1,2 @@
 DIST kppp-16.12.3.tar.xz 700924 SHA256 6ca544f2ec3e529490ffb4dbaa4a78065b2d21373a0d55d24433b2ef7e491b53 SHA512 7a29e80c4ea712a58c8e04b7999b0f333cafda61a1a33fad94b740b0cffdc469425bc6bc2ea0f70099ab1b7fdb4b96ffa86b021b74ffe785673917755776fd6f WHIRLPOOL 7d7ec34d09ab78cf4ee0a2a1f9b92496abb80b0d84a456486076957151c80a4257c96c7135e8f805f738ae7f0aef99bc905ecbb2063da390220486ae247495fc
+DIST kppp-17.04.0.tar.xz 700980 SHA256 c1522fd5da097e73d56c112d8324d8da72ea18f957708defdc761bf832623cce SHA512 76fbae9dee8ea4655dbc9a25f65cc7b8ff44bdf7f5e8d58ba3e6ce5d6b5aac57e175c8a7187e989e5f65b1c90cbee75b53d58f1ba45ff5ee3acdbee7b525a8d7 WHIRLPOOL b7c00c783bb30aa9d4fef22206bb5b67cc19a22593534bf01222872e33bb772f498fe13e9ad87a5b3520ea3d5b562df41ef27a18699be202631996c9c56327d8
diff --git a/kde-apps/kppp/kppp-17.04.0.ebuild b/kde-apps/kppp/kppp-17.04.0.ebuild
new file mode 100644
index 000000000000..de6d1bdd652e
--- /dev/null
+++ b/kde-apps/kppp/kppp-17.04.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A dialer and front-end to pppd"
+HOMEPAGE="https://www.kde.org/applications/internet/kppp"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	net-dialup/ppp
+"
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 4b675ae7209b..b1c35ebfdbac 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1 +1,2 @@
 DIST kqtquickcharts-16.12.3.tar.xz 25496 SHA256 0e3f4da1071ad17a8bd86db536716aa2bcb44bc10c23f9c9bca82a1cfb4ef6f7 SHA512 dc9f12a5fadaf24999052ccdad6389f918e6b49f2618ebd67097fa001180d339ecb5e3515f35e6a57c37e60b49b304a3045ac965a76ad03f21b049851b5d7859 WHIRLPOOL d60ca648d13311d1435599ce7739b9412a8d8f60279327415e4c71a16999a9e0d030e2c20dacd6c92e582b1ab1a541d8fbb8b38ff7d10bd8cbc935c64b635753
+DIST kqtquickcharts-17.04.0.tar.xz 25500 SHA256 7309f7081a79f3ffd04780f00b1a4a06d28d5ab094afe81907655d1d89ee046b SHA512 7158cab96ecc1b689b71e156a88212087911afa8f0f791890a9c4a9360e8c8034c5e17c674dd5b36beedb53f4e78eecf274219910fda460274338cdfd424798c WHIRLPOOL 9dfcbc9b2acddbd0550c7f78c06c39aae65f1666ebb188f262bc5a6211c3d8da35cab870b6513c2a2d08fb25429980beb3d7c652877f218eec3311b9c37152c5
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-17.04.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-17.04.0.ebuild
new file mode 100644
index 000000000000..897bfe5848a7
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-17.04.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index c30170cdd726..2ca27ff99904 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1 +1,2 @@
 DIST krdc-16.12.3.tar.xz 291024 SHA256 f803e173bbef069404db1d96d73dbc19b8bda712964eac9245a7fa70c6e83a6e SHA512 408f0f80d87abdec8fae7e000777a9254cc8d56309b134b35b38504dd0d55fae58a570eae87e4c33553d4d3787259535dea26d0d7b9be3c7e9b6ee27a9e603a4 WHIRLPOOL 51e17b71580a4f45cc0b4c040d66cb80d75b7070f66072dbbab2a58041fcf3478e3622ecb458334c8db16b0ed356b388a7879c263df2d4c8840049ecd16b2822
+DIST krdc-17.04.0.tar.xz 1557128 SHA256 10b789697cc7863d45b78cef4d06fa5d52cb15975761610a643ed58e2698dfe7 SHA512 a6adab1b69d6200a7015e6f52a94408b8740da8afbf079c878653cc9c3def70ff3388d57febecb5d57ac56abf8be70a732b47651ef8cb18a475ad4dec242f558 WHIRLPOOL 50f75cf6abf5c9b7750f33dd8523847a0d88107985bfedb0303d108a082e232a4c184bb5926c9dc4c42dd6a9a7b3e40b5db17444cfcd4af0a37b4b3d5a2263c1
diff --git a/kde-apps/krdc/krdc-17.04.0.ebuild b/kde-apps/krdc/krdc-17.04.0.ebuild
new file mode 100644
index 000000000000..65b39cfc33b0
--- /dev/null
+++ b/kde-apps/krdc/krdc-17.04.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Remote desktop connection (RDP and VNC) client"
+HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rdp vnc"
+
+#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	vnc? ( >=net-libs/libvncserver-0.9 )
+"
+RDEPEND="${DEPEND}
+	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LibVNCServer=$(usex vnc)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kremotecontrol/Manifest b/kde-apps/kremotecontrol/Manifest
index 4352e40a5517..d53cfcaf7185 100644
--- a/kde-apps/kremotecontrol/Manifest
+++ b/kde-apps/kremotecontrol/Manifest
@@ -1 +1,2 @@
 DIST kremotecontrol-16.12.3.tar.xz 1074232 SHA256 73d9a22860ffb343fb2504dba2fac30b9aed29013da5db700793a9b3f6439a75 SHA512 893fc674a66952f0e86de3dab609c157befd0a81a796ae29f5de890e1fb65f5b5a05c608dfdfbcc68a1b915d71aa4d5144056cb6e9bdc2236a111ee3572de807 WHIRLPOOL 23f1a29596e8d1116892bdfda1632d5b5f3de29b6e655f43dfccccc91388d2f5c0203a5593191ac772ecbb5c03eed931b39db19099593e6b1d2c0d7d22a3f16f
+DIST kremotecontrol-17.04.0.tar.xz 1074260 SHA256 d6920c71f5151c7909a86979b4d58bc2112590d34d71e39a46556672f975851f SHA512 bc5e1c70d3081013469875053746f751c1696cf7f34b04103ccb784557f8a672d1375fbf45e5469aeaeea2642cc46023956da5a5a6dfefce1c34a960a5758da8 WHIRLPOOL 13e6be7c27d122b987217d7bb7927f63f388b127c7bbfb5cac3f759fa8211a34328dfba4c02c9d3df3c64346af02bf8c5d3697102ea8b3c3ed3b1dd12b86985c
diff --git a/kde-apps/kremotecontrol/kremotecontrol-17.04.0.ebuild b/kde-apps/kremotecontrol/kremotecontrol-17.04.0.ebuild
new file mode 100644
index 000000000000..8ecc2d93ce57
--- /dev/null
+++ b/kde-apps/kremotecontrol/kremotecontrol-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
+HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
+https://utils.kde.org/projects/kremotecontrol"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-misc/lirc
+"
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 658e9280cdca..9ea970ab6cb4 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1 +1,2 @@
 DIST kreversi-16.12.3.tar.xz 475032 SHA256 2b69bcc84dcfe9c276dcde143bc306ac96827b2653d69df6021723368cf026e2 SHA512 25958417222d1904e27caff2c4ab02e65adaf31abd26d9b7e97446b9fc22fe9205e0f944c763ecc03fbe442763d8340c82bc745e2c8e3a147583a104548672fe WHIRLPOOL 9b24855dc95935c51268a2fee0db69afdbe71dda5fff977e97da9f3390f69f7d3ffb46a9d829e5adcc437e74cc6cea86cf00a1f7cc75eb690eda8acc59c16957
+DIST kreversi-17.04.0.tar.xz 475092 SHA256 e3671c1c2e9adeac9c2f28fa660be047bad64dee881cf907395070daedabb61c SHA512 2aeafe23f68171c9b467d9742078c1444194d110104010236c29e91d3771a75de3f4cae0138a26d3c58f98187c45a8237650e766dcf328a9d1639f49cedc59e6 WHIRLPOOL 1ac9c83555c8da6d35ad1614c8eb196356e261d968cc0cdb719ff9326723a8fbb7d7ff914ef0088d3bd20c162cf107de2720b4dbdf42960595aeb0ea0056458b
diff --git a/kde-apps/kreversi/kreversi-17.04.0.ebuild b/kde-apps/kreversi/kreversi-17.04.0.ebuild
new file mode 100644
index 000000000000..ee68ccb9e16a
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-17.04.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Board Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kreversi/
+	https://games.kde.org/game.php?game=kreversi
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index ab46bd8637db..e8d6a8d5f71f 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,2 +1,3 @@
 DIST krfb-15.08.3.tar.xz 326932 SHA256 c16c76a6daceb6adc71352d741ed5893c5cd69cc922bac1221a922372f1e3436 SHA512 afb373c335434e43e0a4ce69c0f3a360aab3b1845b02c38363704ececa2304f4fab115840cac538033823036dcf7d84ebd78210443951fdd4d155dd80579aeeb WHIRLPOOL a20f9d69240f2f5910de6205f7a7ddda1142761c4efcf5347d838d53cc66988dd06408f0aaeee81ce5f7cd8c31574ada54a3e7e7607298658f1367c7386bcbdc
 DIST krfb-16.12.3.tar.xz 165400 SHA256 1b12e5cf8bba7a2e73af4ed521c0ab7546a1d4994595f61aad69f549db075fc6 SHA512 d9e594759900579f599262c8bfbfd3b64bf88fcc98a7cbff50233188557c21796743026c699963d3bdf7ae8e42e35e68457e740a310b31596dadc12f98d0ee51 WHIRLPOOL 1225b0bcf8229b12f2e0db644c4aeb49103a4be622b30fb7e20f8955fd8bad8373b22438f6a15ee74129dd49fdea550ba6dd4624941de87c5f713e7ac7c0659d
+DIST krfb-17.04.0.tar.xz 984072 SHA256 7ee97a4bb37c43fcd57f72cb7820fe9ab2481702ab77e341c37c5f00c7de6a86 SHA512 13c5ded30b71b4c024826c3ffee95785e4f07b910b94de683b3a87303cbd5bc24d15979c850386d2e203f36116fd5320c128280f52771d62c8345f912a256f89 WHIRLPOOL 135df57357cd743096b1c5fb30664e82d1ef1c4f2c11a04299bf77afb42e31836801cd611e4fce969035f6765423288f487d78bd7c7cc3d31607011ddd16aa5a
diff --git a/kde-apps/krfb/krfb-17.04.0.ebuild b/kde-apps/krfb/krfb-17.04.0.ebuild
new file mode 100644
index 000000000000..3b5956a54b35
--- /dev/null
+++ b/kde-apps/krfb/krfb-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+HOMEPAGE="https://www.kde.org/applications/system/krfb/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	>=net-libs/libvncserver-0.9.9
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index b575ca1efe00..8ccddcb81ef7 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1 +1,2 @@
 DIST kross-interpreters-16.12.3.tar.xz 144976 SHA256 a7ac2854e32f0354efbaebc55b68696b73182d9d3a1dd22b065dc355a320367c SHA512 84688d51a3d26c543b36d4a2eb52f1a9eaae12105461e35237accb962d1b8d9c2979fc4150e9151eb317f331788b06081a53dbf5065d8dab3f904a7844eec26c WHIRLPOOL 5885094ec568ebb18d241912577fcfc9fab9809891e260e8b9a109197f19d3a338c7d5ef6ccfd076028b594bf840055a86e6275b2aaeb403a28e7f2d4a054f1b
+DIST kross-interpreters-17.04.0.tar.xz 144964 SHA256 a6acb02f3aebf220adbe886a184a09035bd4838b3f51b9d861f99ff0eb648f9f SHA512 a9959bb535ac281fdee9940a5b8f5347585ff5fe4c124410f83f8023beb046d1641b31fa13d6eb24f947768b835fb402c556f96234e4c6c3231ad4970216b7d2 WHIRLPOOL b0c17fe8560b0c7b1369dfc6cc95b142cb15cdb528e14e8996f239f3f966ee4d03f30a0bc5e5369e6a6b33d8e3ec13f4e86a0db6bbc771688ee539e4cb55a6bd
diff --git a/kde-apps/kross-interpreters/kross-interpreters-17.04.0.ebuild b/kde-apps/kross-interpreters/kross-interpreters-17.04.0.ebuild
new file mode 100644
index 000000000000..004076404748
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-17.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 kde5
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index b1a6fadf5f06..d3a2ea3257a4 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1 +1,2 @@
 DIST kruler-16.12.3.tar.xz 126144 SHA256 1da348d2fab8965be3a5c4233a3f0723a16a575ebf7f863787162bcfcfba8723 SHA512 63850a7b781595f5c1edffc9dac94e52a0f27045ce4a5799057b7abe9b1ee448a129368a67007e0a3dc87a5c256b044b5526881ac2a201d9a2ce7a20270db89b WHIRLPOOL 45fad4c8a5905b2260865489cf7e1374eacb1a022efccef4fa9d796b875e07f6e89329954e4e7ffee39f0877d41c0bc828ba41cb9aae47f8b9e5190338cdae14
+DIST kruler-17.04.0.tar.xz 269584 SHA256 4979c68551f8a016cf1d073324a0a7fdf5ec8ea083f97746830b5152eccf70e6 SHA512 4c5539020a2a54cf612ddd23916a7f0f829e49966296b12d4102481cb54c4169e8f9bc48f3a9c4263251b2dd797e7be486644375fe621b1dc375adb1c606f7a6 WHIRLPOOL f4241043e59e02f567b97794ddbe05f31496b28127980829bfe324826f8b3b737226bbe67a185d52c5340f9b8f11522020b83e4ddb85f973eb32a9f16a0c7ce8
diff --git a/kde-apps/kruler/kruler-17.04.0.ebuild b/kde-apps/kruler/kruler-17.04.0.ebuild
new file mode 100644
index 000000000000..bbe7e036de64
--- /dev/null
+++ b/kde-apps/kruler/kruler-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	X? (
+		$(add_qt_dep qtx11extras)
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ksaneplugin/Manifest b/kde-apps/ksaneplugin/Manifest
index 6aae60474b06..d1734364d16f 100644
--- a/kde-apps/ksaneplugin/Manifest
+++ b/kde-apps/ksaneplugin/Manifest
@@ -1 +1,2 @@
 DIST ksaneplugin-16.12.3.tar.xz 13104 SHA256 8d669f4c7086a1c6d00cb2eaa3c3b505e0d09e5cfa83651d762756c9ae8a1ffc SHA512 401d1c4a1199657b8432cf8ac870ad94bc90994fee015e6a41a1dda39470e47863e773e218691c1b468e277d2929a2ff831665c8b58c2c8dfebc0a7e9e9aa2c6 WHIRLPOOL b86594a7357bfaa79088a01f9d0c213381880c7769ac51fbcd8375793f96607d372ac36ba67209671b00cb1f2a2451acff0915daaccbd5e435f130c9d2a931b2
+DIST ksaneplugin-17.04.0.tar.xz 13108 SHA256 36bfe84ab4762c4756a37881f36a845f32d433346a5f93ceab081be3b8128983 SHA512 8ff215b47b556001601afd78f5e99092486ecc6d06bb78708f872d5ca4b356c0c53400a2d0cbd605889bd30d83ec3b5573fb96346a0b325023bf49493b8ce94b WHIRLPOOL 10de1436d9753a35f2505e4d7e32f57ba80ffb030f75984599856665386557731b4afe01fb7039856a5ea5bb6c8aa30e7e23d05779ca24423aacdca1b40777fd
diff --git a/kde-apps/ksaneplugin/ksaneplugin-17.04.0.ebuild b/kde-apps/ksaneplugin/ksaneplugin-17.04.0.ebuild
new file mode 100644
index 000000000000..0ae216e68ea6
--- /dev/null
+++ b/kde-apps/ksaneplugin/ksaneplugin-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="SANE Plugin by KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libksane)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kscd/Manifest b/kde-apps/kscd/Manifest
index 68f0df64d999..3bea7f05f96a 100644
--- a/kde-apps/kscd/Manifest
+++ b/kde-apps/kscd/Manifest
@@ -1 +1,2 @@
 DIST kscd-16.12.3.tar.xz 93072 SHA256 403ddfac6259fd6cf114dcd15a1d889005ccf53ebf79620329484352d151ebd6 SHA512 d40c69178dcc4c550f9ace5808e598c10a68e0a3fa0cc0886ce37651a0ffe6c8fae69f9f688679527b1937e259437042e7d483023608f49b5975b77848749507 WHIRLPOOL 977aed3e0bbd865eaa66e41429bf706a6b14d7c6a9a1eb0f030fb6ab3150e969111a7254288618459b1286e157ac381cd8fd2aa166fbe5a605b1271d2821ab11
+DIST kscd-17.04.0.tar.xz 93068 SHA256 aab7a944e111b55560a57274ca4d9e994e99717b488cf445fb0b851ab9922d53 SHA512 1ea3a83f6423c4f9dfa5b3057c74c30d524b0009cc521fb30d300acc3a2e8bb330fcbe5244194493feb772fd9cedc0286151b4fc664aff5ccecb69b445c4122b WHIRLPOOL 597c92a319aa4996f4bd657c95cd695e945ea0a2fe3c8bed5d42c0a7d273171230a0e59790bf4348a6d0111db3a1870af181fe2ce362dcba913e54556adf4536
diff --git a/kde-apps/kscd/kscd-17.04.0.ebuild b/kde-apps/kscd/kscd-17.04.0.ebuild
new file mode 100644
index 000000000000..e612e3814ff3
--- /dev/null
+++ b/kde-apps/kscd/kscd-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="KDE CD player"
+HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	media-libs/musicbrainz:3
+	media-libs/phonon[qt4]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 8474f1fb59e5..f350f126fbe2 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1 +1,2 @@
 DIST kshisen-16.12.3.tar.xz 344356 SHA256 39f9370f1a76498bef997ff2ba0a5a493c9f1e50a5a344fdcee2849be9925f9f SHA512 29f6cb919ecc217112f02303c688fa75feddb389e2ce055aca2e008734122f7fecf45ffe2bd0e64c5b955bedf604f64baecd50378ab27df82af81e659f44567c WHIRLPOOL fb8f5167ff12b843578cefd19cba12c916641528fb333f708b4222f30f0bfb36eb573af468389a7c2187a35984ba729810dcd1e6fbde14b0a4354c58936444d2
+DIST kshisen-17.04.0.tar.xz 709316 SHA256 23c1bbfac2c1e335b85ef3fa19b793a8467bd52561eedd3df4e43f15a70a8ed0 SHA512 768634f9943878ee08faa299c43c89e2f9684cb8ac684508fb3de96c3fbbf47ea37e57f7175e46f2b356d4855128e3f11e529120b8046fae12e69d5e5c6994fb WHIRLPOOL 81975b8a1557a489d61f5442ee28d7fcf62a807e920fc8f8c63b0da96cfacde614321230c5a24d5f6d58d111a926b86c675e74cc01becce71ba72aa737b4be19
diff --git a/kde-apps/kshisen/kshisen-17.04.0.ebuild b/kde-apps/kshisen/kshisen-17.04.0.ebuild
new file mode 100644
index 000000000000..f85388058ef1
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-17.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_GCC_MINIMAL="4.9"
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kshisen/
+	https://games.kde.org/game.php?game=kshisen
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_kdeapps_dep libkmahjongg)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index c05d0a527a07..98becca33bc0 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1 +1,2 @@
 DIST ksirk-16.12.3.tar.xz 5002904 SHA256 c54ecbddddb436d6938c7dd61c01d64289abf64edc4e287838d039e8fcd46eaa SHA512 d8c338e863929e00d9bf97c0896a3374eefc0804ebd8d89a7c0e47cac29ea72889f54af37492ce2b7a818f15d9c3c6426ff6869853636a2d646c3a2f6ea1d9b3 WHIRLPOOL 4ec04ffc94535774375c822d499d20d5c794726d639393ba7d7b14ab9bf0bcb3769d87575941ecfffaa7bc4cda445caee901148131d0be32b3525c4c95b8d94d
+DIST ksirk-17.04.0.tar.xz 5494656 SHA256 40fa7f7d7d8217c8e69806d13a32e31053db6e0c8c594a81b1003f7a8df3d845 SHA512 b635c4e94c4ebe69855da7a74febf8182685b969e13220848a291d01441ab19b436264d65bac8688e9247e90dc5fa61c5cf9658f0c2f74feaeebf3c5adbb55a3 WHIRLPOOL 29dfbb1871e0efe95537ac2d994a530a0aa8aca7218da3162f3ae56eefc5ecf30ed13f69d52e3aca8e5f260c641158f49729bdcf34d0cdec80dace5047f6c55e
diff --git a/kde-apps/ksirk/ksirk-17.04.0.ebuild b/kde-apps/ksirk/ksirk-17.04.0.ebuild
new file mode 100644
index 000000000000..66c219dbdf63
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-17.04.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Port of the board game risk"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksirk/
+	https://games.kde.org/game.php?game=ksirk
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	app-crypt/qca:2[qt4]
+	media-libs/phonon[qt4]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index a88653ba8959..f1c0df3604dd 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1 +1,2 @@
 DIST ksnakeduel-16.12.3.tar.xz 298280 SHA256 d63761a4cef0d870345a2c29e11e3c11450266207e355244c190e53b989a279d SHA512 3a4f12a28a65c31e511452b6c59cc56863a7bc74389692074d5e2037d8b1950e49b576662338720a386ab36746f90f8bf8a02d9908fe36af49c2086021e74526 WHIRLPOOL 5163bc46eca948d5f586aff5b25e96fa6c77f7c406e2b8a12e2cfabfb557b3e5f50032e2708b193dc5d7b8498e8054b2c0f1ff6e2dd591d5aded53dee71217f1
+DIST ksnakeduel-17.04.0.tar.xz 298256 SHA256 193c0211330c766e36c200206fdfda37c464023d109594406f58578a8b624efe SHA512 3454670a50300d6c44cb1a236bc98cc4f081877c0c52785e3acbf5101139a0206864db69ed17b13a5de33e5c34e4556cdc6eec4ee5878304a3d6c2b9c7f69732 WHIRLPOOL e475dec6b99517af3a63ad6d16a455049a83a2674431b9f0c6bf954a35109a7d0b62bf20b1289d7cc964adced874bb9cd51059e03c03cccd96b923fe644264f3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-17.04.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-17.04.0.ebuild
new file mode 100644
index 000000000000..4859bc7cca6d
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index f128c76f70c8..3b3aeb4da71d 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1 +1,2 @@
 DIST kspaceduel-16.12.3.tar.xz 253196 SHA256 53a0c593d1a73dd6391ebeac204f4fe39b434b09e7b27c38b507880dbb0efd46 SHA512 fc4d34768975b96885cb79942ccd355d9e2956a9821cce6aa8d8e5c079c594d63490ff716ae6653436076781832ee56168966268c36bb8b5bcfae11b6c59707b WHIRLPOOL 9f837ada9cf5655dca3f5de50ab07f7cd0054138dfade795af9fa5335b433e75eb240e52d4779962f697254e832ea6213edadc5cf5d4da857ed5bef7d8b16a9c
+DIST kspaceduel-17.04.0.tar.xz 253272 SHA256 640fbec9ef330077a9ea8e08f65eb30a72a4127abb09fae1f229c9586f768e7c SHA512 0bda095d55acca12f2796185e2beaf881161cd28325726a8b80b0da61681b6af38879f329a80e1166e8662589b9f1d36546eff15b5674f29a89b88820410030a WHIRLPOOL af48c305700fafb4fd2384d6f6feb5941120536039a585a69b37bbc8691db6c5e97c8c86866ef41e96c0e0650c4c99e02affe6069efc5c8150b5fa5662ef9c46
diff --git a/kde-apps/kspaceduel/kspaceduel-17.04.0.ebuild b/kde-apps/kspaceduel/kspaceduel-17.04.0.ebuild
new file mode 100644
index 000000000000..c95ef6af0e32
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-17.04.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Space Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kspaceduel/
+	https://games.kde.org/game.php?game=kspaceduel
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index bf54b6f5c3ee..55e129cde4bc 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1 +1,2 @@
 DIST ksquares-16.12.3.tar.xz 136688 SHA256 c962928939d963c3814d76d880bcba694c5fb4a46d4fc2fafc74e7e0600a6d29 SHA512 976b21ead3130ee75304a01c9f2d3621fa069862610a857d2c2ad7282d2e6d0d398a1acc36efce6a43c7ebaacb89848a70f5e77c21bb30a0aa46720abc9879d2 WHIRLPOOL 7073727437943ae73c4fab329f433b3e8ce866010abafc004fdbd5c19438a98d261399089f78e79b66dceb7c8df2cb973409e659490424e78329981b6ac75cbf
+DIST ksquares-17.04.0.tar.xz 216076 SHA256 c44d371694ab7f34e6b7225b889ec535ed91ea16dcc3a0e6fe579e03dce6ef57 SHA512 421ab920c1f842893b298af4f42fe7975d3e87c5126b6a9430ce93dc6c5ab0725e339b3f27abae83422cc41e38c0e9c09ce25b72ba9259b3fa457dc84f61f2b3 WHIRLPOOL c9c08ab1cd52de03ba34bb3e569febd7fc39fb28a5cba712940ae5cf153fd9ecaa8df036a48a0fe5704bec74594443b6863a61a9f51bb8d07be532c385a89b2a
diff --git a/kde-apps/ksquares/ksquares-17.04.0.ebuild b/kde-apps/ksquares/ksquares-17.04.0.ebuild
new file mode 100644
index 000000000000..dd1e4c074acf
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE clone of the game squares"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksquares/
+	https://games.kde.org/game.php?game=ksquares
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kstars/Manifest b/kde-apps/kstars/Manifest
index 2ba79128fb53..414db4f65747 100644
--- a/kde-apps/kstars/Manifest
+++ b/kde-apps/kstars/Manifest
@@ -1 +1,2 @@
 DIST kstars-16.12.3.tar.xz 38872884 SHA256 3eb054971d250be83edfc603c379854a5b5a1caf03bc66386005711bf2b19951 SHA512 caa1cdb679988b8527540e4fa8d110d4638cc3ad9ca637fb2cfcc7bac05ffeea3c56ba3a4d4706ee926bdd885b8e1f57b3d97e4fbf12b1dc1fe5da9154b3f0ec WHIRLPOOL 75276db36ee0c4c835a87e02aef73aebbef73e7b3ec3f1db90d2ef751e73835c78cf6f9aaa3d3223ea5b35007d5a4e8bc612512d4820c9845d5e6126d405ac01
+DIST kstars-17.04.0.tar.xz 61187400 SHA256 d3099290600a1ebffaa441ebea822dd8a44a6dd72c412af06f6c0dec526feac2 SHA512 7b5e2493bc0e7174fe6a855743d54d931b8e792ff8a945a3d51d0635f67513e52492c2f8402b8a7dc49ab94abd81ec26332067a1ca629e37b4b53f58460d1395 WHIRLPOOL 9a58fbd6431244d853458ed1c0e657b67c8790a5dfd10ca06a3a5221ec694a2337e8495caa326c1ca2d0e9f805eeffa34ca3eb1fe3afeb16426ed0619eab3577
diff --git a/kde-apps/kstars/kstars-17.04.0.ebuild b/kde-apps/kstars/kstars-17.04.0.ebuild
new file mode 100644
index 000000000000..257c7ef52d16
--- /dev/null
+++ b/kde-apps/kstars/kstars-17.04.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
+KEYWORDS="~amd64 ~x86"
+IUSE="fits indi raw wcs xplanet"
+
+REQUIRED_USE="indi? ( fits )"
+
+# TODO: AstrometryNet requires new package
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	sys-libs/zlib
+	fits? ( sci-libs/cfitsio )
+	indi? ( >=sci-libs/indilib-1.4.0 )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib )
+	xplanet? ( x11-misc/xplanet )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		$(add_qt_dep qtopengl)
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fits CFitsio)
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake-utils_use_find_package xplanet Xplanet)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index f31d08a94367..82747247e45a 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1 +1,2 @@
 DIST ksudoku-16.12.3.tar.xz 1434916 SHA256 f395e40728953f9e25538ce69a3aa22d33dd44643a27a88084aa489740471102 SHA512 e95e4d44231c382eba027e9e9d98d33a386bd08e735b382c1afae14a01f620fb39c7ffe3e61dd6f317cd0f6ae41dad98db99724075986793c8f1f4dfa5c6dc74 WHIRLPOOL e9d5ca27ab4c1bdeb58095cc8ae6d1451fa1a6279cf694108ca2797557a6493a942398789fc80d48c6edeb90ac3ab614948e4f79d32e5f3a2a0c3573785d7aee
+DIST ksudoku-17.04.0.tar.xz 1433716 SHA256 7a63951ab81ccca46cd3fabc3ce911711fafd3aee5312e168bdaac7f5bd22110 SHA512 0c262dab29bcf64e72a47e46d94bfb47454f5f13d69f1628b3ef45513d207fe128e4f770ab657552967e355970da13b83a3bcda7ed488346793d9877a818aaa0 WHIRLPOOL fd97f0da8d2f54eb83de82d0b249788eac0614f274486201e4a8a308b05cba3fde9ad6cef528626165c1fca6ffd55748cd4326ff432f979006aa11c87d377ef6
diff --git a/kde-apps/ksudoku/ksudoku-17.04.0.ebuild b/kde-apps/ksudoku/ksudoku-17.04.0.ebuild
new file mode 100644
index 000000000000..797f8e78a534
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Sudoku by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksudoku/
+	https://games.kde.org/game.php?game=ksudoku
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkdegames)
+	opengl? ( virtual/glu )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_OpenGL=$(usex opengl)
+	)
+	kde4-base_src_configure
+}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 034d9443545f..99952a4d8a11 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1 +1,2 @@
 DIST ksystemlog-16.12.3.tar.xz 351032 SHA256 712a22bf3649079a8c3db2900ed7e58abc31f2021d04ff4c0e8aa029c0bda675 SHA512 0e06d0e33027c050d1df4b9f0a041db9bff29786368501297f4c0c43d725feb766f91f4613e9222b77850fd09c9e49d37a9968db2fbe223596ffd478b78a96b7 WHIRLPOOL 602d09b0af4650d2870d2e9c96eb5c55139272d4bf96652aff96e062b52e589dc564969957c5dc9e0ab5ff7e6e0bd09db2daec24425a52b8dc164b4d3362f103
+DIST ksystemlog-17.04.0.tar.xz 1784876 SHA256 bec60ce3991dac85be7785c299c15291c9b819a82f6420316700f52f32655498 SHA512 2dd67170602d0ee490e3e8fed0a75827ab1507f01844bf76b7dcf10de8885d433e0b9156ef7dd6c79fcbaaec291f9cc2b8fc37ec43a5699d9ef73c9795e992d1 WHIRLPOOL 929ab28006e45e8339861b84f389e63db4547931b5e46395e21d86fe97a9414eda9381e6894c7fba376490c726c9ab5e6aec81c883651585cac6e947556ba449
diff --git a/kde-apps/ksystemlog/ksystemlog-17.04.0.ebuild b/kde-apps/ksystemlog/ksystemlog-17.04.0.ebuild
new file mode 100644
index 000000000000..7caf52a9ff05
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-17.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="System log viewer by KDE"
+HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+# bug 378101
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	systemd? ( sys-apps/systemd )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if use test; then
+		# beat this stupid test into shape: the test files contain no year, so
+		# comparison succeeds only in 2007 !!!
+		local theyear=$(date +%Y)
+		einfo Setting the current year as ${theyear} in the test files
+		sed -e "s:2007:${theyear}:g" -i tests/systemAnalyzerTest.cpp
+
+		# one test consistently fails, so comment it out for the moment
+		sed -e "s:systemAnalyzerTest:# dont run systemAnalyzerTest:g" -i ksystemlog/tests/CMakeLists.txt
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package systemd Journald)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index d3d9edf31cb1..51c721facc32 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1 +1,2 @@
 DIST kteatime-16.12.3.tar.xz 90972 SHA256 beed338b44941fc7cfdbacd53b94678f305efa215af9dd2c9f6f7ea274e21f73 SHA512 31ea151b4de5000e30d60fb79cca9ef2d56c9c1c2ded5f3168d37c5f17dcaed142979d4ee7f43b0a8c20f5316d651d104ea53feca95ccd74a27971fbe54e6c37 WHIRLPOOL f73d8fbd9b7fb776042e1eb9d62e13af00222b680c17647780a5e040e60c98830ac339b640716397f9d0f7ab64a27eaf08f7a36bf49d76c7309c5f6ca56ab7f2
+DIST kteatime-17.04.0.tar.xz 296792 SHA256 1c6ea73c621120d5bc91eab4cb6bd284ac8ea30ae73a4272ac24e2b324637466 SHA512 0810689c5e3eb1adc22dbd8c7c890e2f09353e07e6bf8c5d283747d76705ea23368b252da136014d33f43d2a3f462b934b8424488f1caa4e531f63cf14df40fa WHIRLPOOL ff0ac8ad5df9ce5cce52a2ea23b6eb61f83b2044d23e5d482f7195626aff32c04aa1d51215094f835227609d1e05a2b406b9ad1c4f74db037100ae6861271bc5
diff --git a/kde-apps/kteatime/kteatime-17.04.0.ebuild b/kde-apps/kteatime/kteatime-17.04.0.ebuild
new file mode 100644
index 000000000000..d454ffd613ed
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE timer for making a fine cup of tea"
+HOMEPAGE="https://www.kde.org/applications/games/kteatime"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index 638a13dc77f6..50faf4a5be06 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1 +1,2 @@
 DIST ktimer-16.12.3.tar.xz 160876 SHA256 df58aac15e8aca5691862b285ab5690269720a95fa78b0d2f80ea187149ffa42 SHA512 5ccb5b38f389874834a29258a2e523e021553cd455005fd61a876e1f21c1f098d0f56cd5daf0fc818f261275fcacd28e83df4c76df3480f949deb0812cf96dcd WHIRLPOOL 8b6a55908e25c73908b4ecb93452f96d4218804fed44ae83ba939d10f17e242a9acdb2db68fd849eaa3daf2664c822a7e0714b0b70aa4435e095e5dcbf750f85
+DIST ktimer-17.04.0.tar.xz 450860 SHA256 df5944c11f2484590390ca9007931aafa8c0d5124cdda147ecc043df6c6fa35f SHA512 a50c8ab1b66490c65aac4614aa0ab1fead12a29974c093da8f168bdffa089646bf4bf3db0af5977240fe8a3f6908267bb74a70514da98de80a39a5956143032a WHIRLPOOL 619d81c2f7c1605f5f002cff7660e2947894a6c10a00ef4d2cc511b16be2e148cca6a3913995c10c78768d909ee3741e0d000eb25d4cffb087daf42e3fb370a2
diff --git a/kde-apps/ktimer/ktimer-17.04.0.ebuild b/kde-apps/ktimer/ktimer-17.04.0.ebuild
new file mode 100644
index 000000000000..d81e88766b07
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-17.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Timer"
+HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
+https://utils.kde.org/projects/ktimer"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index ef8c7979253e..235c16965d56 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1 +1,2 @@
 DIST ktouch-16.12.3.tar.xz 1651308 SHA256 ef7dc861c4cddca5acc7c4e2f91687a5a24fbe8e72c9e151b8b13ef7d9dff39d SHA512 3a211a177da484342415ba319db185165632b93be87be5b03461ed9af496107bd8aa64542fb529eac3040a2fc35ff130ea3462050bdfd6b7d9f63ffd47658262 WHIRLPOOL 4d6950e358e42288a09ebb638c87796973d41835532ad014a7f896ad283217fe2a142b88af13a0a52da5e0155b92eacf0dc73cc0dd8c36346985feb901efe2a8
+DIST ktouch-17.04.0.tar.xz 5112908 SHA256 08f005799bdeb7a06f9a390285e1ddb8cdabe9d224c504a38e968a2a7f3d8d34 SHA512 a0741256c441a91a69fde05692b325ea1a747faa294819672c9e64565099e63f31308bc806653932a7d01d3b349cf0c21a84eb67239bc79af06c69bc3b727973 WHIRLPOOL 4db306e34819e3c94092732288f07808dc891e7cffb92c2258877a878cb07d8233ec454347e89348cd8870b52d5930b421287e25b16a80d2bde8471a484bb59d
diff --git a/kde-apps/ktouch/ktouch-17.04.0.ebuild b/kde-apps/ktouch/ktouch-17.04.0.ebuild
new file mode 100644
index 000000000000..9ae5cb1ee489
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-17.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that helps to learn and practice touch typing"
+HOMEPAGE="https://www.kde.org/applications/education/ktouch/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libxcb
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kwindowsystem)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kqtquickcharts)
+"
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index 5f385600aa5a..b159fb5fac66 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1 +1,2 @@
 DIST ktp-accounts-kcm-16.12.3.tar.xz 90032 SHA256 0373f4475fa4cedf26595301c571682f1eb56ef0354fb42937e657976248215f SHA512 1dece219675f0a653d34c7b23e44f03bfbafa4cdf3fc8ac383078ea37fef92684bcfd6af91b2d142305ef09f0dc8d233d6332e9dfab69e008ee70d5ffbe3a3f5 WHIRLPOOL c7a6a132bdb6fbb34a6c27f1b79755075456207a224670dc4b8869fc53a25a9038db15a7015699c98817e50d95eb75309e25bf442d6d7f47e9962a579ec29ce2
+DIST ktp-accounts-kcm-17.04.0.tar.xz 263760 SHA256 8c2fe67f127ee04ccdc3955959fc0ee59e0d5e259b4a1d2dddbd4b153dd2082e SHA512 8eecdb56e6add605bd4ae65f8a48c7c43974e8ac7e742226014ce09b8966960097772610ecd7a84568c01f8d0fdf88876ade021887dc1647a167df8442901fc2 WHIRLPOOL 84e04fe02d034cd7dac76e19fb5e773e40f14e0c6885fd4e44abdf7364f4371ff4c793c60be62cac864a61d7ab4e5562e8ca008da736b7eba9d383f96ec6cc24
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.04.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.04.0.ebuild
new file mode 100644
index 000000000000..a67ec19116e1
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-17.04.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy account management kcm"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kio)
+	net-libs/libaccounts-glib
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kaccounts-providers)
+	net-im/telepathy-connection-managers
+	!kde-apps/ktp-accounts-kcm:4
+"
+
+src_prepare() {
+	if use experimental; then
+		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || die "couldn't enable experimental services"
+	fi
+	kde5_src_prepare
+}
+
+pkg_postinst() {
+	if use experimental; then
+		ewarn "Experimental providers are enabled."
+		ewarn "Most of them aren't integrated nicely and may require additional steps for account creation."
+		ewarn "Use at your own risk!"
+	fi
+}
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index fe702a176ad9..50ffe9759f8a 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1 +1,2 @@
 DIST ktp-approver-16.12.3.tar.xz 20932 SHA256 2a8d453e6a2750e3a338b8825e0f68d1aba6a52bbb98ce087dd137b992145221 SHA512 d0aa87367b031e8351aad2c03b15ef26df721f94a24c3415ba261283164a2009e4ebc957958e900ed1310265338dc531ec8497a1de89a858bb1f249f07257b20 WHIRLPOOL 14c46a8e0cc151ea516a868197c44b27b12ad7a4e4c5ed24cd940d219813d26ed21fb1254f8c47a96ba72020515e7acf3fe7a96cb941476211fa7e59fc9e66fc
+DIST ktp-approver-17.04.0.tar.xz 37192 SHA256 00deb4a7586827dc193e1d4674f66c5841adfa5abb169f28113db7280eee6c1b SHA512 427e77ab6e759ebc0463860f2ba5f94bcabb2f9c5c7ab5037f530ca1f3b407d2b684477dab375977c83e4c83604084186a53d9759791d86fd4c166991c62d70e WHIRLPOOL 0af5ee07105aa505d10b25873ff736294d310597775ff001a433a2c4a676d17ddf51f3de12860defddfa7962c9e9a66b1e3a746a464c76c153931061f3ae9b69
diff --git a/kde-apps/ktp-approver/ktp-approver-17.04.0.ebuild b/kde-apps/ktp-approver/ktp-approver-17.04.0.ebuild
new file mode 100644
index 000000000000..3187e1251082
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy notification handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+	!kde-apps/ktp-approver:4
+"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 716a6510c3d3..0b5186451912 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1 +1,2 @@
 DIST ktp-auth-handler-16.12.3.tar.xz 26232 SHA256 bd771bb4c986c103408b613409f149165c7d47e06985ab9792cffea4d6c43e23 SHA512 35927d48c0d8741bfe30a5adfcbc3d8a30ea999d796ef396d2b848003304f420fc9702268cf339b0c86e9015a94ffe9220d4f2a22c2c9ea68ad95ce4fb4a1721 WHIRLPOOL e337b1f74ef8f8d74dffa6be085c035be62e4d2a9521df2dc0bdcf52e371c0a5167163911f1165e80113259639183a0e1b9c31fd3d2d800b9b4e32c41a8843c1
+DIST ktp-auth-handler-17.04.0.tar.xz 46316 SHA256 5465e7abff0a1de1a4fe57d8ca68778ab1235eb7bc63e5cfec5c8408bbb81e64 SHA512 b24574f172f63eb37b203cc0cfbee525830e9e75c6f8527c9b307a33bcbbcd94a37eaf51db3a15355e8a51c13c28260cd2e76a1ee63248be43be31d841b65435 WHIRLPOOL 9f528b26f2ea21255e222f46138a1097946cf4b171e637c78a28a0e58484f58300b1ebcbf6fc1b2a22501bff50ab4ad113e142fbbe8758af02fffdf42b435912
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-17.04.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.04.0.ebuild
new file mode 100644
index 000000000000..45cb4ff62274
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-17.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep kaccounts-integration)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	app-crypt/qca:2[qt5]
+	net-libs/accounts-qt
+	net-libs/signond
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdewebkit)
+"
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/qca:2[ssl]
+	!kde-apps/ktp-auth-handler:4
+"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index d7bf6ecdfcdf..8a237c576e23 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1 +1,2 @@
 DIST ktp-call-ui-16.12.3.tar.xz 45228 SHA256 2d87e7369287ce9b0b7782c86b2ac83e86933c31038883ad9c7a8a9336d100ab SHA512 b691e75892288bf15518c6bb11c3bb376c5fedfbb473d7c734ee56b9dc6634f093f7491d44f5d114875f362dd1425b5e792f887118482762e7a76e88eafdbddf WHIRLPOOL 93cf448301c3826321c858f2d3ed9c30c9aacb89024b2d4e2e360e79f7c057ca2765e01121c3095a7cb6995524c15ee3737a7e448b3707cb0758cac26a646f1e
+DIST ktp-call-ui-17.04.0.tar.xz 96828 SHA256 14aba018a4840c3054e0eb7bc58f23212aba8945ebf10db9bfbba1f29c8efbae SHA512 6ed504f897daa87223fc9ec3f6279d4d7cbfdcfab4e20307ddba73757fd9b51f82dd0ca82a3a16c5e5d3114e80aa5c5627967ba7a1ff8f23e7a39ff051e802ee WHIRLPOOL acf2a11ace605cb9109e568314925dc695a0f31210bcabb63dadd18293c60bab87797563ac78375aec18c9b6947dc3f3c4e9ff0282e374526b33385b53676583
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-17.04.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-17.04.0.ebuild
new file mode 100644
index 000000000000..e3b89e3d5edf
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-17.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/boost
+	dev-libs/glib:2
+	media-libs/phonon[qt5]
+	media-libs/qt-gstreamer[qt5]
+	net-libs/farstream:0.2
+	net-libs/telepathy-farstream
+	net-libs/telepathy-qt[farstream,qt5]
+"
+
+RDEPEND="${DEPEND}
+	!kde-apps/ktp-call-ui:4
+"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index c941bdd2faf8..c1c451157007 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1 +1,2 @@
 DIST ktp-common-internals-16.12.3.tar.xz 317348 SHA256 25880bdfee21266c58f5e2844f87c3c74f44e92a21ed9cae73951f5774ab7b3c SHA512 2ec79b50fa9250db02e9d34d021965fd30f0efabe2affe43424b98ceced112ba1f9c99e5b78046239d9b8e65fb14074cda7f2ef9b55f7f85db76320e9298cde7 WHIRLPOOL 5e6acd205acb08c2ba5c31a23cc0dcda8a90b18b332d8a00913a5494f85a31723d7f4d31e0addd64a349d6bd41ef5c8755a81052b3317349f7ce09864368f7eb
+DIST ktp-common-internals-17.04.0.tar.xz 442384 SHA256 32f9ee63e2d7cb25ad24bdc887cd31ba4e545aabb7bbc6e2285b554f1ceae2ae SHA512 ac467d8ebbba714b0f226c1a47469b9a766cd0ac4951f4f43c70dd350405cab4f009a61d3fd2560c6fc8e7f532957918210542e095f072fc3adeffa1550c9c60 WHIRLPOOL 6511dcabc948eb645f58465ed036075c587b388ccbffe48f38b09f196f079c94f9a370c5a1b536acdc911b0237744e03e140874950bfafc3ffd5cc7fb867c45a
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-17.04.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-17.04.0.ebuild
new file mode 100644
index 000000000000..b5083fc3684a
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-17.04.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="otr +sso"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	net-libs/telepathy-logger-qt:5
+	>=net-libs/telepathy-qt-0.9.5[qt5]
+	otr? (
+		dev-libs/libgcrypt:0=
+		>=net-libs/libotr-4.0.0
+	)
+	sso? (
+		$(add_kdeapps_dep kaccounts-integration)
+		net-libs/accounts-qt
+		net-libs/telepathy-accounts-signon
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/ktp-common-internals:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package sso KAccounts)
+		$(cmake-utils_use_find_package sso AccountsQt5)
+		$(cmake-utils_use_find_package otr Libgcrypt)
+		$(cmake-utils_use_find_package otr LibOTR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index eb343cd3c6f8..7845e2e39cde 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1 +1,2 @@
 DIST ktp-contact-list-16.12.3.tar.xz 48928 SHA256 bc9c794d2b8d8fc05501a74bf420252eeb339417522997da68521b4c195d5a15 SHA512 9a59fcde2f60713529bcdebdf2e192dbffc826c33908fb2b868a7258e372acb1b47efb1326f27c8bd160b0734d00992373c824b8f376d03f9dc2c4e1a1755ffb WHIRLPOOL 62f2285db462d9e2c00ec5c878040b27f581bd3b4ec98041ab8d34ba1f9383472314ba0dd85fe7e42beacb7d28c588322160acb0ff7feb57c915090fad81605b
+DIST ktp-contact-list-17.04.0.tar.xz 132988 SHA256 9585a11af1e688e58533e6500c04fa2fcb43e40cd2aaa91cf0c9cd20c4838dda SHA512 17ba4ad002861ba4659dadee998a9b1747ed2d444bb92992e0abc7d6a895a1239b39f4d64e984cba9e80050a664176bfd49bed9687878063a334bd6a5265d6c7 WHIRLPOOL 37917b7f59317fd1e6d82091c9e4c796d180238aa44b131c4f16d5f16e3c255efc3600508fca5e5c1a426d2c9b7260f006333c47790835f2a99438759ea2915e
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-17.04.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-17.04.0.ebuild
new file mode 100644
index 000000000000..7a229299b9c2
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-17.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/ktp-contact-list:4
+"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index beb0beff799e..bccc8ea65730 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1 +1,2 @@
 DIST ktp-contact-runner-16.12.3.tar.xz 16748 SHA256 38aec5b8899d002ba5b9089d4fd94257e17630cb9ab4b634cfb889edaa4e9dd1 SHA512 89c5a00f4fa5e53806b4c834b59f26a47bcf292e2d05d5bf5b6eab37e7ff2b70c263a3305f23053c1b27104a3a78dafd0d1447e22652c5da6fd2dfc24aab43cc WHIRLPOOL f30519fdc972339d664566cf30fcc2c6ad3803d13fc87df3bd119c495a9c06f45f03d2877d94283669355e1d8aa84a53b497ebc639fcd313da6617d140fbb152
+DIST ktp-contact-runner-17.04.0.tar.xz 40004 SHA256 03311fc4d32eb166d1f1aa8f8c59b5eabffe35f800996941afd1a97a310b038f SHA512 fc320e3ce7d2a87ff58fc74cbe5afa80dd4e3ef1580bed3bf83dcfb1160b9bcebef7b762755e5a9dfb4cf15884f43c19697155910a72479fbabb2d7df73435b4 WHIRLPOOL cb924ff2c2ad8b07380666f727e5635722c34c5d67f507710a094644f5147da486fbcaa00106a6771e79d4ff756bc8535f3f1240cf4ddec5c508b41ad31880c2
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-17.04.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.04.0.ebuild
new file mode 100644
index 000000000000..4a5160216805
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy krunner plugin"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep krunner)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kservice)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/ktp-contact-runner:4
+"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 6bec79abb56d..6cd16e55ed22 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1 +1,2 @@
 DIST ktp-desktop-applets-16.12.3.tar.xz 26928 SHA256 7b1eeec81ca7a51d86a8ce150a4ed691f303a2562c6580f0355cb35ef9dfa8dd SHA512 a82940ed7adc98868ff5255d3645a5d820efca28b0bdb51b85167a5ccf8f00d3ae4b177adebe10b0f00d0505d4439105d5764f7c59c500b2d31eb4a09d02c52f WHIRLPOOL f67bef57a5e98f58210717b4a5b5fcddb03523f54e1d677c8a7ab0db078dd5bf8c948b79c393ee94a61650b74bfc1eb23ae7444256ec7cd9a33a86a0dd34b6ca
+DIST ktp-desktop-applets-17.04.0.tar.xz 42128 SHA256 7d4f4b8f18ad1c47670ea83bf6ff2e93fca86ab456d321e7899d7d5e2c76303a SHA512 94fd5423b0e593c47119aa258f420ed776a74e9f74d2b71320dd46a75b1ce290b6eb232a17b15a4af90f5ae3dfefda3e33349b24f40b61efcf7b2fb7bbbb79ae WHIRLPOOL 31952af2d804bae972b774e912a715348786a4b60efb999b5c620e646b9f3659b1cb6d9bc4747e0298f7da869da906c274ecbee41d1e452604fc5d9ca89c6569
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.04.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.04.0.ebuild
new file mode 100644
index 000000000000..8a464d384616
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/ktp-desktop-applets:4
+"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 0f0a39d1e3a1..90c81da0bd53 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1 +1,2 @@
 DIST ktp-filetransfer-handler-16.12.3.tar.xz 23112 SHA256 9899e7149f8feb57b5b7f756f450a2ca807b53ef6cc0dc463dd45703edcdb535 SHA512 fac424585a37b16ce346507189bf0cda66d7b537cde2e0f164ece801c82dd09e76ef9e7babb53da2fac2999e44d581359aef451d5e9176ce98270ca43aed5bc2 WHIRLPOOL 468dc237f6c9101925f81870ac85cb83f28e040f5aef90008d6c7c3cb0daf6be9543a9cea6da05694384c4d9b6aae401db08dae645b613b62d000fce2aa6ad60
+DIST ktp-filetransfer-handler-17.04.0.tar.xz 46144 SHA256 d3035c99d3f64e929f52d1120988d8b2f435a54f11ad66c737bea331adfda976 SHA512 6524d5c76302d7ce8f5444c7afc7191159b68bf59190973f9ea976f22b389988736bc373c1829355deef21e109db4bab4096667d51f0e812865e4a9a0bd796e9 WHIRLPOOL 188ab2d9d5056b934cc312ad70519a4f8bd93d5a952fe771dd9cf1c7238aec027a51adb58b855f794f527962d4e20248d140e0e70c75cb43bffc6f49650ea923
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.04.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.04.0.ebuild
new file mode 100644
index 000000000000..0ddce92a47fb
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file transfer handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+RDEPEND="${DEPEND}
+	!kde-apps/ktp-filetransfer-handler:4
+"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 61233a42f791..51d5b04e4fd4 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1 +1,2 @@
 DIST ktp-kded-module-16.12.3.tar.xz 38668 SHA256 b47a096e9be492f774d8a2f5aec6caf8bafaded8c9e8c59a47765dddd445fc1b SHA512 1f46a8dc3a7d70e40edfa30b1efa08c0823b7ed4efa7b9e685516a5e41fc58648e9e7d58e7e64903013c32c689947fa4a76af99f52c9910c7f5f23b413a36ceb WHIRLPOOL 86da61e483f0f4417fef697120c45f8f0d56e33556f2183d261b99d113e3605c25e3d0beb72c99387a443a4864ee45cc87432c26bb765f11b5b2e9cc21830134
+DIST ktp-kded-module-17.04.0.tar.xz 81872 SHA256 9118a8229e62eea14f1102a865e9a5cb3408cc485d123694a32f7c37a479b612 SHA512 f94d774b9a972d794919de499bc80337e0f7fd5b42b20aae5de4ec18e99c93734da3711c3a48441f7588f7ff33c87439a2e272a61307988ebe5bd8f62ea939d1 WHIRLPOOL b78122734e3795c2095d3247545ffb521e696725a94eba03d06e8e5000cdb3bf5a716a04c9907e562a7249c6b803d587679c3263f0e6485557c7450567501265
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-17.04.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-17.04.0.ebuild
new file mode 100644
index 000000000000..272f6b05621b
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-17.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kwidgetsaddons)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep signon-kwallet-extension)
+	!kde-apps/ktp-kded-module:4
+"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index 1a48381748e9..fd4f36120e19 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1 +1,2 @@
 DIST ktp-send-file-16.12.3.tar.xz 14716 SHA256 e6877249fbc11d1362e6de0f37d6392dca9b59a8dc28ca84c4487e4af090ecd4 SHA512 7744af2efba97c552226a4389277b1535d423898330ff54f0ba1ae4b8d587d3a0cc152e7519fa02a24d83316e979d414057852a805b1cfc363007c0f909f7fa2 WHIRLPOOL 01fbad2d03b2239b1d7fcf20b8d4e109b30c74c54c781effb6437609bb35a2aa42f1274f22b976f6fc179dfcf37955fc57b968a48bb364b67ec7d5d9de04c97c
+DIST ktp-send-file-17.04.0.tar.xz 28872 SHA256 96a76950ab2888d9258fa47d5febef55e0671d408f6d405c6f2369642121e547 SHA512 060587e82c9e338e4032bc8eecd28eee73ed15cd095561ceae74c3c665b19756dcac07080c7b09465ce843708ddef8e65c9522d1e081c0d46cd9dce18d0e1e24 WHIRLPOOL 85d2c43edde7287fb962fed0d22986da7146bdcc3b09e6c3c5c3742b3a73e4e26b4d4b45f79974eae1f40354fb72de213099ffd239f0405715f2e6429c15af40
diff --git a/kde-apps/ktp-send-file/ktp-send-file-17.04.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-17.04.0.ebuild
new file mode 100644
index 000000000000..f1e29828fe0c
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	net-libs/telepathy-qt[qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kcmutils)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+	!kde-apps/ktp-send-file:4
+"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 2e0afbf41e57..989c97f57cd2 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1 +1,2 @@
 DIST ktp-text-ui-16.12.3.tar.xz 295608 SHA256 33c02e1cb5b9b49ab6fe6bdbeb0ae9baacfd67febc4b7fafbd5762b6cbc85d6b SHA512 a416e70876f1f437fda695f6d66f69264ecd255699e73127b403cdf4294dee09bc1708178b15e988331fdbc555cf9e5bf484b18cf206a3555362eda3148862d9 WHIRLPOOL 1e69279e91181123dddde1f4a2166f17ddc5583b1859e54b1adafb84364646dcff631e622d01dc9363ce1555fa96b69dcd110e41dabedbc68cdf49b9f598970e
+DIST ktp-text-ui-17.04.0.tar.xz 467332 SHA256 8a4f7671b6fc711d8fcdcf3f5a0df9ab0f5e4d4cdb3f226c9f9e33369607d4a3 SHA512 32c1bc0f31b3aa235c89cdbc48bddbb092c1e80230bfd3e2d336e5102666168c96159dd58c2865cea4b371cb607c70ad20f822cc3450772bcc0205ae8e8388e7 WHIRLPOOL a3d7f82b1870052704a35558075ff0ce599fa7e25fcb1fc47419937911a0ec819ce2010445b50de4b0ec540160cb80e76116330bff70ef6f59370a54159c0052
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-17.04.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-17.04.0.ebuild
new file mode 100644
index 000000000000..209e84ed325b
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-17.04.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+QT_MINIMAL="5.7.1"
+inherit kde5
+
+DESCRIPTION="KDE Telepathy text chat window"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdewebkit)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kpeople)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep ktp-common-internals otr)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	net-libs/telepathy-qt[qt5]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep ktp-contact-list)
+	!kde-apps/ktp-text-ui:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 2152f480d9a6..71e393d08dad 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1 +1,2 @@
 DIST ktuberling-16.12.3.tar.xz 4470052 SHA256 fbdd747ac5a9a113b0b03e609ca521659310c3bbaa6074646ad3970eec2ac3ee SHA512 7fb27df3ff21b213241e0d741ae63397a70527370a336f6778d3e72ef75180d36a1d35c1cf00f81fbf5926197bc25c2715b7fc93502c368f67cc8fdd12a8c9eb WHIRLPOOL 05b64a00bf24da50a61e48e85ff13b0372ff05ed61033de5661c1bcc56d5783b8d211dc5ea33411ddaea1c2adc65c67a20da75ffc0834cbd7d7ec36760ba012d
+DIST ktuberling-17.04.0.tar.xz 32764240 SHA256 59f532a976fcc90e6bd02ab80161b493551a17784392c85f3f7cff1f9c2d2e45 SHA512 81975e29fdb4d8d645bdcd2e46336938acc4d79bed23a78386ebe560320f85daea3c28b689bc7c9b13fceecb4be12c0fb28f6ace409cf0f9b3af2d53e70dd925 WHIRLPOOL 885eaa0e8f1ededf87e53744c2d9705acb716d334e366aec1f1fe48d74b7765fb62276c26b26e10479516f4cc600ccd2cef0a4ee63eaf7fb24b631568fcba936
diff --git a/kde-apps/ktuberling/ktuberling-17.04.0.ebuild b/kde-apps/ktuberling/ktuberling-17.04.0.ebuild
new file mode 100644
index 000000000000..382027f36848
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-17.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Potato game for kids by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ktuberling/
+	https://games.kde.org/game.php?game=ktuberling
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 77be3fffb0a7..f37c6b65f3c7 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1 +1,2 @@
 DIST kturtle-16.12.3.tar.xz 197052 SHA256 43f25c82d8010cfbcee18a10059b5eb77e4c1c0343c15b4dc8caa694cce2edd6 SHA512 5a1d10bdcec792a6889c94a33099d8cf7444a6a8016416b6db8a3278976f552f70998e77cee21cac1cba03115666e1e804fa4203a0835447afbd4155b6532419 WHIRLPOOL a0bbfc5778babd347fb7b70ac742daf5206686a3f7e39202bbb1fe8b64d08c5f0ed8d9d103496a8bdbb61fb83f81577059dc608780f63a5bfe20220c3494af98
+DIST kturtle-17.04.0.tar.xz 1612956 SHA256 124b2192de46ced81338300edc5e4193d23507709154183cfa1b522eb9fb0bb9 SHA512 19cda4e613a8604f617486675f3b93d833deae24955f17d3ae2fcf14185bfc9462efaad01e56b26e712c4c647ba5e192b44fe546a004b0f7abd48f33dfdcc883 WHIRLPOOL a6de25987c047a9f227512c7a60a18e96e9b67c547926c717d7d326876022d8e4a3352c9fd37179a71cd5566b1729e688186e1f2e9d151561feef985c66c78cd
diff --git a/kde-apps/kturtle/kturtle-17.04.0.ebuild b/kde-apps/kturtle/kturtle-17.04.0.ebuild
new file mode 100644
index 000000000000..8ad2afa6a2e4
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 6de36bffb8ef..3aa99a32473b 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1 +1,2 @@
 DIST kubrick-16.12.3.tar.xz 107592 SHA256 eedc85b91a65f83f49318a8da1e985dd1ee47014805e7a2049139546624799af SHA512 564c897ab08433f2ed025914687fac3958a3f3cdbe6c588d2d37051f78f599bdce1f67e43c275e4a53a3d522b7ec6fea4928d464d5eb8b79ff46ea983fa0cc25 WHIRLPOOL f81dbdf9bd6767e4b41b521cc8637468499e59a2f67436f9e87c7bf7d31bc2d90e6e9929e70865103657a5390405a8cad0c23d65368ab6802154900afd3fcb58
+DIST kubrick-17.04.0.tar.xz 107544 SHA256 49e3175c8ebc4c55f012b610db61831f790d27d6c70a321f9ce338bca855d296 SHA512 c8147f40586272099cae4e413a1144745eb7445016fc11c715401772ce6272ff5abbd469d8247b7c2759ae174dbaa03488da6ed1cfa21d55b17b40efa4174379 WHIRLPOOL 4b52a64698d2fc32255d8b35255b37f8d5b3558889bee5a1758076b48466b5cbb7bdcceac9c3cc73023dfb72aeab5bc581dd34c9df73df9657f1e906699e4116
diff --git a/kde-apps/kubrick/kubrick-17.04.0.ebuild b/kde-apps/kubrick/kubrick-17.04.0.ebuild
new file mode 100644
index 000000000000..63941d461ef0
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+OPENGL_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
+HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+RDEPEND="$(add_kdeapps_dep libkdegames)
+	virtual/glu
+"
+DEPEND="${RDEPEND}
+	virtual/opengl
+"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index eeb4bf062043..8eaaff53d3b4 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,2 +1,3 @@
 DIST kwalletmanager-15.04.3.tar.xz 457256 SHA256 34c20801d17bb0e16111556539e90776cc33dbed8a53dc814c82ffabe526acc0 SHA512 6763afb19488b211699dc2b35f89ff4d24a8c2dc3d0e505722424fb3c821f9e6d232c9bfc8e406730563d93da432d21b4ad7f488d448d840017bf04e08b9f28b WHIRLPOOL d8a094ff8bf27026aeb448eeb5e93b6356ed0c605c81c4368755bd5a19bab03ea1cc2c7b6d5fe6564d4eecd7240b6190a41ed7c2455268ac9cbf995d5068a4ee
 DIST kwalletmanager-16.12.3.tar.xz 381052 SHA256 87d4489b4b6e6de77e581b5a13ecd6296f56c673322cad27050b2b0f3256b11e SHA512 66eed1588f15d1837f9db49372a9824ef2df067988ea18f33a9216666e0ab922a41a19b4248bd6904c4bfad32262cc70aaeb30ad698f5cef8939598014bf184c WHIRLPOOL 4d3ae2582971d6ece9ce8e626b7b084db8aeb5d12affdc4ef7c2ec146424fbb8f8c6347fd037e992fadc6fe32ee65a691e16c64f610c4ef606decf85f9fe2082
+DIST kwalletmanager-17.04.0.tar.xz 746760 SHA256 61b92f9065a2bcad1544a96b42557e5ff4efb9598f5b23199a2735ce3f4c1475 SHA512 12a4a63dea2b9786f5a30075704980fbb1964cca8120389cf292ff8ce524072cf8bf2b70fa095a311047b4c8084e5478de76d1486650a99f952243f8b1e2e8d9 WHIRLPOOL 0f99c6340b65d6ad36fc0001f375dda4f57adcbd1731c6e8266b444c61e81b12078ccc876df3b5e97096494ea54bc0650052fc47e38573c89666731ee28bbd00
diff --git a/kde-apps/kwalletmanager/kwalletmanager-17.04.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-17.04.0.ebuild
new file mode 100644
index 000000000000..6def0d80d32b
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-17.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE Wallet management tool"
+HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
+https://utils.kde.org/projects/kwalletmanager"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kwalletmanager-15.04.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 942cc3f7f767..a3bbc6f49542 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1 +1,2 @@
 DIST kwave-16.12.3.tar.xz 1522844 SHA256 4da5ee0868480402dd2d8b46cd1786ffb6d1e2876fd59b672e95003119e4bfe8 SHA512 cb3f9d131ab58d0a7567fcd97a6eaca0dc3b98fb4f54caa9304b33fa0969bf6e1b12527718892907d89fcccc2fc183caa682309bee948ec0bfeb516186e77c64 WHIRLPOOL 755ee4f169679754384c0f0702c56971bfcb282606fdc652c63e79e624ed73db11aa514a30ab5d5d5736773a12fb08e7acf5390b9f1bd73af297e5ce0eef8d43
+DIST kwave-17.04.0.tar.xz 4607072 SHA256 83fc47bebbf7413aa2a7650f72b592852d85576be6db759d9a6d2d5c48d66288 SHA512 038c70bcbba370e0e63fe24d55101b098ea91298c6dddcfe7879dc3ac29b26558fd132c654d31520fd0f6eb25d01794144d4a1ce3e2cdd75c8bce376b34fa9f6 WHIRLPOOL 1ec56d6eb75f45650504f60d51a1dac07fec9e040bd68d33f89880c8b6548c2596e71b770bfd955b83a61296f1663ec3b6d6e76094286ec1636d6085927468e1
diff --git a/kde-apps/kwave/kwave-17.04.0.ebuild b/kde-apps/kwave/kwave-17.04.0.ebuild
new file mode 100644
index 000000000000..43bc5d206fea
--- /dev/null
+++ b/kde-apps/kwave/kwave-17.04.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/ https://www.kde.org/applications/multimedia/kwave/"
+LICENSE="
+	CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
+	handbook? ( FDL-1.2 )
+	opus? ( BSD-2 )
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa flac mp3 +qtmedia opus oss pulseaudio vorbis"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
+	)
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+	virtual/imagemagick-tools[png,svg]
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/kwave:4
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEBUG=$(usex debug)
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_DOC=$(usex handbook)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_MP3=$(usex mp3)
+		-DWITH_OGG_VORBIS=$(usex vorbis)
+		-DWITH_OGG_OPUS=$(usex opus)
+		-DWITH_OSS=$(usex oss)
+		-DWITH_PULSEAUDIO=$(usex pulseaudio)
+		-DWITH_QT_AUDIO=$(usex qtmedia)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index c076577e1198..c0b998ac4d4d 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1 +1,2 @@
 DIST kwordquiz-16.12.3.tar.xz 1052592 SHA256 125b9db3e68d22f0309b5d36fac1f5e7fda6ae52355146729308af234d1318e5 SHA512 cef92b71aea62939750067253db7b27951e1da19314fb097b2c86134314118113f385a7a199858073cb6a0b1482fafa1c7cee115a5263db0c015aebf41a5072f WHIRLPOOL 8038c4172b1b9f8a0aa7f9885084750d400f5e7619b7c2897876d2380748a35fb0cf0c31279565b8fdabcf1463358a35a7a6393de2c2256ede08722e0b0b2fb5
+DIST kwordquiz-17.04.0.tar.xz 4163540 SHA256 8bbef04e8d68bff25116e87548c93a19841c14ca05c582a617cbfcaa3463e8f2 SHA512 0ebd342f90a2e1bc393e8f5ef09808b458f4cb7949b5f961134b1b6d84d41557e0b605cb1fad0e414c59b765f09a471e3b91c6f4b579370c63fb74deeaa41076 WHIRLPOOL fa1e5c95b4b9f79e057801946116f29e8c0f28c5192b4e299428ed1dddf1140fb776d76585000b4ed873f7970d24e3765468f34c0df45d6a2a8d04f9cc4782ec
diff --git a/kde-apps/kwordquiz/kwordquiz-17.04.0.ebuild b/kde-apps/kwordquiz/kwordquiz-17.04.0.ebuild
new file mode 100644
index 000000000000..1fba65e21ed8
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-17.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A powerful flashcard and vocabulary learning program"
+HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5]
+"
+RDEPEND=${DEPEND}
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index f62d79f71e62..3c772aca02bb 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1 +1,2 @@
 DIST kate-16.12.3.tar.xz 1871900 SHA256 19e8c40985392b5640c022ceb577aa16541fdd99d389645e38b22d621c6d79b9 SHA512 065e7d9016ae4553365ca5fa60fb820fea973f673b38af0a8281b343df677026c9451ed24affcc310cd73f333ea4f9215766b85e9aba6d11c70893a35720dbff WHIRLPOOL 839124cd06b8ab82ba5d80cbe0dead82f722d501f46baa30c5313064e94452cc9b4bcb527eacd7785aa817c3f9e5bc426a9286d71ff521eb26c040e6aae43b04
+DIST kate-17.04.0.tar.xz 5213352 SHA256 6c8d1936a2ec3a7c3c71e353da11e483251875f51846b9609667f9beee1a6042 SHA512 ab6cc21b0b8af99805d322de97cf7ba71e1092f589353a3b8b71e49c5bbd924ba18c2bf88a2783aa5228553b081b013451e68de4738ad54a51b7db76a9e18a09 WHIRLPOOL 52f224b02b0175097b5bea72686089b3c0ef13fbfa48c8c446c3d66fad951ed93092a8a9aec14bd0bebcfd0ae97e0f659bba1c444a603685f582d4f0d950bf9b
diff --git a/kde-apps/kwrite/kwrite-17.04.0.ebuild b/kde-apps/kwrite/kwrite-17.04.0.ebuild
new file mode 100644
index 000000000000..3cc94d66b734
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-17.04.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KMNAME="kate"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+	# delete colliding kate translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -not -name "kwrite*" -delete || die
+		rm -rf po/*/docs/kate* || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 734fbb3107b7..e3582010fb38 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1 +1,2 @@
 DIST libgravatar-16.12.3.tar.xz 21660 SHA256 4eecee614e33331a83eaeff87350846ff14e862ef8d8c7dff8591cad7b34e254 SHA512 085d3f0363943dab7c7e214297960dc201d476e94f013cf3ebd90e86c028c91f21702f923dad9182f6601274576d0a51efd703bfb14797618b18b4d5b49d76f2 WHIRLPOOL fbe99b93f22b432d4790d87a9d237849451bdfaf2042bac4f831373240dc5fb6f4bd87dee14d54c62132702d173a5bcc67cb5d604ecc5cf50a5290e4e50ffa46
+DIST libgravatar-17.04.0.tar.xz 28360 SHA256 f6c5257dbda783df1ba60d6558992ddd59083284456637c4dbb95061a760a519 SHA512 d1e697bfad4fb870e9f4d670fa40654e648ec30eaf569a59046596df51eb3a8bcc4a426b841c0b697abe01bffa41e2c18fe87cf0e810fae2aa0c31d2ada6c918 WHIRLPOOL 3f56b2ec95cd13b6e7825090fcdfa351843a34b35d3d8dd11087dc3be77053034033f5947da3ae712d49f7ce1ee0fad6b6ae00daa550b2d23ed3564e606d6f42
diff --git a/kde-apps/libgravatar/libgravatar-17.04.0.ebuild b/kde-apps/libgravatar/libgravatar-17.04.0.ebuild
new file mode 100644
index 000000000000..bf392963e387
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-17.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for gravatar integration"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 11b4e5e62dc8..1c5d152e6785 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,2 +1,3 @@
 DIST libkcddb-16.08.3.tar.xz 158640 SHA256 36ea1cb4ce855aa65f65ccb29ebdbdd47cf975498d73ac8375dbce15f0e7a0ca SHA512 72bf974b8469d13928716193150c218fd6bcbe1a5c60d970579bca7a8f212f544413a3c6e383f2ba56e76f1a173babc34c6c251c5cc823b83bd1f2852b9723e2 WHIRLPOOL 890647031f167a68dd4c011feeae6a5b346e344d4362a06645b21d5b7271c11dd63c0cc1dd120185bee23b9718d2eb77c95207df245fdbafd6c6ed8f514f1148
 DIST libkcddb-16.12.3.tar.xz 159056 SHA256 ec7217fcf3ecdf79154d14f5366e8acda1e6843bcb30590332e8159536d34a45 SHA512 f738d0c54911ba758c3a3dc791a34cf393787af99f2c9fcb764d17f5f20eaf2d543b316ff0359637a5bc20b31471de031534adcf40e9fc2c96761d966cd95939 WHIRLPOOL 9f4b27d9cf9fd1d17d67736fb6ef81de8b9763c17b79684e8f83357a8ddf8459b0df15fecdd8152c2d311a6a74ce47c679c3644e8d88865b147f0340cec7c7fa
+DIST libkcddb-17.04.0.tar.xz 425752 SHA256 d2eddfc074aecd1f9f0452708757e1024f6d1729fa6126c72d88a6461ec1db65 SHA512 336b9acef964176d45f6d6abae3095d45cab7dccc2842b505161bf96892f10e32948d5cd277f61fa372315cce4487da5f95e2db55cbb89c0b7a0aa2b9c82b59a WHIRLPOOL 96a2f91db4142ad81a883724c83940895e0d45014fc56b3fc4bcd95ceea5d6524e857b390c9cba4ad68d43e900fb04e209ec5530ef81cac6bd0e6e29786d5079
diff --git a/kde-apps/libkcddb/libkcddb-17.04.0.ebuild b/kde-apps/libkcddb/libkcddb-17.04.0.ebuild
new file mode 100644
index 000000000000..acd25421b4c8
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-17.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library for CDDB"
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="musicbrainz"
+
+# tests require network access and compare static data with online data
+# bug 280996
+RESTRICT+=" test"
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	musicbrainz? ( media-libs/musicbrainz:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use handbook ; then
+		pushd kcmcddb > /dev/null
+		cmake_comment_add_subdirectory doc
+		popd > /dev/null
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 87862cabe90a..5454374f29cb 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,2 +1,3 @@
 DIST libkcompactdisc-16.08.3.tar.xz 76240 SHA256 c48d23d355dddc538e4ed5538482e5ccbefd23f3928aaa625148928d5c793224 SHA512 07070f4fed8d0e7dea5503b7ae27c0bbe093bf4b08d3d06c792e0069a4d6eed7bd23f3f60013695af6dbb1adc79d59a5e13e2516cf2c54a3d2ef0011e05b28d8 WHIRLPOOL aed6c827dca44a8302de2da9ad4271cf83aa7f78f630971b669f513a260c1b3699c38c1d3217aa3fa930c1303832a5779429caa1990e89e263cd07cd4d331c37
 DIST libkcompactdisc-16.12.3.tar.xz 77428 SHA256 943430081bac8e8a4c3a8260df0b644aa47ff3412b0cee387786938292e63e08 SHA512 2d5f480124959b00abd68121135e95589d8e27ca44cf9f94b817cf2c415dae46c05b810ae2a27a638e27ff93811ea6b647293d5d9d7338b52ad156df3fb91267 WHIRLPOOL 8635abe78f63d21692193a15c00db39a8b35d9b452f11d080f5821a61dd22cd0ed2a8bb2438da23f35374c2d16a11e8ebdb91a2f11e37a8f1f3bd84ceb38190d
+DIST libkcompactdisc-17.04.0.tar.xz 88824 SHA256 a7a4050053fa84811262a6a281d265a519f87b7a468e567b348e65a27e89d4ad SHA512 0560a2b6cb2a42dab80a5d1365bde1e4352e4e1ef9e9d031d2902f692c8744016250ae1f35ddeb88aba15b4376d3bbf5be22b751c789b567ef807c1d56a20fd3 WHIRLPOOL 066ae36eac832edfdcd0c4500e4c300750ca245ed540733bf335f003a6d0aa05bd34876f8d0ec5afce75a3b2baa361cc10eb1811fb411308a7607c561f736939
diff --git a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
new file mode 100644
index 000000000000..1346f740445d
--- /dev/null
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -0,0 +1,52 @@
+commit 006fda07f559206f9f9f1ccc29080ce71a367b09
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sun Apr 16 21:23:58 2017 +0200
+
+    Fix linking with ALSA
+    
+    REVIEW: 130089
+
+diff --git a/src/kcompactdisc.cpp b/src/kcompactdisc.cpp
+index 437648f..2e297d1 100644
+--- a/src/kcompactdisc.cpp
++++ b/src/kcompactdisc.cpp
+@@ -22,6 +22,8 @@
+ #include "kcompactdisc.h"
+ #include "kcompactdisc_p.h"
+ 
++#include <config-alsa.h>
++
+ #include <QtDBus>
+ #include <QUrl>
+ #include <QtGlobal>
+diff --git a/src/wmlib/audio/audio.c b/src/wmlib/audio/audio.c
+index 9ed7a82..729ada5 100644
+--- a/src/wmlib/audio/audio.c
++++ b/src/wmlib/audio/audio.c
+@@ -19,9 +19,8 @@
+ #include "audio.h"
+ #include "../include/wm_config.h"
+ 
+-#ifdef HAVE_ALSA
+ #include <config-alsa.h>
+-#endif
++
+ #include <string.h>
+ 
+ struct audio_oops *setup_phonon(const char *dev, const char *ctl);
+diff --git a/src/wmlib/audio/audio_alsa.c b/src/wmlib/audio/audio_alsa.c
+index 87bbca5..af1a1cb 100644
+--- a/src/wmlib/audio/audio_alsa.c
++++ b/src/wmlib/audio/audio_alsa.c
+@@ -26,9 +26,10 @@
+ #include "../include/wm_struct.h"
+ #include "../include/wm_config.h"
+ 
++#include <config-alsa.h>
++
+ #ifdef HAVE_ALSA
+ 
+-#include <config-alsa.h>
+ #include <alsa/asoundlib.h>
+ 
+ static char *device = NULL;
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
new file mode 100644
index 000000000000..d6863f4e178b
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Library for playing & ripping CDs"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="alsa"
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	media-libs/phonon[qt5]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-no-alsa.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package alsa ALSA)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 15770d28de97..8ca66332dbb7 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,2 +1,3 @@
 DIST libkdcraw-15.08.3.tar.xz 102308 SHA256 6c91f19bd515942ad28c9f0e504d10ea5a5cf88f1a05da3204f5213387603f54 SHA512 f77902a768df26368a67f680cb1e5c54eec5f44b5598ff9966c30abdfd977ea683a738cf01749557f144d58a85121afea61a8e5f7ec80d1c2d55a3bdf9549c39 WHIRLPOOL 270f9ca4ea18ecd7784cdce5b1ca9161e9a7afb6c9ae78fd2820a365ef6f28db803c2cd3686c49eea0f43b85ea9ba79b38f1150519ff747e700ea7b5d1d954c6
 DIST libkdcraw-16.12.3.tar.xz 42772 SHA256 9cbc6b27bf1ed65a85753a639ca2b8fc873a1941332d8fd6fac716d9fe364f0d SHA512 c119e7e4333e787874719a5f6cb1a6eb8b059257871419175869e3f93959592a9b471ca4402d2da3be671cbce0578f0fd838bb792d6a0bcc8726d5a9f4faedfc WHIRLPOOL e1b2a8ce3d6da3559f9d8f6028d567037460e2519841367003f69e01362aa80854b57c2488036e0d6139d68d7261ff6aeed2bb1bcad46ed6d531d513f50c7785
+DIST libkdcraw-17.04.0.tar.xz 42760 SHA256 da63f80e7734484d4e4b2db401621a4ec71d64f67c89e2922eef0f82d1c62ca4 SHA512 248b5d5e8726ec6df73f3c2b52e3ced4f416dda3c97d1a7471b9f6523399cac265a070e50c5961ef428c7f0cb70635ebcf88e270af2079dfa5bc6481d6358a7b WHIRLPOOL a88feea578d415432413912e055de41ed0c1d28f82fb6a9b580c6ec4bb85f4511b049e99de85f4c9a210521887d3c3f9cc83cd37ae76a2ee929c31e40f59d31a
diff --git a/kde-apps/libkdcraw/libkdcraw-17.04.0.ebuild b/kde-apps/libkdcraw/libkdcraw-17.04.0.ebuild
new file mode 100644
index 000000000000..7be18bd84c60
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-17.04.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Digital camera raw image library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-libs/libraw-0.16:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 2840bc1cee72..0e00b7ae18bd 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,2 +1,3 @@
 DIST libkdegames-16.12.3.tar.xz 5776384 SHA256 6315a47c7a8ee78a0bf33762f88c3a9193998807fbf15fa46b99d748403ff870 SHA512 20e696f65e28adf1765758607f38c7824e23bd03d7d969d7309700da4bb8663185ded7f7c006dbb755701b7e4523496ca7dc2911a51f0cf71f23b6dd3bcb4cef WHIRLPOOL d4141d5f13500852500933849a87585f126e60f1234aaa279e2e437236efa08874e87451f8ea9de834fb264fcfbc3eea19fe0c3bd1cc5c6ed0f7d0ccb37ff073
+DIST libkdegames-17.04.0.tar.xz 5949120 SHA256 d350e827d0a5a53e2318df0c72e7ac7ed4d2c1f7cf75b6acecf3655f5d51b279 SHA512 6dee4bcbeb6a38ffdafc8b19c7a8de30fdf20a6fa74ffa07f770508949f215fddc0ae9436d5f336d17729cb086bbd125d3fb35d469e9361452f3fa90de0feca8 WHIRLPOOL 86170b3944f5761bb53eabaa37bd780b0fb2bab6b33f91443ae28cf8bfb514d76d5905e9490a2eb09dd2b86c419dec514bd5ea49f43dfd22abc2a9dfa1cb1cc2
 DIST libkdegames-4.14.3.tar.xz 5827668 SHA256 c4f2cf08c85f3e2ce809fe8c7a032e26fc20707a27934c6381093c77cc26a265 SHA512 43deba5ea5e4f39eae20425f76f9cb02d5215e0a596ffbdd29585c0bb3ff32f2806755ccb22b3c1c5c7fc5c7bcdb2bffd35fc211ae6e2f55aa751965b5c6d9c3 WHIRLPOOL 9681075fbe445b67f981865e06554a990bf2c8b45bdfce3fefe80c0bf3a4de4d7b54744f6a3a4be6c6f117524a2f0412e0dfd715caf2e50258ee17b895e48616
diff --git a/kde-apps/libkdegames/libkdegames-17.04.0.ebuild b/kde-apps/libkdegames/libkdegames-17.04.0.ebuild
new file mode 100644
index 000000000000..b88bab12fd79
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-17.04.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Base library common to many KDE games"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtxml)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index ca7a6fa3971f..e54eef0b9178 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,2 +1,3 @@
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST libkdepim-16.12.3.tar.xz 114984 SHA256 a05a5de87301f2e71591b2d1fc82df99d8418aa2dbbc0d0204c5ddbe61bf4e1d SHA512 91ca36b5a983cfa87edb30ffa5db192e8ffd09c302439b3dc50e7c2b44f0b81f44912e50adf03434390b86c77deb1eca0ce74d21f4c8d62497ce1ab8110dd45f WHIRLPOOL 64196d5654782e9d9f85b1f0d3b5e09632f40401386f9ca2ea2aef4962808dd4482ae30525c0c85741b9ec6f96757c5c79d76f089b480a269dfe5b72709e0f70
+DIST libkdepim-17.04.0.tar.xz 342420 SHA256 8eea059dcb23c91daacecb24a317999ccfd65459ba193bb4799df9294f9a9003 SHA512 8600f503053d93badac6b898a1574dfbb041afcd42e027435fc9e6efc49ed9e3d0b16d394da274456971cfb8f5f2a32806355fe464d017aa4fdfb6ce1273e81a WHIRLPOOL 013a35e7f4072c5aa6a50e2e2e7a57493b80a251eab39b3e239e904632f6a9208e2552b51c6fbed0f0ecb430215980b2801b25cac69eb701874cdc8580c55a28
diff --git a/kde-apps/libkdepim/libkdepim-17.04.0.ebuild b/kde-apps/libkdepim/libkdepim-17.04.0.ebuild
new file mode 100644
index 000000000000..c799d5a11889
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-17.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index ef799dff6e73..0efc0684befe 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1 +1,2 @@
 DIST libkeduvocdocument-16.12.3.tar.xz 91480 SHA256 a077a804d27327542a48160d681c5577e39cefee92762e3f3abad464044e4717 SHA512 517a942bca9adfc1eb5f725b734167c76240b0d53500c18c10681decfc62d56b61888141d60bde54ee4b702de525f701859bdafc18335e966a9d1379fdf8659f WHIRLPOOL 5cd46c32a38745f6f11d7222476d7973265243175aeb6b5c1fc939d57e8ee0a3fff989a3eb71c1a222fedbcb5127b5142540789759c90e9663d68910a93111aa
+DIST libkeduvocdocument-17.04.0.tar.xz 213960 SHA256 ced162d2820f0b8dd4b5ebd9851485ae7d0c004fc75ee5723a071fddb2903930 SHA512 26867ee5c3a7b95325360089e58d8f9cc5b12d912f793a3cb1f2903b713ffb1903f179eca032493c0fa8e9b1f7045c2e306d41875b78a1a3d626dd39aadb5522 WHIRLPOOL 8181a9cc7a16dd5a5bc5366166e58149d61f6b492bd206e4e581db18509296173d6c61368c1dec7dcbd05675b7c29cb4e882b74ea458c5e3ebbce05f1cf07a4b
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-17.04.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.04.0.ebuild
new file mode 100644
index 000000000000..9b15e11a2aae
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for reading/writing KVTML"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	kde5_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
+			-e "/add_subdirectory(tests)/ s/^/#DONT/" \
+			-i keduvocdocument/CMakeLists.txt
+	fi
+}
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index d8530c427429..af5bb232abd1 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,2 +1,3 @@
 DIST libkexiv2-15.08.3.tar.xz 137376 SHA256 d41a2a329a76b41ab3f5459242f8b71754e033ab7502a20a26c747d9a07c8460 SHA512 f20463dc7d54404c933fb30d55702111aaa1238a521de066c18e91d54f8fe8cb56c51ff4b76100f7508c5b42e24895b864d7ce5b2032652154844f7522c1c1ad WHIRLPOOL e0002389f9739dcfbc4412bb16776190a86786894a03979ccafe270fd8c0d1545d2346a4b7b4a6d6c0eb34687566eeca0e0584d2f9b78a97321dd7456ff5a1e6
 DIST libkexiv2-16.12.3.tar.xz 65092 SHA256 6e50183a31a758629ea2ff2eed268f10eeb1082c0e22c928c6ea569c2f08d909 SHA512 002ccdbde6d4eb838b2fa2e7201a0aaefed5abb9b11f0149a1b772a9486e5cbb850a418e4fd6e7fd2553304a2ede0d924d965fbc1a497083d1421e83dbf152d7 WHIRLPOOL c76d8d9052f1aab6a71fcc0b86fcd080596c66489c423f6146610bd0320ef13d0f0c0847ac547978126066be0dbc82361c39bc00369f8fc32c3ce38b66da226d
+DIST libkexiv2-17.04.0.tar.xz 65092 SHA256 fd026891a1d412dc653162868efd4b105685fd5259cb8060aaa41e21b7e33c1e SHA512 1a06ec4e5c92fa0fe395f03fbc17132a4ba90fc5a56aca4302e5e8b481b96804243d888facfd0e9db8389c97c9a260a359b2f1f709e14c23ce227f0d2a5d6309 WHIRLPOOL cef6ca77b49347663fdbfc0dfe39a2a45d3f32d8b682904620e45add5f30be3d1766b8ada979fad9ff27349ca4717c90bbff2861843ff451f7f7a4bec1eb3577
diff --git a/kde-apps/libkexiv2/libkexiv2-17.04.0.ebuild b/kde-apps/libkexiv2/libkexiv2-17.04.0.ebuild
new file mode 100644
index 000000000000..8b0d36475d34
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-17.04.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkface/Manifest b/kde-apps/libkface/Manifest
index 043190104e33..9f091d835749 100644
--- a/kde-apps/libkface/Manifest
+++ b/kde-apps/libkface/Manifest
@@ -1 +1,2 @@
 DIST libkface-16.12.3.tar.xz 8989848 SHA256 0867e2c0fdda617543959a60c7398d2132df8d1733769bd888d041c0698f1d19 SHA512 dba6f6c0bcfd3fbd34cd0209a62daa60ce704d1587d0054c2f4ee91ba9e5b9697ca2dfb169125854e1d3b7a9684468c87a2cb7578cad3379c9abf141fa531925 WHIRLPOOL 72c1985dc980f92d58d5cfc4dbefc5ff23717ec973f22d42d0e1e20f289b5b93fbe6358052e22933fe3d9965ca9f18b9baa349e173b5a4f8c1f0c8c633c11f29
+DIST libkface-17.04.0.tar.xz 8989844 SHA256 d9d762cf99124cb68f57ff98cf2781694ecf8291bfb9936fbdb7d57a8dcf5fad SHA512 adfc59aa848032c999d6aae301298a6ab2d6798833f25d75a98dcc130cf7c9c72a9257ce6babae11119af6834772806d865eb18502a5ecee0993d0c8ab7d714a WHIRLPOOL 16489ca7fea46b2309f390950a6c638be99b1f8ef97e00fbbf56959937b3f4448684b08977dc6cb685cf634942e5daec2acd7c2f733cd0c7351f08bd00533564
diff --git a/kde-apps/libkface/libkface-17.04.0.ebuild b/kde-apps/libkface/libkface-17.04.0.ebuild
new file mode 100644
index 000000000000..b0d6c7809e90
--- /dev/null
+++ b/kde-apps/libkface/libkface-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detection"
+HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
+
+LICENSE="BSD GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/opencv:=
+	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0-r6[contrib] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-16.11.80-opencv3.2-gentoo-3.1.patch" ) # not upstreamable like that
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index cb474fcc1fa9..7c9dd7e0b7f2 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,2 +1,3 @@
+DIST libkgapi-17.04.0.tar.xz 173868 SHA256 8cc057ad5f88dee2a218b3a3aaf09720312a3fbb9a4a06b2aeb6706818557c54 SHA512 af44c3e4d5bd34c7920a3a29e5e157c4fa3900283277176d3288cde339c7a9f99e9dc7a94eae925a15734fe9bda853559a310364e5a2c58cee5e0b31aa5de112 WHIRLPOOL 582985294e874605af7a77df61571564a177354d8b8e788b32147326c414003174ad3877d1ec99cbdaf021a32e47d58de4b545a2169db5946ed1269343bacb4e
 DIST libkgapi-2.2.0.tar.bz2 127026 SHA256 c02965b639c2496d489d4f1865e35473db6f1b5e9e84fb079988d33db629c2b4 SHA512 c5f37aacb89243d7985d7064aa8941d3d2a6c26685113e876b38c737ea2e1126b40b0f88b0908e7ea8a7bcb2fade1dc528c2f73f22890b9e892c6d18d9d3bb42 WHIRLPOOL 1aa1d5c661098793a6c6a112ed92198c044cd0ab9e320631e165dc2cbb510df6c7d0a96412b2147728aaba822e40c571c07ca2b88ad5f5a055c0755490774a08
 DIST libkgapi-5.3.1.tar.xz 159584 SHA256 366692ced93442809175351f5590e6a82c4e6316f21d989c239bb72132a601fa SHA512 257d1beea9615e9daa05333ad2de948a4e729c6cad192acbd50803be51ee86d7b3665a05fb94b40afc1bcdfcb5dbf5c2c8d2e6d635cf9c1988fe169ec69462cd WHIRLPOOL 2c9c1c073702af0fdc8dd56410299a6547a6dd0a263e8eb20d162f153ceca8aa56efb7c8666c7594f270b5d3fee2ec2543d1569aeed80700bfdae8541bdc36fb
diff --git a/kde-apps/libkgapi/libkgapi-17.04.0.ebuild b/kde-apps/libkgapi/libkgapi-17.04.0.ebuild
new file mode 100644
index 000000000000..079ddb8a23be
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index ea8e934a2c9e..22771b3560a0 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1 +1,2 @@
 DIST libkgeomap-16.12.3.tar.xz 125352 SHA256 a9e945af924751ee1915ca1af4be841ecec37b45035ec1f7dfd92fb5d8e1e2ff SHA512 6c44900fada6b4b71bac8587faded55992a08937719d3866d7da6d9e8b3d10db44f810d9890db27fe757ba2513d0d773bc99fd7d49cb8dd037a3edc140b6ee72 WHIRLPOOL bdaedb20fd74ce156111399beb804780605225e765aa7d8822206866bebb4db0baf349af9a83596e38a2240c1495b1ac3e88aff557fd0e314770203bf410300e
+DIST libkgeomap-17.04.0.tar.xz 150600 SHA256 e372dd6b956db9dd3a005568354723dcb701bf268fecb661bd77cdf3dfbb44d1 SHA512 47290c72cfefc129db93213503ece3609ae1cab120c65b82c0a9747603ed46a36b96c3c6bee2aa31d9a3fecbc9220d0fac179b293337c4c41b23466050b87cea WHIRLPOOL 4dd97a880a824a4b57fd32d70b2ac055f6e4d55bbb47c632d87e6352a948b27f4fe3e674dfcca19fa7948a2af83e512c5281a8662a0236f27ff663b84ff64ef7
diff --git a/kde-apps/libkgeomap/libkgeomap-17.04.0.ebuild b/kde-apps/libkgeomap/libkgeomap-17.04.0.ebuild
new file mode 100644
index 000000000000..20c5c33027eb
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-17.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
+HOMEPAGE="https://www.digikam.org/"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep marble 'kde' '' '5=')
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 92e9683f86fc..95c7033fa0fd 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1 +1,2 @@
 DIST libkipi-16.12.3.tar.xz 104084 SHA256 e64f7f59c4ffc848a404d1a5d0df5b43ea223eaf81273b2ac72d84cac0063538 SHA512 9bccf6aa5d7f54f25d0f7464152035b79d9555d9bea293b86ddd2b0c8b380edfb37bf72b916929c17caa166051116423d9b57cad3bfb8361b90c79a96e728603 WHIRLPOOL 95b188ea75e4e36eec9c966078c3db79b5f2486dd9e1f5127450263028984b0736615c4c0e5efcae269c5b1292eaacd4a78ca55e7f574c6b2bd270820b6ec2de
+DIST libkipi-17.04.0.tar.xz 104108 SHA256 caa8b5fa249920f82254fbce7c17c97babaed60080e168c3ad58fa436b4bef7b SHA512 4099090de80e96aaa62aa59cd4faa2b776561cfb5c9ae9ac9c4a9296e18755967e3cf308dd184eb4081290af4fd89fb89f34d5f2aeda56340bf0c3c8568a959d WHIRLPOOL 5a3199fdfe44c49cacb4c56ff60b6616ef77c5d39bb14a80486412df4d1eaa3893caed7274a8f8a5b4b29fdbbd63e533e42f669098a3d9beb1ecd93047e65b0f
diff --git a/kde-apps/libkipi/libkipi-17.04.0.ebuild b/kde-apps/libkipi/libkipi-17.04.0.ebuild
new file mode 100644
index 000000000000..f81ea096bf16
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-17.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="A library for image plugins accross KDE applications"
+LICENSE="GPL-2+"
+SLOT="5/32"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libkipi-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index baa98d7c9b9b..ef530e0fb9a1 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,2 +1,3 @@
 DIST kdepim-4.4.2016.01.tar.xz 8964248 SHA256 19f4d6ab4bcddf5a0e6acae50c20d0b8fbb482503e47e75c86955637d249cefa SHA512 a04737cc89f96e3635a19c492c9f3f31e7554aa8a237fb0ad8f5fe8c02e7e30911dd5d93bf0f27fd38603e496e02f3ef1d3064e159c99c71dea379199d1e0e03 WHIRLPOOL 9f02f5799b3a10a9b18b4c8cb34084051991cb7240d2b818cd2b58bde05abde2ef3126b3960f2554c7e5c4930266e561c1715c21fe72136654e28184b5083089
 DIST libkleo-16.12.3.tar.xz 130976 SHA256 d602da318acf3208b1cc8d1f9a585b9ebd5d80136d6af8749b2ec988fb12f767 SHA512 2385774f2e928e8e2e4e147d0dd85fa05c344cdc0157033d8450fd5fc75f748c1255e84d50b83034db561c63b395d54552cfb6cf59a6c7dd8f21e64b04c51f45 WHIRLPOOL 2c4ad3f9be2f457ba8acfbd46bdb62d4365a253e2353bb677e91c88cf4e844d9712b672bf44262c755a316ccda3fa5babac97d78188149081cf5ce5e71c1eca5
+DIST libkleo-17.04.0.tar.xz 291000 SHA256 d446f70b2b9c193e538f0c3af71b425d903aaca750db53c2f0fbc0c01a79a9af SHA512 08d9dfa2acc9a0d498deb7ee193ba7ae5930f2b01930c641bb43b2172d0b069e24fdf51abe5d49e2053d5d2cf7ed5f781832cb753688a9c7c96d18c170bd0d34 WHIRLPOOL bde7438718a70957767ca7d7fc33774d8ccc118c67029fb036ba794d87a7bc93016af62af607ade58db59c304258c6d47043995bee42d30b649fc2736755b2e2
diff --git a/kde-apps/libkleo/libkleo-17.04.0.ebuild b/kde-apps/libkleo/libkleo-17.04.0.ebuild
new file mode 100644
index 000000000000..2458681738fe
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-17.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Library for encryption handling"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index add6b8a1fbfe..a6342f5074a7 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,2 +1,3 @@
 DIST libkmahjongg-16.12.3.tar.xz 1677916 SHA256 bd4cd709668cd675365cc51adfa47b8ac7bd09c684f1e8596472334eae3c1f3a SHA512 1842b371fdb8d21ab5d2fb4439af018b837c28ac551893cd5a3c8029d9a660a99feda7cff886734242dab8537ffd689d47e218228ed071b164710e6b055a9dea WHIRLPOOL 65f2d98ad7f24ef6a51c43c02064a9a8aeb380c64b47bcdf2db4eff42590e7f6af2510dbfd2ce01e5ae6f35ce2193b1a871362ac69b8a5468ec2033a6b3ae7bb
+DIST libkmahjongg-17.04.0.tar.xz 1702892 SHA256 e3f006eacc4817056df87ee32e985694a171cfc08799ea4e1c10c3a45409d660 SHA512 ee923894d10d7b467d3f51767a11f990fe1b7a9bc5902e3b42dfa021f467f5dd2a1e2123cd074e234e9cd208e3be8ce76a7f35c45726b07e5c1a7c40c1e17eda WHIRLPOOL 6e8558107b1ab5fdde0c9135533c6f35f880722c1d35d54eb7f72de6abd182581c7ad3d6756f0fd74c02d39800a663902bebce8604cb64547aa9f00547437a49
 DIST libkmahjongg-4.14.3.tar.xz 1673436 SHA256 2638ecfe9bc798e93d9c091c0a0d0579ce50b34747bd414ff44328dfdf3766a9 SHA512 9f067acd0031ff746d3abc1cd81f1372b1d8bba685dbb2a45e104e9124c4de6019a795b07e0537fdada4d60fd680ade1e7978dfb8b1bad631abd837e793ec217 WHIRLPOOL f71fc57607f1a618dde110fe7d6758ffe7587a6600d3654e4cad84abfd2a27199db8ef13c78745c69771a7fffe9d048e7fc2cfdd3b1a0e4cdd35b07d8466dff9
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.04.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.04.0.ebuild
new file mode 100644
index 000000000000..f6705a1e4ca8
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index e44c806f6d34..6f8ed35205dd 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1 +1,2 @@
 DIST libkomparediff2-16.12.3.tar.xz 57204 SHA256 31d14264f37522b2d5472874642cab73fe71ca8e077a6f0dd69de3138469a2c2 SHA512 611d0a0272fcecd139840d63d9efc1b10cdd8b55e3c12ad14626819fb8f062cb7f974cd9426d062d1e9225f2bd076bd556855640986bce2c398f74997a24f26a WHIRLPOOL 2dea87dcf0d6166a49650d89b136e0766fc167f2e658921001885e9a850d768401608945b2b3224cb80996a58c6c922f846489b260b14b9d864000fe48da83c5
+DIST libkomparediff2-17.04.0.tar.xz 179532 SHA256 b94862d42621403e936c653377f32743fc3903cbd9f616c6c72e082784f6715c SHA512 348690542a5f39b3c97adc1661ad4147de138858a44273b3cf7e9bc4fb3f05b897af94cf3a5f86220b7c4b49929467f83e1128e8fb88e62f1cfa6fe173cca848 WHIRLPOOL 16ee09125da39baa560a592087a4c2c0463dd37049167bdcbd9a162e70118fe5fb3e0f281d64e7bfd808cdf868064ae582ec5f343ffeb89b60bbf3d4169766c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-17.04.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-17.04.0.ebuild
new file mode 100644
index 000000000000..c9ce71eed9a7
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="KDE library to compare files and strings"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index e5c3da0b0ebc..9dafd4f7db92 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,2 +1,3 @@
 DIST libksane-15.08.3.tar.xz 81192 SHA256 0a038fd40f35eaec770c46650ef858f24d0f2f9d5b79cf7f92467630fb23a207 SHA512 18b8f5c3fd58e2e272aff7f7d0d45b639680c7d12dbf8dfa19dfae8d872a73f2230958bc415f431eeab1312c2a19a7e2e617fb9a08a68dca3bfb46ed5b986bdb WHIRLPOOL 40c59f3a8748c9498ccce1b74cca029c085d087239225d2123461cd012ad0bb42e2a5c8e258751444a4fcba216a47913788be52de24f7f65de4a526347dc9210
 DIST libksane-16.12.3.tar.xz 81060 SHA256 98c144a36d095b1171da2a383dcadf1a28911976a2cf8c56657aa4a07f930610 SHA512 d8e21dc72f2d1bfd7e7ed0a43bf895a03e92e1ce3489e632f457e977f0f5e3045661ae5fa35b272eaf6ee39c6d7f931fdc03c59c8ede9f104703b80e18980e3e WHIRLPOOL 6bc1fcdcd526edf355870dd3885c4168e8a153fd8940274c8d2ce2cd78287fe6a0416821f8d3499f2e3db66ab06e27b858a58a6576662bee9cbe6128296ae76d
+DIST libksane-17.04.0.tar.xz 137728 SHA256 86f84568b827abb8b46bb887c94742dfdd319859e8ba9cc415ebed5d810b22fb SHA512 f62ee0a75389d337a6bd7f39beb94ede4aa8038c3768ba15a72700fae595afddd540beb6164a2782645adb691def3c3361e7e4a479065348c89d45cc9408f4b3 WHIRLPOOL 4772af9fa2fc72fa3f3844c3aeee9f38127052a286d042a182388177dd2d8d1e829f48589349c3f7d76800063fe6ef4e57a91c04b299005910515b9397de3727
diff --git a/kde-apps/libksane/libksane-17.04.0.ebuild b/kde-apps/libksane/libksane-17.04.0.ebuild
new file mode 100644
index 000000000000..502a7b61839d
--- /dev/null
+++ b/kde-apps/libksane/libksane-17.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="SANE Library interface based on KDE Frameworks"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-gfx/sane-backends
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libksane-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index ba5704367652..1be6381a194f 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1 +1,2 @@
 DIST libksieve-16.12.3.tar.xz 169972 SHA256 22a6d6c79502e431bbe6c9b4231dc7df710b0d920fa57136e677933ea8d338e6 SHA512 a4e47150c658d2a267167b01ff7e3b2bb2547a3589f54a1128f50273d1a6617c88c8a98b17217aeda7a946f9e5e8a9a44dac41a152d420a84fe5dea1e9ede4c1 WHIRLPOOL 082638781770a604766cf9d3986c302bc400d86e3f0d0d362be8766653311894c42331bcd6ea71312e50072d3db3a2ba244b22c379f5c5979dd7ae0e1464a6c9
+DIST libksieve-17.04.0.tar.xz 525784 SHA256 ce8298546e98c85a8f10544967cd635fcfa0009253800814b8048d6bc0046b11 SHA512 0d67c8c730f312c6e3a376c398549da95603fae0ae3c3948d3272a2bb8f33f3f17dcb37022f276f11ce7aa841727fea371f20f7a9bb161564228eaad6466d138 WHIRLPOOL 65b69924176c24ab3d774e939e4de5b9bb97b7d6266060bc554e275b5acc7fd0ab8c24a266d91cb4af7186d7272ddd9e775a801d2aa49904cc771fc007e680b4
diff --git a/kde-apps/libksieve/libksieve-17.04.0.ebuild b/kde-apps/libksieve/libksieve-17.04.0.ebuild
new file mode 100644
index 000000000000..9b3b8c338c97
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-17.04.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets' '' '5=')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-kioslaves
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use_if_iuse handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 5974383cabe4..96b8a48d5a0f 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1 +1,2 @@
 DIST ktnef-16.12.3.tar.xz 232752 SHA256 367869340b7b88701f75dbb668827145a4e25780820d6e8a094b71c9d781686c SHA512 ec4d8d5b74eae06d4f9be31a474aceb4927c6426e8d63472f8dd1601ebf51edb950bd683e37869724d9f930538fe5326578e66309096250ccbc004188b845cd8 WHIRLPOOL e4992ea20d09a249087d68d1f5fca02d8d2d1e6bd9760a355334f6771c679e2c0a1073c02f60c00f4e9fb2de57ec815dbd7417094df0ec4d12efe13fd9ed8c9f
+DIST ktnef-17.04.0.tar.xz 300268 SHA256 e8f614434300e8d2d2604388bd37e3fff74d0f44dd1ee67feb20af42800cfeab SHA512 4b0712b1793ea5102618a1ae025924a6990ffc83f3e9de32a15f51fe77282381bf81ea7f66233397b6ef3b9f1923d210d553f6e2332de301387a79d55d03f590 WHIRLPOOL 8666e015291c184e1020eb4942e17148bdaf25d3b76dc985149faf3276d6fcc363c27e626919899b48d8b09be341fc1b556533d977ff3689c99b26b39e3d2d88
diff --git a/kde-apps/libktnef/libktnef-17.04.0.ebuild b/kde-apps/libktnef/libktnef-17.04.0.ebuild
new file mode 100644
index 000000000000..757edc61cc8c
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-17.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+KMNAME="ktnef"
+inherit kde5
+
+DESCRIPTION="Library for handling TNEF data"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 28c2aac93d3c..7711ca8a947f 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1 +1,2 @@
 DIST lokalize-16.12.3.tar.xz 959296 SHA256 a02347b7f9f3704817cc979858cbf5b68fb808543fdb57d2fe520264129a339e SHA512 d2c7b212804df93f39584531557e76d02c3f16f4c114582c96413f8ec54305c2015a4859f915bbcb067b39574bcdc2fe7ef5defda5d96853b67f305c9c2f9861 WHIRLPOOL 76be9452965772960830a9e433f526959f6e05f2f0771723744d7c76eb63282530f984066afaf4f60ba310f993e66ee6236f95ae92a4dcfd0d734acc5e2f63a6
+DIST lokalize-17.04.0.tar.xz 1941328 SHA256 12f905be1267ee0292645a5dbc8064f0bf5249bce723d63ca30af409578b54be SHA512 9dc911edbe903017dc9a3c168be77562483bcc943f404dd23056da7793d7f3097b571250faf2d465296d8d676baf7cd4a8452f893ee021533734ca6858385b06 WHIRLPOOL 0d2ce975dc2f857b6ece498b0814784f03463e6680de0b56eb3b21cca58b9c373841d749e48493782b9202148e7a2cdae5d5ab40e7b42b1ae1092f068e46466e
diff --git a/kde-apps/lokalize/lokalize-17.04.0.ebuild b/kde-apps/lokalize/lokalize-17.04.0.ebuild
new file mode 100644
index 000000000000..27b66cc3ff9c
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-17.04.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit python-single-r1 kde5
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://www.kde.org/applications/development/lokalize
+http://l10n.kde.org/tools"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-text/hunspell-1.2.8:=
+"
+RDEPEND="${DEPEND}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_install() {
+	kde5_src_install
+	python_fix_shebang "${ED}usr/share/${PN}"
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version dev-vcs/subversion ; then
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+	fi
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index ab4148c23c64..7be70188e8e6 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1 +1,2 @@
 DIST lskat-16.12.3.tar.xz 927964 SHA256 717676dd9b6cdfb21934fc8357bb470a5420f356e1e17171f2cd83621859b80a SHA512 5a169d3e03e957fd6e92cb5205210595c92e6260bbc34401f7a4a75cf9d9f312c55e5160daf581ea4d5bb59a5997a5585377fddd44c8bb7b28b53bcea16d1d77 WHIRLPOOL a497a2aeb476a4b63067c3283c41248740c4dd2f0a76c5569ed6300155ff5ac42d000ffdd50666d85c66c992f1d168204e629937ca4926f039119fab7efcfe1f
+DIST lskat-17.04.0.tar.xz 927888 SHA256 2d8f817ece7035544b78c1d089d7469ddae098bc73401aa5e12b2fddcc11d31a SHA512 30e72fcf67c31dcb60cf9091c9f5661e566406ab51147c64323160a1305bb3d0c74bd332a75eece2be66e60f86005f4062b6fd30f6ee66e914fdbbdcfb83a300 WHIRLPOOL fa4d5a62ef42c269f1cd8715f8c78bebee4dcdfb6cc068aa98fe0b22b85474beefd8d360a189b0481032b6521b1da7951dcd05951e6eee3685b97e28f6707082
diff --git a/kde-apps/lskat/lskat-17.04.0.ebuild b/kde-apps/lskat/lskat-17.04.0.ebuild
new file mode 100644
index 000000000000..df7af656cf89
--- /dev/null
+++ b/kde-apps/lskat/lskat-17.04.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde4-base
+
+DESCRIPTION="Skat game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 6e8b19e11f44..d44285992d12 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1 +1,2 @@
 DIST mailcommon-16.12.3.tar.xz 189604 SHA256 05439969d02b96a51e0d4eb4e4bbf9ff940e484d4fd2162edea62999fc6ba7eb SHA512 54d86d28b4048e8f04c805ab5167e0def67fcf9fb5d1045abd1af2a1f3137dca3a6edd813698c1a4b27a29693aec8cfde426c28a5e3a54fbcb8ea0711c976844 WHIRLPOOL 2f896b5d39d979bc40ceb958d2c1cc6635f1d2fa81ffb83b87b3bf4a0812da31f740907610b9cfdec2fb40cc2afcbe82050e245071dc1ac02a5c9998a514588b
+DIST mailcommon-17.04.0.tar.xz 661064 SHA256 26677125a24e8d762ab793271e8e3b78d1a79d6aa64c16aa49d005abd7fb7bd1 SHA512 8bf478396ff8fcaaa2e5a53243f2d38af57a83715bd0a9e1708b72e227ea4d9756f6d42ee1a9b86afcb1acf8b98eb2d33220f8394a3c5ef46629e737b38383a0 WHIRLPOOL a9c47b9d52429e809d4e43a85313a178a9b391716394c05874bc79d4eae19b9a245d4c77052514b245d65d89c6a34521e92d6b8c742cc66b28db6ac48caea5d1
diff --git a/kde-apps/mailcommon/mailcommon-17.04.0.ebuild b/kde-apps/mailcommon/mailcommon-17.04.0.ebuild
new file mode 100644
index 000000000000..7214025e5a3c
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-17.04.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common mail library"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailimporter)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index e24204b04280..c5c2de47596d 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1 +1,2 @@
 DIST mailimporter-16.12.3.tar.xz 382656 SHA256 4150e1980c0f396aac49f957abfab7f3162ba04e49f05e859910012f4d24d223 SHA512 59989c4e50f277429f3d559e80990e69b8c5f0e183e9106aee78ff343c1da9a828e3e967c982ae90a021720399d949f8fbba58f86a896e2d67fb8fe9f2852ea1 WHIRLPOOL 1c2da3d28bfded103e693ca3511660b80db13a35081518e6c5c269cca41bc8065ba3569650eaa1a40a03f76ad5bf90c8f6959133f471626c40a1281f739dd3cf
+DIST mailimporter-17.04.0.tar.xz 539476 SHA256 dfc804163e86f8a5754d21e71f577d95d3adc88a8b8bfb7d90aa3202ceedfbb6 SHA512 7c6c52839ed4856ae5c8993bf438c00a95161b181ad97ee3fb96405105cc94988a3397d490ece0ee09ba21cbc03f55ce3b1b09f2b145ebe3573891861905eceb WHIRLPOOL bf8d905f0de09750ea68aff0fcceb7071e259caf4d6d23e0451b5dd0488d57e2d199081e61431a767e5a90fef3f9d93688d4f6919950fa20c1d47d5b7f897c99
diff --git a/kde-apps/mailimporter/mailimporter-17.04.0.ebuild b/kde-apps/mailimporter/mailimporter-17.04.0.ebuild
new file mode 100644
index 000000000000..2f215113f947
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-17.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library to import mail from various sources"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 3563a4ed5f4d..7be1fc1d1ef7 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1 +1,2 @@
 DIST marble-16.12.3.tar.xz 24403808 SHA256 522006e0042fb4bf405a7bc90e015fa6e8fb863652ea81b64f53061c6b9ebe21 SHA512 58329b78f84640920bcaccede596728030027b26093dd979c347f440cd2908902c989bba09eced8811bc2f13febb8e41154570986aa323cfdbf73035654ce5f4 WHIRLPOOL 3b01e745cb66e6baf288355231ecc7376f6f3e0b75252090045817f53931e5a68c70d63230c41bafa955042890475bf8167db0bc7f66840d4b90992025eda9d2
+DIST marble-17.04.0.tar.xz 52287344 SHA256 6a8ab776e239fa67f23b7aed1db02b1a9a8fb3abb8ab61b47828c8bc0ada8770 SHA512 9309c669e4e51a24c202ed2f5cd0ff71ed48950f5f1f10b90a2f4ccf0450a7ed08375bc83ae6f57100adfdf69bf537466f090595d66eaf422ab779a31c586306 WHIRLPOOL 8cd7413a8ccbd65a261b58a6d323d7651439436e5c07d8c3faec8d7873361b76a15b7464486410c202b3fbfe4a4b03b8c660e17ce902ec8e5d7c2cf0ffe91363
diff --git a/kde-apps/marble/marble-17.04.0.ebuild b/kde-apps/marble/marble-17.04.0.ebuild
new file mode 100644
index 000000000000..a4c24ad25c65
--- /dev/null
+++ b/kde-apps/marble/marble-17.04.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_SUBSLOT="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
+HOMEPAGE="https://marble.kde.org/"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile +webkit"
+
+# FIXME (new package): libwlocate, WLAN-based geolocation
+RDEPEND="
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	aprs? ( $(add_qt_dep qtserialport) )
+	dbus? ( $(add_qt_dep qtdbus) )
+	designer? ( $(add_qt_dep designer) )
+	gps? ( sci-geosciences/gpsd )
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kcrash)
+		$(add_frameworks_dep ki18n)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep knewstuff)
+		$(add_frameworks_dep kparts)
+		$(add_frameworks_dep krunner)
+		$(add_frameworks_dep kservice)
+		$(add_frameworks_dep kwallet)
+	)
+	phonon? ( media-libs/phonon[qt5] )
+	positioning? ( $(add_qt_dep qtpositioning) )
+	shapefile? ( sci-libs/shapelib:= )
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+"
+
+# bug 588320
+RESTRICT+=" test"
+
+src_prepare() {
+	if use kde; then
+		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
+			-i src/apps/CMakeLists.txt \
+			|| die "Failed to disable marble-qt"
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package aprs Perl)
+		$(cmake-utils_use_find_package positioning Qt5Positioning)
+		-DBUILD_MARBLE_TESTS=$(usex test)
+		-DWITH_DESIGNER_PLUGIN=$(usex designer)
+		-DWITH_libgps=$(usex gps)
+		-DWITH_KF5=$(usex kde)
+		-DWITH_Phonon4Qt5=$(usex phonon)
+		-DWITH_libshp=$(usex shapefile)
+		$(cmake-utils_use_find_package webkit Qt5WebKit)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		-DWITH_libwlocate=OFF
+		# bug 608890
+		-DKDE_INSTALL_CONFDIR="/etc/xdg"
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 35d090481fd2..e8f8b3fa643b 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1 +1,2 @@
 DIST mbox-importer-16.12.3.tar.xz 22748 SHA256 076f88ded10420b7e658ae12b1db09f9cc51fb22a1f2d026967e84ecad8c5d13 SHA512 eff24e6db1cced2b7a89e01819fa99b6bc99e990941140293ac70c222c7903cd7397ba95064d73869e07b4b664a7df3397c802ebfc728d1f01fd19ab6eb80e25 WHIRLPOOL 9de7f2c707eb44531be8170ed128a365a5ffc05986d6ac45f5979be15cebf86d81a39aadcba21dbc54c015eb2b3cc0a65c4670a31627e9d27c2bac15f1ea5720
+DIST mbox-importer-17.04.0.tar.xz 33256 SHA256 cd2f363806da7f66b1de2027c3f71602246932875c790a5199b52ad6bf5171c9 SHA512 f66930117c32f5ef33ff299cb6de77c1d60ea63983c307d8e24e5d8ba6319df7f1e5155ea7cf9652200aaffbf1fa3304ffd049648ceb526ab74617832e57d166 WHIRLPOOL 2b3a733ee588625b4d2a25f6c503b77408db0e9c421bdc996281ac1228eba6a47c584e7ee09d6fec849b665f8f3d702712033b139790c97b61164e51a18d30c3
diff --git a/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild b/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild
new file mode 100644
index 000000000000..a4b378f95696
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-17.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+inherit kde5
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep mailimporter)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 89180feaf7c3..69b9c83c9fc5 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1 +1,2 @@
 DIST messagelib-16.12.3.tar.xz 4650512 SHA256 257cb5419bc4560c79e00b2676b4aca9ae480a8db83449351bfed330042fb9e8 SHA512 9daed383306ed9ab23dd9db57a375a189102d9b34194c6da9aa39f08c57b76fa25668ace79fdd52458f760356ec697fe206a43115e294ee1da82a2482bcada81 WHIRLPOOL d09dc99ef0eb8fe6ceac97511bbe9c3ce0b79e328a67a63de13d12d50d313e8cf6872f9778ac05e77c7c7b3417927740a526ea145151d686dfdb06708661ed66
+DIST messagelib-17.04.0.tar.xz 10476324 SHA256 900c0b5cb8a0eafa03cf7001353d09b4c42be48da8e52f1b478857d4ff729961 SHA512 bd30ca591115d7785bdbef3d321446ba411925e9cbb23f38d661ef49cce7c83dc3fe17a4509881d1a35bf6c11a66d5301dd98ab87924a2ed20feb5132fe994f0 WHIRLPOOL b140203fab2de58b0cf35a0bc5e1afe99a876fd937518701adf3306783535c19d5731ca46c3c29b28e3e0b5bc3805b7262859fb4f09fe8bd25bd06488daa8dcd
diff --git a/kde-apps/messagelib/messagelib-17.04.0.ebuild b/kde-apps/messagelib/messagelib-17.04.0.ebuild
new file mode 100644
index 000000000000..8ec98bc2e757
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-17.04.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional-recursive"
+QT_MINIMAL="5.7.0"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.8.0
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep grantleetheme)
+	$(add_kdeapps_dep incidenceeditor)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-16.08.50:5
+	!kde-apps/kdepim-common-libs:4
+	!=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 85e59dbc053c..99d7c1090e03 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,2 +1,3 @@
 DIST minuet-16.04.3.tar.xz 511224 SHA256 84270171fec23544b991715d8e29dbfba04d65a9304d575ae24347af8a025f8f SHA512 69ae7beabb643b0b1db96c3e4be67a3d8ebf5e192c2413e7d191c47e626842d5a08720c1c899917cafaaf76f89b327554a89f64093bc41390f405e697422c38d WHIRLPOOL 7d8a9a2f6e53d627c9a3fc3618d8022205271780aa27f9a162cda4ce4032943438bb6e6dd61aa3737e42f8353e75d730cfcf9a30d92792b49668cbc4a9f8ff00
 DIST minuet-16.12.3.tar.xz 27296368 SHA256 6c2c25007e4512d2c59398c4ac3e7614dfe163d59ba601450a261f8911af8095 SHA512 857fad766b8850fc40b5a2fa94a8a27c82fc7f2db86169197d50f92fe43a204c4df5a6ba50cb0a551172b497702fb93626ecf629f2f4ff7383bd1b73f65748e1 WHIRLPOOL bdc6284f22ba179a4e640a5e479b970601912ae5ef244bf2ccca9d37db06eb56ef08db2779e39e37ff19e08c7d34c201ecd96f4db871d5514aea1626aba9b43f
+DIST minuet-17.04.0.tar.xz 27850840 SHA256 7a4a9202c114c7d2196c6c89764e70b853eafb4e9e1b342213728093daa1a20a SHA512 085fa7f1130affa01657d969a74b2d7833400ecdd7c3df9a9fd3497cfd05f56e70d4f959356746f0a0233def9b14ee21aeee630f9d17f183f777056c394984e4 WHIRLPOOL 61c82b9b1b3bd5810052b6a70f77ecbf518d8599a6888ecc25fe4c7a1dcd67a49b57fb03324e0ddc5e5fc38069854424f8a1eeb8c803141ab3fc64c5581576fd
diff --git a/kde-apps/minuet/minuet-17.04.0.ebuild b/kde-apps/minuet/minuet-17.04.0.ebuild
new file mode 100644
index 000000000000..088005a48fe8
--- /dev/null
+++ b/kde-apps/minuet/minuet-17.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+QT_MINIMAL="5.7.0"
+inherit kde5
+
+DESCRIPTION="A KDE Software for Music Education"
+HOMEPAGE="https://minuet.kde.org/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtquickcontrols2)
+	media-sound/fluidsynth
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+"
diff --git a/kde-apps/okteta/Manifest b/kde-apps/okteta/Manifest
index 7dd14d70dd08..9035a0ff1362 100644
--- a/kde-apps/okteta/Manifest
+++ b/kde-apps/okteta/Manifest
@@ -1,2 +1,3 @@
 DIST okteta-16.12.3.tar.xz 507340 SHA256 edda8fd6951d145d23c31d34dde96e3244aef5eb4dd3e28b1f6c16d617539593 SHA512 d5d6d6fe989751679a584da264ac86dcb1f8adb993b91794662c03d4771ab9e6598bf904ec8064cc996527f5a7e8df17c12f0faf93b39f121eac5d21917c3b71 WHIRLPOOL 7f4d828bbf5c2d90023be9f1f7a1d0938ab8cbd65ceb033b103af488790a6637ba79bcfa59c9d25339b37394cc43a581bf2226652b86b61695289b89a082dcda
+DIST okteta-17.04.0.tar.xz 959872 SHA256 db63b1359dad8b4e2e8be7731f301be0504adfb4c3d3a43e83121bde5086a289 SHA512 7bf08f3af7a35cd2492cce1a60063438242fbe60718658bb3b18db05c7fe75a51ee34a4a3f7b992f1ebe5e23114735427680fe3168fb657da185311eacd1b8a9 WHIRLPOOL 1f32d149a259120b90413ea7caea939bd0b4959b5831c33491cbabe9405b8b8b02eebc16807ce7e44fe717127bbaedeab40ea5e9a9821ce254844e415c16a477
 DIST okteta-4.14.3.tar.xz 500424 SHA256 bd6e26be988778380128e4bda2dbb047074adffeb02819ee7665ad70f94cfaed SHA512 aa2dcddb43279a97a62477b5ed1db140856c0bf9feb9f3526fbb51f65af5b4ad4d06dfa7b4b965f6fbeb4c7de7a8430646e0659663c1fc4bc0de64acbf01254e WHIRLPOOL 1fde12003f8347c06d8d2817c52b936be1fb2d134daf7df30aa958e2379d5fe50d6a9dc02c662d991a18f78419302345f29a368a02acc397314552cc1957ecb6
diff --git a/kde-apps/okteta/okteta-17.04.0.ebuild b/kde-apps/okteta/okteta-17.04.0.ebuild
new file mode 100644
index 000000000000..fd777920323e
--- /dev/null
+++ b/kde-apps/okteta/okteta-17.04.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE hexeditor"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="crypt"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5] )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index ca979cf57ed5..f298dac0fdb6 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1 +1,2 @@
 DIST okular-16.12.3.tar.xz 1896760 SHA256 3b5a315030ffaedd6ddcb2bd1742737edb49063adc355c2dbba1ecb86dca34be SHA512 4e0c36345edbdfe01542758b55bcc4cbb1806b577e01caf574059d98338eae673b6e5303c80c78974eefaaad488595f199f32571b16f5eee3d39afc692e9fd8c WHIRLPOOL 36579302692a53bc39f162a1f21622352c50633f74b2e6850e13f3ba8341f00d1d1d312290ac8cba87bbb6461c492211be1385882f8110b3a9ce8956efa15c80
+DIST okular-17.04.0.tar.xz 5607824 SHA256 e4a817e276ea7e003b2f494514bcb53343398376d92ad03a5dc0fedf23759803 SHA512 3cf3665ee37d7be832cc039fc37eea24842ae972cfc2bb41ee808ed1729a12b5cc7b5cf8b68791e2c36c52faafa374eb8b939ddf33776dd32c43bcfa011c82d7 WHIRLPOOL dc1b1114f8c4bf6577ea4c1bc23d34c9def1ff16153eb6fbcae32e8c1b581487d1476b6670dc9d6bd462e75a7208ed21ed1460ec242209f160a363badf27642a
diff --git a/kde-apps/okular/okular-17.04.0.ebuild b/kde-apps/okular/okular-17.04.0.ebuild
new file mode 100644
index 000000000000..fedc6a765d41
--- /dev/null
+++ b/kde-apps/okular/okular-17.04.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
+
+DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	media-libs/freetype
+	media-libs/phonon[qt5]
+	sys-libs/zlib
+	chm? (
+		$(add_frameworks_dep khtml)
+		dev-libs/chmlib
+	)
+	crypt? ( app-crypt/qca:2[qt5] )
+	djvu? ( app-text/djvu )
+	ebook? ( app-text/ebook-tools )
+	jpeg? (
+		$(add_kdeapps_dep libkexiv2)
+		virtual/jpeg:0
+	)
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	postscript? ( app-text/libspectre )
+	speech? ( $(add_qt_dep qtspeech) )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	mobile? ( dev-libs/kirigami:1 )
+"
+
+# bug 603116
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
+	use test || cmake_comment_add_subdirectory conf/autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package chm CHM)
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake-utils_use_find_package djvu DjVuLibre)
+		$(cmake-utils_use_find_package ebook EPub)
+		$(cmake-utils_use_find_package jpeg KF5KExiv2)
+		$(cmake-utils_use_find_package mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index f8ad52f965ce..4606ee9e23c8 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1 +1,2 @@
 DIST palapeli-16.12.3.tar.xz 1754484 SHA256 726485261d5be91a402e2dac64d25aedf98cfa46487a6dcc4fc30585e4f2498f SHA512 08dc354ee66cecd879f04815ca2270bbf74073a3a4a00c79c04e960861a1101d20d5201d09eb478b70d4cd0999998162294e61bc9977c4bbd9ba5a9768302ae5 WHIRLPOOL e61d90f3aaa3456500f8516fbf63a4cc7fe4e31590c5a4b99c8c53ffe83c272411fecaa2ccf9c422a3eb54af116e7c65c28d3c521b0fdfde86bae17c44559290
+DIST palapeli-17.04.0.tar.xz 1754688 SHA256 d12c80a47100137e430d3a80931fa7917c6b3805cef092f1c799f84bc8bb5ac2 SHA512 2aa632d026ef88c8e464df6bf08a42d0b53e211c39174ed44d4dd2e1719b6feaf6c041cf224d8433662659415fc58072a8ed730f8d7688f2dea61f7491b4c20a WHIRLPOOL 32ac12a298163d6be8206316089fea49a683356e291e6354279b08485fa83f906848c2f62b451a094c24be1c8c185f47a6c8ddcd36c0b4330c616a1e2fc00d71
diff --git a/kde-apps/palapeli/palapeli-17.04.0.ebuild b/kde-apps/palapeli/palapeli-17.04.0.ebuild
new file mode 100644
index 000000000000..b4e20daba348
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-17.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE jigsaw puzzle game"
+HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+DEPEND="$(add_kdeapps_dep libkdegames)"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index 7dcd834e19b9..68ccf408d529 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1 +1,2 @@
 DIST parley-16.12.3.tar.xz 5308316 SHA256 e170e93e55f9bc1e621ddde0b370fbc95a8b947eb37eaffd22372f8402b2ab6e SHA512 661c8d80365e7b0a1c8c9ab4fc7b16c0c03adb97b42a96be9f9902346e13704324c394f7d01558ce64b207c9f00a606b63e56dbb37180f498f18b48497641512 WHIRLPOOL 63886a25db16f3b9cac694b56d2a5a348e63ebee8f4c560d54472a1c39600f8470f9205c83b91357afc12ffbe502f077e5c20b858e5f159a107693a11b0187ac
+DIST parley-17.04.0.tar.xz 8822368 SHA256 872d65cd186241b4db1519973800634c497d99b935527130b5f59d753e879644 SHA512 4732ba1167821bc7f41e7cf9f0eb496e67b8e506c6f3293d95d7a5641543a80b031b3af631dce47ffabc829eb24a117d2f3626e65825a4049f17df84ca244a9a WHIRLPOOL e05a2af0d172b0ddbf39bc92833f35f261597f6daa90119b7e9be0c53ba2cbf3df9976571af17e11cfac463a752c99d5ba52e02de66550ead089eb50dd917190
diff --git a/kde-apps/parley/parley-17.04.0.ebuild b/kde-apps/parley/parley-17.04.0.ebuild
new file mode 100644
index 000000000000..99d041c20b89
--- /dev/null
+++ b/kde-apps/parley/parley-17.04.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_DOC_DIR="docs"
+inherit kde5
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+HOMEPAGE="https://www.kde.org/applications/education/parley
+https://edu.kde.org/applications/school/parley"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_kdeapps_dep libkeduvocdocument)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kross)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+"
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index cc7c0f6cadf2..d6e922c8910c 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1 +1,2 @@
 DIST picmi-16.12.3.tar.xz 1089604 SHA256 a47726ee4c090392cccb521b17ba2adfbab81006cbe0975dc5866cb30ab0846c SHA512 69f353367d0ad6bfddc55f2c1352c998804be07a6ceb55d49c069277071ed07a10653b5578bbcca17cae321acf0a5d6d09f1beaa4c3dce06a840a6a311f72d4c WHIRLPOOL 90f5a52f7db41cabfffa05ed029c0b52df22c10914fbf2a6ce0246d5f6884d8c0c8bd81266193405e2b55fa474b4cd2e89ed37fd0cdd226946cce9fb58e54b8c
+DIST picmi-17.04.0.tar.xz 1145628 SHA256 9c6e7da93ccc8f8dcc9f4875dfac52db097cc255c13c9896375b5ae208c60909 SHA512 53d7b97aaca9675510176a86a4b802b6713b0bc241a7d4cdfcd9a5e6e0cec491d5465c8a0f20e63731c6ae452528f14fde603c53a7d8464433d481df9046e81e WHIRLPOOL e712f454327ab3edd88b83c39a89c04bc6a4fc968b3197f5e819180bf8cddfb9210d0fdc7565bf3087108d05431611bc62edc4f6177d7bbb7e35abf35204dc01
diff --git a/kde-apps/picmi/picmi-17.04.0.ebuild b/kde-apps/picmi/picmi-17.04.0.ebuild
new file mode 100644
index 000000000000..c269e386d181
--- /dev/null
+++ b/kde-apps/picmi/picmi-17.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Nonogram logic game by KDE"
+HOMEPAGE="https://games.kde.org/game.php?game=picmi"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index d3da34f7e7dc..cade097116f1 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1 +1,2 @@
 DIST pim-data-exporter-16.12.3.tar.xz 103240 SHA256 dc0f76be1e572aaf68736ffef17a4792dbfece5edda4ed488a83ed619f80bb93 SHA512 691a36c22aca6c6b1f770caf5d78fecb18f076d605c8862d3b67e65eee90850f7e1f8ae0551f39e92213bd1f206d31b1affee1f6d095701c3099a737d94e2849 WHIRLPOOL 4e11357ec6b83ad8bd94bf31722fca62003719753b6619dbbd2d5cc36cd98afda8db9156b89d754d0523d29d001c8552b390822715be60e03433cd571dee4a89
+DIST pim-data-exporter-17.04.0.tar.xz 265952 SHA256 cde114166a862ef88a9039db4316c75773676b38074392ac34f2cb06536e18c9 SHA512 b00433669878dd38ae52c972d3296c9d615a452f941d07d588b015e98895934f0d70e09a05ada7870070b722e3797245408667f14fb4ee6b59f440382fb67ad2 WHIRLPOOL 27091387b5e0975bca40108ee8bcdabd95b248f2fd551d9fc42da6497a0797d685688d5302ed2b971f3da64c8c7c09be6df501024a0da6a6766d59cbaeb6e465
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild
new file mode 100644
index 000000000000..f46e005ebab5
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-17.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index 0ce3af83ae29..953f0c58ca7c 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1 +1,2 @@
 DIST pim-sieve-editor-16.12.3.tar.xz 316596 SHA256 33ac5dca731267b687e5dbaa6efc662fdb81dcce7c0997d17b22f14da1c0f60d SHA512 72ec4b6cf2836264fe03c2b758fa3714c05610b8e70631a489a9a026551ac6701c0399b65bd600ceaf0605b3171dbfd5de62fc1ee6fdaa67c468f1e2a54070b2 WHIRLPOOL 232f2c6204e30a1ebd6d113d02f4d8f3dc92d0aaa1411bac369bce6fbd13e24eb8768c6212f9b44153eefb4bdca4b1ea93816093e2b5a9c6ed229009ead4d570
+DIST pim-sieve-editor-17.04.0.tar.xz 438952 SHA256 ce0be0f3ea961ab09baae7e1fa2805bab38e4e7f0c7a844153fbce2cff5bfb50 SHA512 decfc3d817a6dcc0b4ed75e1f19e590c3fe90703a2137f3f242a18e3a96ae3662a102dc54520924b73213d60c6956efba0cde4a759e1ccb1deea56479f0f86e1 WHIRLPOOL 82b5ecb620130b6a364e7710fb5261343fbab9eac5865b755fa24056b1cea35740011388b778ffb17fdbbba38497ad0090969e938a01fe301709d32becfca6af
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild
new file mode 100644
index 000000000000..8e2b855e49c9
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-17.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 6d3be8341513..d22a6d9ac09b 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1 +1,2 @@
 DIST pimcommon-16.12.3.tar.xz 159528 SHA256 94c2f5e9c003647058042c0d2b355c4db83dbc3d9e8979aad681c6ceb379319d SHA512 278a912216ad315862962615c387f547e1ac1303dbd0a7d6fa48b5814425c792baf871e9a65652d2e5c9b69e10e9a845139d8c6286d7f32e8daa99fd9172ef00 WHIRLPOOL 44bea0bb1f8064831969bf078a2a63d5f9b152d328971b27d7bc11df673159494601e322a89af68991bab9c93ea5500288ee4e5875c8b58ef67339251b705cfa
+DIST pimcommon-17.04.0.tar.xz 274576 SHA256 90606d352696a60cf1080bdf9a72573950cb678fe40a922597f6cafdabfb04cc SHA512 ee4408f7f57de2c9303af7876e81b0ae38e6a7cecc80e45a3920a61776ba8f0b2eb693a60dab44015f91b4b59ea0c73731649ef53fb4d254ce0fa20882d7d097 WHIRLPOOL 978ec70ff04d4a9206c5721582eb5e9a462d4de27145880de4e81a2bfd155ea5e1405a9b53fcc718f32075039ddf3434b2a71f000422b70b3fe608b702d8e059
diff --git a/kde-apps/pimcommon/pimcommon-17.04.0.ebuild b/kde-apps/pimcommon/pimcommon-17.04.0.ebuild
new file mode 100644
index 000000000000..5ac73f794a67
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-17.04.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Common PIM libraries"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libkdepim)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+"
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.0.ebuild
new file mode 100644
index 000000000000..adfa3d7169ea
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-17.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5-meta-pkg
+
+DESCRIPTION="Plasma Telepathy client"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer nls"
+
+[[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
+
+RDEPEND="
+	$(add_kdeapps_dep ktp-accounts-kcm)
+	$(add_kdeapps_dep ktp-approver)
+	$(add_kdeapps_dep ktp-auth-handler)
+	$(add_kdeapps_dep ktp-common-internals)
+	$(add_kdeapps_dep ktp-contact-list)
+	$(add_kdeapps_dep ktp-contact-runner)
+	$(add_kdeapps_dep ktp-desktop-applets)
+	$(add_kdeapps_dep ktp-filetransfer-handler)
+	$(add_kdeapps_dep ktp-kded-module)
+	$(add_kdeapps_dep ktp-send-file)
+	$(add_kdeapps_dep ktp-text-ui)
+	!kde-apps/plasma-telepathy-meta:4
+	gstreamer? ( $(add_kdeapps_dep ktp-call-ui) )
+"
+
+pkg_postinst() {
+	echo
+	elog "You can configure the accounts in Plasma System Settings"
+	elog "and then add the Instant Messaging plasma applet to access the contact list."
+	echo
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index d0f776308d44..dea0b81199b2 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1 +1,2 @@
 DIST poxml-16.12.3.tar.xz 31780 SHA256 a55ed35f9829337f8cbf28362fa7ff2dd77a4c3aaa6dfb968a82516d6122ecb2 SHA512 e4eb9ac8c4d4c296067d34d4620f78de5508a2f784b4b9b5459444af81ddb26d394cd5441a50072c38c7336206560490dca0142fc6e8117c0933e015e6f85399 WHIRLPOOL 204d1d5a0c8c077641462a03db10729220c14f59fc3e00845c3488876d1a97ea49f3966727d639a41d7baac1ae3de346789de110b5cf985fb8181cfc9e6fbf7d
+DIST poxml-17.04.0.tar.xz 43048 SHA256 1f49c932cdbbeeaaa772f0d8658924b0de49c50d21fc0b22fc75bffa633d14b2 SHA512 cc68256eb8f932ddb9dc88792067f3f26f368ee1e53334bf6074e2ced3d9529ad892b62f349c7c5a2680e8f8c0f15dccba6858a237fb7df57db259260ce9451b WHIRLPOOL 9ad8dd8dbd4243131c95e351bc92eb08b4bd7f2f8dd83c0a03807df3d82db29620eeb8184d75272c4369a702cb6bba3bf31e8d88856971cc9b5c79e459e1550b
diff --git a/kde-apps/poxml/poxml-17.04.0.ebuild b/kde-apps/poxml/poxml-17.04.0.ebuild
new file mode 100644
index 000000000000..b35a42b8546d
--- /dev/null
+++ b/kde-apps/poxml/poxml-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtxml)
+	sys-devel/gettext
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index 01ca77bbcadb..a96a1709ebcc 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1 +1,2 @@
 DIST print-manager-16.12.3.tar.xz 94268 SHA256 29e549517b0b8ef96b25609d672419e1884a430c1e5a9397243a54e80fc65fd6 SHA512 31bee7f85884b25a9e6df0264aa6fb70bae8bc05c437addba49ebd3e528b9f31476f8e8a34c07e4e2c486e7667ac391573cff31eb62bb9da5945dabd392851ec WHIRLPOOL ee9b3aa5886089b585be99af11df70b4171e2909ea951329c7155ae2c53b8e791cc6bd4770ab091df37b8569c301d3e0abba4314e2acc809619766d116b88c0c
+DIST print-manager-17.04.0.tar.xz 237636 SHA256 1639d6fb12a6c9f241f0f8e41fcabea1b967ad52b02ab012cee9d8f71572f383 SHA512 357ea814beaee0b53fc139d8812eb47abe410b404e2022e178d4ddd753804ece5606e33522c6d215528ee8c17a6cc9af637811562abef37908e7c24902294fab WHIRLPOOL 70de876678081c91e38011f2c19a6020091cc07d1d14022281be22ed682cbc1229d9b87c7530de35420e4bd3ae577f4ff8a82e682c56c87ce69df6bdabae871c
diff --git a/kde-apps/print-manager/print-manager-17.04.0.ebuild b/kde-apps/print-manager/print-manager-17.04.0.ebuild
new file mode 100644
index 000000000000..c978eb84ddb8
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Manage print jobs and printers in Plasma"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	net-print/cups
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	gtk? ( app-admin/system-config-printer )
+"
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index aa766ced07cb..8e2a14bd26d8 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1 +1,2 @@
 DIST rocs-16.12.3.tar.xz 533272 SHA256 74fd3d9baabca946f370aa8643556776557c78e1a871bff50eb22294284e3f9e SHA512 1254c362b9d20334d481e8ce16d2a108f385010202fe42c1f53fd56ab37f31d131516e9436d9f83f4a5640c8bbcdb6e4f955ca8294b4d28b8b420b5c0a9d5def WHIRLPOOL 51385002bb4a988b79658d42b9b144590ef211cd757c356fcb8760d83a324b563b26d63775690955e2e7f6f8ce3f018d23411bce1b5415d016fee1e2cfdabf60
+DIST rocs-17.04.0.tar.xz 1528764 SHA256 7d59be8a8d81376b995b254320c4c1da8a5ae0b5a7439e2be04fcd711eb76749 SHA512 ba46592e960d2fc77334f092ed28a1285d5b4984889098123c1f4a5cdc4f711941cdfccf7e7a2921facb1380a93b3091bc2b2e59f7194531c89a17a131473801 WHIRLPOOL 88a49dc5b7f172e6007ad5fd7fe694b07c0c036737f13ca0647655ad224d8a5e0aaed7550011eb78139890836de585c84d4a2f4fd1b2dade28aa16ada2d1bb0a
diff --git a/kde-apps/rocs/rocs-17.04.0.ebuild b/kde-apps/rocs/rocs-17.04.0.ebuild
new file mode 100644
index 000000000000..d4d7dc8d7a82
--- /dev/null
+++ b/kde-apps/rocs/rocs-17.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Interface to work with Graph Theory"
+HOMEPAGE="https://www.kde.org/applications/education/rocs
+https://edu.kde.org/applications/mathematics/rocs"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.49
+"
+
+RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 0b5c9f71cc79..1676353a8fe6 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1 +1,2 @@
 DIST signon-kwallet-extension-16.12.3.tar.xz 10640 SHA256 8cc1de1c9713107dff613e5b98d13961f0b77cfa666d920ca7301c62236bd83a SHA512 13703bac8830b1ec172ab6c3cac2bc5f37ac087d09535065404a2cd32a3e4fa8f840a3f2ece985570f63d989d2e5df4b8b69259c3f27adaf39fbae8a1c5afd74 WHIRLPOOL 83ece3fb67ba300add1ba8c67f48465d416da891f9c9918f0afe5bc01cc6ab08c980c9fa6402321b965a118c27621e63ce244f05ff11c0243ea8ec55672c9f4b
+DIST signon-kwallet-extension-17.04.0.tar.xz 10640 SHA256 e093a7c8c5f4b2a809554ee0b594198db8d449c55b4f82044bed40a779cebbaa SHA512 f3fba63c02955d68015dc90c6d8bd5f27fc1dcb85023563a94a6cfc2ad17f47540e143114eba9188e04f73e6baf172917ac835d9cc11abc3cdd827a2ce9e78a1 WHIRLPOOL 6f572809c979652280c1f4073c3ef14606b9e2f0283eb7b23e26bbc07bd81d4b2714387f019974ddb26387f984e29e3d2138740f5ad29fde8a2359ea656ff67b
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.04.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.04.0.ebuild
new file mode 100644
index 000000000000..f1337cda8af8
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-17.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KWallet extension for signond"
+HOMEPAGE="https://01.org/gsso/"
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+
+DEPEND="
+	$(add_frameworks_dep kwallet)
+	net-libs/signond
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index f4109db404bd..4f09daa3cd85 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1 +1,2 @@
 DIST spectacle-16.12.3.tar.xz 1006712 SHA256 a64fa9f748e41ad63b65039aa447faf1bcdb418da0a1f81366f1e95454388ab9 SHA512 6f27f14e28bf1cfc2e6cf7e1fd11784163c8ce6ec63bded583c9b86a549891b8de806e7874cea756ea7616d0ac650695038e85282a2bc9fe32568be19c8cbb99 WHIRLPOOL 128ca2a1b314a4e033435da1c5fa0acb4a58d983101b338f1ba9ff240626746912824df0949a20ab70bc35509b2e556561fc0905a52bccf7b5e4dd38946edbb6
+DIST spectacle-17.04.0.tar.xz 2064124 SHA256 1e7cc028fc1d3845f0cf03aadbd4423393b14c562d0d97c84bd2b9a8d7f6b56e SHA512 144b396940050fdb6e1faf6f4202c6a1ee83996d1187024c225368c3b77cef03690acdd40a0c9db96e37271e9198279da37eb9b13d9242d77c274aad87cbdd8c WHIRLPOOL 6791346778abafa830583114f9eab48f2d684ac61a9f712b99bb9e2f420518fca008d78effc24d2d9691e582b747e4f15ba1045d9d42da4120e1c3c4c4604d5c
diff --git a/kde-apps/spectacle/spectacle-17.04.0.ebuild b/kde-apps/spectacle/spectacle-17.04.0.ebuild
new file mode 100644
index 000000000000..5f892af2e50c
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-17.04.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Screenshot capture utility"
+LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE="kipi share"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+	share? ( dev-libs/purpose:5 )
+"
+RDEPEND="${DEPEND}
+	kipi? ( media-plugins/kipi-plugins:5 )
+	!kde-apps/ksnapshot
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 91b1a2b69943..ce17fe43abe2 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1 +1,2 @@
 DIST step-16.12.3.tar.xz 390172 SHA256 d9d8b20f67bbf283e45f7d2cffc9bd20f6d2f1b5d482457def82d1991d85db5f SHA512 ea749e2a586f10eb934e9d5f92a7a0758390727058521b034cce7fbce2b5837dd7b83ced8231d00e2ce35cf53e4995f6d1ba3e0ff3c8a3e8cefb5b75aa671cf3 WHIRLPOOL 7875996d617a669ea02f0cee9be183b1bb0e7f0b2cece8652f87ebbfd6cc19ca625dfb6a4be5c8035aee66aaeafd80f9c0d586210dbc33d716cd5eef2ca6a2fb
+DIST step-17.04.0.tar.xz 861812 SHA256 9c92dff1d63d374d6ad8a47b18d3207a8a7b09b7f9324005b6b9e513b4a73c49 SHA512 c76b70eeb200009865af5f4719bf92e15e346aeba94a313384669424a355558a230a674e495a22342591671450651a49447b00f0f88617049e1a69047102fe19 WHIRLPOOL bf8bccdf7e536613fed564d6106cbf919bc05043be9fd448a494caa99f8153cbeb56621a7bf91acf89180f79be90566a3567df51e16946fc7b0a25b3312e9c3e
diff --git a/kde-apps/step/step-17.04.0.ebuild b/kde-apps/step/step-17.04.0.ebuild
new file mode 100644
index 000000000000..f1c15a5a9ddc
--- /dev/null
+++ b/kde-apps/step/step-17.04.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="https://edu.kde.org/step"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gsl +qalculate"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-cpp/eigen-3.2:3
+	sci-libs/cln
+	gsl? ( sci-libs/gsl:= )
+	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# FIXME: Drop duplicate upstream
+	sed -e '/find_package.*Xml Test/ s/^/#/' \
+		-i stepcore/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index 6199490a80fa..2963fb3c73a1 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,2 +1,3 @@
 DIST svgpart-16.08.3.tar.xz 9020 SHA256 fb6da370e2c09ece3b78dd445615d590f54ba8e4eff8b555afaa61e730c33177 SHA512 2b2dd045755fd82d1e8bdc25b7a9a8abc6fbde70e84723164e70cf4268a0ed2b3ed0c70c4d88c21b92327c9f4d217bf3eb7dc89db91f4077f2790266a22ab847 WHIRLPOOL fc4cdfba05434365553e8e50497d044e6d3bef4575fb096dd9da6faa45c670696804cde4ffc54425202516cca20993ba7f3a944dbff705b3344c98eff5d3d54d
 DIST svgpart-16.12.3.tar.xz 9164 SHA256 7ca809c2e872e1f917ae6314894dc4da44a47a27a4409a34e6f83702cac53f3b SHA512 95f882f32d16c6f72367e8c858e0117d24a61de5f1e42d1c46bb8842b7d53aba31ad15d14004019ea95e54cf79c102d61efd73175330d337fcc9eb69e32acd72 WHIRLPOOL 7f8289bd3e2e899cd1f34f3c8f796540bdbd24e9de2ed82c69c4992cbfb6238b4018d782d6e2a05bf3ead2da718911ca15f92b9a751675211c448be8d233d5a1
+DIST svgpart-17.04.0.tar.xz 19092 SHA256 395a1ead030cb604eaca072dbc21b3aa61ab937789c372900ba447d7ec51697b SHA512 abf27734ba0e01cef5c7e5bafbb8a582a8f5122f86396cbaea3bfbff3ca16e6a2dbf90486b92ceca7194b43399ba444f8ac657f30a4f19c9b57c9607c4d69f6e WHIRLPOOL 3e3c51b657c3a0b5b57e938ede5ce359031fa4e761c398ec90220153650c0be57ef400d2031b4b1e748b5e4bec162781401e434a793c9e1ca0a364834f6fc9be
diff --git a/kde-apps/svgpart/svgpart-17.04.0.ebuild b/kde-apps/svgpart/svgpart-17.04.0.ebuild
new file mode 100644
index 000000000000..f400c2807cdf
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-17.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="Kpart for viewing SVGs"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index e7aee60ed426..c1ceb9129fb2 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1 +1,2 @@
 DIST sweeper-16.12.3.tar.xz 82340 SHA256 548d59f98cbb9c5f8891f38caf8b8d13a57cc57fe94da949946f0c410141c4ed SHA512 e0d96a1cf21a867e849e4c95d0c34ef3913e4381d30d4a185d0bf20d47e4b1e329a50add32d8ab1d6e9b404d008ded06aeda95763add8594eb4046696a309686 WHIRLPOOL 1d9bc2ba235b30489e0801a1ab4546a4e1e9e43069ed1e8fa33f6bb55134acd40557bde1dd50130d3fc83ee254d93205d0f66c3e01fb75bf037eec082d84f277
+DIST sweeper-17.04.0.tar.xz 82340 SHA256 05b0012c9cc7dacc8cf29533c27cb4c69054f7f534de995afd1b32daa6b84b22 SHA512 ef0ca149d993119f065bbd8054b57d990da4eec2934cf31d83a14856f64edbfe29f6e70dadae7fd372b2e5f2f1403d781c9ef0c707ace5f8458157d39ca4747c WHIRLPOOL 625725fd7af0a3904de02eea98049e5543fdbc400547db63bc34336426c1bcc9b83e0450551130bad2631123c735194b10882a189ded04245c57976f8f074a52
diff --git a/kde-apps/sweeper/sweeper-17.04.0.ebuild b/kde-apps/sweeper/sweeper-17.04.0.ebuild
new file mode 100644
index 000000000000..d6f7cf034b3a
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-17.04.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Privacy Settings Widget"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index 22c68cbdf6c4..30fb1cab0c69 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1 +1,2 @@
 DIST syndication-16.12.3.tar.xz 160052 SHA256 a8306a915c19003462276c3b544e3f1e0805457a4aa18435875bbaa1bc040a87 SHA512 868c8f11d4e477312943bae5e59effb56432fac96060b015e072489344f9b3a099594af8541598aa516e9239179080ca7a376db90589260d1ce694facb59194b WHIRLPOOL 82643353b6e02322f6f57d7d24cbd1d9fdbcf1c9c9d8a4a9a3f33f4307cf965c827626a9cb476e4b475147b5f3b7f826242a31d92f1a1b25e034304439fb6142
+DIST syndication-17.04.0.tar.xz 160100 SHA256 8297a96b95c3e8a3453dae1b792ace7c234d4607a39716fa4eddc307889635c7 SHA512 1e09d97541e9d122dba99483de812f98ebd357ae73c3b44cf2f99b1c0dad71167def773b0657d7564339d00d73109c282b1e461ae70f55ab9a1ce8c06ac5f1db WHIRLPOOL 2e5f81632a0be7253d47e5577c03a8bbdd6b5737d7c8cc8505f08219ec6ff0dc99155fd9b954911c4e42eb12ca0bd30af1631ca28e36887874cd90f2a2700130
diff --git a/kde-apps/syndication/syndication-17.04.0.ebuild b/kde-apps/syndication/syndication-17.04.0.ebuild
new file mode 100644
index 000000000000..f8aebffd02a2
--- /dev/null
+++ b/kde-apps/syndication/syndication-17.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Library for parsing RSS and Atom feeds"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index 6330b853cf9c..109ff2adbc9c 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1 +1,2 @@
 DIST kdegraphics-thumbnailers-16.12.3.tar.xz 41412 SHA256 b82b5e85f7a64400628c4663152c8f7596804594f53c9fee6280088cff670207 SHA512 f2578e185f3c4140c0070cb0556900761d268ff8539316d1d66fd87e49f16f26b28aa90e538602a2cec27aaff18b62271edef3d92984e4b1c31936ce9ae72c8d WHIRLPOOL 083912c3caaa65b74102b977c7c8e6b378cb11b211d478a69ab341666cfddf96cfd6deff22f40396725fcc69494e3980d7edc3cee6d99e7792b3b79debcdc982
+DIST kdegraphics-thumbnailers-17.04.0.tar.xz 41400 SHA256 2444eb59ab0e98d704ec651c6c5038228815cf49456d5633c465c420d96c5e40 SHA512 ba5d1e8074bb7eb2275f2b5d183c78d4ed79642a761980c6c55398886255c098f17b9d520487d331ffb7d21108e963703defe7b7dac7090f3ae3495145089386 WHIRLPOOL c979cf01fa568903a9e8c9a34ceb5ae052cc1228292978fd08b3b0b9b7d0932b5eecb35a7ac9098096ad7e9a3a5d9233d9ebbec70730ef2b0738b5e2461ae8c1
diff --git a/kde-apps/thumbnailers/thumbnailers-17.04.0.ebuild b/kde-apps/thumbnailers/thumbnailers-17.04.0.ebuild
new file mode 100644
index 000000000000..4bad5f5b11de
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-17.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_BLOCK_SLOT4=false
+KMNAME="kdegraphics-thumbnailers"
+inherit kde5
+
+DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="raw"
+
+DEPEND="
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtgui)
+	raw? (
+		$(add_kdeapps_dep libkdcraw)
+		$(add_kdeapps_dep libkexiv2)
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package raw KF5KExiv2)
+		$(cmake-utils_use_find_package raw KF5KDcraw)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 4664b9997282..a575f9f57932 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1 +1,2 @@
 DIST umbrello-16.12.3.tar.xz 1636740 SHA256 94813479532c69336d642ff215059172d2054aa90a0a7050d73b5c01ab8392a8 SHA512 98d0dc760b31afb02d2f5fcfebf3eef57c464908bc9f6cbb7206474fb08a9b222a886d3e97f99194001e3c03eef61fdfa9c1d1e641009a8d9cffcc7c48e6e443 WHIRLPOOL f6ade232182d562c6b70503849068ad438ef030c0d87aad7c892381757d98d4e22430b87bcf36154800375e1b88257d005959adf213083d5b367ecac8950673a
+DIST umbrello-17.04.0.tar.xz 1646936 SHA256 d6fde01d10016efd12e9bcb547c3a375124a7f6cde7b2be6b5c40f4526ce6a36 SHA512 d0c90428dd5eb4886dd1c1e367f116cc904b636e9bbc1c436d9d74bb99d7bafc19074c6e8a410a0b437dabaa0c390cece6904b3e141004d28f3f458d173d572a WHIRLPOOL 1a7e627fe9aa063975b56aeae792884eaa0807a717dded340086b85fb0fe10d46ca2a5b8019aa8403946cce5634ce67e7513258392e7a13ec84d0bcd0aab9729
diff --git a/kde-apps/umbrello/umbrello-17.04.0.ebuild b/kde-apps/umbrello/umbrello-17.04.0.ebuild
new file mode 100644
index 000000000000..5727e4026162
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-17.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+	https://www.kde.org/applications/development/umbrello
+	https://umbrello.kde.org
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	kde5_src_configure
+}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index fa9242a69215..995009ff4160 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1 +1,2 @@
 DIST zeroconf-ioslave-16.12.3.tar.xz 25924 SHA256 ab94bbffa254d6379c7fff18ab609c50b96fbfd00898b70969db8fb74e77f35c SHA512 48bdcc704a0b74a7e26ca009663348487c86e4579400f34d64d4dc2b3a5e47435153210d7bbe22cf5f99faa0d377ba26c999e323f37b2427496d1b111dd058d4 WHIRLPOOL c121f3ed978dc7e5174cb5cafbcacc2248970336ad3428572f32278da7b26600e2ec0321a9a753822026b150da14850c83a7bfd2e73d8297f72a9b9f551e31de
+DIST zeroconf-ioslave-17.04.0.tar.xz 25936 SHA256 1f78e31c3097ffedd93c51b98f65b95a9ac87374718baed6ecd640272b4d24d4 SHA512 4ece7fdade00fda6968fbbca997d4739ce89be74604e313ca824623a5e83aaf124a2f0ffd6efaa965e7f1c37dd17318dabcded999af4fb51110b3217a2d5965d WHIRLPOOL b2e2036145a82c4e2f8a199beee2c9e51a87e2a452bd5e544cf4cc36ab6cf027ebe3cf8ccba8b99b128d9994df202afc71e4b2211f14217eacb9e82a984a82d2
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.04.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.04.0.ebuild
new file mode 100644
index 000000000000..e05155391cc1
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-17.04.0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index 6b9a43bd72ad..bf2f997d5dd0 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -1,3 +1,4 @@
 DIST offlineimap-6.5.6.tar.gz 187801 SHA256 650fa588bdf86624575a5196fa12e9059b74673a51593718d058365230189abd SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e WHIRLPOOL 0ca66a196683555c5a9e193ccb0a84a8104b2a7715a3839f364d77d1376637a4938b39fa7e9a47f925cde2516a4b0ace94d9e4f9d62dcff50501510c834cb023
 DIST offlineimap-6.7.0.3.tar.gz 679221 SHA256 0b7cd43501d1a65fb5e7e4f3a5d0a61f61435ec6b3a7385cc146e924eb6b03ed SHA512 21800eb14e814fa04b983e9718a5780deda4c99ae55ef900ccec9f1e65f9bb783c3469e00e6595c7dfddb60d760a6b3c98ae979da3219de51c8ae107ff1c077a WHIRLPOOL d8983260f309f427abcab65bc539bf8ff7ab38168643a863cc3d7e10a85dc864e4a6a11511a1cba32d2eb74833714f9b3f499b7d14d28800174c58816d59608c
 DIST offlineimap-7.0.14.tar.gz 698081 SHA256 19494ecad4d7234ac69480abb7462d0cdcfcec444b55f5381651057d9fdfad44 SHA512 05d5ee81e5b0483038ad3bf8ba27f7b57423a75a3456df192c0c8b7926d7252424ef8f357f99dee2fa2f2590341e9f95d225ee2ad7d01af3466fb9d5488541f9 WHIRLPOOL a791cb67f1e51197fce9005ffbbbbdb8f4ee986d78a7ba46feff6aed6b50e17c5e57a9fa03bba9db0f90325b92c23b9d76071d460f6fec60fa878616cfc6544a
+DIST offlineimap-7.1.0.tar.gz 698600 SHA256 dc998d1032f0e4f944cae0e584a146b70ea732422fc52c909eebe6e8f95b1ae4 SHA512 9e9d5ea2b58dc212c9b69adb701fb4cd1ac1a7c8af90623dcfba3115ee7e1f63cc8569c352bae8f1fe09eb8c9255c39d0bf947dfb5d683ee4b03c0c822cb192d WHIRLPOOL dbf33188c790b43e4b7756a1be6c1c7950bb192e079ba729a8ec159fb3d07a505e5892dc08b2cf8b7b55e2d3dc998f74354339e1c8ed6d3a0e190a5e904bbfdc
diff --git a/net-mail/offlineimap/offlineimap-7.1.0.ebuild b/net-mail/offlineimap/offlineimap-7.1.0.ebuild
new file mode 100644
index 000000000000..c38b4b231571
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="threads,sqlite,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="http://offlineimap.org"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="doc? ( app-text/asciidoc )"
+
+# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+		elog "Sample configurations are in /usr/share/doc/${PF}/"
+		elog ""
+		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+		elog "display the server's cert fingerprint and require you to add it to the"
+		elog "configuration file to be sure it connects to the same server every"
+		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+		elog "check SSL server certificate) in cases where you have no CA cert."
+	fi
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 5be2d8af32e7..422b284adbb6 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,3 +2,4 @@ DIST hplip-3.16.11.tar.gz 23096060 SHA256 f6e20cacb4891e4e60fc5de2213a10f8d0c688
 DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
 DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
 DIST hplip-3.16.5-patches-1.tar.xz 8200 SHA256 98866e57a247e7a30d9cd584ed9411aa79a6185294a73b4cc5961efe9a5e5fa6 SHA512 36d33da5fc4105183cbc5137845ddccd8ab2b6abbff053a3a51f3da61c26c2d9d48dcb735345fb453abd67b6a0797aa337102c366cce037bc7006599b20b1646 WHIRLPOOL 8ac91bdefeb177c092b1d6de16474e8e1da57ad046dbc579f14fd40a27d1837d9bf142573137ef8d91c37dc7b03ca908fd5bfad23a9815af2015b521091c2700
+DIST hplip-3.17.4.tar.gz 23212715 SHA256 e6f6ef71f7da80a620983c940b636054153a287994a13dfec1d5c86b15afe6ef SHA512 ea295502df5b6c44839a7c03a725dc7475d256994eac2a7950058a68c805ca4942611df2688384c8acbc6551009841bb4623e7a3e7c8c0b16f44a2215a7316e6 WHIRLPOOL 92354dc97090e9a472e28df7f61f60b9af3c582584036b1be153ca74e2dc5f6a08beff4febbcc9f0e269a6d408a62686881e1295546cc5c1c0f091715d35a319
diff --git a/net-print/hplip/hplip-3.17.4.ebuild b/net-print/hplip/hplip-3.17.4.ebuild
new file mode 100644
index 000000000000..2fb4096c4542
--- /dev/null
+++ b/net-print/hplip/hplip-3.17.4.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.5-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		kernel_linux? ( virtual/udev )
+		qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
+		scanner? (
+			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+}
+
+src_install() {
+	# disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED%/}"/etc/sane.d/dll.conf || die
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED%/}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED%/}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index d18c97db579a..a0eaf17b0c98 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
 DIST opera-beta_45.0.2552.225_amd64.deb 55739572 SHA256 300a316f8a510bddc0a9c67f7710cf346acdfcb5f4f43d84713ed1e351187f15 SHA512 be2945ff309a61183959ce929b236a27e515c62c95c53950691d85224920c8de6f0b5131f69c49885347c8c01fe71558b5b0f4e22a1be091d1a19cefbc32caea WHIRLPOOL 6e7ac56b4604c2ae366463cc3e7590d3a5569aed71ab53289088b8dd78dee11d55605aa5b7817afe2659ac5afe6e811ac5c143edce46d278de087cdc41f191fc
 DIST opera-beta_45.0.2552.225_i386.deb 56690684 SHA256 bddb8fe387af22d711a0a5f5507d228fce826ae145aae5f1fc950695ddf6e49e SHA512 ba361f6d352d75ac902685703b65032bdbc15ffad3dd07cba28f0ce23a26513659561d83a340ecc4402d89e550840aac17c78c3185d9e94cf6789ab82375ef2d WHIRLPOOL 3b5674468f278697d188277ecebf829ab0666fc11864137e3eaf9ccdc46741eee37b1e9eadee07d8b5937fd89002176d1509eb0f475196d7513a4de2ac30d847
-DIST opera-beta_45.0.2552.89_amd64.deb 55743496 SHA256 d21205da5da145f7b15bc8263632ed1b23cd02b600a79b94e34fa61198c002ec SHA512 4359fd7be6845384f92fe60543c1c31e967a16a003f8397c1a1758ce96a62a27961c522c11f791d6223c3a3002439dd7f3a1f91dc9facc5fecdec271ec713a8a WHIRLPOOL 64cd29528b4c4a40e913e206c10cf2315cd35a4e0cbd5ad9cfbc2f1b11c08377b1ab83e59a7362ab24f1a481c28671c07bacde319161b5cc04bbf4b81dd445da
-DIST opera-beta_45.0.2552.89_i386.deb 56664120 SHA256 80dbf033765d0dcff1f789d4c79312aaf4d6921a5065e2e130d4f3dfcce32e60 SHA512 926c88d5ff8c209bedebad6f5bf50b4c47a758061264de49ea07c3f32bd87d139dd53d5a6c4810b09074e601b9f996fd6fec7e524b4ece7cfdbd2ed1c31d107d WHIRLPOOL c91cb25667eae7d9627712b59edb243098e1f9eb0036fec00b277da67c02bed204bc16abdf3a812af1559bdedfe11251f0a87d7fabbff0b3cb08e0e768362da6
+DIST opera-beta_45.0.2552.453_amd64.deb 51500778 SHA256 bbf62c8f6c6929434c6fe8fd53c295a9c6da9cc7ba60760adc3e84330b8abc40 SHA512 133d1a7a2f0c52bc81692e146d22df57bb114836475106d3448762bb3f94dd8edc0c926717d2e4cdaaf2d93788244f689450cbdc8f994dcb4e6fa1825a7c3383 WHIRLPOOL 0ec0e7ffb8a0fffe040cfc0a7fcbd5fbd2989a253ca620d670bc1fbcbdcf31ed48a0e63e30603604bf84e6192f9bf5bbfee61b30c7aad10afce33698224e7ad8
+DIST opera-beta_45.0.2552.453_i386.deb 53067560 SHA256 72f3ed04230c8754da56048a9d9f913e5027a709c0b3cdd67466222ba5e724a2 SHA512 10b98863a0268112a5ebaa371b508c8b90acc5472290c0596ba371f0c415be47be84919588b9b079934c649b3b2abd1222386e0e0f64d5fc846907d8b9f59c47 WHIRLPOOL 85c126e9522be89f19e3133028a5d19849be00ede10883aef88e14d2c88c5c5972e1cbf979c04fe6e03817a8d3db755ca621672c98336dc992ff07b63577896a
diff --git a/www-client/opera-beta/opera-beta-45.0.2552.89.ebuild b/www-client/opera-beta/opera-beta-45.0.2552.453.ebuild
index a68ab5abb84a..a68ab5abb84a 100644
--- a/www-client/opera-beta/opera-beta-45.0.2552.89.ebuild
+++ b/www-client/opera-beta/opera-beta-45.0.2552.453.ebuild
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 5de1231fd7b1..fa55db407f9b 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1 +1,2 @@
 DIST elementary-xfce-icon-theme-0.7_p20160321.tar.gz 7464404 SHA256 177b520d986b9b63909cd9c575cb025ff5acd1c033bdad5ffe7f58a3e634e494 SHA512 5d96cb987d322e5689181498f3c1bbf9a9ddc16bbf919378c31e34df10596607fe09d5b619b5e0f3b066c8db33992c5554ca1631286836dbeb68aad5505ee800 WHIRLPOOL b5feab559d28a48bcb2169e6ed5f3b6fb6098e3ff8f09b3aacd12aac5c5a74ce906e8b133f1d36ac5ccc86475f92554f4ea7ea626b8f5a3c0525048c17d04810
+DIST elementary-xfce-icon-theme-0.8.tar.gz 7517799 SHA256 15f08395b89e955f479faf9bc9eaab7bc56f4d4f7d365a38b4b282a443a79c1a SHA512 6abf95e6b4aa41722848ac818f482eec3de012f69ed76db4396d9e572d6032d2ba32a6ed399b9446fb872c1d2f54baf862a0a55fc49ea15ba781ad54b91cd8f5 WHIRLPOOL 35d83601f6fd3a09de5c271140e55395e07c18c30b568ea7c7d8fb7da7bdc6aa994d3b73b4ac92f800e16b34846b6100c8771706cd7c8f50e2bd135476e7a842
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild
new file mode 100644
index 000000000000..c9b20a3f4677
--- /dev/null
+++ b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils
+
+MY_PN="${PN/-icon-theme/}"
+
+DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
+HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
+SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain GPL-1 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/icons/
+	dodoc README
+	for shade in elementary-xfce*; do
+		for doc in {AUTHORS,CONTRIBUTORS,LICENSE}; do
+			if [[ -f ${shade}/${doc} ]]; then
+				newdoc ${shade}/${doc} ${shade}-${doc}
+				rm -f ${shade}/${doc} || die
+			elif [[ -L ${shade}/${doc} ]]; then
+				unlink ${shade}/${doc} || die
+			fi
+		done
+		doins -r ${shade}
+	done
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index ba44f20f7c0a..edb88f5d420f 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -3,3 +3,4 @@ DIST greybird-1.3.4.tar.gz 116901 SHA256 d4c3ea3445d191f639fd045feea43f7139375da
 DIST greybird-1.5.3.tar.gz 118732 SHA256 856f092ebd199a2a28346938a3dfe62613135ad886c25bbaeebd3a917de4c962 SHA512 1010019b1341cf1c0d48d15d0bc371bbe62e3b6d4aa5d8feb6998093487f465c7dbe42133753a6ca74a01e351ce7b15fcc14c4e194a97034e2e4c171885accae WHIRLPOOL c7b724e11a7f2a4098b83744bba06e93f7c04fb5725b25a6d373f0b11438df9cbdd7db07fbe93e43f173b4ed6de2221eef0702622a3601a0f72c049c2bc54c8c
 DIST greybird-3.18.0.tar.gz 133088 SHA256 85a2d6bb73c32fb1caba2e5881dcf604af5b394bb8818058df874398e6dfe96f SHA512 0f4e9161a8c99dfe2569ba755af819dbb14a75ca11816deccbcdb057469e697e0adbfe8af6deafadf629425b83d96ccfe0c979cde0733e516d9203061700820d WHIRLPOOL 74ed3e6e7c0bd7cccec71e908e77758b649ca1c112368db0f6474c13a2cbb4b509894f79b51fb9b73fbdbc4376ae40dd542a7488b7ce65fb9b2328c2a4a0b9e7
 DIST greybird-3.20.1.tar.gz 193824 SHA256 31da67ba87e90e28b37ebe5f29e0250b1c3478be96ef3f0131409c333f9d5c11 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e WHIRLPOOL a5e6dac032585c32e66a6bb700c0d936895b6a8ac9f7718549f66ba0e38dd2bed91a24fd9070b965f41f39bff8da709f9d447f5c44c00ab45c8f57ab461e92aa
+DIST greybird-3.22.3.tar.gz 194488 SHA256 7b81451f6157c49e4a8b01c4889668c3bc7653fc0a910e536a615705fbb5aec3 SHA512 2a36f8eeddf95ade7d91b882e80475f7db840bd749ba76deb2bc223868ec0c0020ddfc60b0055091478f5a8313f545f5b44088ba3bdf8213ec82924c8affc90b WHIRLPOOL a8706cf2ef13ec8b2134c229e8caaeb029d4ac20e588062857048502e96a276bfbab956a29e50a28302fa47ecbe2c86cc6c38dc8bd54c7757fc40fe8ead4a6dc
diff --git a/x11-themes/greybird/greybird-3.22.3.ebuild b/x11-themes/greybird/greybird-3.22.3.ebuild
new file mode 100644
index 000000000000..8f8ce5e67bfb
--- /dev/null
+++ b/x11-themes/greybird/greybird-3.22.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+MY_PN=${PN/g/G}
+
+DESCRIPTION="The default theme from Xubuntu"
+HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
+SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana gnome"
+
+RDEPEND="
+	>=x11-themes/gtk-engines-murrine-0.90
+	>=x11-libs/gtk+-3.22:3
+"
+DEPEND="${RDEPEND}
+	dev-ruby/sass
+	dev-libs/glib:2
+"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+#RESTRICT="binchecks strip"
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
+	use ayatana || rm -rf unity
+	use gnome || rm -rf metacity-1
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
+		elog "For upstream's default icon theme, please emerge"
+		elog "x11-themes/elementary-xfce-icon-theme"
+	fi
+	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
+		elog "For upstream's default cursor theme, please emerge"
+		elog "x11-themes/vanilla-dmz-xcursors"
+	fi
+}