kde-apps: Add KDE Applications 18.04.0

Package-Manager: Portage-2.3.24, Repoman-2.3.6

451 files changed, 9938 insertions, 0 deletions

diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index fcd8fc7aa23c..10414a23febb 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1 +1,2 @@
 DIST akonadi-calendar-17.12.3.tar.xz 284008 BLAKE2B e88d748d5640fd5906b3f4d843d50da59841f9e3dd6f15ce19e9bca32112597300d85e257ba77ca47b6c4a556a14fd2177c6ea7ef3e8cacc0ae6b9b8d8af9791 SHA512 456f67e88961c1187d5a347f2651665848468b3179dce91bcdef2dbbcca7fdb7d760bdf25f8dd8de9b41ea2794a069385c1cfbac407b6e187b0c6f3e460638d4
+DIST akonadi-calendar-18.04.0.tar.xz 334864 BLAKE2B 369f3fa6753d6b7477ea875e50fac56b374364b65654d1b3497f54bd391dfe8c3d20da85a11588b8e676ea8e7d3d89599b8bee3e8a7b89554039f9197c3e00e9 SHA512 fe62ba15a3797ef76d0c837e59b49eb99954e2f10e4ee157882e536d9d1c16e39dfdbd21449e9e07bdb6f768f4637dcb089918f8a0102be25b4e54c749a54468
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-18.04.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.0.ebuild
new file mode 100644
index 000000000000..7d72f8ee9a3f
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-18.04.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 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 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}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index fe5e029c9172..bf8fe763f961 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1 +1,2 @@
 DIST akonadi-contacts-17.12.3.tar.xz 345296 BLAKE2B 2f249c14dd8ea549eb1a8aa8c5508dfb9ba43f4521e979b3ff9a76d50a5337a7df6a7d4ef18cfe821659c45bd7f7c691ef301c32dadca93c9cfcf06eca9b85e1 SHA512 37e621015ebbc80d765e4668cd720901b815c55b84f78ff39c163ec90dafdd50ef46567c6091afa02d434d339d4b172e5332d8954a134a50215a12bb099822bb
+DIST akonadi-contacts-18.04.0.tar.xz 390212 BLAKE2B 128e741618494738d61378a530065c7260676b021eb9cbba56aca860997735889b7f8d95bd82ac688d754db5434524d8c580e874d902237b69a6aad8604241a7 SHA512 8a744e94848cc592c2b788b44a68d37e4c59c62fd44dbb722b110765fd85ae8d76134e38481a4ffd7ee611b7d504df6cf2b1441f2ca7eb316ac3a5093aa38179
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-18.04.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.0.ebuild
new file mode 100644
index 000000000000..8e7312d67503
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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=""
+
+# 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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 772fbba3e048..25765f03db8c 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1 +1,2 @@
 DIST akonadi-import-wizard-17.12.3.tar.xz 436656 BLAKE2B 149488e7c5188df4edd78d9d3d58565b5eb629f25cb7a2e759ee8f6fb6e1112948cbc7e953778ca744616739b3ad86f4707c1680e87e1509c35aab64fb46f5e2 SHA512 3c3001803921c2860bf1c16c73db5cffadd5ae1b77f0577d1bd0eb05e19b4632657ea4524088698e770b9843cda69faee9071c8a4269de158d65ed730b8fa074
+DIST akonadi-import-wizard-18.04.0.tar.xz 435540 BLAKE2B 11a52e7dba10d876c07b55c075b862b5735d98336af805a5372ad598bd5e5e312726fd31b04599c7d455491f31f411fcb3a7d7ac6807081ce28e72dc2ef0bbfc SHA512 e5fca1aca6e6cc1485aac08dd9cfd75083bc742cd1cedc938d7340a0e0dc1c80da076381c8bcdcddc8b7edb57e5580a73010ed8b7de14f8fb8e97a80ab1a8954
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.0.ebuild
new file mode 100644
index 000000000000..711036b2177b
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 62a035bdf5f3..4556a68cde8d 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1 +1,2 @@
 DIST akonadi-mime-17.12.3.tar.xz 129916 BLAKE2B d0aafdbb9b2ba2e39dd33a6e8f5e7638b840c4b7a67731ac87c1c33d986a240b38fe18e467c0987f54b8aea51b42c7078b3eda588a349cbc439031dfbc8b4cb1 SHA512 5f260b00ddb5949cb924e62b1781ef4d6d3b23fca310ef120440345f6095ab678a41672287b139c8e0ac7c3d5a7dc0aaa15cfe9d59ecf75b51b1c09de7d952b7
+DIST akonadi-mime-18.04.0.tar.xz 136948 BLAKE2B 56615517845c728d05639f4e4eb84f28be663393c28a1ba5337c609e42723a3cb1aca10f5f65e70bbcb49eb05389f49ab6ed7bd200953c80ba17a036534c815f SHA512 f1f9a33378f81c5c255c12be3a739521666a1a14f4a14a18c48dc43037a6bd9d75de23c170d61234cfcbaf78fbcf7ac5c75b03ab9e5f4d0a8e679730c6bdb9d3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-18.04.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-18.04.0.ebuild
new file mode 100644
index 000000000000..1b39beb487f2
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 65d6fb1c7779..0348d9123ea8 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1 +1,2 @@
 DIST akonadi-notes-17.12.3.tar.xz 24520 BLAKE2B c37debede8bcbf97a6f2bee6d7195ddda69f466034b6ba60299bf93485dee1826930a7d029ebc39df7e6317c9124db57a8b7d97a6713635f4fd266dbc1dcc93b SHA512 306fafd7ef59f541cc30b111f4ab83cc2d218c8949ed14805f8116388a328ec8d522194408afbf455d133ef8a40153c04b9dbf907e4b0e784458f9fe2aaaae62
+DIST akonadi-notes-18.04.0.tar.xz 24564 BLAKE2B f609d1106fcda1630011e03056493bf61445861bbdd55aa31533f97fb5dfa64148b6c3866d313a19fd8368ba935279581f8d9ded1ecf601af6a06a85949b60f9 SHA512 f826c52dbc99a7c5f34afbb8a31ec8bd596b4227f4cf9751f3d71a16adbed4dab29040915fbf2d9f004afd7d205ca82f85fce572942264e17599a3ee51f45144
diff --git a/kde-apps/akonadi-notes/akonadi-notes-18.04.0.ebuild b/kde-apps/akonadi-notes/akonadi-notes-18.04.0.ebuild
new file mode 100644
index 000000000000..0afe6508a57e
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep akonadi)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index d1f635923f89..e6edddef3632 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1 +1,2 @@
 DIST akonadi-search-17.12.3.tar.xz 81872 BLAKE2B bcbc5cd5d2cf37bb80c890164c45f0141d7d668c59ad099888831efb45781d15d8d34ffac2c18a9dde4fc697cf02dfe0493d01c60bc687b137dcd6cbdb11f6da SHA512 3c227f25784069bca95abe43657fa2964049dac840629f6ceeb8ea7378f4a8860b4dc2346a7cf1069d9cd0950ceaa65c1aad772199a4e15b27d099ca16c46689
+DIST akonadi-search-18.04.0.tar.xz 81892 BLAKE2B b6c89d64ddd765cfa2da758e6d7918c884681be59648f0a2e0cc3e0f23d5ac2d56b482c4423d19a1166c43744444d4284c659c1d6020ea179b83b7e0cf8c095d SHA512 8e4fb7c99f2b4f1dc15238798bbcc193a220e445e19ed26f390fe51f7b4811195bde62f93009e04f1874159a0c3eace234648d2ccec45bc7b29a295b42013696
diff --git a/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild b/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild
new file mode 100644
index 000000000000..6a27d7108910
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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://cgit.kde.org/akonadi-search.git"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_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 kio)
+	$(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="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 5d851ceaa06f..c8804762ae9e 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1 +1,2 @@
 DIST akonadi-17.12.3.tar.xz 1521576 BLAKE2B d4809ccac14a18d922f04bf772892aaf7f43209b030880ec72d7ded662a1dd03bd768d71a30c1655a1634ad7b20f3c24c176d4da9a5beb1e9c543c256dbb4b97 SHA512 410b72dfa6eb3272bb8b959f7e0ba5951faef598e7c73696844bb6e33d4f5edb0bed4dc5ccea68111a7eef3c9f7a776acf8823c9a138b6af28d819ce8077595f
+DIST akonadi-18.04.0.tar.xz 1524812 BLAKE2B 3b13a2842b0fc8a2ec360fd550c1e47c80d564fec7b7d3128157d6cbf1687db2271a396a6f885ad884f95995fc0342bc8fe6435b11cac2e91ecbad95deb46e0a SHA512 311d278ebf58b94f8d7704cdddb2fb3253216790f79ea287f56dfd026500428d73f9af3d77a12dd9a45721ac1e2ab350e612e6b76205ca2cd347d9b8ac061151
diff --git a/kde-apps/akonadi/akonadi-18.04.0.ebuild b/kde-apps/akonadi/akonadi-18.04.0.ebuild
new file mode 100644
index 000000000000..99c2e48ae5e8
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-18.04.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 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://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+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)
+	$(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}
+	!<kde-apps/kapptemplate-17.11.80
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# 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, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	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() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 91b429637888..b1fa163a8571 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1 +1,2 @@
 DIST akonadiconsole-17.12.3.tar.xz 185432 BLAKE2B c4be134ccf31a42f9244d7ad0b717e4cd8e7c89d1208e70339f096b84c64fc22223de318fb4d3e843ed7bf2c0d61ceeed4e4dc10db964c581b537ef9d7f7d0b3 SHA512 f491a16fb93a23cbad1160d5bf63ffe07ee015097211e23464031060247b550399140626f016d2a5336ed783a55f8d803a7aea6c8f4cac9495fcde35b082765a
+DIST akonadiconsole-18.04.0.tar.xz 185584 BLAKE2B 40e1da352383d08eef06c8363faa669279087473d60c46a4efb2409660920352b7d73cec5dc149e5b2d6af544afc01f552a116d5dd9e153ce6a2075a4e22f556 SHA512 e3ea3cd9699a1b781b05532254c45ba0965a229d55e309597dbee18861d78b43a5fb6166c29073d21e6fdbd1cbd032a284ca2776ebd164c2e5c4585e1d8180d7
diff --git a/kde-apps/akonadiconsole/akonadiconsole-18.04.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-18.04.0.ebuild
new file mode 100644
index 000000000000..5943cc52ea5a
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-18.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 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 kio)
+	$(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 akonadi-search)
+	$(add_kdeapps_dep calendarsupport)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep messagelib)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	dev-libs/xapian:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 392df4ba10da..9e505d6b0c1e 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1 +1,2 @@
 DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
+DIST akregator-18.04.0.tar.xz 2249180 BLAKE2B 2184b415e337cb924c88cf31cd6cb9ef804c817a1a0b0d1979e80cd629a709afad24f2202cf935757fd6ca177b685a2e9dc9a95d92d343feba3b44529c480af2 SHA512 e78d6b17c3811704ef34abacf3271233a89614c807e30b161040fdb578f1ef360bc5d9e9382cf33457f0e5c0ceb14647068c1f3d9fadde8a6a58f3b2113be597
diff --git a/kde-apps/akregator/akregator-18.04.0.ebuild b/kde-apps/akregator/akregator-18.04.0.ebuild
new file mode 100644
index 000000000000..9d2cb6d441c0
--- /dev/null
+++ b/kde-apps/akregator/akregator-18.04.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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"
+
+IUSE=""
+
+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 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)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/grantlee:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 00f6334f1fcf..786a96075e87 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1 +1,2 @@
 DIST analitza-17.12.3.tar.xz 331052 BLAKE2B e250093623dd516051684473fdb03becaed6c3361bc478f633276a16cf5f75f6c6a8e2df5cb98b8a998e570f4619f2a0c32a59170fbad2563ac93e00e29991f7 SHA512 31d461e09736b4109b6d0af37e4ff1af075963566b0363b7801849bea83b411a53a8498d6c7b55778636e7bd22c120e46dd99dfa74d841532269044449f7621b
+DIST analitza-18.04.0.tar.xz 331008 BLAKE2B 0cbe12bc8c137f492596734962f013742b90c5ba9e72c70f651259e46ff09abc845bb2c0fb7be5901592e0149eaa957ddc974e0812b6edbd0b789ae8fb93d670 SHA512 3920429a1a04902232ecc7e3f91fa7239ea04fb4063210c9a6875fc129bd89d5c00d0ee3e1f99133572f607f34560277b882a1e7337bf816044842bc39b4c0ad
diff --git a/kde-apps/analitza/analitza-18.04.0.ebuild b/kde-apps/analitza/analitza-18.04.0.ebuild
new file mode 100644
index 000000000000..dc538401ed67
--- /dev/null
+++ b/kde-apps/analitza/analitza-18.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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 nls"
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	eigen? ( dev-cpp/eigen:3 )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+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 7fd74c2180fc..64a2de071036 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1 +1,2 @@
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
+DIST ark-18.04.0.tar.xz 1969376 BLAKE2B 9d1e017c0d37307b8f8b9c7c0f9ec2be0d856c97cd39e0d928cd201553543883941baa4226a035e1cce9049125a80bde0d9a20da1159823bcc5d23be0fdaabff SHA512 0a6ab705bfec8af43c847f50580e97452e29ad83f34271ba09f5ec5eacefafe09b312149565ea802e25cf15597ecd78108e2581ebf52396af22f52aa228de69f
diff --git a/kde-apps/ark/ark-18.04.0.ebuild b/kde-apps/ark/ark-18.04.0.ebuild
new file mode 100644
index 000000000000..eb5ba8737873
--- /dev/null
+++ b/kde-apps/ark/ark-18.04.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 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"
+
+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]
+	sys-libs/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)
+	)
+
+	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/artikulate/Manifest b/kde-apps/artikulate/Manifest
index c219e95f4a0b..a7b732d8050c 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1 +1,2 @@
 DIST artikulate-17.12.3.tar.xz 3747444 BLAKE2B 69ab847203f3a6ee408435320d3973d48d55501010ce34c329605ea653cd26a0e2c8a082fba3d91e610f153193441db310cd58416ba6f1907d3680f35197f6f2 SHA512 b984eb53a78bac012a9918a24d995dd89413225ebbd0bda29dd6840ccb14f40efc14b80b0ea6a5df335dcf28f7bb45ad8d1af8296a8d761e4ae48288f2354a23
+DIST artikulate-18.04.0.tar.xz 3746024 BLAKE2B fe6a62ee447a033760b6b18721c4786b0465a152991ccfc418a94f5e2a89eb907ff48056772a30fbb312da2c3d62aaaa8c14b888063a062c0d618c5d02b0248d SHA512 01fec3affd588f07033b74f1d60986350090d12cfd6345b81d8d4a1b94427a5e7e55f1f5cb66bb50404a8c614d7cf1aca062e3dede10774c2f81659bbfc15f51
diff --git a/kde-apps/artikulate/artikulate-18.04.0.ebuild b/kde-apps/artikulate/artikulate-18.04.0.ebuild
new file mode 100644
index 000000000000..9c910d95fd15
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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"
+
+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(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 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}"
+
+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 1931f5b8c066..f912bbdf746a 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1 +1,2 @@
 DIST audiocd-kio-17.12.3.tar.xz 248320 BLAKE2B cc9fd7471fa91c9cc026f9c7b2bc7dd20e8a507ef92a01b170c5fb0f011af31e562eb1f2f848ad6747ccba665c8144e2db01782ea7008eabe5532200e29db5cf SHA512 9d21ba053acd9d9f717aa8e7c3b3021e1f24610762f332584bfd4ce1b4f61b10daf0c6715ed4168f37bb36d4551d43d88a8eea54da313aac7cb6df862680f2a5
+DIST audiocd-kio-18.04.0.tar.xz 248248 BLAKE2B 584dd0aaa316e550dc80edafc19ea74cec3ccd3baadf3ce5cc92824311b866edee515bc47dc4bb57adf150fe62c1b91d6d2baed75a96e752ceb19dece6651f94 SHA512 75b2806de3356533d58e7bef2d2e917e2faad35ffc9a24e8a615e018f227e9fb287793ee479a2c02dba3b9c62ca3e86332bb2e851436a830c352371f60bc3664
diff --git a/kde-apps/audiocd-kio/audiocd-kio-18.04.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-18.04.0.ebuild
new file mode 100644
index 000000000000..6bd5adfbc365
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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 ~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 3fe7930a958a..478c17ad4e97 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1 +1,2 @@
 DIST baloo-widgets-17.12.3.tar.xz 151088 BLAKE2B 00cbad49940063cdf3f8b5f6b3cf2c29e81c5c6b2d34de9eef604bdfbcf1e55a2b606aefd6a9616d11dc8ef00c220c7fe7d0da65eacb6b057bb807330cca7677 SHA512 82237401900789b624fd5c7111127e053fad0f13bcd56f9edc063604fd9bb6368de27d5a62fc844c24b0e283da01f5b77135e7a021b880b026931ae1e583a97f
+DIST baloo-widgets-18.04.0.tar.xz 245200 BLAKE2B c4e95e5f75d3606fbff417e4e27f7c5a2d8b4c857fd2746940bdf8adf703251dc70325c6c0566c9bd13bc07b3eb02ba4620c1c4add394ca98dc1e1106c9e917f SHA512 51d9a08e852fc339f81ec59a8ee3fa724d906345b8eb2768b33ddf569b1c12364a20c800ff6595cd7f573ecee559628e4737af2e462fe27e7675e4e22eb32021
diff --git a/kde-apps/baloo-widgets/baloo-widgets-18.04.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-18.04.0.ebuild
new file mode 100644
index 000000000000..585c9262ec1e
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index 9aca925dbdb1..552d0fc07651 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1 +1,2 @@
 DIST blinken-17.12.3.tar.xz 2505872 BLAKE2B 304cf939db4bd4609a0bda247119803d0cedb276d99bd7c3ea4cc449dc85c2cf5db1a474ffa79dd09087fbb9cf8dd8e2e1405d02ee5d8f5d265202dc898556bc SHA512 9cd1ce9f74f94d7beab0192f59114459d3434f341f3ad2d83dc6b659f70e6fbfeafd21ead5ae22f4f07fc03ed2d9da85ad59703f6d6af879355575cf7db07494
+DIST blinken-18.04.0.tar.xz 2505856 BLAKE2B 9c86433b3751600b01e75736ba600570fa71ffd3737b30614eb64716283fa4ce16ca7311d6a1605b6a303ce05e862b2d2971b2ded97b1dc28a40a573d2dd06a1 SHA512 6e226aea5d94d34b36cb3f89214c5bcd1a37e0c4a8958b8abd243f7c4613dc0860dc084f8aa7d66a44f42a6961d2b12c960ebf4eb4ef7794a54fd5a418153d68
diff --git a/kde-apps/blinken/blinken-18.04.0.ebuild b/kde-apps/blinken/blinken-18.04.0.ebuild
new file mode 100644
index 000000000000..691085603aae
--- /dev/null
+++ b/kde-apps/blinken/blinken-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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/bomber/Manifest b/kde-apps/bomber/Manifest
index 1f355b2d4198..0324eec38470 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1 +1,2 @@
 DIST bomber-17.12.3.tar.xz 753868 BLAKE2B e865f2c565eea5def26687c3dc813aa40aca0468e6754f9bbb349266fcceda609f7f8260eb44e2313f253a893892edd00456b517642939028921489b8bf9d3f0 SHA512 3c792fd103b93a2ec5e9b030382256cdba1c05477e04e8d95d0a331dd630d88137e0079fd1b91f267ccbc1c32a60e4c94f34330061380b0a069f689b90efb6ec
+DIST bomber-18.04.0.tar.xz 754256 BLAKE2B d2b0b78874d5c2e4821bc2e4472d375454ac326a22340240251ec65d1ee0ed819795da8453e0e1a19bff147a862808752aeb2cce2e70cccf3eeaadc118bf5546 SHA512 f3acdf0c910b3ca659cf961aa840d849d6809563026df83fab45b01307ac16b46af9f73c329c0c7958a0b13d13fb0ac1469ee0677064507c5f754053b66c7c4a
diff --git a/kde-apps/bomber/bomber-18.04.0.ebuild b/kde-apps/bomber/bomber-18.04.0.ebuild
new file mode 100644
index 000000000000..1131554ae2a1
--- /dev/null
+++ b/kde-apps/bomber/bomber-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 a8d2a8aa304b..e90413e0e1fe 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1 +1,2 @@
 DIST bovo-17.12.3.tar.xz 186488 BLAKE2B b3cf4a9d6b168e9197290d9fb50698b60122a07e91a732ba2f75b50ae6821bec9dfea41142c1e40e982db53f61026e82fa9370cfa39cc2edb3d605cac579eb45 SHA512 11b626795fef8bf8bd30f086e759d26a8f63f74c05dd155506121e5251e2f2e07cd67f3f337a6eb0b567b96c73980875cfbf02ebfdec3f5e13062e2aff21fe76
+DIST bovo-18.04.0.tar.xz 186460 BLAKE2B 785c3cb9ecfd90e093762902396c93d31577eb84fb8364de85427dc72ba0214d872d0882d9daa0d81821edee3014daa17701654afea3015702fd6e1f5b01c1bb SHA512 f73871a5a6598e6d33f0b14675f3a2f7bae994c22585627f0c5467ed409d13109d87e72bba132236bb695b49956d0ad60d88188d74e1009a039b562f2e6d1477
diff --git a/kde-apps/bovo/bovo-18.04.0.ebuild b/kde-apps/bovo/bovo-18.04.0.ebuild
new file mode 100644
index 000000000000..8f3de523e8a3
--- /dev/null
+++ b/kde-apps/bovo/bovo-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 6df3ca73c49e..381968d8d4a2 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1 +1,2 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
+DIST akonadi-calendar-tools-18.04.0.tar.xz 220516 BLAKE2B 58be803415e1c6ff6f02930a356d3db1fef605bbf97abf0cd8b8ee05596881d173973bcab0af37f5c933f56ee2dcddafcf765e697d8667e94a662a8c304dc20f SHA512 cdbc1a59c5fe85928786ae8645d19322f108718e9c90fd55aa78f48bcceee98ebca328f814630fd188b7e22f1c889dbc112077267523c76adc622a2b8733cbee
diff --git a/kde-apps/calendarjanitor/calendarjanitor-18.04.0.ebuild b/kde-apps/calendarjanitor/calendarjanitor-18.04.0.ebuild
new file mode 100644
index 000000000000..026dab8a1418
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
+
+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 -f po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 5dbe2032a1f7..582010d513c0 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1 +1,2 @@
 DIST calendarsupport-17.12.3.tar.xz 644864 BLAKE2B 52733e61d06eb1335f5e104daa073be87123c71af99dd2894934275b71b7a61478ac7853954492681327b5047a85dbaf7d634ca7bc53fefd115d3d2148e76048 SHA512 db578210c496c0e127e3c11efeb71cdd1bf56d0e61db6b82528ca036dbe83bb08338598863e51e7c8bead8f83169e1ecfb6080231e2bb97678c3b078fb12ee22
+DIST calendarsupport-18.04.0.tar.xz 644584 BLAKE2B f7fd7db775531e6d081ed0ee44e1bd905f881345cdf12ef669b424ef74a91cf6ab2dbefcac6f7566c42d0bdfbf0d4f59aacf4075aa165136286e0d089b3925f0 SHA512 309075f7b898717bc92194b4463ba3e4a3abca0916f6a4a0c2eaa6d37bc1db84fea99989b3366f914555823657ac4247b88fa2334d861713246de34a1d64acda
diff --git a/kde-apps/calendarsupport/calendarsupport-18.04.0.ebuild b/kde-apps/calendarsupport/calendarsupport-18.04.0.ebuild
new file mode 100644
index 000000000000..04abac8577ef
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 kguiaddons)
+	$(add_frameworks_dep kholidays)
+	$(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 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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 1b2be543522f..62db0a634a44 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1 +1,2 @@
 DIST cantor-17.12.3.tar.xz 1066992 BLAKE2B fdaaa42adf45b3013337374b83b6da77d6adfd610e233d56a80965f35f3433b412d4f1279a3c2c3e257a57a69b44d7e190f42e325f0fd3fa5ef4223ce6ddbfb7 SHA512 37d080fa3e87cbd105e33c687b5bc670c0833639873c41e1dcc519577103186ec629c85b5a1875af915267eb7ca3d13f170894bb9c0c882c964ccc02a24cfa3b
+DIST cantor-18.04.0.tar.xz 1068836 BLAKE2B 909f78fd5c19f95caa26633906c36e1b75e8009adb5e336e1a065e168bb8988c8875061d3699845c5188edff7db106b79bd187b0ab419d2b327789c44c904883 SHA512 a53d51aa1a095aad1ab0da21535b8409c51e246fa6fc08f30bb641d04e48783e6b2f610d282e1628471c99a547afe0c63bf795b7450bce9f28c8ba7aa2550617
diff --git a/kde-apps/cantor/cantor-18.04.0.ebuild b/kde-apps/cantor/cantor-18.04.0.ebuild
new file mode 100644
index 000000000000..cd2bf41394b4
--- /dev/null
+++ b/kde-apps/cantor/cantor-18.04.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 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 ktextwidgets)
+	$(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"
+
+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, lua, python, qalculate"
+		einfo "Alternatively, install one of these:"
+		einfo "    # emerge sci-mathematics/maxima (bug #619534)"
+		einfo "    # emerge sci-mathematics/octave"
+		einfo "Experimental available USE flags:"
+		einfo "    julia (not stable, bug #613576), R (bug #619534)"
+		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 35b4c1d38c3c..f0ebdab1e392 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1 +1,2 @@
 DIST cervisia-17.12.3.tar.xz 1905900 BLAKE2B 8ada882e8bd19a272eb622a0bdb5e9fa9a20ed0c31c4b05ecde68f969288907ce00ea4ebd1c541aa8f5e51e3ca248b8413cd86611e96ca94e186cd6edd1e70b4 SHA512 fed1fdb51cba8eb2e02139095fc250f4d4cbed261a815cc9e8cb12df193da79440026730aad4fdda73759a4b8571776014a74b5d0517637d2fd2d86432e947c5
+DIST cervisia-18.04.0.tar.xz 1906028 BLAKE2B c53b49084e9ae91381f8b3704e6d6280897d688ce5ef7e80fa34bd4d291410f39def54468d7a1928369cfbc58dbe2a4b0fbd80fb0a32fe6dcec4936ff6611616 SHA512 6e1c83b4cb33c8963f964639cb49c0218d4fad0f2496c57ab9a206105cc26d72de7717c6f95fad8b99e33a22edbc0b1624a2895b635140ad5741cbe5dcdd3f43
diff --git a/kde-apps/cervisia/cervisia-18.04.0.ebuild b/kde-apps/cervisia/cervisia-18.04.0.ebuild
new file mode 100644
index 000000000000..fe35d7708a72
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-18.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 ~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 ebd036b78126..f69cd0ecd801 100644
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@@ -1 +1,2 @@
 DIST dolphin-plugins-17.12.3.tar.xz 187288 BLAKE2B 205db4fddf395f5e1c7ac9db123984f712867d2523b916ba0017525872a56460c2540dacc6b4e49cb3e876d3d504f619ef603372e98622d1634804cf5bee4efd SHA512 fe0e2aabea0870e8f3127178a10c70264fd339391f88aa9e2a1a5238cb25a0ef47ab2c66f60d2da0788a41399cdfd4099542c81d47e8db1ea09cf2f5941fdeaa
+DIST dolphin-plugins-18.04.0.tar.xz 190108 BLAKE2B ed2df9a3e07cda89d9d7a6b7cbc2bad0af307005af98805bcd036c80b6024c2e643f5e67534dcbbbf83293ad4bd5a5b3b11a61b527a6685cd00bb79ce95807bb SHA512 26d44264cbf0e86baeb8007c106e23a3282dc3a76186bdf9486e662ad2ef7d5b19dbda567858113e82281444ead3a8b5a1b073270630341de5d840aafc7103d6
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-18.04.0.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.0.ebuild
new file mode 100644
index 000000000000..125d149d68cf
--- /dev/null
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-18.04.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 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 5757a830d6fa..de50bba6ae5d 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1 +1,2 @@
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
+DIST dolphin-18.04.0.tar.xz 4843460 BLAKE2B 408e0c3797885a80d128247f178e4b966fdd280c5538fcccd40e4cee7bde6d7821616df098e28b79fcd3136a6b14b654ee053ff6bee0c6424613e9560bf55f01 SHA512 9c941c37d8c1b132c092a3c71f75b821427b170ded6be8a0d1ca19a5807c9c2689cd695ee8e953443e2769358e3a28704c1880671a1fa0daaae9c1149cc12642
diff --git a/kde-apps/dolphin/dolphin-18.04.0.ebuild b/kde-apps/dolphin/dolphin-18.04.0.ebuild
new file mode 100644
index 000000000000..256cdd947622
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-18.04.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 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="Plasma filemanager focusing on usability"
+HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/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 b34cd1ce7c83..9eeeb63b75bb 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1 +1,2 @@
 DIST dragon-17.12.3.tar.xz 1464016 BLAKE2B 54360c45227c2260b4b401978e902de4777a5357812f93d73952938e6400196369e4b41777809619aa8cf2c0bf9a840b47ab71fbd3348e61f37de8943d1fd227 SHA512 0ba2e1845d6b6fcb3885e340160f37d924afd5d5b1a8f1f3e196ad5b04db87d55d1460feb447e0845802757e3b81d550fafcfca2e91bf334209953fc4466eef8
+DIST dragon-18.04.0.tar.xz 1729408 BLAKE2B 2351cc4e10cb4836a76f9b4c02f69412d184439dcdce3640a029a1e49387855038ab269fe2e75975a82a270b19fd0d0b301846ae316321f539e997315e39da1b SHA512 734ff41eb868d8e1439b07c09e3bb705a691d5ae182968fcd507ed48c5dca2b4ebdfd36042f666968b31de6acddfdcf14827d24587051f21f8bae6dcd346c45c
diff --git a/kde-apps/dragon/dragon-18.04.0.ebuild b/kde-apps/dragon/dragon-18.04.0.ebuild
new file mode 100644
index 000000000000..e97559abf858
--- /dev/null
+++ b/kde-apps/dragon/dragon-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 knotifications)
+	$(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 c0c45d4b8c4d..f1398f4a950c 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1 +1,2 @@
 DIST eventviews-17.12.3.tar.xz 437868 BLAKE2B 294cfcbb750ae81714257b56dd7f2c7817be8182331ec3517c96e17858997f1e3c49b3ecbce27e906c9485fdbc2f2bcab94131fc9365a0fc484b799ef2e29877 SHA512 6a51eef25eb9ab0522c95ec4ed800af94e5a1243b597e7aee4619a1494bdcd26b08df4d42d04d837c561f5c0d3434edba9f4a72fdd2433816ad3e9e0e6b6bbae
+DIST eventviews-18.04.0.tar.xz 441120 BLAKE2B 0d9c0b850800fa4647e85b3f9e41edb9a731332429227d87ce909007ed1978e227e9d1864bcd7882e442e0370143b653c4d5335c26696f82a83ccaabdda02279 SHA512 c228cbb8f9d09fea8c826eb04a24d6979e63d78c881b9c515151906e6309f8f86e0ff758f1eefbc4c2cb1f233616ad8eb6b9ffcc04b6d65d0068b67747b79ccc
diff --git a/kde-apps/eventviews/eventviews-18.04.0.ebuild b/kde-apps/eventviews/eventviews-18.04.0.ebuild
new file mode 100644
index 000000000000..8b6b5841912a
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 6b2f0cce2b2b..7669b20085e8 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1 +1,2 @@
 DIST ffmpegthumbs-17.12.3.tar.xz 21100 BLAKE2B 6f0ee8bd6c8d775c463734e83c44ee6a59cb52d7d8a622aa33b10e57b944f26aee5f453fc2cfe153d6d970114b19d524811681447eb01f5d8b16bd90e1897bcb SHA512 923bd21bc7e27c3ed511c987ae8011066b713acf6f14794c00cb26a0c6c3d8859a88db02c88ec5cfbc4210dd4a252dddcbbbe6e768d386617b26af3ea9b5184d
+DIST ffmpegthumbs-18.04.0.tar.xz 21092 BLAKE2B 3c60565ff1390b1efd9598dd6ef087c0f6a6231d1f1587dbfae63143a8d9771487d663413aaa038565390758b4048c83b941a46a1c7a3dfd130183a602249f8d SHA512 3e8e3067b4e93478a4cd25a53c4f6d7858291b4e47ad9b85b9459838bb3078e7ea541364dfa2db7e48168f3211d3dff78d9a17d5b6349a9d9b1b164504b2be7a
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.0.ebuild
new file mode 100644
index 000000000000..a00942c7569b
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-18.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 f42d7f0364be..e9a4cc7ebc26 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1 +1,2 @@
 DIST filelight-17.12.3.tar.xz 654916 BLAKE2B 3543b15b6a1c691769c01aa24bcb8b8b3f1b81d0060ebb7409e8f22749fa6b08cd5ca0eff94e6a950c6f027bf3c56afcf7f43cee27192a34284509e3d6a8d670 SHA512 6c8efe81b54bc5fa0111d94c65a15a6a2beb079790bb741a38f336baff417eb5c8d6d133063afbd538378b5aadea08d221915cfaab8430fc4dc32a889c2057bc
+DIST filelight-18.04.0.tar.xz 657908 BLAKE2B 94e8ce3c4ab5610e33c610a435919959dd2eefae3d08cd429511be80be9c896b52bd7c9c5d3a9f2e6d63c5866b5da6089c7dbd7851a3c6d76b53a67968593f78 SHA512 ec7a1985ff60b4553b365094de42fd961c44ed9b2f527bf8a7dd8b99f7175b7b29435d296d2933132b182320698dcb5b79e37458ec17d6dece4dd2af43c75864
diff --git a/kde-apps/filelight/filelight-18.04.0.ebuild b/kde-apps/filelight/filelight-18.04.0.ebuild
new file mode 100644
index 000000000000..03b58843a55e
--- /dev/null
+++ b/kde-apps/filelight/filelight-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+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 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 d23ea4138c52..e47bef26e6f7 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1 +1,2 @@
 DIST granatier-17.12.3.tar.xz 1959944 BLAKE2B 8b25ade780f0679f722eb3a4e323adc73c2e3c3d774595a934bdb2d6017eb0588e2163b0610bb90dd2277a0dbd9e6df590c2fdc238d36d80e50b335abd8702cf SHA512 9d3b8f53452a345a3c48547dc04bb1e58ab35f8d25b0e7611fba4adddefd04b705b681aa24e7e504e742a65b025b0ef5869d1959de9199f2f6d5681bbf7290fc
+DIST granatier-18.04.0.tar.xz 1960192 BLAKE2B 73a21bc59b32cdc5892566331af04f5ebf7f206a6f0abb729b5ce86bcd4c11e6d027cb5a4dc3e671bd6f48cdc0b0a56112ade691d7c6b70f111d95e8aa8af381 SHA512 826e2b0db5ecf19657f260bb1e405604c97f8264f974482f68a25c3836997bf9fcb05379784925c753b2fa39352e01639cd6e3c8218e3bcc0d172212f00d4b21
diff --git a/kde-apps/granatier/granatier-18.04.0.ebuild b/kde-apps/granatier/granatier-18.04.0.ebuild
new file mode 100644
index 000000000000..28cef3517e33
--- /dev/null
+++ b/kde-apps/granatier/granatier-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 fb49689b5373..8bb2cf259980 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1 +1,2 @@
 DIST grantlee-editor-17.12.3.tar.xz 110752 BLAKE2B 2d0e60207bcf1edd1bd4e69e7a959c59e0e63b14117bafd402f8fa57aea2a1c1eb30c152ab3a70498691e854241046d6ca1ee9ffb3c8303393c6a629244c6be6 SHA512 722db8e101c7132717840137d77dc8c0972a2f1692b4b0d8be3e33c296649d0d5f30f55b4cc6e1dfa58778a3c470c93baae0b060d234a99f967e87296e947f0b
+DIST grantlee-editor-18.04.0.tar.xz 110608 BLAKE2B 08450ee2612c0ca45c026d0ec25a03751721542b4286dd2ff367c722b36ad25e58928f0d9339a99b8f0468f3f01b0259f01b2570425c412ab837b290475a585a SHA512 4391b4bc42f2ba27909a9c2b65f59523322a79804d6e6816f4d7fd563c5b1aad029a773ebbec15c4da8257f8f1ff48080ea0cbe7f4771b693ad47f05c7430cae
diff --git a/kde-apps/grantlee-editor/grantlee-editor-18.04.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-18.04.0.ebuild
new file mode 100644
index 000000000000..53bf85082a4f
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 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/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3435fcf2e8c4..b4b73137163a 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1 +1,2 @@
 DIST grantleetheme-17.12.3.tar.xz 51348 BLAKE2B 89055379524d9273b2db9185c1f0116638e5f45414ba674cb7d2511e9539d556daf489e9a54f39a3c1197a8b1939076ccb7bd932d336c0769b97d2c7e59a8062 SHA512 203fd80f303d4c2c76b9375179da9aa7f040416b397ce576ee5836b2bc8d04109601275bad843a192317971852f97c9a7fa83b48401da14ec820f11706187928
+DIST grantleetheme-18.04.0.tar.xz 51360 BLAKE2B afb7c40c82c10d240310e28200b9460d72b7a2a4e76765b97071b47112cd66bbfcd9e069b7c46af374098cfb4dda23bd2776a0ae9da3c37ef95496d331c97eb1 SHA512 af4f4db9b25bd8545e5145d0167af0ad0f0b2527054e4f4f26c7073631d5d359b375b149aa72c096c36b1bee23ad0c4c7ad4a031a15196decb985b53573839d4
diff --git a/kde-apps/grantleetheme/grantleetheme-18.04.0.ebuild b/kde-apps/grantleetheme/grantleetheme-18.04.0.ebuild
new file mode 100644
index 000000000000..605753b034bb
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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=""
+
+COMMON_DEPEND="
+	$(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="${COMMON_DEPEND}
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index bcd32f4a541a..d92419db6963 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1 +1,2 @@
 DIST gwenview-17.12.3.tar.xz 6021476 BLAKE2B a4142239cfe4d82b26977d788a67286625d7469ce4722a1c091691c02abe75ceb5b852e4754b6c3809fc96219b0a967595cd83910e8b809c553adaa0397ee939 SHA512 7691e07f6ec572a46a8b0c3e63aba93d7a3c2886384370d3d77299c94e7f9cc5f7dff4e45390cc6871bc003da27ce0f90d85d8108a7302657bc3f0175e609abf
+DIST gwenview-18.04.0.tar.xz 6050924 BLAKE2B 43b57bab1ca7b303af48b704a42ffe8755399e1d441db441a37a8fee445ba53797b0f6217aabd9c24a8182964889e541b31e4f50302c6a6b21be4011dae15f6e SHA512 fa2b9cb4418907a7e73d21d9e61b0caea7143847af1c2ee8d8474062b2f46ccd8a0f4eaf01f39c7e09ecacf0950372901ab79dcc3846c8572bbde037473c1b36
diff --git a/kde-apps/gwenview/gwenview-18.04.0.ebuild b/kde-apps/gwenview/gwenview-18.04.0.ebuild
new file mode 100644
index 000000000000..87a4835bbcaf
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-18.04.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 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="fits 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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(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
+	fits? ( sci-libs/cfitsio )
+	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 fits CFitsio)
+		$(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 3c45679540a3..2a82ac8fad7e 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1 +1,2 @@
 DIST incidenceeditor-17.12.3.tar.xz 517144 BLAKE2B edbf3e6b3bf7027ca8399d42cb59e5122e8bd85b2fdf0de5e6932bba68fdb1a8b75cc38b20022f8bf3712ac0ee6ac4525b709a0e24609d634cea83d2571bf57c SHA512 b800a3f1f62a195e515b1ff41aae801f17a983549499c2e694f5ad8690bda1a7218aa7ebcc4908b288ee97c6d335df729348d9a34df4400cfea86d4501af2ba3
+DIST incidenceeditor-18.04.0.tar.xz 527148 BLAKE2B 1539da04ca67fa5780af112894db5c4687e8d57a0c24dcb4e7849433838e10392303a71ef67df259ad40edd4e021ed38180b3f92fb8b0ae221b1849b239ce582 SHA512 c10cc3f4e91846c7d28218bb9475094d4fcc69e491150f1af77a283ff6b24731f74f3a367cc601cf6095c6006566bff940361defb72f89773a4bb20f94f78fc4
diff --git a/kde-apps/incidenceeditor/incidenceeditor-18.04.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-18.04.0.ebuild
new file mode 100644
index 000000000000..8cdf4d1b3dc2
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-18.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+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 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
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 2960ccb6c646..c0ea4245a08c 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1 +1,2 @@
 DIST juk-17.12.3.tar.xz 1868428 BLAKE2B e88f8607aa360751cbbb8c72fe04ad52f1d3f66679515cccf048a3802c65212c66e53936c1826c121ae9dd728ace46dfa5d33978818b8c95d088760e2e0a34ea SHA512 b86e8eb68dca55a9a321cbcfb0172a95a4e1536c3959390f62e3e519862c9de32f327db04e55de39ab194a5e46c228614333b22886b5bb2b4578f0f1d6b5cddc
+DIST juk-18.04.0.tar.xz 1869228 BLAKE2B 84e1be161a460c8f212d233d653d390e8921459b5b77186daa45d6372fd81a8948963847c393dfc4849b62446e80cf4f1f3379c1b48482cdf5df8d3a8dc3a7b9 SHA512 336cb88c85ad8b79da009c437eda83c16b14b54113f5db0809c04ae58e669cea41b8ce4df8c5cb84e2315cde02ad697f4d2310756f44b1784f2293e398b9ae02
diff --git a/kde-apps/juk/juk-18.04.0.ebuild b/kde-apps/juk/juk-18.04.0.ebuild
new file mode 100644
index 000000000000..b5a9daf6e7f6
--- /dev/null
+++ b/kde-apps/juk/juk-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Jukebox and music manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
+
+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 kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(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 qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	>=media-libs/taglib-1.6
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 88f702f89f4d..79d0b4fed230 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1 +1,2 @@
 DIST k3b-17.12.3.tar.xz 10573616 BLAKE2B e5606f7ef96aa34cf2aba068cd7417bd1783910f759dffa2bb4edab3d2e921788513b22839c8e6156f304db4e81b3a6889d1bdf7b4648f64e2cbd383fe032705 SHA512 05cd1413d99f55c4aca5b75cd51691fa0ca0a975660168ee3effa39774deab36d28ef3e7c71860c726d1e7e02b3ac12e6372e2e47bb64d5fa5e21f58540d11e1
+DIST k3b-18.04.0.tar.xz 10588096 BLAKE2B 6f5d0cdbf537e4bea514c04951ee5ea5e7d8db5f79ac955d5943ebd5b89a82d7441c1fcfceb389d6b14c5858946ceaeaee2341368147ce0c1a135db791ba65c2 SHA512 3748d5a9100091ade797f1bee61f5f04ce9ec9e29d265977ffe2e0dadd25d37ae1c1cbe14de9c0229f775ebba1a107ff5bcc9aff4d67cb4cc8e446345b7d48d3
diff --git a/kde-apps/k3b/k3b-18.04.0.ebuild b/kde-apps/k3b/k3b-18.04.0.ebuild
new file mode 100644
index 000000000000..33ccd3437be8
--- /dev/null
+++ b/kde-apps/k3b/k3b-18.04.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/K3b"
+
+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 'taglib?')
+	$(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/libogg
+		media-libs/libvorbis
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	dev-libs/libburn
+	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="
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
+"
+
+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/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index a8390ccbc117..35afffc515df 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1 +1,2 @@
 DIST kaccounts-integration-17.12.3.tar.xz 70824 BLAKE2B 1299d25ac8852362a346edecc9f9d6554cd05e5554dcf58b735bce3b099074de4c0b2f8d77566075d90e775bc7e8a6c5cdac2bcb332207d808641163bac5cffa SHA512 239e273496c6d190a5c07f4fb98d718e435d0d4864f2c58877e90824d8f4fbbefcc4a057bc4a1ea25b4df77da9a111711d18a6111a58febe932844befc0489dc
+DIST kaccounts-integration-18.04.0.tar.xz 71444 BLAKE2B e12b2a962dbee6605cac07eecce2ed41ee110b71ac79683db6fa73cc82871c80e274cb636c2ca684d0b2187cf8798ee9bc82a7e5d24a1316b2189b25a0d0d059 SHA512 b16d6b8146c859451852ce78b7f47f6767ef6dfc7561685928102f8e57d339818cad10474688e4932154798eacde16553b40886b4b0cbe63553e9a58e1382c7d
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-18.04.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.0.ebuild
new file mode 100644
index 000000000000..d30f9c20dd11
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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_frameworks_dep kwidgetsaddons)
+	$(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 28b0f3af551d..e81766e71d5e 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1 +1,2 @@
 DIST kaccounts-providers-17.12.3.tar.xz 31740 BLAKE2B 5518d40bbb28a7657ec406b76df35faefda9b6e9a3e8a2c31b27806329b66487d54c8a72fae50795bfcde519fbad96059b58466cc62b1197b2f7e4f2bbebfb93 SHA512 c8eba2caaa4cf3e33cf86b8a8713292be9666d3eca75931a493206317735b1938b0d36e028461f16229e26f38039d54d25b7c2e5ccdbfcfe5a68adbea69ee756
+DIST kaccounts-providers-18.04.0.tar.xz 31856 BLAKE2B d2c27f5b9e669d9a6d2cce81fad7c45ffd6f9258df79ce343b0ca2f6809fa761338637e6bee46837e63f1b1be2ef664f6d99258358d1ef7956cc7aeb2d208921 SHA512 a009e410a1001f188ef4950c4aafe778f045f56dba0049d5b9a1646c3fd6000e9c4a308c759c338849d23542cceac72283301f6d82cf0368285be98d43cee90a
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-18.04.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.0.ebuild
new file mode 100644
index 000000000000..da4738ab4dba
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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-libs/signon-ui
+	net-libs/signon-oauth2
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 63ed47aa8179..c5c482a69442 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1 +1,2 @@
 DIST kaddressbook-17.12.3.tar.xz 544148 BLAKE2B 9857bfaca4f94e6108066d4a6270e6e959b110f5a6ba9219cc371665d36b00d445cef0723ea118c285bee7971a9fb480d8851e4eb569d474de29161f37b90915 SHA512 0b498c7ebf49a6a4df3c24b185ae9edd2d53a80fdc6d84c6ebc6b9f5531766dff579ca7240f6c4657bc113b872811de941e75f7f4d171d3cbd08a0e9afb2a054
+DIST kaddressbook-18.04.0.tar.xz 547224 BLAKE2B c92377db92348806f529d84d99d44c972f4acfaae93d2137042058eb7f6b9aff8983661c522013722463856a841f9fe8b1908bcfe6a228a2d662bd9bad622b5a SHA512 3ef4161e1f8d24b5baf65667f5d530ae8c494180793b895eb6edea6648383397238aac11f1728edb61897d7a3dd00dda41ce77c652bc099de75916cb15539145
diff --git a/kde-apps/kaddressbook/kaddressbook-18.04.0.ebuild b/kde-apps/kaddressbook/kaddressbook-18.04.0.ebuild
new file mode 100644
index 000000000000..23715c549f96
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-18.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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"
+
+IUSE=""
+
+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 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_frameworks_dep prison)
+	$(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 libkleo)
+	$(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
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	$(add_kdeapps_dep kdepim-runtime)
+"
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 57fb732f7ed4..10b0c9d92c5b 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1 +1,2 @@
 DIST kajongg-17.12.3.tar.xz 4238944 BLAKE2B 5b953695413d8486468be2e83d7326199415a1cfe3f2fdba834f0ac3be841042efc73fea11d0c2e0177573065b0576f058e8e3527d7186c02e37986c86bdcb5e SHA512 c1d8a0934952cf11d3de3bc081cc7b33b42a7707cc0cdf91a669087f6707108aa6be25a34a065128afcf63602491096f8533bbcebc8ba89a37f310caab9515b5
+DIST kajongg-18.04.0.tar.xz 4239560 BLAKE2B ac2446899ab68b967ff64ef60459e9fea2c41a579fb418bde429dcc65c1d3d505973e7b4d3e1b2379cb79ba64b68e9f069cbdc64c71b7abbbf9b5dfdec4d0cc6 SHA512 8f02f4011e1329a6903cbbdef7d88d3338c44356b38c853495cf68a722c111ae5e27f9eb1e43e2b8493f8f6fda7ddcf5c4506e5339c460ab350833fab6966c02
diff --git a/kde-apps/kajongg/kajongg-18.04.0.ebuild b/kde-apps/kajongg/kajongg-18.04.0.ebuild
new file mode 100644
index 000000000000..1c531f3048e1
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-18.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 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 ~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 ../share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym ../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 e51d53954857..c9bf22c600fe 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1 +1,2 @@
 DIST kalarm-17.12.3.tar.xz 1797760 BLAKE2B 9ba94eb0dec5b6b9d55fdeac4605ed3ea12668c3d82f530072187b4c5010f8b2d0e4042f7a9b64858a353e7d588afc52186e899479884bf78b2ede7807e61625 SHA512 21f5187fbec15e49b9e51b062b1ee1e424c6dd73cbc9c7871940a8441da5faa15d3344b7adfd1795906907c6ea8b469846f1ad1371d9abfd0e1e4df84daac892
+DIST kalarm-18.04.0.tar.xz 1793544 BLAKE2B cc5397cf551b1792433eac472e84953bfa745e9ce07e525080f1c42480406c75bf46cc6e94ac5258f393ef0a837ffb2c00be59c35d34f772389b19184d94e58e SHA512 a298063d4ec52d14119c4da6925d918e1f1b0c917d9024066259bf25e5dd5ea88bd4fd901dd9e656ec9b4f5a2047ac5c7e587de2cdd6d184b75ea17643f91aa0
diff --git a/kde-apps/kalarm/kalarm-18.04.0.ebuild b/kde-apps/kalarm/kalarm-18.04.0.ebuild
new file mode 100644
index 000000000000..dd0bc7c1fc8f
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-18.04.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 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"
+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 kholidays)
+	$(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 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}
+	!kde-apps/kdepim-l10n
+	$(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 a0d052422cc6..e102e9868810 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1 +1,2 @@
 DIST kalarmcal-17.12.3.tar.xz 494884 BLAKE2B e13c2d013180129eebb497fc26634f53d80cc88b23ea0bba9b5fb775247921e28408ae877651483d803743d531674b4b06ef42c4b33fe87b51978e772714ee80 SHA512 444edd565287441a53da00520bba9b4a22c155048c504a1bd1c0a25f066ae12bea63100589270cd93c26af18cb6e4686c7a753199d10980db638c5a14529239c
+DIST kalarmcal-18.04.0.tar.xz 546548 BLAKE2B 80ca1b5ed880ca525457ac6a7e347ae286d20c481d69a5887fd1040221547910e9af785f2996a6f9cb0b310a2af80214d6c7c5f6ad9b9268117e8a7efeb15c85 SHA512 7b85eecffc9fd77adb966d46a41a133f95b3ba7c57d941e2a8a82551c7d2e48b34be3e78b01b5d66296ec568e96c590484459af585c26772c733c1f53718de22
diff --git a/kde-apps/kalarmcal/kalarmcal-18.04.0.ebuild b/kde-apps/kalarmcal/kalarmcal-18.04.0.ebuild
new file mode 100644
index 000000000000..b1578f2d4290
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-18.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 kholidays)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_qt_dep qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 708459f19246..1886e0d4d0b4 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1 +1,2 @@
 DIST kalgebra-17.12.3.tar.xz 690480 BLAKE2B 996b66e256d3a87181d03d6fdcd35df9322baef6fa4b6c7a28db8e8641dabf7c33378b632b3a676f983cf25f91377ffc9c98b95553e61805bd1d72ccac958702 SHA512 7062ab6c6a2fce17e313ad16535f51b5ce893384499971dd05e9a256b00e7172b1b83dd3fd4cee76406b32e6abc2a16fa671eb5b95cd8062c760968ede44c62b
+DIST kalgebra-18.04.0.tar.xz 707480 BLAKE2B df10d71df0fbf2228fd986b7b47e42ec0cc0ae66876a50be47f05db24df5019be8b4fe6cd3a8efd1bcfc873bc8db2666f08efca36c0554c97c02a732a91926a3 SHA512 6adee94137b19b631fc05a8be9dd752fb9661126d10ba309b1a9d53f0c3205de4c5a855561004b83838f8e3b592d8d57a2da95afbef6da6c0dceb7e1b62fbe8b
diff --git a/kde-apps/kalgebra/kalgebra-18.04.0.ebuild b/kde-apps/kalgebra/kalgebra-18.04.0.ebuild
new file mode 100644
index 000000000000..8cdb5cfa3a59
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols)
+	!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 c5669dfef1fe..4084151db92a 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1 +1,2 @@
 DIST kalzium-17.12.3.tar.xz 24447404 BLAKE2B 48e99e119bf3bdf38603e6fbe942697fdee28c9decc38aecde525b7d0bd4a3b9f8a8084cd13a238b0eb356ebc179f355783d4937e4317bd25dff138d433ee92f SHA512 989e35f617ef019036571103c1fa4df7fb64238fd2cb7c909798b7baaacb1ebc64d6c989c07040a5c46f3db240edf2e415c11ab4a480eb2f532f1ed992af4fb1
+DIST kalzium-18.04.0.tar.xz 24450360 BLAKE2B befcff1cec71feed4887be51d24b0037a88a630150013f09c2376a9cd8fad98a1b1b9b808c31349ffc8d7436758da7cc0aebfefea772d52cb58eed0c66efc3af SHA512 38be9de3fe37be940f507f1b286e856e95fac0468cc9d0e650059345d4402ac9b0ed82e99288af0549335413467ee8a96eca67cc3734814ef34944f71f9cbcb0
diff --git a/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
new file mode 100644
index 000000000000..8d1eee5720b0
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-18.03.90-missing-header.patch
@@ -0,0 +1,24 @@
+From a56c48890a21f0d9556474e3edae9c11be898243 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 8 Apr 2018 02:35:14 +0200
+Subject: [PATCH] Add missing header when building with AvogadroLibs support
+
+---
+ src/kalzium.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/kalzium.cpp b/src/kalzium.cpp
+index d7c9b4c6..4636308c 100644
+--- a/src/kalzium.cpp
++++ b/src/kalzium.cpp
+@@ -42,6 +42,7 @@
+ #ifdef HAVE_OPENBABEL2
+ #if defined(HAVE_EIGEN) && defined(HAVE_AVOGADRO)
+ #include "tools/moleculeview.h"
++#include <QGLFormat>
+ #endif
+ #include "tools/obconverter.h"
+ #endif
+-- 
+2.17.0
+
diff --git a/kde-apps/kalzium/kalzium-18.04.0.ebuild b/kde-apps/kalzium/kalzium-18.04.0.ebuild
new file mode 100644
index 000000000000..6ead311e558b
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-18.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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 ~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? (
+		$(add_qt_dep qtopengl)
+		$(add_frameworks_dep knewstuff)
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		sci-libs/avogadrolibs
+	)
+	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 7b7ae4e9ee2b..580e46481d95 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1 +1,2 @@
 DIST kamera-17.12.3.tar.xz 96720 BLAKE2B 8f0efe658f007a89fb946be9ead52bf3492f4fdf8684899722c9d6a7273d921b64333e576158ad34c4facb477734b355453ae2379b1fae5db1f11cd5390c6393 SHA512 498ebef75fe32e1ea7a4eb048f6942ab1539db870eecf0550f1f04ab85bbe36543ffa864cd658988110540cc3d8a0ace442c71d00bd9a04497c221bfeba24376
+DIST kamera-18.04.0.tar.xz 97084 BLAKE2B 32e2558a164222229ab3a2dc5c2ac3aaaf815d866320654e84d204c7f1738487991d0188e19376f46564060a1676d49bbdfcc216674e2c1ad10f0d24e1660096 SHA512 5ab86eec149cf7d406c943d8c8fc839fa5ed46450207a16887f9ef4ed7dbefb0cf4c76d3f07f882e0e48078aacc772c101aeb4875d8ef6f12fd957666401ede7
diff --git a/kde-apps/kamera/kamera-18.04.0.ebuild b/kde-apps/kamera/kamera-18.04.0.ebuild
new file mode 100644
index 000000000000..8e527cf2d876
--- /dev/null
+++ b/kde-apps/kamera/kamera-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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/kamoso/Manifest b/kde-apps/kamoso/Manifest
new file mode 100644
index 000000000000..2440a60c11d4
--- /dev/null
+++ b/kde-apps/kamoso/Manifest
@@ -0,0 +1 @@
+DIST kamoso-18.04.0.tar.xz 185568 BLAKE2B 4338f55932c69ff14304ec93f8a1b0e2d0848d61917fd5ebe6bb9903599afb40dd29ff816f3312a239a789b9d267a3b2d606e36905030a6af94ef5a96de2cefc SHA512 f4b75aae061131f8a64043efa8f09250ed3591506aa4f24b4bc922db22d394b8f1ffbf19499d3895eeb6e1f4b24067ec2b67b2512c5e618b85f6a0a61b6b304b
diff --git a/kde-apps/kamoso/kamoso-18.04.0.ebuild b/kde-apps/kamoso/kamoso-18.04.0.ebuild
new file mode 100644
index 000000000000..5ad87b3e7f56
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
+HOMEPAGE="https://userbase.kde.org/Kamoso"
+
+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_frameworks_dep kitemviews)
+	$(add_frameworks_dep purpose)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	$(add_frameworks_dep kirigami)
+	$(add_qt_dep qtquickcontrols2)
+	media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l]
+"
diff --git a/kde-apps/kamoso/metadata.xml b/kde-apps/kamoso/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/kamoso/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/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 10e634b35d64..d0955ef0c64c 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1 +1,2 @@
 DIST kanagram-17.12.3.tar.xz 7523656 BLAKE2B 3a3cf6ca8e79be66e48f0d9c9e6a9fe311aba098ab0766b2d07ee6c153a77613167c95a2622fd8c42bb5ca30da7c60470fb824322a9c2a10d97f0afc72a6efa7 SHA512 c75df80c167b155c53cbbad66d90a5b01f8f7ad9a97b303decfa3fe9e02ef5f4fb4f890256f6052ab67d735c0c5a1c587d56ea76738889a0c9dc9f24a6b0eab7
+DIST kanagram-18.04.0.tar.xz 7523324 BLAKE2B 1a6fd67a7ae56ce62993ef5a629b9263835d0834beee282a0b111c4dacf8980f4282f17c816e3f6b7b5591d09604d02e48d270507b3ebb8bc84b34d8189afcf0 SHA512 0016461f1996705a0f627206529e63d797f9df99010d8400b38307d23b256ef944217e18acddc379829fef9e30c032706725375521140aa837283f0e13b19452
diff --git a/kde-apps/kanagram/kanagram-18.04.0.ebuild b/kde-apps/kanagram/kanagram-18.04.0.ebuild
new file mode 100644
index 000000000000..9899faffa5a1
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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="speech"
+
+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(+)]
+	speech? ( $(add_qt_dep qtspeech) )
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep kdeedu-data)
+	$(add_qt_dep qtmultimedia 'qml')
+	$(add_qt_dep qtquickcontrols)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index dc4c1a3efcd4..eac036022d87 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1 +1,2 @@
 DIST kapman-17.12.3.tar.xz 2525252 BLAKE2B 819e84a0c3c887eb5cfdba86935e174f716fb97a93c0cfb7ca30b13606959e5100fc780d199c1955cc585a505b92b2edb8ecd682de3ca0030613268479e498d9 SHA512 68504b49a9cd41e5093096b24fa8ada843656cedbf4274637aac7f8d0f7d78f35ec35c3502bd5781380cf7ae763f773747193747fe8eb8a7e73a91d97c0af379
+DIST kapman-18.04.0.tar.xz 2525164 BLAKE2B 99291667d3f2e8b67cd50ef70e2cbc6623af4f5445c873462f7f0a1c47dbce9aee8c7d80da7f28a98a09a4e3b4e8807ef3a2310e4488b4e893098d541436f9fd SHA512 fb72e057a0eb7bc1035c15fa3a218baa3da02dc31a38e56a5bc914ef9872595014a656c4ef4b0c2cb060715616b6a813bcf64b6b172a61e398c97da1e7ee5b0a
diff --git a/kde-apps/kapman/kapman-18.04.0.ebuild b/kde-apps/kapman/kapman-18.04.0.ebuild
new file mode 100644
index 000000000000..1bb9a2b6f7e2
--- /dev/null
+++ b/kde-apps/kapman/kapman-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 774e992b3391..56e04262f8eb 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1 +1,2 @@
 DIST kapptemplate-17.12.3.tar.xz 352488 BLAKE2B 203bfee3e05c42b266f7d7c880149ac31e2f8e37306ae46f2091831b68e80477226c05ace0ba63729e1e258fa504ee91133583e76ffdce0239191f2d4b08c22c SHA512 03eff26877917a38bcae3166a16e6b802cc900513bec9a615c38342f6a1ceeb454fbc195d1e05f3cf3b6f8a9a7a64eeaaa83d07a5058efc42c2140b4a8c9006e
+DIST kapptemplate-18.04.0.tar.xz 352452 BLAKE2B fda5a228478800f0b068d092dc2f0c0f3caa0e30ba600bdcb9dab779b1b74f3f50df6313be0fa196c315793d070619c6b7b134c4fab39b90b45983739d590e95 SHA512 58d697a240d9b8bf712d3bac509d9591e68e1ef2c02f74bb023e116c0bb5d1caca98753d090e3b22a4bff0de5ed76abc010f407afb97b17f27c99fa67efacc12
diff --git a/kde-apps/kapptemplate/kapptemplate-18.04.0.ebuild b/kde-apps/kapptemplate/kapptemplate-18.04.0.ebuild
new file mode 100644
index 000000000000..a1bbc2a3c37a
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~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 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 7251ab444cf2..b51e13b46d59 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1 +1,2 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
+DIST kate-18.04.0.tar.xz 5643140 BLAKE2B 298e15cd6545f35f1cbbb670c33f4d6c3305a250dd004e77bc56e28adc5975d242afbd7cc0b722c09239961e97d7400dcca76c842d721cd5a7e6c9b1c8967344 SHA512 2962b64a123be966017408bf02d3a92d6814ff76c759e8ea6f98e58c2cfa92086c290aea23f800dfa05ecf092c421ad7225161f757c98d409d40adce61aebc93
diff --git a/kde-apps/kate/kate-18.04.0.ebuild b/kde-apps/kate/kate-18.04.0.ebuild
new file mode 100644
index 000000000000..751163775355
--- /dev/null
+++ b/kde-apps/kate/kate-18.04.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 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 https://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 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)
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/ktexteditorpreviewplugin
+"
+
+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 a78dc33cafe3..9a65e11bc31d 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1 +1,2 @@
 DIST katomic-17.12.3.tar.xz 1236200 BLAKE2B eb0eb2375fbd272d11e77484029fa66a35915021247e0d30a7312a019b1a59fb092cdddaeea28294b0d84085fe18f24ed06ba140a57c6f70f2b6b7d0dcffbdcb SHA512 7254fec57e9c0fcc2a3bdd3d3fe1a608d09aa80cacb42157b0ceef1af8706a5c0c047b554b0a9cc2a3c098a4d68c07738ea07c23e2516c0e58b405e13df16e1d
+DIST katomic-18.04.0.tar.xz 1236192 BLAKE2B 59084979fcef4d29d3d7bf3590902d187d40c13a729e31cd6d1866261dce38a4b7fc31d306a85aa3218d1e69071d14e666943cfac515a933a55da9b5316b9808 SHA512 c55ca9bfe95213fadfa9ced5bf2a70c2243b01f6f6d0462ea06cd59f65e7730a2180a03b0d24a02fbebaaa04c0776da79071680b3ca694b10400c076e715b027
diff --git a/kde-apps/katomic/katomic-18.04.0.ebuild b/kde-apps/katomic/katomic-18.04.0.ebuild
new file mode 100644
index 000000000000..8385fb375b83
--- /dev/null
+++ b/kde-apps/katomic/katomic-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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/kbackup/Manifest b/kde-apps/kbackup/Manifest
new file mode 100644
index 000000000000..c44a6a8ab6bd
--- /dev/null
+++ b/kde-apps/kbackup/Manifest
@@ -0,0 +1 @@
+DIST kbackup-18.04.0.tar.xz 337368 BLAKE2B 9c1ad666994c20e16ae034ac96143186c472526cbc671d6ed5fc1f970962cb31a6baf803b6b23de17ce03ad3313f63b9085ff5476a01797eeb74850090e220b0 SHA512 6bc1da368b7f7d9f1cc3c8cadace7e295afbb3143f1dce02ceede221f207c2233c30d52a23bd8664bcdf910d0da945749945f9e50abff8acf1d202c28faee203
diff --git a/kde-apps/kbackup/kbackup-18.04.0.ebuild b/kde-apps/kbackup/kbackup-18.04.0.ebuild
new file mode 100644
index 000000000000..cc493cea15d3
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program that lets you back up any directories or files"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(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 knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${CDEPEND}
+	x11-misc/shared-mime-info
+"
+RDEPEND="${CDEPEND}
+	!app-backup/kbackup:4
+"
diff --git a/kde-apps/kbackup/metadata.xml b/kde-apps/kbackup/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/kbackup/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/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 1fe5a8683602..1bff198315b7 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1 +1,2 @@
 DIST kblackbox-17.12.3.tar.xz 401756 BLAKE2B 46a6a533271839747e1331f52f6b1b6429b9632bec0473aaf56be90cdb39733257a6ab1f7ddf981c7dc62f4b1e0b3c79aa8a73306c54ead4d4d8f6c303544934 SHA512 e06f251a2b75db0910649e96c0d8ddae449fc23f39d468fc04e56d30b37ce58c3c15483122f40882dcab1ed1791c038caad87131fe2a4c2d140f66e79ed320a9
+DIST kblackbox-18.04.0.tar.xz 402632 BLAKE2B ba0f0b0256beefdf37a429ce69430341a66a6db22be3d8018cbc8e698ae7a22a5bc2f9f1ce33a5efff0c257ed8216f5b515c773ff1cb5fff4baa190581eba3d2 SHA512 59226a7c1d1de99853ace2ba85f6d418898a1572d872861a49a62ac688d0e6c7ff6d029f0578de9f4aa97daccba99583e63ac93bcb409cfab5a6e93304f4027d
diff --git a/kde-apps/kblackbox/kblackbox-18.04.0.ebuild b/kde-apps/kblackbox/kblackbox-18.04.0.ebuild
new file mode 100644
index 000000000000..f595a51a7bbc
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 9709f4f32e37..f9d7218f9c10 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1 +1,2 @@
 DIST kblocks-17.12.3.tar.xz 1750472 BLAKE2B 60c4390b9b3625ac6ea8c296fa1ed73b46f255fa5d594b7669a27286a73e296e3d49df0ddb39ec4e244eb465538dfec91f03963911b8e06e8aa46bc85c8367b3 SHA512 72e2d278a5707ca423f1494eec0806a0c267b745f14e0c88b9cb97b4fe5a8ae62c8dd0a78f0c94ad9e285d8090be8b45c91bfd0d88cc2a1956d5e580b090de6c
+DIST kblocks-18.04.0.tar.xz 1750336 BLAKE2B 9b7f6aea9e4ba95618de44896cd803b78229dc6ab84770cc815f0b15cecb2fca4e924887fff06c2e8b93b85174181f7a1497631bff0a91de80c863c571c5fa9d SHA512 0c7d790e892168bb1f050e2487b614c82460fb0f69514e16f6e6331006020e16331e84ec27cf77f14e8f660c91f71b437a20874fd4a75e08eb4d27efbb30277c
diff --git a/kde-apps/kblocks/kblocks-18.04.0.ebuild b/kde-apps/kblocks/kblocks-18.04.0.ebuild
new file mode 100644
index 000000000000..864dc454ad9d
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 7768571f391f..1f9ff7fc4fde 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1 +1,2 @@
 DIST kblog-17.12.3.tar.xz 72264 BLAKE2B 36bb90d92b033fcc40f5f899e90b189458b1056c7d3b196d7fe6f0397f98ef5651a1eccbef3294403a27cd37a29ef2d7b45e4be89b752307a3fb2ea011c8db4e SHA512 6e048eed6c247e9af6c96d536fdac371734fc3dfc198094e2cb60218f63347508196ecf9d2d88c190c7e838aa3feb7872001d736be2b7ba01c596f0ca8eea2f9
+DIST kblog-18.04.0.tar.xz 72412 BLAKE2B cd4ef0d1f60a09ff2aee039451ca873a5d6ed52c3e6e32f02a28a37d4817e63ad57a1692d2babf56c781207b3455daf207bd3f9d1fb6da9fbe080c76f51d9d27 SHA512 078a9715217a0ffd6e5f2cc4b46fab3230e9c09a9493f66cc4e1e5feeba89cc59d3da259e601a3e4f6fd50c981bd1ace7fd6cd37b7c6556284b7856b66055bfb
diff --git a/kde-apps/kblog/kblog-18.04.0.ebuild b/kde-apps/kblog/kblog-18.04.0.ebuild
new file mode 100644
index 000000000000..52fe4d617ecc
--- /dev/null
+++ b/kde-apps/kblog/kblog-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlrpcclient)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep syndication)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 487101c96f58..a3b47f86074d 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1 +1,2 @@
 DIST kbounce-17.12.3.tar.xz 3484252 BLAKE2B 0d802cd70a1618acaaa6609bec8c58628a149aa6bfed08a33041e11e30feca0902eb17f834f02be632e26b5e210a1b636a41bc22034f3d4059ea622228756bcc SHA512 e9a3a4ea3abc0fb46fe4595e494285006e29f0994841f2effe1b9c7efdbaea4eeea48d74268e0db610e8c8b58e322bf4d4261349e9ce00de7681158850c957b3
+DIST kbounce-18.04.0.tar.xz 3481884 BLAKE2B b17c57d9893c114b7c6478eaa39109b3f4d2a3b6d346a3a14aae4e908fc201b07f330c048f0d36eee4084c5b9eb697c3f7a80965c3b3485015a33f300c49ee5d SHA512 743a941ae770cc5e90bd43f3344acc27b93c90f32942c1598746c8623f5173d05d384a1f648c5e734ba3741e13ccac96a09e654f7631e6b9c772d77d6ac8d934
diff --git a/kde-apps/kbounce/kbounce-18.04.0.ebuild b/kde-apps/kbounce/kbounce-18.04.0.ebuild
new file mode 100644
index 000000000000..eccbc67cbbbb
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 6bafec0d6526..bb446fe5eb6e 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1 +1,2 @@
 DIST kbreakout-17.12.3.tar.xz 2021172 BLAKE2B 839334740acd0c6ac83b2f977044fcfed5c5546250ff96af973a47b7bf323ebb09d2e0feb6e556ec1b6f6bab9f86b81cca97d84f895408dab9652db492bacabd SHA512 8e0927ed28978175dbe9c9e35e2fd2844987b2d556b297a1eb7a31d6ee32508f14f9eb656ebf5ca29ff36dc1007f270e301c41eefb54e34889564e909c122b08
+DIST kbreakout-18.04.0.tar.xz 2021660 BLAKE2B fbd23e83bf00b213d7886a249ea09b0374bdb35642c499901f6b2a474983db7a3f0ec3c6d330a1cb3f237b0920301c33ffb35090d70afb97500590262b5f0a74 SHA512 be11a87e506393092128d733c18255c73c04d7ef1b9ec032693e6c0d21dbe4d87ae423b57a2ecf579ce7ebe93e3ed77055ce4aabf3a47c269eed431063c37eaa
diff --git a/kde-apps/kbreakout/kbreakout-18.04.0.ebuild b/kde-apps/kbreakout/kbreakout-18.04.0.ebuild
new file mode 100644
index 000000000000..df3e421e986d
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 dcd49b66089a..4a36fd347132 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1 +1,2 @@
 DIST kbruch-17.12.3.tar.xz 5601080 BLAKE2B d6fec580f74cd443f63e3e079060314e29b6b8e706f0ac91209b59c1be948c8cae53b03676d6bbbc7ad22981f43fb62c0975c8c64ff663cbd5dce879a60cee5f SHA512 3b3a4ad6e4abebf803feea0b3145290f9ae4cab048b4711138603cf42a1b856a7175b42bcf30388440c63b6c7025733c2e3f286e821c783f700936eeb890340b
+DIST kbruch-18.04.0.tar.xz 5600696 BLAKE2B d9a5d988abfea7ebf7883119541699081b45d3011607c83a0178e1166f6359ed138bb2d9872a1398dc007dac1946945ee3c33aa28f5c485f6fec7ab2593364a1 SHA512 2d2ac713186b344c6896f0601d33e306432cffe5cebfe2a7c037cfb9f6f790bfb1a5c87f9f5abe17e8783c1bbb99976b9dbd5612da207efa71c5753c2bb9f985
diff --git a/kde-apps/kbruch/kbruch-18.04.0.ebuild b/kde-apps/kbruch/kbruch-18.04.0.ebuild
new file mode 100644
index 000000000000..cdaad6a4a6c1
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 aaf887ade2ef..e2245db574b6 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1 +1,2 @@
 DIST kcachegrind-17.12.3.tar.xz 813108 BLAKE2B a5768fb9cff28f22750d0cca761ee6201ba6e53ec42e86fada92451b2f43a2c81235ef71cf7484a754c39739b8501f1c8fc31a5da9108c7cf0aebe802662346b SHA512 56f4fee2ba8d03760858bd9d0fd6601e5beb9aec4d8ce2d87ba1d811698f3e8673d12ae834b20696ec98689992b6a560ccae049a5b69538432df6abd21dcfcd6
+DIST kcachegrind-18.04.0.tar.xz 812584 BLAKE2B 1bc04395f45ed56f1dbce57d6f064665306d55e1d9ea701c30d25501c9aa7b3128366f7d60bdad27409def92222d102a5735a9ebfc56b5d3e92fb6412432dd1e SHA512 cc945d74e506ba6dc982b0a0e42d1f284963a05ca72fc6cf10f61bddf2d367f3eeb6af82460e1659bcd915f4266fa12a1245cfba6cb054f66b4a628931b3bc9c
diff --git a/kde-apps/kcachegrind/kcachegrind-18.04.0.ebuild b/kde-apps/kcachegrind/kcachegrind-18.04.0.ebuild
new file mode 100644
index 000000000000..e373c6a3ab5c
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 ~x86"
+IUSE="nls"
+
+COMMON_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)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_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 758548f67cec..739c1e9964f8 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1 +1,2 @@
 DIST kcalc-17.12.3.tar.xz 360180 BLAKE2B 5b48e85c8c5bde7a01510d5f9fbf0f4fc98d7afbacf4574e1f8f21ed0c99df0776ac62de7589a1405473ace3c27a01fc54179e8f59463cbe3f5108f95c60f106 SHA512 e8d86165acfa8f6bce5ec0500baedd16ab73330379675b8b92d64093e8f74b8fbaf2758a269ea522682375c3b30c074194f55e1af96cd6ac758cc08ba68e30e5
+DIST kcalc-18.04.0.tar.xz 360196 BLAKE2B 671980370e2139bf974074f43dcccd19b356cf48ea63c2d268a16af52637383f5d95ab8f41edbe5ba7cf0ed459b14f6c3fcc49fd9068f072c85477393af42295 SHA512 c60ebc85ea5da9385298bd8ca0514184a23f070752cc39c68fb6b045080c866e0baa701eab6f98966ffa099820dfd356ca218392d98c0b6f8b9d26333c6db55b
diff --git a/kde-apps/kcalc/kcalc-18.04.0.ebuild b/kde-apps/kcalc/kcalc-18.04.0.ebuild
new file mode 100644
index 000000000000..2877d5cef5ce
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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 49437ded7019..b51a9241c1fe 100644
--- a/kde-apps/kcalcore/Manifest
+++ b/kde-apps/kcalcore/Manifest
@@ -1 +1,2 @@
 DIST kcalcore-17.12.3.tar.xz 276504 BLAKE2B e2843a3aadbf6abadeabcc135b03ceb8278b19df960bbe9069ea36068844c13a330a8820a7d4cb7bd0bee98d39ea32efa6828eab95f851eee18bb41146ae8194 SHA512 af4d1accecbb220f4d2090553a1b8eb70b6c941ae0304cf67863c70cf25647a668c65f3371c7ce40533955416cf8ad7381da65982c31848087308249c6ff0968
+DIST kcalcore-18.04.0.tar.xz 253804 BLAKE2B d7bcb1c9d213973e169a0d7450a0849d5d05a84c0fbac198d5d84eed977815b77ae17b2e68a5ac35b104619a77f836b41cd38743cb3d261d8a5f22bae1f48cae SHA512 6e51adb1eb744b5e6ee4bcf672b74e4788857d0d7110ff4c86da125b331578a760ef0fd657bb6d4b473607a07e88e17ffa263761c093d78ca234629c12e4a439
diff --git a/kde-apps/kcalcore/kcalcore-18.04.0.ebuild b/kde-apps/kcalcore/kcalcore-18.04.0.ebuild
new file mode 100644
index 000000000000..88a4662dc2d7
--- /dev/null
+++ b/kde-apps/kcalcore/kcalcore-18.04.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	dev-libs/libical:=
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+"
+
+RESTRICT+=" test" # multiple tests fail or hang indefinitely
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index e2f72cd54f49..30aedfa59e5d 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1 +1,2 @@
 DIST kcalutils-17.12.3.tar.xz 323512 BLAKE2B 31ee7f6e9608f496fe3aa3ac59f591ccfdedb421397d36dab0e04aa1cfe21a8e57d6716708dc35d06a32c8053822520c4c2b8b527e725a742de8cdf2b7863aa0 SHA512 68a5cded42a3b2d3cd8eb9f0fa3529b34c270fea06a0861c98bf4d1fd8d9bd239c656c25f5f4cd697b7434458c15b3ba974267161f9b4497020d89345475fae7
+DIST kcalutils-18.04.0.tar.xz 325260 BLAKE2B f1a044867300a8f2172ac5969cf8312303bbb0cc67d1cb5ec8213c879b4faf2b83892f7915c4d85b216dd2c72bdc23449086d249f354ce6e63ce2d34044cfa68 SHA512 97ed56e5017809e7f76c1a4fddcf727a2c23999da65ef1fdae397f1fcb8d9a1b01bcfedf6aa06feabac157fd92d51fc267f29dbbb816e8d90ea74f8db7a11d4a
diff --git a/kde-apps/kcalutils/kcalutils-18.04.0.ebuild b/kde-apps/kcalutils/kcalutils-18.04.0.ebuild
new file mode 100644
index 000000000000..e2a72988299b
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index 4736cc3aa3c5..99e420fa74be 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1 +1,2 @@
 DIST kcharselect-17.12.3.tar.xz 351308 BLAKE2B fc9e005381eb83f308c1fa10296f8cb54797cc0f53611cdaa737b6755ad35ba3dcf6a4a69dbdd1531d1dee910f000f62d1ee9bbeb1f3a925920969b33727af56 SHA512 75b4044c55ac539b05306f759bc4241da71500086157cb0847318ea7a9cea8a4fb40580c54d747f3e80a51668c435ca7aec80d68dffb7193e3bcded540b31275
+DIST kcharselect-18.04.0.tar.xz 351268 BLAKE2B 7caa6ff3a49decf4bde4a91831c12be0c01d7d51b2f49cef2c47430c9eea0cd97a5329b387abcafc5adcf39b0905a170144a0645bcbabe9d4a1289a907836f3a SHA512 6e73109e5e3112bd922a4ae660c79e0c6238499b8ca90facd17e499d1998f65c269575e9fe0528499e5019d2834e93eea0839f0af3dd34d58fac4d0055dcd379
diff --git a/kde-apps/kcharselect/kcharselect-18.04.0.ebuild b/kde-apps/kcharselect/kcharselect-18.04.0.ebuild
new file mode 100644
index 000000000000..d7ccc94ca3cb
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-18.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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 bd39845d8e27..2193f30c4ea6 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1 +1,2 @@
 DIST kcolorchooser-17.12.3.tar.xz 16716 BLAKE2B 2f1f0f7f00104aa3264949b7c14bf304b7f679baee1bf082c4b478742ac18d04989a97b3dd473d2cfa330b86fec7ca913508e4625c64939a12a83be15bfccdbd SHA512 0016433e5f445842e606ae8f258908cd9911b14867695c1aab4d6ba9c2aae2b3255db4442c108a2561cc32b072085a532ebd6ab94a2ac3af70f382e27d4c451c
+DIST kcolorchooser-18.04.0.tar.xz 16732 BLAKE2B 3bd9701b96bcc5998a859c080c290216728e6917940a433caf44a339590a183b9abfcea861e0ddf113766807f8a961b73dc737380e6130cb0c3945ce5befc7dc SHA512 af925dcd81f949d5d28705aa1302531483fa46253e0f5f3546a2ad17ed18c66bad7abe671b8f2ce64257a845761e77dbba810725037a15b49c161c0828273fd9
diff --git a/kde-apps/kcolorchooser/kcolorchooser-18.04.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-18.04.0.ebuild
new file mode 100644
index 000000000000..fdbb64c54d27
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-18.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 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 530dd8ba06d5..e7cd870a5855 100644
--- a/kde-apps/kcontacts/Manifest
+++ b/kde-apps/kcontacts/Manifest
@@ -1 +1,2 @@
 DIST kcontacts-17.12.3.tar.xz 206708 BLAKE2B 8c948183fa389be754ee7a8d2928c64f9b854ce06c97fbbca79c784d8e7cd48cade5c2e6a95b3dfe77017f2fcc7bcaebc15c8fb759755b2402a50f4e7dd029e3 SHA512 e6f77cb685d6c163e575862608d127b524815704a4d124234f871aeb36abdbbe6efca26d17c86692094b395e7edf889f53cc70b7c72f33746483c9a04a674e21
+DIST kcontacts-18.04.0.tar.xz 206920 BLAKE2B 00da3c840b09526903cad4a9c51f70f7ea9c3ed2df4cdee64477312ff713d3002d008a2f0274f1b11b979619277b979978a6c408027d551ac86b3cb2447dc518 SHA512 2cd7ff23f18df20020760c8969725be683d04855949dc0b926c720a65c1e160f3a1085b1ba03b80ec86c7ed5575407a4c8f16f45142326de809c4bc1be5ba0e7
diff --git a/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch b/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
new file mode 100644
index 000000000000..2843c6d5422b
--- /dev/null
+++ b/kde-apps/kcontacts/files/kcontacts-18.04.0-unused-dep.patch
@@ -0,0 +1,47 @@
+From fc512cee665f1e2736a701c9960efce5c093bca3 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Sat, 14 Apr 2018 18:08:38 +0200
+Subject: Remove unused D-Bus dependency
+
+Summary: Makes this much easier to build on Android.
+
+Reviewers: #kde_pim, dvratil
+
+Reviewed By: #kde_pim, dvratil
+
+Tags: #kde_pim
+
+Differential Revision: https://phabricator.kde.org/D12198
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f47888b..87408d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,7 +33,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KContacts
+ )
+ 
+ ########### Find packages ###########
+-find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS DBus Gui)
++find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Gui)
+ find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS CoreAddons I18n Config Codecs)
+ 
+ ########### Targets ###########
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 819e7fe..e1a2094 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,7 +63,6 @@ PUBLIC
+     KF5::CoreAddons
+ PRIVATE
+     Qt5::Gui
+-    Qt5::DBus
+     KF5::ConfigCore
+     KF5::I18n
+     KF5::Codecs # for the vcard parser
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kcontacts/kcontacts-18.04.0.ebuild b/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
new file mode 100644
index 000000000000..0eb69f42b2ae
--- /dev/null
+++ b/kde-apps/kcontacts/kcontacts-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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 qtgui)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
+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
+}
+
+src_test() {
+	mkdir -p "${HOME}/.local/share/kf5/kcontacts" || die
+	cp "${S}/src/countrytransl.map" "${HOME}/.local/share/kf5/kcontacts/" || die
+	kde5_src_test
+}
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index b86cdb70f10c..d51539f906c2 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1 +1,2 @@
 DIST kcron-17.12.3.tar.xz 1054784 BLAKE2B e9f37357c1a83f7f9fe162ec5f5e0d1289482ff83b77c0f83ff8a592944fb5c133b99709139c12324be1bb1e0b5b87f92fd306e2a1be9eb0a083240803eba9ae SHA512 edc96b2521d86fd288afb688dc7abc60b575bb5171f2ed0026fcee4f9e12966ead95a15aca55e89b672649d83433cab66b6f569e802ecfb680ace86003a36328
+DIST kcron-18.04.0.tar.xz 1054572 BLAKE2B 749b45d23f3d2191829b6aa08072e9346f9f70ff6e6b2fb7078f9919dc5af1c1c0eeac64beb88ec38952231f4723974f6d8143785fc5527d2e47a21c27dfaa0d SHA512 45f764a72f30e59e02a3053423642aa3b38eedf05231545df138c426b7bd61e1ffcd2e8da8d2180e827a9839503cab1463012039e1dc06c0868c2029aa3095aa
diff --git a/kde-apps/kcron/kcron-18.04.0.ebuild b/kde-apps/kcron/kcron-18.04.0.ebuild
new file mode 100644
index 000000000000..eb1f317ce6db
--- /dev/null
+++ b/kde-apps/kcron/kcron-18.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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
index de56172ca53c..b46d4d3dc599 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1 +1,2 @@
 DIST kdav-17.12.3.tar.xz 37796 BLAKE2B 3f335f82fd6793d32647d2ab124b349166a7f80aea54d421e57b77f9b68123cde72ed2b8694e4c990303c9e57f73d1fa0a9f367ca2546be267aceec524b4d8e4 SHA512 ae4c28406d9a1cd6e8816ecd693cce1f33c92de8532b29ded33355c417837380bee784608f5784c61d54e77d3bc90e6efcbec9372f64f02131848ee40daba9b6
+DIST kdav-18.04.0.tar.xz 48760 BLAKE2B 727fe3a7efe5edd639b1dc7a47b348d09ec82ceff487abc21de47ce4033fd40d0ce7e8aa5fd9b344b7f23f3f6f8fb2e4e889016a693a6220644deaf32ee9d25e SHA512 fbafc995fc629023484574b0e7bea749b76632364297fc53dd085565a647f54e5a439d62c7756df44075767cc6d91614fd03f5e21ed1d94a4ac43bcda1b9cbdc
diff --git a/kde-apps/kdav/kdav-18.04.0.ebuild b/kde-apps/kdav/kdav-18.04.0.ebuild
new file mode 100644
index 000000000000..4c5706c9bda2
--- /dev/null
+++ b/kde-apps/kdav/kdav-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.04.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..e528dfd0deda
--- /dev/null
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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) )
+"
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index cd0014b3971d..72651d55f9cc 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1 +1,2 @@
 DIST kde-dev-scripts-17.12.3.tar.xz 375796 BLAKE2B 243211c87fe27f298a49107ef48390d30b80bbf904bbeb1a8eb629453f301069e98ca1401a1bc178fc1df98c0ffacf85d253b86077fdeb1ae2c796f1b972c1b0 SHA512 eb55b5016dd4cd50ba8b062496f4f21a8704e48e277c467ef9f9b2e6056afbb6f71e75c9edff84f6e50b0e25b87bcc97f13646cfd6eec892363362d402ee70cb
+DIST kde-dev-scripts-18.04.0.tar.xz 377364 BLAKE2B a150f207ea98e290c403f37e3e54a335d16f2f52269fe6100e41b7be9546c51bdec268cf90da0179a52582bb7243d0f8dd19dc883b277cd7790d34dc0d45b50c SHA512 9b2177e21f166306bfa99fdfdd260cc1dcfc912fc75a602c345ede5700427d608bcad3f207f4ce4bb1ccbda5aede4987c173728db1e030c9d57eede46f69dce7
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.0.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.0.ebuild
new file mode 100644
index 000000000000..8f878b4fe584
--- /dev/null
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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="
+	!kde-apps/kde4-l10n
+	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 49855c1e267a..bf9d2b091a01 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1 +1,2 @@
 DIST kde-dev-utils-17.12.3.tar.xz 61000 BLAKE2B 5bdb7ddfaa792d4a74cc3d55e4c1e110c69af3393421ecbef5871a095097645be566137c2b609ec33c6d13a777e62b388d06f417859af390bfd20e33e406c0c7 SHA512 8f774d33f74eec543772db7a39b18a6a52b4fbade62d5ddad9f632c1719aca58a3a77ceb50bc4f4a96df047c3726c1f37e6e9d21b496cb6a2c082334082ae359
+DIST kde-dev-utils-18.04.0.tar.xz 61000 BLAKE2B 8d558e9ccdacf1ba213aa0e6c80d216e513f5b114a0d79130c2bc5e1c2cdbc8fb2d06073336107304af6a5b9f9d02d818644f78c668af031e4b1e9cb3ade8552 SHA512 796e60fcb1f5c8a7339ec5ea0e134a97544c5e75992584c4324956712c754fc710171bfd75d1a93e7c832194091e2de24140aea5abf2b7f6ded13ca0cdd696d7
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-18.04.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.0.ebuild
new file mode 100644
index 000000000000..fd428260d4a6
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~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-18.04.0.ebuild b/kde-apps/kde-meta/kde-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..e986cfd70609
--- /dev/null
+++ b/kde-apps/kde-meta/kde-meta-18.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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/kdeaccessibility-meta/kdeaccessibility-meta-18.04.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..f9f04c8582be
--- /dev/null
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.04.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(add_kdeapps_dep kmag)
+	$(add_kdeapps_dep kmousetool)
+	$(add_kdeapps_dep kmouth)
+"
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..d87b170fdc44
--- /dev/null
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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-18.04.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..37f06d26788d
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 805e82cda435..802f484e4c18 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1 +1,2 @@
 DIST kdebugsettings-17.12.3.tar.xz 48668 BLAKE2B 1bba5a7860b47c6cc74e249dbc5b8885ea1721ba5614dbe4246f701c0f759a13efca834298453c17e75bebb1ad9ac155a51d95742b5b428f279bf3090c9a4e89 SHA512 e0f73e18ab1d7bccdb1d4a76a546dfb638f4b0a9ef331a45478fad8e15057a9424bb47d24aee5d870181c00a917ff42ef0e99697ebd3da4319ee8c24aba9264b
+DIST kdebugsettings-18.04.0.tar.xz 51772 BLAKE2B 8b58a9bc96e57ab6d3f2f77be38c1e79799e92a0fba47770ed5f5e94ef998e1afbafb7cb5efc2f7f174d6508510f15cf33be19c3e1363cb9ec1b5dce48129fa5 SHA512 f4eadc0eae9b779127f3a7112242954f9281ab1ddde9c81b13ef97e6476f79f0e65e69403a2b8262ac03fab045ae68e9069792dc9e2da82d4a08b3494a0dc091
diff --git a/kde-apps/kdebugsettings/kdebugsettings-18.04.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-18.04.0.ebuild
new file mode 100644
index 000000000000..e53b5a97cb69
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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-18.04.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..10c9f670dda2
--- /dev/null
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.04.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 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)
+	|| (
+		www-client/falkon
+		www-client/qupzilla
+		$(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 8a8c7acaf4e9..b94f21a77e4b 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1 +1,2 @@
 DIST kdeedu-data-17.12.3.tar.xz 327652 BLAKE2B 554de77a50fd6ac954dcdb6081f3ab9631c819150994389977142095defc3f7c802d8a94d8fcf0a2e07df60663d49ae27b75a4420d3ea35013a8c6ddf62ab6e4 SHA512 4f6dc1ed4407bc1447d5a4c66e0ee6e1b2eff69545a46ff365f69ac1e93add84e6415e3e397210112f9850556b52d82ac826dacba501713c4495f1b3669b15de
+DIST kdeedu-data-18.04.0.tar.xz 327636 BLAKE2B d75a1d038cb54f06d06e60e897dbd3548b7343a4b99d5026e8fdfdf20d96aeaf72286486df79e6af3db6579db0c754564b0eed9b7615131a82f9bb96f12720b0 SHA512 6f183123ebccd9d722bc2b2a2ad5067c9b2ce8b089a4c2e59a8673514cf368fe0489c4e94e3906fdee6ad174895880b9f9def18de334a69bdaab88df38010ece
diff --git a/kde-apps/kdeedu-data/kdeedu-data-18.04.0.ebuild b/kde-apps/kdeedu-data/kdeedu-data-18.04.0.ebuild
new file mode 100644
index 000000000000..0209c5857d99
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-18.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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-18.04.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..5dea5c430d3d
--- /dev/null
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 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-18.04.0.ebuild b/kde-apps/kdegames-meta/kdegames-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..85eb713ba0f4
--- /dev/null
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.04.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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="opengl python"
+
+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)
+	opengl? (
+		$(add_kdeapps_dep ksudoku)
+		$(add_kdeapps_dep kubrick)
+	)
+	python? ( $(add_kdeapps_dep kajongg) )
+"
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.0.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..bff71a679d37
--- /dev/null
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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="scanner"
+
+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)
+	scanner? ( $(add_kdeapps_dep libksane) )
+"
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index d581f2c25f38..5291e1059923 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1 +1,2 @@
 DIST kdegraphics-mobipocket-17.12.3.tar.xz 13436 BLAKE2B ba45e959dd1f2c807210ac215cad3bfb0270d7bdf4162e2d80560fb4c6d8f6524a2a7da9ff519a6f93a4a937d69b1d1bc8b5fc47d97c3ff900cbf63a73e22adb SHA512 89558644d89bd3c68ab1436adb49698f264c2f59c85646cfbc8dbb2c2364933e74d91d9a24bf266b8ecf2e8852786d21615be1a83d7807e3abf6cd9cef213243
+DIST kdegraphics-mobipocket-18.04.0.tar.xz 13440 BLAKE2B 552f1877851dab80d1c90c83e6c66ae8d036db100ee433912d3063022eef6681079ffec01a4349bbf140bee18de504acf656c0f0b76324c4511951a401b2130d SHA512 cdd486499d28efcd09b3dd27c4d2a811b453f8a737223ef34f7bf33f48eda7afd8eb7856f05938440bbb5700a42da4bd62f43f6bb80877e4006f62a18c045fb8
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.0.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.0.ebuild
new file mode 100644
index 000000000000..ec101c11b41e
--- /dev/null
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 ~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-18.04.0.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..59d525810f19
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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="+cdrom +ffmpeg"
+
+RDEPEND="
+	$(add_kdeapps_dep dragon)
+	$(add_kdeapps_dep juk)
+	$(add_kdeapps_dep kamoso)
+	$(add_kdeapps_dep kdenlive)
+	$(add_kdeapps_dep kmix)
+	$(add_kdeapps_dep kwave)
+	$(add_kdeapps_dep libkcddb)
+	cdrom? (
+		$(add_kdeapps_dep audiocd-kio)
+		$(add_kdeapps_dep k3b)
+		$(add_kdeapps_dep libkcompactdisc)
+	)
+	ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index b467ef31fc1e..2eb3ca09bbca 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1 +1,2 @@
 DIST kdenetwork-filesharing-17.12.3.tar.xz 323564 BLAKE2B 5d1e6b96507e983bb0d30aafc57c59517e6095546de71892e2686d13c96a980af390343a629e5f41426bfaeb010bd52739fb377356fb9854cdf783ece5f01316 SHA512 3152b7ba7eea4a8dd5f4dacfc87cdfb4236d678cf305bebeb915e3f13575d1924ef6418df1d7095ddcea83d17d614370b61738f62631e9696e41a313fcca7457
+DIST kdenetwork-filesharing-18.04.0.tar.xz 323572 BLAKE2B 33d41538248d9d6be89d3a9ff6094b42acca4b31ebe3fb6389d926528b3bfc79257d957b6e66e5c5e58fc303379f7ddfc8c3e9e1bb59ff89f91180f9cd492979 SHA512 65bd46e6e3ea6ce9f0164f134b3dd90dfd1d2550734288f557a2194b45355098011961e84ade44aab4e92c784234fa50ae2743ed02765a67372f1714ad6b2bc3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.0.ebuild
new file mode 100644
index 000000000000..13f47494f491
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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-18.04.0.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..35d715c44b10
--- /dev/null
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(add_kdeapps_dep kdenetwork-filesharing)
+	$(add_kdeapps_dep kget)
+	$(add_kdeapps_dep krdc)
+	$(add_kdeapps_dep kopete)
+	$(add_kdeapps_dep krfb)
+	$(add_kdeapps_dep plasma-telepathy-meta)
+	$(add_kdeapps_dep zeroconf-ioslave)
+"
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index f46461e7d489..5375436692af 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1 +1,2 @@
 DIST kdenlive-17.12.3.tar.xz 9383532 BLAKE2B a348cfc3622735af5c37d60f43645062a0bb077e1b10fd780d91ede4d1c6298fe1cad3ce8d6964b33e4b60ad7074ca656199209c827deb2e67da5a71cd341593 SHA512 8142229d01c4c5108bd1482f6479dd7ef7ccb56e19152a74021a47939aedd5841f9161483994f2e8078099b4e3c65a501736938b1ea3233779498f0d8cf5272d
+DIST kdenlive-18.04.0.tar.xz 9388972 BLAKE2B 8e3deb993c041be5803e29f7101a556d4867f3d763683adf1ad418fde7b2d1942f7dc45edf3eca91d0e2fcbd7011169c37ce2a68baacfb33000ddf848e960cc2 SHA512 5a3f2669eee7e850cc47950dfe9662b0185a962f3ee1a2a593e00862904b422903ccec39fe6c2837c01a4132773d24c7a17e1c13cb29e4e452e0bbb4adc03a6d
diff --git a/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
new file mode 100644
index 000000000000..9b65000a8cb5
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-18.04.0-qt-5.11.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,7 +78,7 @@
+ check_include_files(malloc.h HAVE_MALLOC_H)
+ check_include_files(pthread.h HAVE_PTHREAD_H)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
++find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent)
+ find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
+ 
+ find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
+diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
+--- a/renderer/CMakeLists.txt
++++ b/renderer/CMakeLists.txt
+@@ -9,12 +9,6 @@
+ add_executable(kdenlive_render ${kdenlive_render_SRCS})
+ ecm_mark_nongui_executable(kdenlive_render)
+ 
+-qt5_use_modules(kdenlive_render Widgets Concurrent DBus)
+-
+-target_link_libraries(kdenlive_render
+-  ${QT_LIBRARIES}
+-  ${Qt5_LIBRARIES}
+-)
+-
++target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus)
+ 
+ install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -299,7 +299,7 @@
+     target_link_libraries(kdenlive KF5::Crash)
+ endif()
+ 
+-qt5_use_modules( kdenlive Script Widgets Concurrent Qml Quick)
++target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml Qt5::Quick)
+ 
+ if (Qt5WebKitWidgets_FOUND)
+     message(STATUS "Found Qt5 WebKitWidgets. You can use your Freesound.org credentials to download files")
diff --git a/kde-apps/kdenlive/kdenlive-18.04.0.ebuild b/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
new file mode 100644
index 000000000000..44ad842ceb98
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-18.04.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 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.4.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}
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
+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
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	# Gentoo bug 603168
+	if ! has_version "media-libs/mlt[fftw]" ; then
+		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
+	fi
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index d8f2c56c6505..f59c4595be0f 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1 +1,2 @@
 DIST kdepim-addons-17.12.3.tar.xz 2038588 BLAKE2B 76636629c40b81afa4cd6bdf273ea250e196247e2673365dbfb768c76449b01a72ad80af277bb03e31302b4ba8643f5d783b9c05aa62dea8b8eba1effce8a68f SHA512 15e15f5a7a00db274f1ac643d03b41cb71949ad7c36d35c19a011d2704b887dd1f23e78dd6f8ef04852a7934e5e5361fe0a60c93e17b2c891d55baeee75352f2
+DIST kdepim-addons-18.04.0.tar.xz 2501240 BLAKE2B 6d6aef42f8076071fca6fb701be9f07a188ca3d3a632db7eba8c24b080d6687ca2f19b4874701056a81f6f2e7ed488df461f3284836162e243ec7ca3715d1323 SHA512 60c3226db3ba8294633510013ec1301248ad345f4910eb39df975e0148254512ab3055195ed3161910b0a99e5a05706239c3965dd7eae54b73dec6bc6dc6ea84
diff --git a/kde-apps/kdepim-addons/kdepim-addons-18.04.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-18.04.0.ebuild
new file mode 100644
index 000000000000..5a11e4f931dd
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-18.04.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 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="importwizard"
+
+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 khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
+	$(add_frameworks_dep syntax-highlighting)
+	$(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)
+	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
+"
+DEPEND="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package importwizard KPimImportWizard)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 0da8ba2f9965..ced068d3402f 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1 +1,2 @@
 DIST kdepim-apps-libs-17.12.3.tar.xz 72912 BLAKE2B c7988237e127e6b5c79f1488dbab6b2594c16c93570ba5f2dd3f61f477f9a0eff4061417c913eaae20f359037a045c349b960b8252091c180e1aac1cc69725d9 SHA512 ffa2f59f95245ae5f6de56c8bd70a7f7b08cb063917d37aa225ffb7f580460ee951b442b1678151a1cf9ab8fa2fe04a36fcce8fef9773256dd74091337014e50
+DIST kdepim-apps-libs-18.04.0.tar.xz 73016 BLAKE2B d7ea79a627f9a9fbeff45691cc5941c37a16cbb72040d233a4f3b79467850af46a137b338e3d943dfa4a43ea306eaac1ae9f4cfe8f0903b323189907903894d9 SHA512 c466c2cc9d53b0cb1367344679f891d1144a520b77a1f49812475918822c4b816a9cd3d8d81a8c85d4315823dd36cd1d9911c532ca9b01d3e386c8c7e420c641
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.0.ebuild
new file mode 100644
index 000000000000..bdabc1a6ae7a
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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=""
+
+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_frameworks_dep prison)
+	$(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
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.04.0.ebuild b/kde-apps/kdepim-meta/kdepim-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..e6ecd44f3a8e
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.04.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 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"
+IUSE=""
+
+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 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 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 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 ksmtp)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkgapi)
+	$(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)
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index b34d48f523ee..cf5f99fa685b 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1 +1,2 @@
 DIST kdepim-runtime-17.12.3.tar.xz 1796892 BLAKE2B 8e74409e6a5eee9201340f971f14324eee68d1510c23f2684686a3e8b8463031cfd6658de2073f1205f8c6f7207d1f1dabbddcfad05c87fa7c8665dd30566bfa SHA512 9ddb7c717a94ca75f561e54f7842c18c2def83c129f004e345a32ab4de4a5b4b15ec50f2044000d785572636a0d78adc4d90f9b3550ed853cf1982c6ef749aa7
+DIST kdepim-runtime-18.04.0.tar.xz 1745684 BLAKE2B 59553cf5559825ef06c408aafae1f07f36bcfd1afd1f08e90d0f011c3d13f08d6d6dc99745c4f1b615af02b3941741d6be9abed80b1e4f0cb0f60e21d413d34d SHA512 303fa9fa3ab0b26ea49971f8928c0bf3e4bf75993dd0551bdf5e4aab95e00d3a871d09ff8b399f452f97688e25377ec53f6705f9e0b1993cb4b3772a1bee8ce1
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-18.04.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.0.ebuild
new file mode 100644
index 000000000000..4f1d61f160a7
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-18.04.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+# TODO kolab
+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 kholidays)
+	$(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_kdeapps_dep libkgapi)
+	$(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)
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	speech? ( $(add_qt_dep qtspeech) )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep qtxmlpatterns)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kimap 'test') )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+	$(add_frameworks_dep oxygen-icons)
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index f0e6212b321f..39deef15d6cc 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1 +1,2 @@
 DIST kdesdk-kioslaves-17.12.3.tar.xz 37376 BLAKE2B 6d3e5f63ba3aa306df92740cb7e0b3adf46475fbdae8d3994e0682f5c6ce51e16e9c1288d85c9b9f5cb20ffe21af39d3fd99602cc6877b7bea0a2a2efaf72d33 SHA512 c82efe950bb23a8a78e941136a544fd61eaa96421c547b1d68a8b21c265ed69d746fdb14078dde007b96d800aa8b53c629549de01b64733ab830990a65161750
+DIST kdesdk-kioslaves-18.04.0.tar.xz 37360 BLAKE2B d51c32e9370d77bc44854a5ed3468a45123f8f4833de5c3f71b1828f80a67d09f14d651079da5863bcce9b47581f0628b5b981407f1484523b54d2772fb873c9 SHA512 7907759a95d8e66a8911b5ca0c6e1b16dcd7e139058597caf2066b31653c40a119897215187972be0e1a5acfbc8252abf91a5e754308efc33fae37415fe0ac6a
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.0.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.0.ebuild
new file mode 100644
index 000000000000..a659366d3db0
--- /dev/null
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-18.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="kioslaves from kdesdk package"
+KEYWORDS="~amd64 ~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-18.04.0.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..0759a45c3992
--- /dev/null
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 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 acdeca04e78b..763c52c7a18e 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1 +1,2 @@
 DIST kdesdk-thumbnailers-17.12.3.tar.xz 17164 BLAKE2B 5189bcfd5b39d3d91af18b3e0c2be39c9cd889eea6402b8ba98f6d9bbe2ac1b28d30d68ae476e3b26d2a75f29e8f73cc304dbc67cfaaee381afab2ada1564a35 SHA512 4a1aaee48d72601730a5eaffccfcd8f3fc10c848af4c5b72d0a81a41c3012521e43c259fa1fecc83268261290d86cb188c541d06827bb7cb990148257b699c45
+DIST kdesdk-thumbnailers-18.04.0.tar.xz 17140 BLAKE2B 902dc50c482a2ef8ee6731385c8c608a100d2fcf247a708bc9fc5bcd0df5d8e042428b408a21f00e42a2775551d6a49f8abe37ac53cb70e7f32cc500eba040b6 SHA512 b342bec3933565132f29a8783e11d27d2aa7065cb116a0427e72eafd3fbe72932e866dfe6326d8fa7ef51b02bd3f61985f44fd357c6a42b438abc2e3dcd732eb
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.0.ebuild
new file mode 100644
index 000000000000..aa6e30a17640
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-18.04.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 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-18.04.0.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..d34c1f9cdd38
--- /dev/null
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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"
+
+RDEPEND="
+	$(add_kdeapps_dep ark)
+	$(add_kdeapps_dep filelight)
+	$(add_kdeapps_dep kbackup)
+	$(add_kdeapps_dep kcalc)
+	$(add_kdeapps_dep kcharselect)
+	$(add_kdeapps_dep kdebugsettings)
+	$(add_kdeapps_dep kdf)
+	$(add_kdeapps_dep kgpg)
+	$(add_kdeapps_dep kimagemapeditor)
+	$(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) )
+"
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 409cc88ba570..9b0198785865 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1 +1,2 @@
 DIST kdf-17.12.3.tar.xz 531168 BLAKE2B 34999ff9c3dabd8f83b3b4e1f197d6587926782ee68cf7df1897316ced417a8a5d6fe83821f9d74f3a2eda95e65c87bedd06822e71c6776c9dbde4705405ea5e SHA512 4a39e1f1d25d73171ba5b299227b9e4e51778d27a544b0198d77217904a5479c9e7107b15514f1ed1b9e2c8418ee3afd134f23c929b796a940a851b104563167
+DIST kdf-18.04.0.tar.xz 531144 BLAKE2B c0578e0b7d520209ba6ab2ae07e86a7f18821e24a55a094ca342c1c7ff40cd5f7bb26b83156905b7c070ef25f52215f42aaa396e557c4f574f0f4e6f2f023b44 SHA512 12d33dcbb5a6bcd9561ead9093977c0ed8b23be46dfae907a4b2568da7f9b84b9a022f21e56010f62419549096b84bd60feb30fb950b1ec5e9ece9706c52eb04
diff --git a/kde-apps/kdf/kdf-18.04.0.ebuild b/kde-apps/kdf/kdf-18.04.0.ebuild
new file mode 100644
index 000000000000..3ac87d6ff652
--- /dev/null
+++ b/kde-apps/kdf/kdf-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~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 989e50ca32fa..5b83271a9fd9 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1 +1,2 @@
 DIST kdialog-17.12.3.tar.xz 95956 BLAKE2B 5a7aee1b13e3163e29f85a98f17fb94e0d4503ad43f4c9a6be82df8bbd64e9ad12de80ebc33248c79c63f27240d192d184e5c9f7d85e458dca22731b5678a599 SHA512 412cff325ff8bc77f91077d5a364f4e900d7344f27a0b13d9319c16c903bf9d7ae79e3687f53167e0157600988ca8c77ef005e37e3fe8d1a0c45c8f776de1e4c
+DIST kdialog-18.04.0.tar.xz 95972 BLAKE2B f3c3e7d7262416fec728258ab4496c751f61a81d6224654601144e58fba9b51a728f6cbc244ac24cdc3a02a85b66d6ef600b736a1d09595f884150db2425e477 SHA512 73848edbb17f3908932fa039da8bf8e2892a31ff034cac85b5ecfc6032dfd8e4f76bf4a155c893e9c0dd9e423eadf0a78c513fe0ef8378fdba220ea79d09fad6
diff --git a/kde-apps/kdialog/kdialog-18.04.0.ebuild b/kde-apps/kdialog/kdialog-18.04.0.ebuild
new file mode 100644
index 000000000000..a3f46e46a8fb
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-18.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 ~x86"
+IUSE="X"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(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 c176535f092f..3921d7dd943b 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1 +1,2 @@
 DIST kdiamond-17.12.3.tar.xz 4606848 BLAKE2B ddb65e22deeaf41cdb125ea7dbac51c82a7f7e2528f77e49738261da79d4507f3b61a4261014d16ec5e1507b2317e483bc2e01d2815587ba6629feaa55a16521 SHA512 bcf362489e0e1ace69de17fb33bcf2fe8237565a620f6cb4f6a0ac5563c93c1e7ecdf76e5411463daa7a71225b91c2dd4131b1726566e9ac6b80d49babfd2b4c
+DIST kdiamond-18.04.0.tar.xz 4606960 BLAKE2B 4c219c4fe40fd4df396814febc8a33f044d3e654b54f0e3c1abdde78406a53c0aece2e2fd5dd37f1e80ba7592c49741b9a4690a2c7df1305153c7be3236cf3ea SHA512 4815fd982944806e81171df9ed46d45a589bf6412f5cd787a3a3c78f8bb81d14adc58edecd28e318212a2eec955d5e26dc1dfbeaf6ebdb48461010e1da292c8c
diff --git a/kde-apps/kdiamond/kdiamond-18.04.0.ebuild b/kde-apps/kdiamond/kdiamond-18.04.0.ebuild
new file mode 100644
index 000000000000..111637d702bd
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 716f59614217..d1a749f1d6e4 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1 +1,2 @@
 DIST keditbookmarks-17.12.3.tar.xz 183248 BLAKE2B 89c2c23d1d0c9387d38dd84843b9da21cf9fc2d93d58f3b28c1f88bfdcf5c3e35862b7db9e13832cdc72b81a38421ba813bb4b00c21ce6ab2e21421d3a3abdf2 SHA512 9febc64485af7ecc4e2d80d3412a4c6ee8cc6cc38ef4606f31c10bf822389da9318f5e5ac97386bb68f6d4640f4ee5212871bc7c7a2b1a4ffe229936a00c0848
+DIST keditbookmarks-18.04.0.tar.xz 183208 BLAKE2B 2f9456478a98b07bdc9a4296c0ee4a8db3c8ee0cdf3850b0a83253f4a4278ada78d83fec36fa6a7f15d897739e90661f6d6de35110327854e38b7406d7dba959 SHA512 8e2f8c4ed3f231d3cb0b10613c885e7b60e44a701a81a3cd1c1db59dd0d102434524d3d7fe94f17717c8999e0af43e5707e361ee04c39915ec08d37d7098780a
diff --git a/kde-apps/keditbookmarks/keditbookmarks-18.04.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-18.04.0.ebuild
new file mode 100644
index 000000000000..b048c6a9cf89
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~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/kfind/Manifest b/kde-apps/kfind/Manifest
index c0c3243e787f..e138e4115bc4 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1 +1,2 @@
 DIST kfind-17.12.3.tar.xz 208948 BLAKE2B ac1830df924a8e81fb0756a331e1bec1ed267cc8cf27ac38d2c1c36be8e9293b92505f6446ce0b291871bd0c09e9a3a3399dd63b2d372da7f242d6bb7dc3bbcb SHA512 bc6edb248208f7ef6f609bd3b49cea6c621276dc2e43fec9b4dc28c86f162eb01af6656adc6bd9d90f3b47c92c35470985468c0b166e41a12fac608d77214121
+DIST kfind-18.04.0.tar.xz 208924 BLAKE2B cb4500cb574f29866818d35db58c9f8b22f82f7b517d27eddf56b0909ef3e9be4453f6a364cce4fb69d9b903c768ee254f5a2f70e3ff3f65a1a720651f23f4d4 SHA512 0956a85c4c6070ac6a40084682fd5194b6571ab3ae56f7a445c2ef61a12b3d3e13407c2af7f01d6dca8a5e782dea935a724278be354ad7809434db649893801b
diff --git a/kde-apps/kfind/kfind-18.04.0.ebuild b/kde-apps/kfind/kfind-18.04.0.ebuild
new file mode 100644
index 000000000000..281d188e459e
--- /dev/null
+++ b/kde-apps/kfind/kfind-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 ~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 qtconcurrent)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 0739927c90f1..00d2e0fc741e 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1 +1,2 @@
 DIST kfloppy-17.12.3.tar.xz 199060 BLAKE2B add58331fd220c61c7b764e2bc970181b515dc08ddb7b867f41a23d1a70ffc2d8b457ed7a97ef4f49040f048b508e8431478c96db6eb18af990056c934055710 SHA512 1197b15ad8953e037f4fd8463b49da903b56dd5108472b24c9d9e9af22a7c247737650e80c70310d4d906baffb2783e4b911a3645afcd3c69a9acb124a782a16
+DIST kfloppy-18.04.0.tar.xz 199044 BLAKE2B e3cd19d1bc5abaeab84c8f37b0dc638e65328a54ae5c6fcd19b6259bd4f0ab3da55ba55b45f728eed277994fdc01abdfe7dee2fdd9ad0c1abe981d50a006dc49 SHA512 4d31fb02917f8f9c3331c16e185d40a207bce4ff4872e86ca29a60c4a06a6a328d6bdaf78aa1c5373585b78c818e67ecda747bf790fd4afbf81cd36047407740
diff --git a/kde-apps/kfloppy/kfloppy-18.04.0.ebuild b/kde-apps/kfloppy/kfloppy-18.04.0.ebuild
new file mode 100644
index 000000000000..6bdbc688d3d6
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 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 fb669369ff71..8768196bcb32 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1 +1,2 @@
 DIST kfourinline-17.12.3.tar.xz 573076 BLAKE2B b7fa506a3e602286b6e5329fd5b091e8165f80104ddf9c6c859e75caaa29257f124c05da82a04e7e8f5ff90ffe5654287a1e10b2f1bbaebde90042b240ce08a3 SHA512 77f9046d477e65aa99a7dd9b4c88b1bf8727e25127b1afdf9872f01d8154bb01e3dd3d8dfe294698dcbc8acdb666f0cfa80bace9893448a5a696485316997005
+DIST kfourinline-18.04.0.tar.xz 573168 BLAKE2B ce4df8f42070482634c37d9dc2130d969573965a37244953999f7c9be659c09b938371292dd348dd38b81a19a8c2f1c997ef10fd15179441a0eef5de699d8261 SHA512 b9cdeecb2ec74e465acbf952e30daab4a0af1587a963f03950515f2cb891acf53f28580137011559ee125e47344b3ac35398307789a65bc5bc55b79210c53245
diff --git a/kde-apps/kfourinline/kfourinline-18.04.0.ebuild b/kde-apps/kfourinline/kfourinline-18.04.0.ebuild
new file mode 100644
index 000000000000..3e6be98491f5
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(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 6f3664e05231..85cd80f04cfc 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1 +1,2 @@
 DIST kgeography-17.12.3.tar.xz 10922256 BLAKE2B fd19344317ced08cebce16caf2f927b6cc8e4059ea6807a0a176ce390d4ce40a9072d06c53454650d77b26f824afe4d1adc89b6c69380258cb9e6208bca57e8e SHA512 de54afe24786535fc90433322cd6bccbbd130e9a1fc162e32dbc2ca2c6ff4a0277be851bce5e6dc722e32f5bea709186a1c6f30eddf0f6a9d403bf5e86b1c1d8
+DIST kgeography-18.04.0.tar.xz 10921300 BLAKE2B 585737f2730612cc088632fdaf9b834ea3daf3ad1836d697140ee672b18d706b9b13454faffb785a6b73b3ebfafcb1012179dfc148121067f855e1ee7152efb4 SHA512 71070c0149dfd598b96bcadecc3cd804bb6c7fcf31578daef4d4d22bf103850e95cf79df3faabb547743dc706efd46dbe7e7e1dec7226a0b0b6f4a5d1bc9072c
diff --git a/kde-apps/kgeography/kgeography-18.04.0.ebuild b/kde-apps/kgeography/kgeography-18.04.0.ebuild
new file mode 100644
index 000000000000..1a573e6946c7
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 34f5395eb8c4..1c08d45969b4 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1 +1,2 @@
 DIST kget-17.12.3.tar.xz 5388864 BLAKE2B def36699a85dcf35166b2466884966acff152a5db16501ecdfd99540c42658f2b63e15024b6f0a891d24fbbb856c19aa8538b42f28fb084e0ce004a4c4f68ef9 SHA512 7f4f12090ed94fa16c71bbfb1e00702fc71b145cf9fed3b3d49197360f2533cdd8f9e442caf3d41e9d1749f94156f48b935e03a9027826def6a3b334af5bdd18
+DIST kget-18.04.0.tar.xz 5204268 BLAKE2B ca1e66544ba7faa5494ba59aff1723ebdfa162d7ecc716026de4eff84245e2321cbd3db43d9691fb3ea52dc054bd8e91ff3f99570e30ae47191291084fdf70c2 SHA512 15f73d6135b48351bcd55bc5436d513c0c0c8872cb22118fb5f854fdc7afa9e279679905d9b8cdaa0b5bd7fd64824712023b39ccb35a82dd24b01caec0478335
diff --git a/kde-apps/kget/kget-18.04.0.ebuild b/kde-apps/kget/kget-18.04.0.ebuild
new file mode 100644
index 000000000000..314ad8dce43a
--- /dev/null
+++ b/kde-apps/kget/kget-18.04.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced download manager by KDE"
+HOMEPAGE="https://www.kde.org/applications/internet/kget/"
+KEYWORDS="~amd64 ~x86"
+IUSE="bittorrent gpg kde mms sqlite"
+
+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 kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(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 kparts)
+	$(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_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	bittorrent? ( net-libs/libktorrent:5 )
+	gpg? ( app-crypt/gpgme[qt5] )
+	kde? ( $(add_plasma_dep plasma-workspace) )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bittorrent KF5Torrent)
+		$(cmake-utils_use_find_package gpg Gpgmepp)
+		$(cmake-utils_use_find_package kde LibKWorkspace)
+		$(cmake-utils_use_find_package mms LibMms)
+		$(cmake-utils_use_find_package sqlite Sqlite)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index e66f6403f37d..b59bcff7de60 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1 +1,2 @@
 DIST kgoldrunner-17.12.3.tar.xz 4403404 BLAKE2B e075034c51de901f78c53d1156488ef4f81bf5822217e69ea957c26a83060365f037dd565a83e4eace9a271449ccf06c7da0d8b592162fa1117957cb20422af6 SHA512 b8b0e596270f9f231e79a83eb0597932bfac675e33574320bbee60290973f907f753316e336c111b370a15989fb945fa5ab762d55bc8db64c782a695a8e4eb1f
+DIST kgoldrunner-18.04.0.tar.xz 4402276 BLAKE2B 713cc9cc9dcbd9716e24692110887e626ff1a6246408f7808b95d81f2a313aea30fad70bcd951d1f60c0bcc85f81e64fc2e5380603fece1744f113f0ee73d6a9 SHA512 201a1f41d5ad8b7d2a7f95373e452e0baec28c46ddc8f49befa92a96322cfdcbc66a9cbb420e1b6a16be671a9792d1ef7157a23270f104e7b7020654c6a90613
diff --git a/kde-apps/kgoldrunner/kgoldrunner-18.04.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-18.04.0.ebuild
new file mode 100644
index 000000000000..1377b14402d4
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-18.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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="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 ~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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libsndfile
+	media-libs/openal
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 7eb39848996e..b3cd013c35f8 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1 +1,2 @@
 DIST kgpg-17.12.3.tar.xz 2817380 BLAKE2B 0ea960f82cbd25a8b0d5bafaaa4ee08f8a70a187c438dc89a113e6f6192e9bc1f70778815257cb2009c117fff698c8d5de87a23feab3c15b798a9a1786cd49b2 SHA512 ff013f675a8a28cd6771683060cbafc12ce2f11fa0bbe400c75483c3eea78311aed6a35c11e799372b79ae6f33d8bfe38410c4faebba6f3c5db693a359cc0cde
+DIST kgpg-18.04.0.tar.xz 2817252 BLAKE2B 72342ebbedd866f1a502508793a2773122b09aa66c351c7166641cc81d3256df21b256a3bd383e3b57d2ac9cb3854f3f6abaa33199bdd7838562d8402dcd7095 SHA512 b99f279aecccdb36d76bea3b244afd65ba317c95323dcf602f74fb6b6ad53487dae4aa0f1a503d999ff7cae320941cf747717c52c57bce4a361485653e1e3e3f
diff --git a/kde-apps/kgpg/kgpg-18.04.0.ebuild b/kde-apps/kgpg/kgpg-18.04.0.ebuild
new file mode 100644
index 000000000000..9179f8168592
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-18.04.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 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 81e4486efcdb..0ca95b2f9138 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1 +1,2 @@
 DIST khangman-17.12.3.tar.xz 6456648 BLAKE2B 48bd56b9bebbc2f91715c5b1d33b9f3c32908a8fced9f609c37a0f91cd431d9bb6dd5afd5cf452074662c3fe0f7b1017809918b4f2f00fbab94a447edf6f8016 SHA512 9b2759a272089422e1929854cfa584c356e3b69a6f58a26d3f610961cf36d581f06b41e173e19783c80cca4d9adb0f239a98316dcf36f82ecc17fc829d0aa5dd
+DIST khangman-18.04.0.tar.xz 6454700 BLAKE2B 365c8db44ec290017b7f58505cf18f5745ef6d0cb98a9b3ec604d2f0bd0f5282ff7f7afb60314420ae93e6c70f128b24b31e0783345421b275deb0bf9b44f1d1 SHA512 dc2564b3b8695e8fa7b9ccb427498698b111713cb5f2a812be8614ac41b28be45e3ae0af4097f28e8c21e0c73fb6abba2bb1d74426f4f38310c7bfa6f0a26156
diff --git a/kde-apps/khangman/khangman-18.04.0.ebuild b/kde-apps/khangman/khangman-18.04.0.ebuild
new file mode 100644
index 000000000000..cb57c5103efc
--- /dev/null
+++ b/kde-apps/khangman/khangman-18.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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 7f28f491b22c..9070753dd417 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1 +1,2 @@
 DIST khelpcenter-17.12.3.tar.xz 3024356 BLAKE2B 97f0ada4b68485204d0a239932a581c3e89312d5e0f5d991d35983e17ddb65331660e8a4d134594880989c17d36ad3a2b21a9ff327fc171aec7fbfe57e0489f2 SHA512 32febc1984c44112c22877e05742c6e7bbf0933ada1708305687fb6147e9bf3e06141cb2e88d8d3a4fe6442d983a56d4dd0e813f05e8ddb8b7083826575bf40d
+DIST khelpcenter-18.04.0.tar.xz 3046868 BLAKE2B b2a1cc9d79266cd7076b45f00da8ed47f782a755ce2db89a32535aea61a09d2ed3c9e489b566ac2cabd770effeb5bb34e8ea3a84a55416a2592e7c16f05d8328 SHA512 51fbeb88dba836d53f475325ebcd30a005628f4331fc3725cea72954dbb04e00bc3d3c1214ffa6e5b6d62de5ed9a733723e8a2fc62b22289a5cffdc0f8d256ea
diff --git a/kde-apps/khelpcenter/khelpcenter-18.04.0.ebuild b/kde-apps/khelpcenter/khelpcenter-18.04.0.ebuild
new file mode 100644
index 000000000000..7a7d14ca377e
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-18.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
+KEYWORDS="~amd64 ~arm ~arm64 ~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 kdoctools)
+	$(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/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 5fbcaadbae85..bb675be6bb02 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1 +1,2 @@
 DIST kidentitymanagement-17.12.3.tar.xz 147912 BLAKE2B 84c2252caaa7b30145910fc6012018e325ea5013dbe5f780504a181d067ff3279520a0e64385861130e6eaa350bf44edf14890e01bd17621026393eeb7ad98c3 SHA512 3ab1f0ebe6f993a5c1d8bc6b4952f7ab99150ec9938d4599c3b15451880089f385fe4775a950bcd948ca0926082038c47ddd3dd1f3ca5e9dfcd625f4934a66ea
+DIST kidentitymanagement-18.04.0.tar.xz 147884 BLAKE2B c1adae15b3519ce760cfdf680fa68e310cbec8a09808008bd9fb18ace84d1c34719b0dc84bcab2f73dd56a4670ca26f1c51da537d7d5ef226bdcb25f368d8481 SHA512 5eb71a792c1b987ea3eb7d549dfd2e86e91a9e50fb679e5a62cd9dfd0e3a9253496fc5f692c5b5942ac89119ff365b4b93663df7f3319275037a74f2e60d9c92
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-18.04.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.0.ebuild
new file mode 100644
index 000000000000..9cc840613bb2
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 0c929d00c4d7..7f3c13e457f6 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1 +1,2 @@
 DIST kig-17.12.3.tar.xz 3589648 BLAKE2B ebe02b35f3244d3e9f262dace700f194b8083f0f3f996c12b466ae1f722085205bc39e8a743ed201f5e41c5b201cc512c2b5700f6c2a11d3c596479c718f9b2a SHA512 bf6201c74627e3892a584c455875f6aeabf466aa092ff35255423e152ca59b9b4d364281c740ba5f65ec3b6a208628ed229368c223193c28ae0c7fa6a21aee36
+DIST kig-18.04.0.tar.xz 3587972 BLAKE2B 93fc6f36faa3831d013b9d34b81fd215e5dfb11f0094a57ce49c7588f9eac8618ffa44f198b188ffe73707899a3c18c379159b8d011599cbbccf0dd5c28c8f91 SHA512 1afb7d73ad94670ec342091546aa0a91bbdaea37e0eb40f9c4d35ca17ca50a7a0e28fe2995b4aa3bfc4a1c9c226e14a1d7ded392fef6a56889e11b3d7c458d46
diff --git a/kde-apps/kig/kig-18.04.0.ebuild b/kde-apps/kig/kig-18.04.0.ebuild
new file mode 100644
index 000000000000..7e2644a1fb74
--- /dev/null
+++ b/kde-apps/kig/kig-18.04.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 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 ade66a26740a..05d3455b840a 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1 +1,2 @@
 DIST kigo-17.12.3.tar.xz 5222512 BLAKE2B 24fa500c8b5b973fdaf266f710c120a824e7e7832c1d973f915c745cfa5a6528dbfa4c3fb0b62fd80520b6ce8b8da1149c1b24438c11c679bb08718ba34ef9a9 SHA512 23e998bf600b7cd97b92ad5d327448b5190885c1470286e0c1c76755b5cd4d278806010854ea98b7ac71ba6776b6748895f62f4c9c309adae44a97c5c9295112
+DIST kigo-18.04.0.tar.xz 5222516 BLAKE2B f9255a6b435d1ac5ee97bd8db42898f15f14dadcc89120825d917a4640537efca947e8eb973058661d6f27a3c3da5a2fd117a0d112569bf4431ada8e5755c05e SHA512 f580cd32382f50ed82b9907a7134889d143ebc1c2f9643a16e1f1f4404cab7147b0c9f315847b6b2852a7ec7691cd7d58da1b24b975c7569f8d06d2bac073376
diff --git a/kde-apps/kigo/kigo-18.04.0.ebuild b/kde-apps/kigo/kigo-18.04.0.ebuild
new file mode 100644
index 000000000000..3dd95da49b6c
--- /dev/null
+++ b/kde-apps/kigo/kigo-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kigo/"
+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 knewstuff)
+	$(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)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+	games-board/gnugo
+"
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 2b4163a7494c..2935efcf8cc7 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1 +1,2 @@
 DIST killbots-17.12.3.tar.xz 1166204 BLAKE2B 418c9e86420e9d8b7014e949f2afd910503e9cd90bca71034af1f99c26f5a2bbc339e36c1c46df091a088a71c23a1294dd04cd31c600ebbc9c1fc31050148686 SHA512 327229cdc3f2dfffbc3cafa152b899081d66e0fd7560251c948cbca0bf961bfb4df16e3cf7eacef281278441a4eaa58985197942d653980d6f3ed82e754b7cc7
+DIST killbots-18.04.0.tar.xz 1166208 BLAKE2B c089f1b29099b0b1a020063e8fe72626cebfe8d204cbdc9b2c043440e0765c6f40a2d19accaf622dbeb51d99473947a1e32924fdd1a23280d56c2d431e476456 SHA512 0a3dd8b65aab054a093b1c1ba90334c3b3d9da111ac13a987780abd12d8bb2049968aed037c41f6e55f9380a6c92fa6abfbf74d75816ccd8b33eff3e1fb41296
diff --git a/kde-apps/killbots/killbots-18.04.0.ebuild b/kde-apps/killbots/killbots-18.04.0.ebuild
new file mode 100644
index 000000000000..eb0d9bdadcb2
--- /dev/null
+++ b/kde-apps/killbots/killbots-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 544b042929aa..d0eb246a5522 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1 +1,2 @@
 DIST kimagemapeditor-17.12.3.tar.xz 1053900 BLAKE2B 07606cc923bf586027111797822f61c4a9bb04bb26216e52e7970ace5a6729f2b2493b2c89cc1a8945ef3955273b7684ce085cb2268f917873a682343b1ac9e0 SHA512 5a8922131f5847bca4100ced10d8b02e4d0b641f14afa0df7162ac71682bc19bed499515df57e40ce61f1c30bb3593e8c68ee5c650d60e9e62d390a10dd12bbf
+DIST kimagemapeditor-18.04.0.tar.xz 1054708 BLAKE2B 69c459953fb8fffe7bb4cfdeb52d972c8658c3fa7ec8fdcc26cf9d26a58f778a13243ef4e11da12f66a9545dac60fe9b53828ecb08eeb37d095c716028b15942 SHA512 e729952ed3580764244a082ec4857e7dfc9dd53230bae2f6e911d54dffc5078810f27875b122f3b1f0d14d0ab7e7658e0eee5d1660a9eef4202da3224de4fa4d
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-18.04.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.0.ebuild
new file mode 100644
index 000000000000..a457413fa6e2
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Generator of HTML image maps"
+HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
+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 kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 715f45ef4bef..b4189ea74ccb 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1 +1,2 @@
 DIST kimap-17.12.3.tar.xz 119720 BLAKE2B 49bc60c94804735468f491f6d50308f580cff8a7f19f95cbb0e2168a6c357783ecc1efbef3eab6a8dc5f841bb5166116690e2542fab51dbfb86f4e8b94569a03 SHA512 588a681bca53d4a0b961ba6670007c1d507c6622db1e3c058ec20b1bdaefb603fb6d071931ac988916b0686d3a020a86aaf96ddb29f1e75355f53090b79aabc5
+DIST kimap-18.04.0.tar.xz 118764 BLAKE2B 93e4122d77c7d54de3c57486d6952879e83a124e5f84407c827c341dab9e3c28439c8978ec0681397b6f7db5cc075a72db43da0a1190587f3e9b0ab231e939c4 SHA512 7e032f3a8a00c35dcf8c6677db7deaf9980735eb8daf7308bebbf2660485a164ad53b36ab4acaceadeec5f8587f6d70cddbb1c3d088eaa51a35472ff4de0afd9
diff --git a/kde-apps/kimap/kimap-18.04.0.ebuild b/kde-apps/kimap/kimap-18.04.0.ebuild
new file mode 100644
index 000000000000..e7bcd2eec264
--- /dev/null
+++ b/kde-apps/kimap/kimap-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Library for interacting with IMAP servers"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: Convince upstream not to install stuff with tests
+CDEPEND="
+	$(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
+"
+DEPEND="${CDEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${CDEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 05ebe052a25c..a80378a3d4b0 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1 +1,2 @@
 DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697efec49b9841b272bc9574aca897bbf104644ea303f11749161c68543206407c26174141ae31c43ca6b403c7d39c179 SHA512 a7d13516646954a00b03d1284c6d93ae71ec9598d03e3f500a6449160c228be9e41aa2351b71522423960e5321cc3a30a46ac6d2ba9e8dbad043def2804b57d5
+DIST kio-extras-18.04.0.tar.xz 549904 BLAKE2B 7571ce84f235fa2ac153249fcba04fe16dea66558d3ede7c1c554463e212b44e1826879b5bb30e7f3976cde9df53ff111ae48d1fa2c93797792fff7f6aa6aeef SHA512 fb7d8d9588625f223c27a5721859ac3b7c245733cb0f7270969af6aaab7202a1c1b7db3e373bef7138af98af0e9211421bfce3dafdd7d9348979a4479f2f6872
diff --git a/kde-apps/kio-extras/kio-extras-18.04.0.ebuild b/kde-apps/kio-extras/kio-extras-18.04.0.ebuild
new file mode 100644
index 000000000000..b884ebc08a3d
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-18.04.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 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="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://cgit.kde.org/kio-extras.git"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="activities htmlthumbs +man mtp openexr phonon samba +sftp 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 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)
+	activities? (
+		$(add_frameworks_dep kactivities)
+		$(add_qt_dep qtsql)
+	)
+	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] )
+	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 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 taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 1d3ac793445e..b4eab463fa46 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1 +1,2 @@
 DIST kiriki-17.12.3.tar.xz 325916 BLAKE2B a84aa79acde6f9ed16e9f92a7e64b3b479e161e8f394321fa929c6da9083215c60bae64fce92d4a3f59acb59c6eedc95365e58475788eb852aa0ea0981bf0877 SHA512 68ef87ee08d3ece79a90eff2e231851bf0cba0c8dda335be68716188646c6b2c85bfe45b0d159d063ef80e51b096e5a8872037f82a79250dce7cb64139cef1a0
+DIST kiriki-18.04.0.tar.xz 325888 BLAKE2B 5a9197fb74dab9f570733565a86a728df1b3bd98a979011d51b72d4a88e34ad8540d9f3d8788f337fa397e2f33ecf1b0827acec2795f83dc78dac26eb99adbe8 SHA512 29fc9833f677ddecbafc0c696d3938378e4cde5948d295fa75b126becd60f2c6ef3e0f77074725f36bcde9aea4c609092241d8426b36e02d03f71be145cdb3a2
diff --git a/kde-apps/kiriki/kiriki-18.04.0.ebuild b/kde-apps/kiriki/kiriki-18.04.0.ebuild
new file mode 100644
index 000000000000..b0d97b3b53b7
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 4cf099b884d8..6262a14d8692 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1 +1,2 @@
 DIST kiten-17.12.3.tar.xz 11556408 BLAKE2B 4e6604d0fe67cb6a10aa43f8339bc161ff66c7699b26c88b4b973de84fdcbce2bcd448f82e670f6c7e5f5f940ab4707aca513c671cffc5d840b5265d30dc21d3 SHA512 aa84ca7fddf98eceb2215f4040b4494f529d7270f9b0157b916e3e9e97efbc9de0c6c7483d31f99eb17ac9a7c78e6765be2853090da9e86b379678678b8f2fa3
+DIST kiten-18.04.0.tar.xz 11554288 BLAKE2B 756c12bad031c473e30658507275ce1c8af38601b05327bff3725901822ac34733a1e47ed13c3b4384d808f81e1bb9dcb44e921c6deb11a30bda665b6460b1db SHA512 c982fa20104c14d4fa676309b8c864d66c421b1f7697f92487d35d1162540cf2fc87ef706c200f521f086bf677766a7d4c47ef136a61b73f6c5803793f1467d5
diff --git a/kde-apps/kiten/kiten-18.04.0.ebuild b/kde-apps/kiten/kiten-18.04.0.ebuild
new file mode 100644
index 000000000000..19dcab41571c
--- /dev/null
+++ b/kde-apps/kiten/kiten-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 1ca61a8fb904..9a16c17fadbe 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1 +1,2 @@
 DIST kjumpingcube-17.12.3.tar.xz 293288 BLAKE2B 4efcec26285087b8eedfb406c9f702972e93e609a6f2a34ff98e1cd7f097fc7c27d51ecba4bda582adf36c07affd2c7825a6300feb4c0790f711931c00d5b090 SHA512 880ac463dead49d103947b228f80153e38c43c0c75d7b1f9a60445f61fd19999403d8d04848250b29a1a3424c2d5815312e99ea1a3b520eb511369b26462e3cd
+DIST kjumpingcube-18.04.0.tar.xz 293420 BLAKE2B 8e927bf5e5862e6789bf7eccc86127858b464682fe719b8cd0a7bed97b6b7a293e97f74272e50abd83f0c095b06cf62ae315737a1b17b7b732aef7b97c24b6c6 SHA512 fe8eaa97fe4bf00d01ce954d3839593083233e87913d5b9960ee11ecc9701847318a89061d8fff7b0c5ddeca8cc187a81ab2c7036e40fe7a84677b76a5848794
diff --git a/kde-apps/kjumpingcube/kjumpingcube-18.04.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-18.04.0.ebuild
new file mode 100644
index 000000000000..24ea87a948d0
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 f2927863fe51..14e401cc4819 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1 +1,2 @@
 DIST kldap-17.12.3.tar.xz 155112 BLAKE2B f4d124243e39f5ef94a9a8d5c9c0eefba9881c243867f8d873256cedb96a03f3e2791a390f2e14dadec84cf4255ff4627ec2cf435b3eead21963efa516bd1d3a SHA512 d7cf0fa6b7a0f6fdcc712fb91f3214a4696ceefdc5bbdebb67f5f03c59901e0eebc6a7010c51f17791ffef490f2e39aa82d81dd581f2e2075e9f3bb4a3e8d3af
+DIST kldap-18.04.0.tar.xz 154088 BLAKE2B 61515989a4c86f0aafbfcff34e34a91a7dac112e80ee2b47a99c955b90577707580ac4814d26833cb0b3855bd6777d8e271e2ab5a5b0fe7b49f83d46cd0ea39e SHA512 779914011c7c6f8ece6899d29973544c921b3583768ffbdf6786a9360c86e5c083ccd33c50e95db60d6c7321da8abe2b71dfd292b28ad647e104895fe925e52e
diff --git a/kde-apps/kldap/kldap-18.04.0.ebuild b/kde-apps/kldap/kldap-18.04.0.ebuild
new file mode 100644
index 000000000000..fd1452bcfd54
--- /dev/null
+++ b/kde-apps/kldap/kldap-18.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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-l10n
+"
+
+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 e00e40e9e1e0..7915e42489e9 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1 +1,2 @@
 DIST kleopatra-17.12.3.tar.xz 1895848 BLAKE2B ed9c6b72edd555b1707ce95804c32ca7fb682016135f290677a7964af344fe6a2c1529f7b621626fcf5cf7fd1d7a72bff7d4d7e5e8f7c379a82326ee1fc9c343 SHA512 36cb2e8abe68d11e8d1919e1d87f80d0f926e3934432f0ffc0988574e5d82adf67fb9891fb3bb81d0c68b63d80f7165462dc78572bf29d5cd905284fc255cdbf
+DIST kleopatra-18.04.0.tar.xz 1901700 BLAKE2B d29037b5a6ae3baec7f74880307018101763f79a6d1577bbd22898d28baaacbca253e2f85ede343d8cb95d989137d961344193a81e99abfd11e2ac361bc96a9e SHA512 1ff164eb923b5f50d8925b2f89d7774c39716b3c2da5a11fee1af0bfdf9fe41f87c0776f4dcc6a18135b75eaf10103cb1abd115d8b846114733e96932bc697b3
diff --git a/kde-apps/kleopatra/kleopatra-18.04.0.ebuild b/kde-apps/kleopatra/kleopatra-18.04.0.ebuild
new file mode 100644
index 000000000000..9526ad8ef1bf
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-18.04.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 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"
+
+IUSE=""
+
+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)
+	$(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}
+	!kde-apps/kdepim-l10n
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+# tests completely broken, bug #641720
+RESTRICT+=" test"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index a9fd51f849e3..ce4a29447e2b 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1 +1,2 @@
 DIST klettres-17.12.3.tar.xz 21712168 BLAKE2B 79e8e2798fc50fdf0b78eac94f3d346fadf90e4ca70ea8e51cfbf298e08c9143b4ad68cfcdd7e7970ed02f4c4b16189403ebbcd9aea0c1f8ae6cb6a9c015efbf SHA512 a251699633712938393c81f314f9ef8069ea8ab792201ede097cfa2e46ddce6e2184add5a8959dcf6925a87b329b2b3b1acf134c9da1c25e3d39850a42276158
+DIST klettres-18.04.0.tar.xz 21712776 BLAKE2B b4122520d93ab5e6956453dae0e2fdc2a9412d295e50b18ca5ce0d5761be85b9635d590e252b5c13a6443948a50f0fa70c0520e883209a815a4d1e62d4c19563 SHA512 8906c79294def93c8b1c50b5686ec265e4fca81309eeb0693dfc4f1b6780c3c2cb46640efa438e8b22654ae9576c90d5c6c1c0e4be2ff1ab8de0a1437c98ea79
diff --git a/kde-apps/klettres/klettres-18.04.0.ebuild b/kde-apps/klettres/klettres-18.04.0.ebuild
new file mode 100644
index 000000000000..5a99090d00ad
--- /dev/null
+++ b/kde-apps/klettres/klettres-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 a291386c17cf..59eab3dc639e 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1 +1,2 @@
 DIST klickety-17.12.3.tar.xz 1410128 BLAKE2B 224d7df32d37039e289e436c60a432c94cfe4fbd1e467b846272b710e86a089f946e0dd9dfd421f04a1d890311bf293335ba0af1f78e1e40cfe6437dd9dd4aac SHA512 3236c3f294d7270a6da40526436ab789b722e61f17774cc337287f482602967ebb5428bdc843e45fb375d0ce227a0d20e4dbe285477df846ce46e52b215e5b18
+DIST klickety-18.04.0.tar.xz 1410448 BLAKE2B 7db16bffd8e52de17c2fff8826a05478331ead2ad66379a4d07779b74fe48202ae7c9b0ed6b4108312ecf1ff87cb2b10ec2403273a48f846dcd4c98aa021e75d SHA512 86e3f775414c92e799f199beacaabc2e977e1bf4b1c476c60e6ddeb83fe8b6733c8587660e8fd15d9a277444b85dcc781de543be3de1a98de9beba1717230a60
diff --git a/kde-apps/klickety/klickety-18.04.0.ebuild b/kde-apps/klickety/klickety-18.04.0.ebuild
new file mode 100644
index 000000000000..29d07f818c1b
--- /dev/null
+++ b/kde-apps/klickety/klickety-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 252ecd5c9c10..b39b42bcf956 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1 +1,2 @@
 DIST klines-17.12.3.tar.xz 1667652 BLAKE2B 1159f2867e124b95475efe73a4bc2588eaaaca5172f4932e8aa9fcf5b06e6d895252e019550a4aef05f4d7c6cfdb17bd50b17a75f2ef59a4c7130e34c2496dbd SHA512 14a3fff0dd010d94b7e76308a8032c4bce428950b5024cb81676a18c264f0c1de7d87540d8a36060588beaad5da7f22a4140551b8c46be08cac7a50c314ff3e6
+DIST klines-18.04.0.tar.xz 1670024 BLAKE2B 071de5d8f397427169a7f6cbd5b6ac0246cccf2b39d7854524b84ed562b41a4ff1b73f82f120a06046e9eff92e8b105f8c61136dafe7640ecfba03f0fa834938 SHA512 98488df1899a6fac729d8e059a4d16415e754bd892afdc9a7801ac406af032c8d78870792e425afa6201c1f7f66d8fcc92c58bfd99e2bb61dc893d16158207fe
diff --git a/kde-apps/klines/klines-18.04.0.ebuild b/kde-apps/klines/klines-18.04.0.ebuild
new file mode 100644
index 000000000000..7d4775b223b4
--- /dev/null
+++ b/kde-apps/klines/klines-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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/kmag/Manifest b/kde-apps/kmag/Manifest
index b05443279600..67145ff49405 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1 +1,2 @@
 DIST kmag-17.12.3.tar.xz 588224 BLAKE2B 7e5a9c5eba52fe751b1bdf8f5e5afea400a82cb3b48bc8e5a31c7219b44f5fa69b9bd047c8e0b508c5229c367b2ddd706e0b2c7b26e18ffef8105310f2fefaad SHA512 d9815d9e59a25765a74b3a33253de718b333f53c32df9afefdf4cb6551f10faeedaed189e625f20593d8d3528b835a01a47891dfaed341f0e943a317d6c6aab0
+DIST kmag-18.04.0.tar.xz 588324 BLAKE2B 04fb0ad3ee9b44d7110a0e3877bc0f10c4d6630f8d0a49754256a40d7e3ec9a9e34a6bc09ddb5847065fb26b23f693a43e9d54c63e693b72a879c687c0628cb8 SHA512 ed669fe9b1b1f0b26519eeff649d60cbd850934fa07a75bf4fed0a8c7a20c9dbd8d1b223d762f087741c46b8f982344975ba47c0ed8ab6a8c142d7cc28fd06d2
diff --git a/kde-apps/kmag/kmag-18.04.0.ebuild b/kde-apps/kmag/kmag-18.04.0.ebuild
new file mode 100644
index 000000000000..78ea685239b2
--- /dev/null
+++ b/kde-apps/kmag/kmag-18.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
+KEYWORDS="~amd64 ~x86"
+IUSE="keyboardfocus"
+
+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_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	keyboardfocus? ( media-libs/libqaccessibilityclient:5 )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index ef5305556b97..9c8683493063 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1 +1,2 @@
 DIST kmahjongg-17.12.3.tar.xz 4084868 BLAKE2B 761d68c0d027110a6898d3697898ed6824681fed98bc0a87b042406432a6796dd771a2012866d82c2b41eaf447a3cc89c6baab72d3fb09002aa1d9f3f0c3ebe3 SHA512 c6835b0900e7969f65f5cf74cccdd0271aac1e4d0f161fea13812e91415db77b7b5937b75adbadd027a3b424e520de8cb7c9ce277dd29285ba6a8e439888e8fe
+DIST kmahjongg-18.04.0.tar.xz 4085108 BLAKE2B f7cda6b6d618e60aa4da0385d781575e0d2146bb8561aa98197af17a930071486d550f6e9c11465bbfadeba974a94a856aeaf8b89fe320e59846f5ed7c46e936 SHA512 0652d751636a51624b273cafda428b0c33fe3891c8383b94be63d02233580c32d54a19b4fde76cdd71ba151775d293465e2db65d83802c7eb02a46977a53ff70
diff --git a/kde-apps/kmahjongg/kmahjongg-18.04.0.ebuild b/kde-apps/kmahjongg/kmahjongg-18.04.0.ebuild
new file mode 100644
index 000000000000..7f03c60e0f6e
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-18.04.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 e2f3141d365b..da18cca71ccc 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1 +1,2 @@
 DIST kmail-account-wizard-17.12.3.tar.xz 153456 BLAKE2B 84dcb3249dc82d22e29597ce9396d788fa6447f0e5ab4ccb783904e54eb86f65e8cf7b7e583567bf7d61a45f4eda485b46e5abb9767f91fbb71ba95aee0c981a SHA512 c19d89cfaecb4072b1dbf4fbd059e522e60b148edb78eb94e46ec73d56f3794e29b4af198d453d6b837431fdb738ab22dc6ba3c98766c2848c0e3a24135bbd02
+DIST kmail-account-wizard-18.04.0.tar.xz 153600 BLAKE2B 1f2ea6728b6a8d09d819e140e1412cca6d9b9f144f86d64f63a6802bbcb64bb93da71a68b1448b05117a100102fa5344f3ee1583580381a2d29f2235ae75a97b SHA512 35f5854d3ca07fe46973f952112037c3ec79ae44fbd6a0be74b092827e2fd735d25c42fd64783858b7da3b54ce57383c3e591dcf10458a9d97bfe8fd54bd9478
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.0.ebuild
new file mode 100644
index 000000000000..1d631b73e888
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-18.04.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 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-l10n
+	!kde-apps/kdepim-runtime:4
+"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 45301b79a5b3..9bcce981760e 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1 +1,2 @@
 DIST kmail-17.12.3.tar.xz 4746820 BLAKE2B a8ffca362a5cb7433917cc361a786039e9792714910ccd46b305d97826111d21502a9598bd044988949cf4b1ed74c3eb49a4cb70f5d7af22a118a876d3d17b52 SHA512 903e6accd92cf70134a162fcbe2bb78c5058453c4272ed2fae02cc75aaaf185da7fa87b64926c0ad6d40a3f42ffb60ba7873106076c034840cd75dd965e406a0
+DIST kmail-18.04.0.tar.xz 4753384 BLAKE2B 8637e003d7a1b293668acaf0cee22503c6d3e97a5e8967f05d1eede596dd73a30d2556a3ed3414211262c1baa54ac4e4dece879db42e06bbac452da356c3883f SHA512 d3487cf9d48137e66b1d1bc536562742eba4353c8a64dc7e26b0fd63195ad0f515ad98d27942c071c902c072e4c764c873fb05da0f2d1a66228f1a161cdb264d
diff --git a/kde-apps/kmail/kmail-18.04.0.ebuild b/kde-apps/kmail/kmail-18.04.0.ebuild
new file mode 100644
index 000000000000..42818ab48cd1
--- /dev/null
+++ b/kde-apps/kmail/kmail-18.04.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 2adbdda15da6..53748533097d 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1 +1,2 @@
 DIST kmailtransport-17.12.3.tar.xz 164804 BLAKE2B 79b2e5d28429c777f1b6f205a950109bf8f16310eb8e6700079a9e28c4876398e813406376aefbecef5565caf0d75262bef700f1a69ee59dff393ce93d10d18f SHA512 a90d305a0ca9e938c0629ac602862307f1561280cd8f90159e0d9eab48bc8e3ad67208a04db724bae5e8b5edb08ff7901843c86f3d6ab3b5a2d7092de127d513
+DIST kmailtransport-18.04.0.tar.xz 164516 BLAKE2B 39b12ab209f6bae09c49cd9f679c54e6f6a5b95daf7ad471c1aea04cc3508273cc9e248a164ec4a5143426d9dce7db3ba29a1e700c7ecf2a024e27937b83df30 SHA512 7f3195ade7c958071e35a992a26fcec2d308c59d0005bf5e56faff91411b725f42b919639a4f6c9f3029a7435fdf43f2251289ddcccb52a6778206124adce91c
diff --git a/kde-apps/kmailtransport/kmailtransport-18.04.0.ebuild b/kde-apps/kmailtransport/kmailtransport-18.04.0.ebuild
new file mode 100644
index 000000000000..5814e89ef59e
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+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_kdeapps_dep ksmtp)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index b722f98d823f..f74619f3212c 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1 +1,2 @@
 DIST kmbox-17.12.3.tar.xz 24356 BLAKE2B 7780c408317bbc7aaf1d0d8cb128550afcdf0a8a5a5d035c51fe25a9b9870ef825f74351b4bad33f0d8524582771ff91f15297bd1e3c1d8c119c3d4e399af335 SHA512 785dfc65b7b3ef7b5bc9a1dde9d67d04d06110995fbc0b4112670c27350fdee4cfffdae7867dd73f07a431f4116b784faef716de902cf4da0767f396e7d3624e
+DIST kmbox-18.04.0.tar.xz 24420 BLAKE2B f84332f3b670213348e56c4671e501e3ea03d24d4a9ec33b4718e2908cd7c081a61fc211eacd962ba06bea683144abc63136c02210839e27ae98238d2743a043 SHA512 0955044d13a13cfaf6bd090b8d5c9f5d38c269a6ec8c85dc7933c769e2c092f4e94cf84143ad3ff64a42669718e4757def495a8934e80c96c405bd033ee0bc83
diff --git a/kde-apps/kmbox/kmbox-18.04.0.ebuild b/kde-apps/kmbox/kmbox-18.04.0.ebuild
new file mode 100644
index 000000000000..aecae880bedf
--- /dev/null
+++ b/kde-apps/kmbox/kmbox-18.04.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 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 bdc25ea0e7ab..8ba07d44ef7f 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1 +1,2 @@
 DIST kmime-17.12.3.tar.xz 146456 BLAKE2B 106a985528ae9ecebdf3f9363ed2d84eb1067e53cdec59dae09896575bb49cb350527ee72c2d44ff5a7f48c8208360c2a919f8b1362bb5397796fe32d6c7a922 SHA512 f1d9ce2468da62836f9db461c2da71293ca38666576acece3c7e60c6f1bad10380f5db650c4bc5c4ebdb5bb12969c6a11f88e0e9205d265a8b0af825c34afab8
+DIST kmime-18.04.0.tar.xz 146480 BLAKE2B f4f0a10348747c49e96240d57e91bff933ea3a31755e015a1c4916172b56eab48ab5834479b9fede84326b539f48580cfa6053574ac6909e16e6cedc0d4c4435 SHA512 43eab6346d55a3547d7722495fc85bedb29e71465511afd2c57b98c04fdd21feb3c1d8c960f5573ca0e5b224e3a12aafc4fd2e7fb3e418ed37e4a9588400d686
diff --git a/kde-apps/kmime/kmime-18.04.0.ebuild b/kde-apps/kmime/kmime-18.04.0.ebuild
new file mode 100644
index 000000000000..18fc8866db0d
--- /dev/null
+++ b/kde-apps/kmime/kmime-18.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 8762b91605df..0fc3a3a6afb1 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1 +1,2 @@
 DIST kmines-17.12.3.tar.xz 882616 BLAKE2B 80d87205c646c6f4fba54bbbc92361678e6247cf34859649dcff73eeddf62fb6830b47520ac6778aab43cb0378c7469f0f82e14636e57abf1305c7ad6fa4986d SHA512 09f17fc4ebb8babd9c2a1470269e55c9f10f94680577812aa65ef84191668226e4aefe206cdab4997a05ef9db1eb45a568563da7061de8be6d1629c1bbbc8a33
+DIST kmines-18.04.0.tar.xz 882540 BLAKE2B d483b470f568015ed16e7ea6b1411f5d3153470e8c2186e65dc12f53eeb0059f2dd0a0367d40fb39ad47d5817f0cf95ecc5a9575b2f0702e2934bc7613c3adf7 SHA512 81572c532cdfc739d48e0984e717459921a16786890a848908629c0f1c3edce8938b7bb3548f0b09946e3d8408b45c43ac04321f1c3908e12e82ba80b13eca20
diff --git a/kde-apps/kmines/kmines-18.04.0.ebuild b/kde-apps/kmines/kmines-18.04.0.ebuild
new file mode 100644
index 000000000000..517fa32429c5
--- /dev/null
+++ b/kde-apps/kmines/kmines-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 a709f88ac891..7fc3fcfda60b 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1 +1,2 @@
 DIST kmix-17.12.3.tar.xz 1281524 BLAKE2B 7eb86417515b33a1ee0d50f87d20e2ade27df4be6792e9b2991065eb99bf123b0d5aefe4477c952a129aef08052dbc96960e32b58cafaad124e4072254e4d6b8 SHA512 e238331586a9c77792c10b1011f789ba739ff0811cf457e73812b31ffea7bc8bd4d3db66d5d50395676d1b8eebaf1894e01ae10166bddf7818c2833c6f346688
+DIST kmix-18.04.0.tar.xz 1283136 BLAKE2B 56b8d7e8c80445a9254fa8d7b6d07583c537d7c1f7977e9cb84d37ab7fb988b120bd86f4e1e611f94bbe1eb472ae98c55cc6d6aac66d31ea8efd08bd55ed86ee SHA512 342ebb659ad3466dd374973ce2ead176234e6cd2e19830e9432836b25b4dc813c66955685e45fadd1328f4460f26e930249c8ec703ef814ed652cec2ca145303
diff --git a/kde-apps/kmix/kmix-18.04.0.ebuild b/kde-apps/kmix/kmix-18.04.0.ebuild
new file mode 100644
index 000000000000..768fa6584e01
--- /dev/null
+++ b/kde-apps/kmix/kmix-18.04.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+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 kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(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? (
+		dev-libs/glib:2
+		media-libs/libcanberra
+		>=media-sound/pulseaudio-0.9.12
+	)
+"
+RDEPEND="${DEPEND}
+	$(add_plasma_dep kde-cli-tools)
+	!kde-apps/kde4-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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 92d8c08f0cff..edda0cd07533 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1 +1,2 @@
 DIST kmousetool-17.12.3.tar.xz 110788 BLAKE2B b0212a774095735d69048430b0181a88d6c375ab74d850d8fd0a2e1978ed85a201d860fbf957b151f8f513dd785c15f4b3a8ec0616bfdcad43b456cd4a1ce010 SHA512 5e67d82d8034568c27e367f77e591688a3f9cb2fb0a84e06323994fa36f486004dc1bb9bf8c7d2cbbc42c234bbbcac95605e05eca6590ec53499f391b36eac83
+DIST kmousetool-18.04.0.tar.xz 111868 BLAKE2B 8548aa38b443de0fd6d08548014dfac066bcf163d568265d74abdbd4ec410d416b81049c7a319be32ae4d50d681b2edf2b9f05e799f4bafd2184ae64877ecca2 SHA512 e863a5861a93a3e2794dc7d7d5ba22a15ff1eb57e2bdbe1c6fdbb5222bf1afa8fa5d652d04db978adf8a526d4226f057001ab7908b318f57f5ed1faebff1d5d2
diff --git a/kde-apps/kmousetool/kmousetool-18.04.0.ebuild b/kde-apps/kmousetool/kmousetool-18.04.0.ebuild
new file mode 100644
index 000000000000..ed8aa9a18385
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE program that clicks the mouse for you"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index 3ee7fbcb2a91..8198aa5c21a6 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1 +1,2 @@
 DIST kmouth-17.12.3.tar.xz 1823724 BLAKE2B 782ebccaeab0fcbeba98fd6b3deebd3a19b445032e5b0b921d0130b88dad60b96cc4d7b46a5b5cc94b9a70620f4aee12704ad0c581bba7ca75d4218f5e17b10e SHA512 3f1af3952d8ed591b7e492f7db0ed3a80097b111e9b5f37039f71145ebb4bb6c907fad4748b6fb804e0f404ac1b30a7aa70e00946bce5ceaf3b54f3ad0f51576
+DIST kmouth-18.04.0.tar.xz 1766072 BLAKE2B c22e21871d34c8c559ea9f7453316255a5b152dab7034294f1b44174c43b0ee90ebdb591fbad388d30f277aeb4c43e4db6a230428bfac59196e7c8f7fc6ba383 SHA512 414fc0418ff441a07384941ac42369b7f23b4cfff93e76b0f2a3fa7bb77020e3b262725a044d49ae874b2556611bc05742f0f18777877e3b9d5683cf7c4041bc
diff --git a/kde-apps/kmouth/kmouth-18.04.0.ebuild b/kde-apps/kmouth/kmouth-18.04.0.ebuild
new file mode 100644
index 000000000000..c648621058fb
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Text-to-speech synthesizer front end"
+HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
+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 qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtspeech)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 361805e8d2d2..c1b0e74b9166 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1 +1,2 @@
 DIST kmplot-17.12.3.tar.xz 3024624 BLAKE2B bb733da35bc751b853e0e7f0b22f215552417bfefaa12d0591fd4a5d18e9c693b891a1521bece8e4bce68b653758001621078b082db2513a3814fe23f366894f SHA512 c82c6560e41aa24b7eed69fb24b1f96825b36ea8c6bc82a3d73d95aef74ceaf534bb4e7da64b68fd3a7e291e96790cee123d1c6fbef06b578996ba3df6180af9
+DIST kmplot-18.04.0.tar.xz 3024400 BLAKE2B 5c3a5fd9db9f8535db7d551cab0520e178c0190f9b8d3ca6df9a7ce9b29d963342835ea861332a630a39e01272040ec9c0cc828fc6779f440f7c6a2212844426 SHA512 c395afd2b6134656f047b47e426003a3a3aa83459cefee2248c9d4c4eaf0c61aab773ed4af612cb6c9f28ffd5cc30a025b6598ec03695f58b4efbea42f420c84
diff --git a/kde-apps/kmplot/kmplot-18.04.0.ebuild b/kde-apps/kmplot/kmplot-18.04.0.ebuild
new file mode 100644
index 000000000000..029f91d4ded4
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 3235a93ba1cd..a19ab90089f4 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1 +1,2 @@
 DIST knavalbattle-17.12.3.tar.xz 1220100 BLAKE2B ed09e00653164e254fbf1fa259861d26507ce61df5d126343691b804067c0facebf0aeb88d32d7d4d8f0440e66bb886f5ab469a904fe66d9980c83a7ce6920ae SHA512 3f15e67cff9ea4a055fe20896787568e1171cd3de58b57334be1bc3a50c0922b87a8f81c0fbd7acbe793c5882aa06581e73756f91bf15cfce3047dfa057e26e2
+DIST knavalbattle-18.04.0.tar.xz 1220072 BLAKE2B 53c0afeacff2a33ab9e7127b194eb23407c7eda8f5eb7f3163d57f2c61c4cf7296ff5ca0afa736e61f0e05031f659837e0d7d0b96acb8cbeefd0939d1341276b SHA512 4a665d40ae7da861ca5e42b67766b3da820246b5c857c6ec73be28d81188811fb570e9fa8a21545bbedd1ceb682f3162be11e1885eb708baf4b0134ef2dcce7e
diff --git a/kde-apps/knavalbattle/knavalbattle-18.04.0.ebuild b/kde-apps/knavalbattle/knavalbattle-18.04.0.ebuild
new file mode 100644
index 000000000000..aa760fb43133
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-18.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 f8d28b7b3b8e..da9582021c63 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1 +1,2 @@
 DIST knetwalk-17.12.3.tar.xz 981588 BLAKE2B 9ab231ff78d0ded0fc44a1f3d719f512edfc831f2eaad7a1622259c399eee6272441532ae24ed40f324cb8ec65e8484954c1f0087ea8c6021e640b7a499fb462 SHA512 c7fc0cd8622eadc3036a1a286736162a9c6240546741591b48b74d4b5fa84aec25b5764ffd05ef7ec2ab85ad97bee7c0ec63d3f009e07410444f09b99f26ea9a
+DIST knetwalk-18.04.0.tar.xz 981560 BLAKE2B 77e158f5a2b5f545cb19657c003c21cf3096c1af589ddd788513d0006ef149ac6a59880f841c6228e1c7042e5e79e6d1b54628f5a6a76481bf54f108127f61ea SHA512 3b746800b270865f853b11ac130208cb8f44e99b9ccf082c7b6f25a38fc131f605a848b7ed2f0a5405094c95522db9010707ce7bc81d8816242326b650ad4168
diff --git a/kde-apps/knetwalk/knetwalk-18.04.0.ebuild b/kde-apps/knetwalk/knetwalk-18.04.0.ebuild
new file mode 100644
index 000000000000..cd1421b84e74
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 42aa4200e5d5..4521b86ccbcc 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1 +1,2 @@
 DIST knotes-17.12.3.tar.xz 335744 BLAKE2B cb49c9542939bafe89846470d3a799128ff8f7397cdff3185e281fa8c00df40966560403f60639c3afe688bf863c4566073f561601be188eaa88804847a0c1f4 SHA512 b3c24cecdbfb72280d2fdd83b1cab481691980a9a29cd93a33af2a62421186b06d4df98bbde484d50140d8db3d17b0ea6186208bedcab7094a314fa08e5fe085
+DIST knotes-18.04.0.tar.xz 333688 BLAKE2B 509c6eb7472d93fc79d4210d4696fe99c0ddb324e1af3b9e1f412294d577edd56f6adf71a34fc9b45753cc782782b6199425e71727743f2cf18c83f72d8aaac1 SHA512 2d5fa579b9cd8245fd0b32010800cd4e6de5dbefec4b1f090e445e100e47e5d3f92311ece0706a338867177682828981a5bacca2280e9b38d481c3ba9d45add8
diff --git a/kde-apps/knotes/knotes-18.04.0.ebuild b/kde-apps/knotes/knotes-18.04.0.ebuild
new file mode 100644
index 000000000000..95df2eeed40a
--- /dev/null
+++ b/kde-apps/knotes/knotes-18.04.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://www.kde.org/"
+LICENSE="GPL-2+ handbook? ( FDL-1.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 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}
+	!kde-apps/kdepim-l10n
+	$(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 716dc6b0381b..e3c138ba7952 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1 +1,2 @@
 DIST kolf-17.12.3.tar.xz 923672 BLAKE2B 2329786f8dfbbee92cbcd84219b091bd30872b44179bf1f688997df0b4fb05ba4a2dc45c634873708b4a2dc365dec325b21af8540114814c81648015e1a7242b SHA512 8040362317639222c4b4046b65de77888d66daa3e7d99dec9661e8b868b253408f3f45b5636b4b5771e0bc07700d506810e95e7339141901947b8bec78b5e92e
+DIST kolf-18.04.0.tar.xz 924608 BLAKE2B 32e3703a31a5ae5909509505b94c345b384ba6c07e36f1647c7ea028d3148ae4f4b6cda7cb6ba93b5574114286f995b693df34200930ed7352d9573c972b3e03 SHA512 6559dca60c2df59e14e4a4d6c235d020a4a5901754f7eefc474f48f74a4cc0948ca504fd0ede5b10a9c1925a427459bc15b168de0f9d0c4af3eb48ee810bb2c1
diff --git a/kde-apps/kolf/kolf-18.04.0.ebuild b/kde-apps/kolf/kolf-18.04.0.ebuild
new file mode 100644
index 000000000000..c4fe51941993
--- /dev/null
+++ b/kde-apps/kolf/kolf-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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="Minigolf game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kolf/
+	https://games.kde.org/game.php?game=kolf
+"
+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 qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index bfc5a0b84f94..239dd2f81380 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1 +1,2 @@
 DIST kollision-17.12.3.tar.xz 272044 BLAKE2B 86178a9a39c79accfd21e8797feddff506cf260e81c407c32ab465894f37df9877619aecbc66619f04f10b887ca27ade0c47bc1a96d1e24ce34d81a04a51993f SHA512 e28d33f6fa0e52b08c674a68116586561bc0a786fc089922c313107d1d3b39ee89768192a203fc7473cdfe40fb67675e421f1058443703df859f1003371f1393
+DIST kollision-18.04.0.tar.xz 272064 BLAKE2B 1d91bee8d9eaa691c890b817ec16a40d665ed1b3e5f7608de590d23f450fe0cb1c5d54b25a7acbff154eed44b5674f09fb591cabfa639dee66cfede898c34248 SHA512 61ecc6322076612e08d32acfbe43f952d315aecea66655f091c4fe5b01408d63080231743c3fd576d33238b66e2866ff1a0ba952e3ae616acf3cde8e6e79d2f3
diff --git a/kde-apps/kollision/kollision-18.04.0.ebuild b/kde-apps/kollision/kollision-18.04.0.ebuild
new file mode 100644
index 000000000000..159531afe066
--- /dev/null
+++ b/kde-apps/kollision/kollision-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 e3f10d186201..09a6927336f0 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1 +1,2 @@
 DIST kolourpaint-17.12.3.tar.xz 5546236 BLAKE2B 9cf7aa982fc92fcead172a43bcd0a73b9fe88b05a893d51251600bf3a22eee8973f112874f5253bc127c8b287837a144d0f2a2e21b997affb73979af50b34797 SHA512 abe94f8bb56e975914302429f9d38fdd7ee5cd7b7942f0684fd993c2db0c3b7ab83b7562eed2c1e5d8330939df7705ba99dfe15249a5f6f1abb6c5b1e837d2fd
+DIST kolourpaint-18.04.0.tar.xz 5546756 BLAKE2B 31850ca33256284de0c8f177396f087e6416a5e2cb8bc99cc78940193e762b99fd5e07f5ed23b8d512d827fc44b04c0f4b970ebfbc9a1b30129eea23c0db31be SHA512 d3b58f445262801d05ef50479be87dea5bc4e8e83bfa7dbff9104d09c88b4a14617252eadc50d1663b261d3721855266633901d625b156166060502595480e33
diff --git a/kde-apps/kolourpaint/kolourpaint-18.04.0.ebuild b/kde-apps/kolourpaint/kolourpaint-18.04.0.ebuild
new file mode 100644
index 000000000000..5052eeec56d2
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 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 ~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 2bd1b10de199..6292623e5964 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1 +1,2 @@
 DIST kompare-17.12.3.tar.xz 710940 BLAKE2B 421d6c9a348f7f50272fba87c3c92f078604c1f4d641514ed30b92a1f8582291b69f85bdeb027a390c6c71df783db54217ed7ba3b12d60aae398696c0589ac44 SHA512 19cf624d6e3362d3b0b6d384b08aea25b74aebbeaf7c8f6c4849eb233f07016189a393551c2a0a60b4b31094b4f5de1d0c1bd747c0829ee2f2276e570a22e483
+DIST kompare-18.04.0.tar.xz 711028 BLAKE2B 40b96752624c151c4bedeb38f463f8a39e78cc31cf5a97995b2818c0ee4b8d66b9bba1d4aec356a8100286107a0a3d57ef6455a0576612c51c6c884f831a7606 SHA512 cc11ff60faf503f6b99bd3a0b094d3ac7c74e35adb1f1d6d0575716756d85e5b910ae9e56b08bcb00a70e942b4a88fd3c46a383c9b877deee5b1518cc78cf8e4
diff --git a/kde-apps/kompare/kompare-18.04.0.ebuild b/kde-apps/kompare/kompare-18.04.0.ebuild
new file mode 100644
index 000000000000..5c3fbbe779a7
--- /dev/null
+++ b/kde-apps/kompare/kompare-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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 ace59c27ae4c..5c39668ef7bb 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1 +1,2 @@
 DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
+DIST konqueror-18.04.0.tar.xz 7726188 BLAKE2B 84af194200333fd734b1aec7b7b2585b51dc0d8e6d311af69fd705e499da994ab16ec648a5b67d75e369034d0525827986cd3645db5b31bc559bdccace02be97 SHA512 c424836befecb8d5911534f91f4f344b03758562af047f150177e23f1c6b161c3e0c99a728130420cb59ad937619a9074654c6f0243bb4658b564d71448108bf
diff --git a/kde-apps/konqueror/konqueror-18.04.0.ebuild b/kde-apps/konqueror/konqueror-18.04.0.ebuild
new file mode 100644
index 000000000000..9f52a596a115
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.04.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 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"
+
+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 kwallet)
+	$(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')
+	$(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 8072c7c81edc..4b732431cadb 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1 +1,2 @@
 DIST konquest-17.12.3.tar.xz 658364 BLAKE2B 45ab884319512ffd4e8264b5cff389906c53552148825eb1028ae5bda9f324f00df19bb11a45573aa42f5c07aab0f451436fff1028bcedb0c73df4024993a4af SHA512 24c7dea266b3acbd7d006592c15a0ed28e55143a04ed107806bf9476eeb0ac8d30af18abde283e89433bb86f151d5e0363c8db672aee49368a53a963ad3bc7e2
+DIST konquest-18.04.0.tar.xz 658328 BLAKE2B 4215878c455198719a84333fe7d17c3e4e4faf771d86a4ba377a80ada1c4eb5abeaa86167e124d3b4d8738102412431ce4d772329a71d3c0dc9320c36a7b48ab SHA512 687bfa9dcd4c09a6b7bb0add9ac9560cbe4234e64baea1e75872cb74ba857925590f26d14a21b793080b5f4106c846a83aa04a6d4a94834fc5465304cb6726af
diff --git a/kde-apps/konquest/konquest-18.04.0.ebuild b/kde-apps/konquest/konquest-18.04.0.ebuild
new file mode 100644
index 000000000000..f2519a625009
--- /dev/null
+++ b/kde-apps/konquest/konquest-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://www.kde.org/applications/games/konquest/
+	https://games.kde.org/game.php?game=konquest
+"
+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_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index d1413da19876..9ece21046793 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1 +1,2 @@
 DIST konsole-17.12.3.tar.xz 1026672 BLAKE2B 98f2f545aae26965009a79d196640811702e9444a21c665db1f4da277a1059943f192a31ea1020c52867523ad40bfe21bc09503ec2643b289da1ed69c7eda30e SHA512 973c47341ebe729442ba8f8a7523eccaf5da28afbfe236fd4ec2897f710c3967f22ed5cd8f2f997f631a5369625c830f7a4540cdf6953874c2f556f547c413a0
+DIST konsole-18.04.0.tar.xz 1039396 BLAKE2B d19333ef25c972eac943b0c551c105fb5b9019d63a36471335f52b4c05f5b47eaf672b37dbd09f6434d696663cff1ec348f78034fd7de0761be0e336ced55aa1 SHA512 bbfe004a2cc75e761cd80ebd08e5c86aedf3c43fa9d4273008f0bbda59277f85650a9d59201c3591f2112698159da4ea4e72b02583130a20a048b31e67353396
diff --git a/kde-apps/konsole/konsole-18.04.0.ebuild b/kde-apps/konsole/konsole-18.04.0.ebuild
new file mode 100644
index 000000000000..c091c44e38a2
--- /dev/null
+++ b/kde-apps/konsole/konsole-18.04.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 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 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 6df3ca73c49e..381968d8d4a2 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1 +1,2 @@
 DIST akonadi-calendar-tools-17.12.3.tar.xz 223424 BLAKE2B 57622ccc637d9a41634d90e764f1c9dfdbe60e7a77d13632397e41222dc1cc5b544f268451132a11f8a3118a9042c701e993eef512ef5ac1df05aeea6bc1d35e SHA512 18c8bc3deb273022543c209410403f7bf7a9b13bcbcf9be601ef011dc9ae6c0335d866d1e696b410fcc4751830cb824a1fe530299ae76fe92e2f785f6886bd11
+DIST akonadi-calendar-tools-18.04.0.tar.xz 220516 BLAKE2B 58be803415e1c6ff6f02930a356d3db1fef605bbf97abf0cd8b8ee05596881d173973bcab0af37f5c933f56ee2dcddafcf765e697d8667e94a662a8c304dc20f SHA512 cdbc1a59c5fe85928786ae8645d19322f108718e9c90fd55aa78f48bcceee98ebca328f814630fd188b7e22f1c889dbc112077267523c76adc622a2b8733cbee
diff --git a/kde-apps/konsolekalendar/konsolekalendar-18.04.0.ebuild b/kde-apps/konsolekalendar/konsolekalendar-18.04.0.ebuild
new file mode 100644
index 000000000000..5e43736100e8
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-18.04.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 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"
+
+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}
+	!kde-apps/kdepim-l10n
+"
+
+src_prepare() {
+	kde5_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 3bc6b20e7c2d..9af38068c1f4 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1 +1,2 @@
 DIST kontact-17.12.3.tar.xz 862984 BLAKE2B 3428fea3f4b207fabf3e0a486044f79487baa1c3d5012835f4d502c884212dd9973d90c8ad2dc2eb53ee17d47bc1d6dd40f75dcb2202b696406f9f054956aa8d SHA512 f6ec9c2e4631246aca06d6af1cd0681d7cd1477d6932ce24d444f3d74e9805dc91da62afb40093e088390778a2ca08c92ae186d30de99bb488406cbdda7a0c86
+DIST kontact-18.04.0.tar.xz 861444 BLAKE2B 6412202eaa82c102073c58c5c65b8490d6052c4c3121416aab1ebf4d13d26c04291c7def7d55632babc6af874762a50a859ed63f151b48b8fa750ace799199cf SHA512 53dfeea617c3977a2808abd83923ca42b55c25172890211ee782471ddaaf0cb158eec381f4ccd6bd2f4d097346a3d9c567ceb6b13f2ebfa70d9f114ec0becd15
diff --git a/kde-apps/kontact/kontact-18.04.0.ebuild b/kde-apps/kontact/kontact-18.04.0.ebuild
new file mode 100644
index 000000000000..e768a574bfe2
--- /dev/null
+++ b/kde-apps/kontact/kontact-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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"
+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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 7f587e22a77d..3673fc57a12f 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1 +1,2 @@
 DIST kontactinterface-17.12.3.tar.xz 32768 BLAKE2B 3bdfcb9910bd733a937a90cf24b9af15b6dfeb5c41a996f86229a0cbdebaae3103e04fbb21f957f6e246891345deb7167d99cc492d84832e5ebba28910c2fde6 SHA512 e65bbfb7e717f60aafd47d4a0f8f37da3058a1c1f7b6ada3e806b1c292502a91bd2f7cb46a4e9f2512e8b4f33aa93fd91cbc891b68d89ddb14a33acfc1b0aa57
+DIST kontactinterface-18.04.0.tar.xz 32960 BLAKE2B 9d3b900b13e15e624a96037dfba20a616b967e34b979b6f92a33f6b698f24ef6e7314025004bfeb7a8a5972ff5a7e5acc1621a0283613ffd5129b12e91adfeda SHA512 588754479be3c4829f8d9d4b5b7c57797a124a034be8df4cf8b37c969509a9dd0d22a55d5a6f52e044f397bb30865a2b20aec0dc50a7901854966af7b33fc55d
diff --git a/kde-apps/kontactinterface/kontactinterface-18.04.0.ebuild b/kde-apps/kontactinterface/kontactinterface-18.04.0.ebuild
new file mode 100644
index 000000000000..9622e2e660cc
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 8f4e8f52313e..4591f4ae47f0 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1 +1,2 @@
 DIST kopete-17.08.3_p20180315.tar.gz 8003041 BLAKE2B 1056dba1532047ea058578ff935132a6456cf57a5b46b323ac98bed43fad3e87922a072700d987509e1fc607704de608544e49bf1f3c05183498eb74c749a665 SHA512 790fbff05108a6f899011dd67d2eb8edc4f6abce987f77c3f24183714ca145595cddd9bc724ef52720c08a6433322a0bc85c1e9dcb792d421dbadb1e5b3348e2
+DIST kopete-18.04.0.tar.xz 9748688 BLAKE2B e4fb74b1dfa8627c8d47000f0841c5d51c18098fb8ed20c14742fb63aa2f078366202dede55a92e6572ded532cb67fe9af320b308128702764e7e566e85a4e49 SHA512 50b7d4e7d219a723d721ae979c310e0b8d80a616876d833d1ea13d3c074b1cb16c08c4909849f42b292e8482b439070c054fd83c721c9128455eaf0bc75b18bb
diff --git a/kde-apps/kopete/kopete-18.04.0.ebuild b/kde-apps/kopete/kopete-18.04.0.ebuild
new file mode 100644
index 000000000000..bfcb2c87d471
--- /dev/null
+++ b/kde-apps/kopete/kopete-18.04.0.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
+HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
+KEYWORDS="~amd64 ~x86"
+IUSE="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: BROKEN (app-crypt/gpgme[cxx,qt5], kde-apps/libkleo:5)
+#	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 +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
+# DISABLED until fixed: skype sms
+PROTOCOLS="gadu groupwise jingle meanwhile oscar
+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_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep libkleo)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	app-crypt/gpgme[cxx,qt5]
+	dev-libs/libpcre
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2[qt5(+)] )
+	jingle? (
+		dev-libs/expat
+		dev-libs/openssl:0
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		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[qt5(+)]
+		net-dns/libidn
+		sys-libs/zlib
+	)
+	yahoo? ( media-libs/jasper )
+	zeroconf? (
+		$(add_frameworks_dep kdnssd)
+		$(add_kdeapps_dep kidentitymanagement)
+	)
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	ssl? ( app-crypt/qca:2[ssl] )
+"
+#	sms? ( app-mobilephone/smssend )
+#	winpopup? ( net-fs/samba )
+DEPEND="${COMMONDEPEND}
+	x11-proto/scrnsaverproto
+	jingle? ( dev-libs/jsoncpp )
+"
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libmsn=ON
+		-DWITH_qq=OFF
+		$(cmake-utils_use_find_package jingle LiboRTP)
+		$(cmake-utils_use_find_package jingle Mediastreamer)
+		$(cmake-utils_use_find_package jingle Speex)
+		-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
+
+	# disable until fixed:
+	mycmakeargs+=( -DWITH_{cryptography,libjingle,skype,sms}=OFF )
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
+	done
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! use ssl; then
+		if use xmpp ; 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 900ba7b07a72..a4440d01a2dc 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1 +1,2 @@
 DIST korganizer-17.12.3.tar.xz 2257368 BLAKE2B 3ecd3ea0711df1d7d45f8b2e8efa0942e0f1e189b08c1fab73c18aa8358ad2175c2b4f69101d29fe062894f9e614e35a72d7bae39872221b63edecf3ff70d8e0 SHA512 c6127e3d0c8a1892b1da4435885076172f6026f83fd412a0069ce0cd75156e7211356b07032ec2f673d5d38787bec352f03aff561143e50f61909ae7445bb686
+DIST korganizer-18.04.0.tar.xz 2262752 BLAKE2B eb99083d7ac9d1cdc82f17adaee3adbd3cdda07581d88c9fd8719e518b1aad61f083c157346753c1a280395fc1660a3a4e4d2e8c4a3638679303c2693ce5305e SHA512 36322745bac3748fc7fe3b25e780c214ef32eb1f905374c8725d24e7d37a32d2eb61f65c6ae49c4470a1ada3c32792d5cdcc63371b836c7a1ca909889b30f7b6
diff --git a/kde-apps/korganizer/korganizer-18.04.0.ebuild b/kde-apps/korganizer/korganizer-18.04.0.ebuild
new file mode 100644
index 000000000000..23f6fc99a125
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-18.04.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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"
+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 kholidays)
+	$(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 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
+	!kde-apps/kdepim-l10n
+	$(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 09fd54a59a10..9a2e59248420 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1 +1,2 @@
 DIST kpat-17.12.3.tar.xz 3566240 BLAKE2B 0fc1339871589216ca0ed037e89c12fe9a0e66279a51c71da9913ad035b528dd0ae9ed59b07f656142bed1a27b8f1214f9f4ea4a1231dfdee3ee69ed819a5b41 SHA512 e30ac4a80c81285513d730cc331e2c93c208bc2d6a1521914675bf46307f9b90b612e2ed247224cd9495b443cd67efb6b01a009c62727abc127e112d94f0d25e
+DIST kpat-18.04.0.tar.xz 3566372 BLAKE2B 13c3f0fe06ad59437beb7a3e31a79352f9e9f800dc2b3fff0db55b1dc9eae7234ee64ecfa7ed016bff790e62c0573a02371121f8b2357d1a8636108e70e8b7c6 SHA512 a25bf031e71a6e663d2bf4b3e8ad9bb8b53c8f3f4016092cea20347ac5ad4c4837c5bd643d00410741923bc0a9b88afb45fda8f37f85599b4ab975c096679235
diff --git a/kde-apps/kpat/kpat-18.04.0.ebuild b/kde-apps/kpat/kpat-18.04.0.ebuild
new file mode 100644
index 000000000000..14604a38fb25
--- /dev/null
+++ b/kde-apps/kpat/kpat-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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 f6bd6a63a6a9..ad803f277cd7 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1 +1,2 @@
 DIST kpimtextedit-17.12.3.tar.xz 141572 BLAKE2B 04c091748c8f4c5cfd9e57de3a1888d755aae2b9e6550f19738213cea21a487f65bcfcb5ff7e71dcce7a64a7c4a43b073442ef238541f090a108ac49f5760306 SHA512 0dd7891de260c2497ff0b44340a6a79994c512ad906db4bffe0217cff0fda11f27c86fcb89bd43a40668bcc8068b76b9287ad43de6a277909585b6b2737953cc
+DIST kpimtextedit-18.04.0.tar.xz 142684 BLAKE2B e184529616f2c60495a64e01f75c567be32f17be6211bfc4e873bbee6aa4eabf4b06790e87a932e45c30807ca64d52a52f2829a28980a98a727212184564f523 SHA512 fc4f3eb7731378839c1c9cbabcabeb24f600c5e67f3f9d1e3a32bcc0068513d66fd1438293aae30d576f4eeb604f66512fb47c5bbc4ccf0ac29e585391ba1b8a
diff --git a/kde-apps/kpimtextedit/kpimtextedit-18.04.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-18.04.0.ebuild
new file mode 100644
index 000000000000..4df08dc9cce6
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-18.04.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="speech"
+
+COMMON_DEPEND="
+	$(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="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 8e9600912d20..2112deeb8fcc 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1 +1,2 @@
 DIST kqtquickcharts-17.12.3.tar.xz 25516 BLAKE2B 3f9e906bfbb6de0e70855e721b08b52f78be415b4b862a8aed8210c5c5f51648d01092151646231b3f6ef49c1d884c978fe2d9b74924d22f8f6198f8612031bc SHA512 496502071f079798ef61c7ff2542ad77f5cce505efc6492d18c998e017ab6eb2b0b4c6f7565511ba951ec21af45e6f0e45b58586d69ade3867ddf07e5e5de913
+DIST kqtquickcharts-18.04.0.tar.xz 25520 BLAKE2B a9e8035155bb647d19c15361bdbb49863c26d1b2db4f4a3918b98cd115169d71cf4ce8e0d0b6279305182ef6efc7b82ddd654d1affff6be6be294777cab8fe06 SHA512 e00fadda30c0be441de59e4062300f9e2761d5e1a88325cb5c5ae4096335dbbe496534d2fcc7ce67dc59a5bd7694a4991723222e67ab4d07721c801c10bd53fe
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-18.04.0.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.0.ebuild
new file mode 100644
index 000000000000..25309fd1765c
--- /dev/null
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-18.04.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 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 ~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 cb2f9567ad24..04a04f406bc9 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1 +1,2 @@
 DIST krdc-17.12.3.tar.xz 1554384 BLAKE2B 800a1365d3bf73573e0b36510531d215f7297b666805bb8a27a1a311e8125307e18d6d0b8d860c92e20bd4c81747a8aebb8ae8fd36a1034b15e32c10728d90a9 SHA512 aefd7f2ae3120482d9b85550eaa5ad5e771e4bd2663c0646d0256f95413ce27d45ee843a6dcc7ce5c6b33513e72983d528ac3e4e41e6a2eef61e094aaff2b82a
+DIST krdc-18.04.0.tar.xz 1552568 BLAKE2B a7b88e014ce46b7dd3a1889d91412aea3130f9c9038b6657a3e3e2ef9385f08999aa867aae4b3096f27631241505c160748c74b1d8f39c073a8d4acf7a5a9b52 SHA512 fd471f38be7c5846934efbd86b4cc2a2f6496d46d4d281ba7193d35e75f43483ddae063400e08d404f6b61e86b0b6cc12fa5be995207a2195eb3782362b65f0a
diff --git a/kde-apps/krdc/krdc-18.04.0.ebuild b/kde-apps/krdc/krdc-18.04.0.ebuild
new file mode 100644
index 000000000000..b2db820336ce
--- /dev/null
+++ b/kde-apps/krdc/krdc-18.04.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 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/kreversi/Manifest b/kde-apps/kreversi/Manifest
index fa42062bf6d4..a465ca82fe12 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1 +1,2 @@
 DIST kreversi-17.12.3.tar.xz 913036 BLAKE2B c76b01192e3ca636306007e5b3014d4af20f38f98403f337af2cc72ffa076b76ff6bf5f9ffb4c1e4b7145a6f48528076848572d93837e1f9496968bdc90156da SHA512 dfc0cc5d4b49375754a1928cd45d87bfe4b6d18e62766828bd3ada8bdec017df12f51d18e432980449879f4fd321c38c75fa5a2c3919397f1363860d5d52559e
+DIST kreversi-18.04.0.tar.xz 912708 BLAKE2B 8f825f70a8d23de2f7e77b2597556a8c329fd1d9a9c839011ea0011b4dc9f6de66ab3b4503415db95449793461bedc77aad9398e9628f30ccd19a577b498c1e7 SHA512 e0fa09276f0267c906486f52a2b5f0558f12f9867f46bcf9a8b592f076b73c270fe7ccee94df75e4503daad25afb9538c73ee400d771a7385d266da40911cf6d
diff --git a/kde-apps/kreversi/kreversi-18.04.0.ebuild b/kde-apps/kreversi/kreversi-18.04.0.ebuild
new file mode 100644
index 000000000000..a18a0c64d8dc
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="Board game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kreversi/
+	https://games.kde.org/game.php?game=kreversi
+"
+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 kdeclarative)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(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}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 0136b3825d7f..28dd819ed884 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1 +1,2 @@
 DIST krfb-17.12.3.tar.xz 995712 BLAKE2B afe6fa51e0b44b96a2bb7f1da1cb5b35c901219d6f8d0a086ec5d73915aaee47dd039d2346649d0aa5aaee280239dec9a2be1c52a436c4caf2a7bb17fd5d4898 SHA512 934bbd9e6b92bf6e6a2b46ac7df03fae9bf2d604a0fe9e5420d16332576251e621caee1057b0e743a32cc38bb38b54ed95a6ef99bfc613754a5fe23e8f697a53
+DIST krfb-18.04.0.tar.xz 994844 BLAKE2B 4d46d66ffba4e10409975f02fe77364201e7417a03e563b3ddf2656319f268dd8a92f5a8fe83281b5aba4b17cf032875a4d593e90ff0e3affab0233669bcdab4 SHA512 a161bd1ccaeb975abbda5e578d3843cf23c044c4e7986c0de1aab0329b6f99957698939b02d5f232ede7f0abeadbe9f3691f9d2bec36bc2aed15c161b73f43a9
diff --git a/kde-apps/krfb/krfb-18.04.0.ebuild b/kde-apps/krfb/krfb-18.04.0.ebuild
new file mode 100644
index 000000000000..479224e0ac41
--- /dev/null
+++ b/kde-apps/krfb/krfb-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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 Plasma 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
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 9658e90ca0a4..4848280a571a 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1 +1,2 @@
 DIST kross-interpreters-17.12.3.tar.xz 144424 BLAKE2B 0eec653e071c026e3485c33325d9656c271e59ec187c166f2440cac8095f6ada195ffdd07622d05a9a1be100b4c6b06265771b2245a3ea79b00a2b1c5ea21fc4 SHA512 2eb261cbf57c505766dbc1d7086350f8e93b0c4da804464488701444a650119350b6ffded93beaf9956ee5974701ddaa3354838341ade3d080877918c91c6c63
+DIST kross-interpreters-18.04.0.tar.xz 144468 BLAKE2B 666633945d407dd9a7733f3f3676425082bf538a7ffaad4764368a769fa279a45392b35427b7a6d905e5994b81ab0af31bdcac8b67f3389d4ce7ce27cc7b5b6c SHA512 fe114664c2079e914d150e2125a6549b0189d5ec5a58a88c53cc6f9da4ba077b1fcbd4f49b376f568708b4b65e7c8038650de436b37018417509dee6b71fc18d
diff --git a/kde-apps/kross-interpreters/kross-interpreters-18.04.0.ebuild b/kde-apps/kross-interpreters/kross-interpreters-18.04.0.ebuild
new file mode 100644
index 000000000000..0ef8019aaf2d
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23"
+inherit kde5 python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	$(add_frameworks_dep kross)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "/find_package(PythonLibs/s/REQUIRED//" CMakeLists.txt || die
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index f236c78ac46d..51703e1cc82d 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1 +1,2 @@
 DIST kruler-17.12.3.tar.xz 259608 BLAKE2B b79ef372469b76d5734aa758b18e570c9aaba410d24f76f80a97e64bf35e61d0ac578a37dba088eb2c2ad10a8a46d4a5b24376a36a5e5f770011d51cd7230990 SHA512 e505604e01916226401ce0bbaabe8660910ca6a3e4f0e7213312b1f889ea86023d394e7ef7f821f29251ea1b16d44e3f270298304aff2f65bb1b5a937eadf23f
+DIST kruler-18.04.0.tar.xz 295680 BLAKE2B f1c0fd90cfca216892e20f61f432386d468ac3dd5428dd685da5e61b386236369af3543c39c366b8bfec2342e70292fb599b143ba97564fcd35044ecaa4664af SHA512 3ef46db7f601c3a9a4ef30f44635df7fc40b5a8a0dbc93914cb03113d37b6b6bd0e88bea9071c264b23fa375458acc501c529a1e69fabd296658b6de7208957e
diff --git a/kde-apps/kruler/kruler-18.04.0.ebuild b/kde-apps/kruler/kruler-18.04.0.ebuild
new file mode 100644
index 000000000000..77f5502679f9
--- /dev/null
+++ b/kde-apps/kruler/kruler-18.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 3306df52ed37..1479dd9a902c 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1 +1,2 @@
 DIST kshisen-17.12.3.tar.xz 708896 BLAKE2B 736271af515dad98556f6003b7fef81be7a7d56ed4a76219b479370cfb064e53a19fc829ae3049bba8ac902d5a29ea77aad2ee70457ca540e38f41f7d9e2dacb SHA512 50599330d51f4a08de050b2f4af764f084c505a5de09e3044cba00b687d9daa81618c8d9526bc76e4ab3fb53fa84e28a2f1508b992a05e284240649cfc1a0b96
+DIST kshisen-18.04.0.tar.xz 710788 BLAKE2B 0a26795703a997b3042dc4e0c2ea087ffb0782997ae847fd8e52b71e377edf36864c5724d4819ee5e1924ae5f5c2e768640fc100137e388301f9b02613dd90f7 SHA512 cac07d1cd1c91e91afef00cd26c65d6aa2e05a3bf6594917f3798313c7e15ee0482d6a2136627beb46dfa6cbcbd612af097410c81d40ef303ddb860e0c91a66a
diff --git a/kde-apps/kshisen/kshisen-18.04.0.ebuild b/kde-apps/kshisen/kshisen-18.04.0.ebuild
new file mode 100644
index 000000000000..907e49003ece
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 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 2d12988bc54d..867814492242 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1 +1,2 @@
 DIST ksirk-17.12.3.tar.xz 6987416 BLAKE2B 280cfdbe3254d6ca6a63be411f1b96f2d892323fcc72b8800982461712d9e16b1a76f824c355e227db0d862fc8ebecdc73210275dd394b76aa1669cc2fe9e1b0 SHA512 dc18e40bd3db456dd5313365bc531c597ac4724b887465585ce4ac496c2086c078e059aaebc2e7f3e554fb3c51dd4b103e55017474020d5663209ffaf16aadce
+DIST ksirk-18.04.0.tar.xz 6986612 BLAKE2B bad4f7274c5260b4851a7fe57c022d731d8fc828cdcf57f485f425177c5b05efb930532f04e6163759d81bfa5116e89657338534e3bdf7fcb709ab049b6dff4d SHA512 12bc289bbbb5992095b74fc5801437003f9f4e78d060048b581f433bf7c79e70720824d84f0eaeb90061dd5513da98cd55af2d801140c266c254a5e82c8c3c4b
diff --git a/kde-apps/ksirk/ksirk-18.04.0.ebuild b/kde-apps/ksirk/ksirk-18.04.0.ebuild
new file mode 100644
index 000000000000..e147ac059f48
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-18.04.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+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 ~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 kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kwallet)
+	$(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)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5(+)]
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index b236d07eb501..70057b120c08 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1 +1,2 @@
 DIST ksmtp-17.12.3.tar.xz 38496 BLAKE2B 448a00e29c8bbd8143b5a18848aa6a1bf9bbc2f0b9270ff90c695e3b44c7fe6c055442cee685cb32259bd5fb9bc913ca0d302e68a3d600d0fadebb303fa7ff89 SHA512 9f11e39cfc7fc56a2e84b7a33ea832c3817069d8e91980bef936d3cffacbce320af1d31ead13b3d7db56953d6aa4bb0a91ffb28cbc6d2cd1d435bc9e077ea197
+DIST ksmtp-18.04.0.tar.xz 37812 BLAKE2B c7738dff480c0dd600e04bfec636996bd213a100d50d53ae0fd0af7911d2b8e3d01ed4764e6c91260337b25931e3e1c2b816d92e111d4adaac8aacc55b44e9d9 SHA512 741c86b15cc4256788cc9476db67436af17563dbd0e87918096c95b992885cbc9bc7d43f3c8b6f52626d8e6aac4d3b071ac01adc651db7f5fa5dbeb263b260dd
diff --git a/kde-apps/ksmtp/ksmtp-18.04.0.ebuild b/kde-apps/ksmtp/ksmtp-18.04.0.ebuild
new file mode 100644
index 000000000000..237add174dc6
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Job-based library to send email through an SMTP server"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtnetwork)
+	dev-libs/cyrus-sasl
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 816a5c6f47bf..16f271e3ab15 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1 +1,2 @@
 DIST ksnakeduel-17.12.3.tar.xz 606008 BLAKE2B 5f0860f9b5c2848e7a4ce1b1b01c49df05280d5e7369b09fc7cc458aaab6f40c6f9414c19c44f9445bf8ec8a1be73191d8f9ec8a8981631d66f519d4919fcc4b SHA512 aed3e2f9744dc8b3a85aa3119a68f9a5081703a69c7f75394e23c9a5bb8308b4a2a2feabb6f404ecbabbc6e48fbbc7c38f592fd66a840a0628f416f0d724b4c8
+DIST ksnakeduel-18.04.0.tar.xz 605988 BLAKE2B 301682fb4131649168cef95f040e558de93b6cc9cc02b73cff6d0d4411509d7c4fa80d8acc1d8d98b2de7c1a11ba853a06d356e27a94b217eb2926e8dcb78ce2 SHA512 5834d71177ed720e91b00edd31abe1503d925395f56e0c2afbd3e51ce799fc568ae2877e604d7fd9d750b65f289deecb9450c71f4a35dc74f8141d16cff39f3e
diff --git a/kde-apps/ksnakeduel/ksnakeduel-18.04.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-18.04.0.ebuild
new file mode 100644
index 000000000000..7bdccd636b12
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_SELINUX_MODULE="games"
+inherit kde5
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
+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 kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index dab7e6282d27..c56aa91c2391 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1 +1,2 @@
 DIST kspaceduel-17.12.3.tar.xz 609992 BLAKE2B f50359fd07ca4580e4532e1797c8d7e0e083b16429aa1a8202a38c74c0a7dcbfd41104003497449572fa299b748c28598749d2e8dc4b50e997bdeabc272fccb0 SHA512 c4a9851ef9af9d9db4248800548a844e5ec64c0f368c5aac18efa2172155e2b7d10daa1c7f0e7bee3161faae20acd3b4a3a10dfdc75f197d07dc981a633752c3
+DIST kspaceduel-18.04.0.tar.xz 610076 BLAKE2B 2aaa7924657a0c94591465c52c3159ad51a4c494386aea1b94ee155075c125615eee14998b4ab978338a1759c4134cad403d9968b8ccfffd932b63fa76d12243 SHA512 c84c11bc02b0126d6ca3cf5f8b8ac653279689d665f8f4ce93bd49ae390dc8f6af9630d5741a79a3c302288a3505649c72b8587923ca50c7e74c4925d36cd897
diff --git a/kde-apps/kspaceduel/kspaceduel-18.04.0.ebuild b/kde-apps/kspaceduel/kspaceduel-18.04.0.ebuild
new file mode 100644
index 000000000000..f04dfdae0a5e
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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="Space Game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/kspaceduel/
+	https://games.kde.org/game.php?game=kspaceduel
+"
+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 kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index b066a979c2a2..50886d808f1f 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1 +1,2 @@
 DIST ksquares-17.12.3.tar.xz 215668 BLAKE2B 779f1b9dd804b008fa14353fedabdde12ddccb003314b7d326d8606537fe71e3827f2cc4179140ed0dee067eb6445e6f90b532509542011d754ebf44f2a272bd SHA512 d22db7bf1563005c7ae1bb64bac77211be7c0ab0fba47832f91759a88814d5b4ed97f121156599f9203025657167f4f6ed542ecec7c64da3dcb7503216b9345f
+DIST ksquares-18.04.0.tar.xz 215792 BLAKE2B e102e8a8cbe672fcb096d54133021981d9794aad193d77a3398fc6b0c4977c634bc21436f145ac6e38fb072a9d8e55df0c9fddeb3392b17ca26eff1d30e47480 SHA512 8156bd22bde4735562d20bd1b7c8a971b41a561232eb32f868eb1dbf1400320f43c3fe35397e99e860cf8b7dffd76a1e6836720c889172cd50e2497d7b125d0a
diff --git a/kde-apps/ksquares/ksquares-18.04.0.ebuild b/kde-apps/ksquares/ksquares-18.04.0.ebuild
new file mode 100644
index 000000000000..2a05f5517dc7
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 76eadd6b2c34..335564b7b20e 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1 +1,2 @@
 DIST ksudoku-17.12.3.tar.xz 1635656 BLAKE2B 19dc7c25d38db5b86b83abfe4a68b45ce0499e3ff8850649d9c9b4b77623662e57146011d8ba1dbdc2f8b06a19e3fa08a47873d51b677466aa1364dfae52be72 SHA512 4c35e01d793dd8358350378766b85f7567a91c18d9637aae7cfd752255fdf84cdc028c70ba32e7b0e71c6bbd4a2a1b06d04257524fca3ddb7dcc411ff983d841
+DIST ksudoku-18.04.0.tar.xz 1636428 BLAKE2B 5fc0a338ba4a0d6edb26dcbb86f9d6bef28eac266aae54e9aec7ffdaa069d31215c1318ffd9163ff1064398f84da57d5efff69cb3b279ac9a99aa66fcafa2d1d SHA512 35ec6382b1e0a9a24ae30b848b724d8610e76f0f945000518a40833aa3f1a48ebc8d0689d0e715e5aca5e7546d325aaeb5ce2966e4295496fad1cd69c3b67d15
diff --git a/kde-apps/ksudoku/ksudoku-18.04.0.ebuild b/kde-apps/ksudoku/ksudoku-18.04.0.ebuild
new file mode 100644
index 000000000000..816d157b242d
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-18.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/ksudoku/
+	https://games.kde.org/game.php?game=ksudoku
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="opengl"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(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_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)
+	opengl? (
+		$(add_qt_dep qtopengl)
+		virtual/glu
+	)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package opengl OpenGL)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index a57d4a8b6c68..79223e94380e 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1 +1,2 @@
 DIST ksystemlog-17.12.3.tar.xz 1782044 BLAKE2B 0679e1f79edf65dc99958932d1e60cf4e5979d02786a97b0f5181a819b289ceb3dd219b4678dd84537df4fabec0560a6cf112fd55adb1155da2060b826acdd39 SHA512 b9f1a56a4ec0c26cae5556f3454d69fb7f186762affe95008ee4403071a42d1c76cc2b8451fdd19b3d0302fb0f2b1e7c8e04f84b0efae6fda3ceac90d83d9b61
+DIST ksystemlog-18.04.0.tar.xz 1781444 BLAKE2B da505697b4dfb1924d30b94504f76b78a1048bfbeeffc48b26a9e6017fcda729c4b809f14ff35aa50292c3127b15d38f9998593aabcd28d929152e9f23de11ff SHA512 b23a748f3e1fb46a56f469cd9fd3fffa21c5614af1a96cab142d247545dc00f2c17c50495086c7e5694a7259e8ce6944f25e580a743143089b1332f8e1378e56
diff --git a/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
new file mode 100644
index 000000000000..efed562efe60
--- /dev/null
+++ b/kde-apps/ksystemlog/files/ksystemlog-18.04.0-qt-5.11.patch
@@ -0,0 +1,32 @@
+From 3ab2bd7564bcb9518892704e47634053875fac14 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 14 Apr 2018 01:18:05 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ src/lib/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+index 5cabcba..30b97f0 100644
+--- a/src/lib/CMakeLists.txt
++++ b/src/lib/CMakeLists.txt
+@@ -49,7 +49,8 @@ add_dependencies(
+ 
+ target_link_libraries(ksystemlog_lib
+     ksystemlog_config
+-
++    Qt5::Widgets
++    Qt5::PrintSupport
+     KF5::I18n
+     KF5::Archive
+     KF5::ConfigWidgets
+@@ -58,5 +59,3 @@ target_link_libraries(ksystemlog_lib
+     KF5::KIOCore
+     KF5::Completion
+ )
+-
+-qt5_use_modules(ksystemlog_lib Widgets PrintSupport)
+-- 
+2.17.0
+
diff --git a/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
new file mode 100644
index 000000000000..0c60ccb04012
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-18.04.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
+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 0b38c34a33d3..2d0ceb301540 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1 +1,2 @@
 DIST kteatime-17.12.3.tar.xz 297228 BLAKE2B 48bd8240ba9b8c5d31522ac5a5fa84483709f18c690b88af003c0534b70390a92c11c90c280b1021bb0e3ebc9e6b2191dbbd0ebe5f188e30b9d248d6222ce187 SHA512 658f08d6d11705d4bae1c458a44d1910ebd1297b6d245e3b866fc6355dad517081ca2feb6a33cd7e0629eaafcbf0d6007d94c54f1aea6bc4a45bd423c10f4f49
+DIST kteatime-18.04.0.tar.xz 297208 BLAKE2B 55996ce694a0a0b11f8b60c96ed5cb053b8adc0440ce2689d58549135987b7b0703549976873ae0653cf78eca33eccf457d5cb1591083262a18ecdc5d0fec779 SHA512 c3a995b691fbe43ea8b59ff50543126b0da2a438b195c557f922c1bf5d73e4fee5d1ef006ebe194c885c3d398d5846a96fd35db82b08e950ddf74c0c81598bfe
diff --git a/kde-apps/kteatime/kteatime-18.04.0.ebuild b/kde-apps/kteatime/kteatime-18.04.0.ebuild
new file mode 100644
index 000000000000..d6175c6546cc
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 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 5d19d1d0fe8e..a1fde23a2aea 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1 +1,2 @@
 DIST ktimer-17.12.3.tar.xz 452056 BLAKE2B 2b1916d8b26232824296893d4ed0c9e3db510b8e6dda93a8b547fe83e490e2d646b7d6abddbf781730bc831c7aeaf05ae478658b85fe1395069fdce090f3b437 SHA512 89445386f152ce0960f0de9c84d50701d30811a526933c3bcc4441a29b5ee71cbf7e3f674b49ab8554f5e58e884f46a6727c66c60f273d52dec5d597e053df5f
+DIST ktimer-18.04.0.tar.xz 454600 BLAKE2B 7cd1d471839dd50ee1313c48ef4122c8799763112dfee2eb55ca4c54bc7454ccde1e716374c60579cad8eee372482346c965e3ecdc34ee2fd34eb31d7bfb56c9 SHA512 7bc95539988ab8ab00ba00a0ade688d27efcbfdcb4f6b5dbe6f6474a1aaa1218580b37937030a62ab8f14cf3207ef81c6445a9692f09d87f7ae15c6bb7145c58
diff --git a/kde-apps/ktimer/ktimer-18.04.0.ebuild b/kde-apps/ktimer/ktimer-18.04.0.ebuild
new file mode 100644
index 000000000000..f21e3aa1385a
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 edc2aeaa3450..adbe49ed7a75 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1 +1,2 @@
 DIST ktouch-17.12.3.tar.xz 5105460 BLAKE2B 1878e633bd2aebe9f3da34a53d3ca868f1b1585c55bb0bfe6a05ac18788480caa3385ffc6f0249c0687aa0a44e65f4db4a69e75880550aa0f29b42b1bcc6d2f5 SHA512 6fb3f1ee7062331047aca2d44159bc47717cd0fdbf72e97a19e6bdf0fdd86df35f05405b724cdb0401c42b6a390eae7e9aaf26caddaa9f15e44c9ee7388b6c9e
+DIST ktouch-18.04.0.tar.xz 5110572 BLAKE2B ff85494d22d90710ec7c1b3d0edf0a990ce07a4b5fb95e3abaf9606acc67dbb3a7a88efb4b20f68fa8a9a5c61438f0e0a3b53a93e972ebd33a78f2770cce1f14 SHA512 ec4114fc7799ad5f774c2c7864e7d1c29dd98b1ca4c6c3f0e5694f40efc423d265c56a4643dda0b99d896d7a2009d139b62f595eb1f3a20c9badbdc43a1e403d
diff --git a/kde-apps/ktouch/ktouch-18.04.0.ebuild b/kde-apps/ktouch/ktouch-18.04.0.ebuild
new file mode 100644
index 000000000000..548ca5f0385e
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 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 ~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 8ec96c09b9aa..bf5034ab5c11 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1 +1,2 @@
 DIST ktp-accounts-kcm-17.12.3.tar.xz 262800 BLAKE2B 63db8496c2a21114ade346ae060b1ecea49faf8df101cc6ecb465ef0c5b856d54f6240dd7900f0917fb9729182b32c376634e6fdf29cd94c5e2d66e4d768fce5 SHA512 5cb33357fa974e383a288f7af4785b9d18e35445130a01a3062e127be4f01039a4f65e894cfc5fe2f0002cd8bd837b066be03e5e19f4fed89a8a0bef5436f43c
+DIST ktp-accounts-kcm-18.04.0.tar.xz 262652 BLAKE2B 47c13ad5273afb635731156d41ddb3632896cb29fb644fa44af405eadbb7ad5f98d947da1ed957e00eb72cd6746e3ca3ea367bf828b9a47a1c257eed73738467 SHA512 a2d353bbc9b8ba17a355daa7ba0ceb00d4cabbcff955b535e69dbe29a8359ba9cac99b11fcfc201bce4e7336266f2e99470aab2a4dcda3593c1be84f8ab95155
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.0.ebuild
new file mode 100644
index 000000000000..0bd40b4ef69c
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-18.04.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 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
+"
+
+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 daf237e017a6..44d1d0a824d2 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1 +1,2 @@
 DIST ktp-approver-17.12.3.tar.xz 37044 BLAKE2B 7c9f25572a3a1bd9d38adbfff60a161900d2a02fa1a02f95be2412f4ecc3682097f63dbe4b0b29a8f6e5cbe6a63be63f405e74012816dec21a8fdcea0625eb96 SHA512 30668c4ee3b03b11a4781b57f4c8ba9c596c4e965016522ed9d6bd579cf42f9cc394c36ae1c4035288a1821276a392094a6c6b9bbf4e0bd6f94c3e46546ca4e4
+DIST ktp-approver-18.04.0.tar.xz 37092 BLAKE2B af1147ad3480f646ee6dbb9d19e4b32062cc86f2d4860507be07dfd019aacf3485f5bc0a0d7216cb9b06e58259065347fa30f8c7724758598c5ed127852e9a47 SHA512 7637995cea5df28fa8e39357be6c68f440e06ce838808282aff0200968df1a6c19cf0d465e4d344265f6086a00cc110957f6b0654b51946699275f4919b5c457
diff --git a/kde-apps/ktp-approver/ktp-approver-18.04.0.ebuild b/kde-apps/ktp-approver/ktp-approver-18.04.0.ebuild
new file mode 100644
index 000000000000..58706d972a41
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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)
+"
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 0a569e61da49..a1fc0f427af4 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1 +1,2 @@
 DIST ktp-auth-handler-17.12.3.tar.xz 46260 BLAKE2B 22d2089a51776a0adc363422fe93b7a179f8c7fc143c42197ba8ed43e74c35b91558444f116d9527cd009235a670563ae73aac4a135c393da84a6083069584c6 SHA512 08b6a5e0b1a4ade40dd93ac8c515f4120e84e5251a7117c824194c47e35e30992e6afbd371c46ca8f29684caecb3f0e0ae26ab8d9c090019ca9c78336f24478a
+DIST ktp-auth-handler-18.04.0.tar.xz 46216 BLAKE2B 00305a105f10f5e94b55b119c13d549428e5e5da582ccd1ccac30735b389ba64f073373a1fb527c2ad20a80ed6dd64d21cf37815254bba979b9a5e6296fa7fb4 SHA512 9b14cd09078fb690bc6dbbbf4d1e90afd4b613c30c1ea35210e5a984809583171e7ecccef1f5ba7bc0323890c634a4b1fb7c101ac393d7aded02a6a93fb7f42c
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.0.ebuild
new file mode 100644
index 000000000000..2420ddb40f4e
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 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=""
+
+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(+)]
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[ssl]
+"
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 22ba2b39bdc4..1e42143835ae 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1 +1,2 @@
 DIST ktp-call-ui-17.12.3.tar.xz 96532 BLAKE2B ed43fa92c5ccb10b831c3577a1a58f91195d50c3207b56e11911f0a153fea4705a5a2b99de950e40647730473dd53815333819cdc933bdb71d2fa7087a1bb5c7 SHA512 9fc96b1e83b95a2e6d2793631c94ff1092e72fdd78b700ed7d44bd1dfe7dd2c010ac86ab7baea1ddaad02c99cbf75b27f8d42da43867fe84d2d7dc245aef0ea4
+DIST ktp-call-ui-18.04.0.tar.xz 96580 BLAKE2B 0bd7e1c35d8d03e9022878057dade9dab5a76d2afd3330fced2d118ba4a6232d21a18de3bcea021c9e283c8ff797bc843f0d034a9ba2b18e832ac31e2b276bcf SHA512 f8ed549b6986b6d6eb4b4285a4d9da3d0a3f1fb6d37481e2d71019db52ad80b73c6cf1a69c5eb6b5aca8d9aaae1ffaf444955eadf4e9efcdd2099ceed008c5ad
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-18.04.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.0.ebuild
new file mode 100644
index 000000000000..c0ba9a38bb85
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 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}"
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 61072ff46094..031d63c1488b 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1 +1,2 @@
 DIST ktp-common-internals-17.12.3.tar.xz 441184 BLAKE2B 65b3e4e830e5d90f9318d160ddb3ec239772a840973464b95c0b6dba1e753a5a12120896a31aa9d6663adfc235591181adb4b0f938a3a56f7f18d63ff4e1146c SHA512 7662017f3186ed0b70dc02a6af33b0f0f5547c2a3da5f76855cbdaa7ce8bdc31cc43929033b040cd1d7bea0b9606dfb440ee93a8ce5d0f9835363775b95c9cf1
+DIST ktp-common-internals-18.04.0.tar.xz 442288 BLAKE2B aa59570e86eea9fcc2d24922668bcdfb745a01afb685be8a7db8b872c8d614504afb04fa4199ab95d164de88a49c39190a005b186b3ae3ba9ba941fa039fdf39 SHA512 3b2ccf58fd8359e407a2b17de8709349b19f818873940572c5b209d9c14dd35dc9cddedf5ed86f89975ee6b2a9cd1ad5c7430b78049d1ef20df2fce0c76f3133
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-18.04.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.0.ebuild
new file mode 100644
index 000000000000..6325d2580a18
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-18.04.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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"
+
+RDEPEND="
+	$(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-17.08.0: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="${RDEPEND}
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtnetwork)
+"
+
+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 5b9b8afc08e0..af3abd0e3688 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1 +1,2 @@
 DIST ktp-contact-list-17.12.3.tar.xz 131508 BLAKE2B 55f46331693029939137067e98d252cf6b8efc816b96e597042c2adbaec3bbefdfe5bf027ffda47d9ece869285107425da27661f2b5d0bc63c438843bffdabfc SHA512 4ceaad321e180a121ed8dc10001932c070042544fbab6df1716d882ff429a51615fa3d97615c443141f0e709eb78aee6a013a2e36159d500494bd406761c8983
+DIST ktp-contact-list-18.04.0.tar.xz 144584 BLAKE2B bdb331347fa16ba97995825bd1139425cb99a573dc8d2a1025e4139967202745d07dbf2719f23b3984b225f7a31a09cc0e72f8f15f8af72968e35026d8250159 SHA512 07fe169f4609d560a099b8fec63e790002ebe3e2697cb0fe997d0e901e75354cc634b39c4eb66df9791194d441503167b180c42bc6caa3684692b0eec9ac13d9
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-18.04.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.0.ebuild
new file mode 100644
index 000000000000..93ce9c752242
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-18.04.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(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="${RDEPEND}
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_qt_dep qtxml)
+"
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 5ec568ba384d..fdb8af1adf75 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1 +1,2 @@
 DIST ktp-contact-runner-17.12.3.tar.xz 40100 BLAKE2B a328c6f8af07e2d7a3d1bacad077fe83e39d412ad1517feda7a1f0f17aed45fd503e22fa3064cf57e3687c572b1dde4a99df48e36405ba1662edbab33614f5c5 SHA512 b2ebd74bc9dfd893867fca624a1e4ccb2b999b27b87c2f460735fd0c1e7d9627765d012cd901a9db1d5d6df79a587da3d2457d7a2afd504eae8b41cc9917cf9f
+DIST ktp-contact-runner-18.04.0.tar.xz 42344 BLAKE2B b1e129c34ba8dcda9cf9e05238068921ae8112043d8fac78f0c9937101dc26bceb457b0ce60a5061b227950f7e2c38166c46c54fc6d4ac19f4657531aae84dd7 SHA512 b3d0ac82b9c81ce4b0ff6100c2c40acc4e5d0098f134155152cb932e9c45608a55e9cb9d7c08400d97f8886d4326758acce86a54e89b153f4bb4669c24f54b17
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.0.ebuild
new file mode 100644
index 000000000000..9aba85ad01ae
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(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="${RDEPEND}
+	$(add_frameworks_dep kservice)
+"
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index f1d45342284c..b76e02485ff9 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1 +1,2 @@
 DIST ktp-desktop-applets-17.12.3.tar.xz 43220 BLAKE2B c1d783c2c10481e4eda0e18cabe6598d8ee5fb0342f3d3b23f75916c66b2bebe6e43ac330fb224b1380d8fdfa746ed458e447b1525b3b23ad15a6ed2d4f8d1d5 SHA512 e6f1edace6b543c56b85b79f421c0023d28495c5dbf6d821f729970161a8d097faa03433051f385117d4b0968c4d877ecc5b0134b94feddb73a577763de63a3a
+DIST ktp-desktop-applets-18.04.0.tar.xz 43144 BLAKE2B ca239601aa7308aefdf5be3b3c1c79fd0f2ca047c4c5b32ecfe1fbb0258d89c9c662db03ae96d31abe1f93a7fb98280bf3d4cd9ded53cad8d68ada956f3a2e8b SHA512 525a964bc0f50d5cc85d471210957f7585a7a62bb3b1cd04935ac9e4be1249a9b4c9d1230a490638e244d22ba3f154c1662c9c9b4f047cc82b600707ce981d08
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.0.ebuild
new file mode 100644
index 000000000000..71c40a130e42
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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=""
+
+RDEPEND="
+	$(add_frameworks_dep kdeclarative)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep plasma)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep ki18n)
+"
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 175940f1fc5b..0c92cdcaa547 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1 +1,2 @@
 DIST ktp-filetransfer-handler-17.12.3.tar.xz 45968 BLAKE2B d982a94ec787124d5d6df5284a1effdeb58c4f1dd15e7a9bfd6e017f8acc172becbfe83162b9769ee12a3617d1dc7348efde4e563f95e771976cbb58d3d1cfc8 SHA512 145b3616523c224b479107b94de6b267151a9e6b12a412a86abf8da7a1f0b18fdb88783167149e84641532fe4ebf5105d64976155561f3ce7d23139ef58825c3
+DIST ktp-filetransfer-handler-18.04.0.tar.xz 45984 BLAKE2B 2ef641b80397168d11ba1814111358f2312f500c4c2124344d807fbcef8525b3d0b4c0476f95f8c19041271d20c64b86492c0cc523de3094b015503e0d663e78 SHA512 c34e44fc8ec27b06f6eea0c80f4132a04f008b0f8ae3580971a73d184061251cac57ed56ac7989e4ce5bebeda09d46ae14e462d7493b26d38b3593c880c9fce1
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.0.ebuild
new file mode 100644
index 000000000000..a8e607bd7257
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-18.04.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 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}"
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index 2512fac093c3..f5f1c8bd1854 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1 +1,2 @@
 DIST ktp-kded-module-17.12.3.tar.xz 81256 BLAKE2B 690a858e80614ecb1f3fa465361010d846acb73c4a92d9355735cc6cde97648894182a11065aae28954f093a09e4e950ff5e104f0b6675caadae79126ddcf913 SHA512 0d804705662ed87fe56217e603ade5b0ad28b3dc852a7f6fb005c42b033464ae92f866ef00e52e80cdb67c2e107d94f104f3e0b7ce7bb7660cc4555f4e414d57
+DIST ktp-kded-module-18.04.0.tar.xz 91460 BLAKE2B 4cc22f801feb81d4427b5a775cf5ad50c1f832067fd7d3947884842eefe79bb68f04572f201e171ae2811becf85314d4ec276317ea6d1c3a2b7b5fbd6a61f9ae SHA512 6b7b8c67383e5ed60356da28eabd030b5c004cbb99b1879cd3395dcf10d6628b5a65e9263a6ca61d56277f76a513df25ab83752274be74aa277168ab408ce045
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-18.04.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.0.ebuild
new file mode 100644
index 000000000000..6d59197ba41d
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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)
+"
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index faeed7a5c4c8..040ffbc13e87 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1 +1,2 @@
 DIST ktp-send-file-17.12.3.tar.xz 28820 BLAKE2B 267abc501fa4d2890e5c530ed7df132cad2a56800d3008f72dd3599779e1ba34c14f82635991bd43035af25087ec2c36dd14c79384819a01c2f9e4d3a7050f95 SHA512 887a7d4008f77fbc48355c32e4716f164df77c901ba4bf7eb0b0305e83b03e3e8fd38e7b5381532e3037f42b60055e65c4b49e1510799000c3951c67ee2a0ef5
+DIST ktp-send-file-18.04.0.tar.xz 28696 BLAKE2B 3998d44e189aca636df777d4a081ea7600fb1e8fdefadb1dd348da2c9d2150caff2375b0eda812964ddccca46fc776f509ba0596c4acbacbbfce7d20c6c2e784 SHA512 6d2fc71fb2c2803bc7df102c2b0aa1d4e27ec0c7d2a94e5ac0cef363be3a8b1f7ca463affde064d16efaa32cf622583a3828fd026e561314378a54916407fb53
diff --git a/kde-apps/ktp-send-file/ktp-send-file-18.04.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-18.04.0.ebuild
new file mode 100644
index 000000000000..d297bb178cd7
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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)
+"
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index ff98d3e1155c..49d08eb5092c 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1 +1,2 @@
 DIST ktp-text-ui-17.12.3.tar.xz 468592 BLAKE2B d4a4aadce200e67f40ec16382902f386ff06bc14bcbc0b91fd7ad0193eaf31e9bf7b1e8fefdf80dbf1cbd6e3e100a61fefcfcf1a67d4dd578f2191760877519b SHA512 2ae0dbfac8f23e478cf208be610cb2d5b73648b1bda43af75f4fa33dcbdb00a5342a19c4b2b6cd8c5a59a07ec6ca3a8d3d8d95cbc42d24c4b74ff40ee22b427f
+DIST ktp-text-ui-18.04.0.tar.xz 469208 BLAKE2B 83c1974017bf493c8eb5766a10a3157bbe83895e3a31744d740d4d40ad5b9abb14c5d3eeac363a880e249530b6f9ac94d4bbcc014bf65a85eb09cebe82d8d59d SHA512 163acff7ce2b766093b2eedd92ec2c3cffa246d78fe76763ddded5e036127375c7563e9ebe9462cc6d7bec1e9955874436ebc16173cbde76b779a903688dd6d6
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-18.04.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.0.ebuild
new file mode 100644
index 000000000000..d8d737632890
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-18.04.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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)
+"
+
+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 c1379a4b08c7..b88311e6bc6e 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1 +1,2 @@
 DIST ktuberling-17.12.3.tar.xz 32802036 BLAKE2B b80c4fcf37315889270de1e9cbef3ce70817b6823a5f20305d05e4213be0714d3a6fb575c388d77fc264b32acf9458e1317bd29ca4021cdb9524b13bde0a76da SHA512 f92d1f97c725bbe45e2590b3873978a321fc5fc78930e21f98274ec34eb665d71542a3451e7970c964e5f3cd7a615f472f6e4f5656562f6c349d45807ed2bda1
+DIST ktuberling-18.04.0.tar.xz 32802132 BLAKE2B 1e817009d00d6d650b3b84b160e6ca2969e2f9ac3f29184a74441aca790744c2650b267010fce4d51c6051c3c3487cbd8cbfdf4ed3bf9b905f8a133bbe6d51e2 SHA512 fc3b6e9e45d92a364b15b484e9a67b5ad880acd202cf005e64db64d2f7f0a5da1abd7a99650b7a6f74015aeea5db46bb657967b13fb6d0da51d81dbc5a8c1709
diff --git a/kde-apps/ktuberling/ktuberling-18.04.0.ebuild b/kde-apps/ktuberling/ktuberling-18.04.0.ebuild
new file mode 100644
index 000000000000..6f603a18c561
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-18.04.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 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 kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(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 c26b073d2d07..7a04498534de 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1 +1,2 @@
 DIST kturtle-17.12.3.tar.xz 1608852 BLAKE2B 1f8fa96742f08bb3e9ff4be1c6b2f1cc9bae22acf9e54f69a19a74f621fae9cf55bad26f4baee1313e03ea3a575b21f5d45d66541f712c128b823718fcc7936f SHA512 5510621296a824cdedd2454cbda21e5eb906bb72a79addae5ccb19d011af813c29c7702166bd2e4b728a3cd1d62589842b44983af01af10d3f6a13536afcff2e
+DIST kturtle-18.04.0.tar.xz 1608744 BLAKE2B 19213ebc91f536fc26ca51ed8dda393bc39d8d81fbd0fe3e935f2eb102a94e69ba8a82b40a6de388804a6d311092c4d0c4eed81d8a16d4a79fa865551fa29e16 SHA512 97e20b5357826b658d608594ee8e3eed111c8f6b51096ad4f0ff69053e2c4cfd829347fc6abcf11d4a6a5e6bd4d481c7e421a50dd6275d068140e06e06120253
diff --git a/kde-apps/kturtle/kturtle-18.04.0.ebuild b/kde-apps/kturtle/kturtle-18.04.0.ebuild
new file mode 100644
index 000000000000..f1c34975ae1b
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-18.04.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 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 4fa2db5e4e67..b9a0abb385c3 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1 +1,2 @@
 DIST kubrick-17.12.3.tar.xz 307056 BLAKE2B 737e97392692bc9aa7e1ba67d1cc04e370824932248586ab1a6a04afe4f4a3f4feea6e8dc86a4f39e56714bb01781c637d466d6eea6c950d22146d61b7fedc1d SHA512 4aaa118514674458513ffc8b4ce0d5cad479d33103302979e2a9ee6f9ed7955147dd42d8f31ba73a6ad39e1050ffbd48f85d8eab6954bad834fbf1e6b92f39d6
+DIST kubrick-18.04.0.tar.xz 306988 BLAKE2B fef75ba6eb3302e8de858504ed9c2bda8d1181d353ed6a00cbc3f831a17a2a4e7b90eea8b6568855b89653004ba6e4cc721e4ced5087037ecb3bc11c244fbf23 SHA512 238b2856cc532b5b4872e5d859f4b377c9e819f60ae6577839d080159b00d6dd9c837ce1608522c8b73ee1f8e64af47435c75a00319747f2219ace6584c5b925
diff --git a/kde-apps/kubrick/kubrick-18.04.0.ebuild b/kde-apps/kubrick/kubrick-18.04.0.ebuild
new file mode 100644
index 000000000000..49fdf450e365
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+inherit kde5
+
+DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
+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 qtopengl)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	virtual/glu
+	virtual/opengl
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index 167a6f41635b..30fb6ee44cd2 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1 +1,2 @@
 DIST kwalletmanager-17.12.3.tar.xz 778500 BLAKE2B 106e4cae3ec45f1782f838dc7fdf6722ebf766120ca922c6ff49a469afe09c48ff2dd81607094864a56f69355408b292e5dfa68138375bf1b2e48415f9227766 SHA512 b06bd097c580dc70d51388a12f30bd0ff0460d6dec5789333e460037ee3d132886e004c1fb1cdb13add6e588bce554d72b5cfb33bffa205b0edfebcf074610ac
+DIST kwalletmanager-18.04.0.tar.xz 779064 BLAKE2B f5b64935944ab5aa814eedd93a5d995b5475bf92a3fac0d0731782b8d1a5b1582841676a7aba61dfb3b10f70aeb3f4c20be9854802accdcea57491df8bd2ae22 SHA512 dbc3fe9d8a238817b1a67f6c564569d08124baa2639b366cc0128de54884df2acf5f5ce32a3ba024fe14db236b7a357b3db7b38cd40ea26c75ac4e4cfb1c944f
diff --git a/kde-apps/kwalletmanager/kwalletmanager-18.04.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-18.04.0.ebuild
new file mode 100644
index 000000000000..c557ba43034d
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-18.04.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 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 ~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 kcrash)
+	$(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 23669332aee3..e34efb7f2e1e 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1 +1,2 @@
 DIST kwave-17.12.3.tar.xz 4757724 BLAKE2B 1479b75aada209ec45fc69a735f789512f8c81177a469e7f87f55e8063f8bf2421b7c901aae0886f6aff238ff6ed9acec2b872fa61d596d30251745ca5553619 SHA512 008df107d05c5e9d07a9b8f64ad261a03bfdca64c8ffc098be6838a4672bce2d0c00f9fe4afe07cd7418390e0973720c0bcc1703ac4ab8fb5e0bbd5fee9fb503
+DIST kwave-18.04.0.tar.xz 4758208 BLAKE2B a40f78a9d1e1fbee03bf79cf3e0c3fbcf65a1830c93714a851d2113ff594b6ccd4057c8f3ef357c4fa7ae84350b47bd0446442cd2c4933a6e4ff7ee7578feffd SHA512 93620c058e7bb148097d4d834cd2034bb3f2586a10063038077f0fda22f5caff788c6fca8c2ff7b922fac19c43852942535c3d29cb73f91a5593cd94300de56d
diff --git a/kde-apps/kwave/kwave-18.04.0.ebuild b/kde-apps/kwave/kwave-18.04.0.ebuild
new file mode 100644
index 000000000000..5327a15228ed
--- /dev/null
+++ b/kde-apps/kwave/kwave-18.04.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 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 opus oss pulseaudio +qtmedia vorbis"
+
+RDEPEND="
+	$(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="${RDEPEND}
+	$(add_kdeapps_dep poxml)
+	$(add_qt_dep qtconcurrent)
+	sys-devel/gettext
+	handbook? ( || (
+		gnome-base/librsvg
+		virtual/imagemagick-tools[png,svg]
+	) )
+"
+
+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 3592f8952d7a..b6887fb63925 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1 +1,2 @@
 DIST kwordquiz-17.12.3.tar.xz 4168956 BLAKE2B ae201895e4b04e692af562a4adff052f2d6c6897cd7e441f17a1c4613d0a5094fd34d2ab842f4d0661fca35b1a5512b1906ef54179ce22e135d4a0a196c281d9 SHA512 b07d8673c14752ebf38e4ff18771189a701f52435b4c565e4355f48246eb81660f2d0d6d5beb22ca19774e1ec6c0495cf203dcb0e5634609f7f021751e64f561
+DIST kwordquiz-18.04.0.tar.xz 4169008 BLAKE2B bc875df793da6692c8526e46a97fb93c33b5fbb2d3d7c374ea7f4f517abf5fa75d440ff08f434dcd06ebce3d050867915378c9850d67b80c6656e5c1c657e852 SHA512 0962570379eb45fa2d0aedb100fd0c9abb3c58128b1628519fe139c3e57fa68fa9584de314a16575f09d4f65a9457b88ef308b266dc806be5e5baff8a87a9d36
diff --git a/kde-apps/kwordquiz/kwordquiz-18.04.0.ebuild b/kde-apps/kwordquiz/kwordquiz-18.04.0.ebuild
new file mode 100644
index 000000000000..666208ff0dae
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-18.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 7251ab444cf2..b51e13b46d59 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1 +1,2 @@
 DIST kate-17.12.3.tar.xz 5629840 BLAKE2B 384b15a1273ec02d0d3342e761f5c1135f000d1b8485445d07ff5384ea49f60c6d4a6aaadd8371d931cbfcab190e4e5ff820021708dbc44899a01340b980e3bd SHA512 3435afb4dc643064c9e98c86e02521cec9d53fb7ad30320e686db6260e3468b3745643447172218b033dcd46e7c9f02efbd00af26ee820b928ac74f5cf62b0a6
+DIST kate-18.04.0.tar.xz 5643140 BLAKE2B 298e15cd6545f35f1cbbb670c33f4d6c3305a250dd004e77bc56e28adc5975d242afbd7cc0b722c09239961e97d7400dcca76c842d721cd5a7e6c9b1c8967344 SHA512 2962b64a123be966017408bf02d3a92d6814ff76c759e8ea6f98e58c2cfa92086c290aea23f800dfa05ecf092c421ad7225161f757c98d409d40adce61aebc93
diff --git a/kde-apps/kwrite/kwrite-18.04.0.ebuild b/kde-apps/kwrite/kwrite-18.04.0.ebuild
new file mode 100644
index 000000000000..40a36cff18e3
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-18.04.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 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 bdd5f0383937..0c1003ee56bd 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1 +1,2 @@
 DIST libgravatar-17.12.3.tar.xz 30064 BLAKE2B 0bababb8f69e9d18b336e59e15718f0d59a333c3a77801e2a5a1f39d39cdce498b0ca6a76277131194e1292b2649dbd31dfd5ec035cfa4338a2dc62867629344 SHA512 66491e357c8c1c89261abe1aec07fd3e56c45368404c5e06857c9c8bdc95001176eede18446317971e42731d604467ea0b5c829f7e1fb435bd7ed11b8a15f512
+DIST libgravatar-18.04.0.tar.xz 30408 BLAKE2B 6146962a2c786fbf3a45ea7c9640f45440a0491647b65b185fa287a26ce48b8c200a254f4d831f9e7db583ce8a354ac9273740bfe2e2e54a7eda3640b924e6a3 SHA512 9c269846a49f0adb91f128668ba744d839bc70498ad422f4d5078f3c0a156757e98cab7c1494beb3ce805073c2decaed2606358848a01a338fea63713eca6ae8
diff --git a/kde-apps/libgravatar/libgravatar-18.04.0.ebuild b/kde-apps/libgravatar/libgravatar-18.04.0.ebuild
new file mode 100644
index 000000000000..06eba7322aa8
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-18.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatar-gravatarresolvurljobtest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index eabec75e953b..2224b990adc5 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1 +1,2 @@
 DIST libkcddb-17.12.3.tar.xz 423976 BLAKE2B a5d4723e01e53c9b168bab44b54e89d16fd5d6689da6bfb677e023ccc4478e30c1e26d682712b4313991820282628a879e4a016397ca5b84f4b53a2158870f5c SHA512 f2131996ed0727a591a3e8a265c9c65f1d1700377ccaf35e9008a2c7aee1222bb3d37d47de9f740011e9fc9c7c13936f5e473f2ccc6990e683ccce5bdd0e95f9
+DIST libkcddb-18.04.0.tar.xz 423964 BLAKE2B 8d0dc043df816a9992589aa5d9272fd79ef1d15400576da774aa2625dad8a65bb5663fd9a92a5c7cb1e96b9c78b2ab0500ece5810a7e115b46ec5cb7668ecde2 SHA512 9ec0e4ad4226ba47601f49d4eb4a076c8b9b02b3acca659a5ca9598e382160cb930fd4282d82222bca20b86375336c3e0cc45c74dabae1326109265046dd0d78
diff --git a/kde-apps/libkcddb/libkcddb-18.04.0.ebuild b/kde-apps/libkcddb/libkcddb-18.04.0.ebuild
new file mode 100644
index 000000000000..7c3b36bcccd4
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-18.04.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 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 ~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 165aae71c1ac..21022cbc2f87 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1 +1,2 @@
 DIST libkcompactdisc-17.12.3.tar.xz 88684 BLAKE2B 6fc33d00d71d03c6bdc8f35eabfcb21d69c14b81c65b88d1272da509a974958ea8c35df33b5c7834592098245dd46d3af132fc644c6203d9517657b871e54487 SHA512 260bac30666eae88575d5a584c89d78a3f39c9281260f07773cbed150eb7ef7f7b65bb41d904bf346faa311a118a6fea955a3cb127a27ee68c91b37b1d516cc2
+DIST libkcompactdisc-18.04.0.tar.xz 88604 BLAKE2B 33d176e4e28075ce70aa7389e006ce67e9321ae69ba2d2c0b16f02d677783dc2e76f991632aa6dddbe5ff7837081936bfb616295dcc2458f5cab7d69b714cc61 SHA512 d1de9c4510e274de98e67266750150b4fd051f7b361d2b8fdf4f550692cb96768ecf232d6418096ac8a1b1ede6b58a2929036539a8f12f8ed7c4ed0e2d706d38
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-18.04.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.0.ebuild
new file mode 100644
index 000000000000..3c73db683d51
--- /dev/null
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-18.04.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 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 ~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}"
+
+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 afe7575452ce..734dc7f7c0a8 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1 +1,2 @@
 DIST libkdcraw-17.12.3.tar.xz 41840 BLAKE2B ce2fca321aae3fd5121e883299b2e10aaf79befbc4bbce0488f88200cf2816a9b83cd035e2af1c382751e8eca5d369ea88a63eaf71b1e7987eccb9e69f7198ce SHA512 f8248b22636b07083af84bcf66cddbca91cfe3d3966299f1d6c18681474d01fea395c4f855a628cfe5ec857efd4e4965cdc987463b8ff661f3425e81aa2f2eb9
+DIST libkdcraw-18.04.0.tar.xz 41856 BLAKE2B bab8beb4399a57a6ac18d00c54aee4fa7f86b0e358e0f32b529083c0f0459c64deb683ac9afa3fbadd443e9c212ed272bec7a363b6a8e3cf0ccaf421e60bb341 SHA512 fe56475f8e9e544e85a31f88dc1987548aa27c5f5ed944b40503092d0914e3851e2e4a729ea06b6a651d5fbc8ce9d166afd861e87fee8b1da1bc17161bc4c013
diff --git a/kde-apps/libkdcraw/libkdcraw-18.04.0.ebuild b/kde-apps/libkdcraw/libkdcraw-18.04.0.ebuild
new file mode 100644
index 000000000000..88aa2516004a
--- /dev/null
+++ b/kde-apps/libkdcraw/libkdcraw-18.04.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 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 ~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 39ff53f150f6..89b13db2af33 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1 +1,2 @@
 DIST libkdegames-17.12.3.tar.xz 5941232 BLAKE2B 6cb6f92c374f09c4c8f51bc34a163584ba48f44e9efc0408fed539cb9567d98f5c10ed1208a38c3117e64993826e006739a252623237028a9f2e1943d837f5c6 SHA512 159a2d6e84600e3dd92455c143ee0f8084db35e5f13a1d05013e8afbacf2d56cc9f67f1215be38ec420cdf66cb026d9e51b0f0d0daad76e3370374cd4317cd8b
+DIST libkdegames-18.04.0.tar.xz 5946692 BLAKE2B 0b78a5ebc15f624846bba9a135dc2ac072a02fa93d58f293b299e6f917ad1647e409d0c93c8c4f7b1525854b632880d4d9fdfcaae823b1ddb2b349759a780a35 SHA512 3c1773793804f6ef3fe85e0f34b2f3d7d85f0c418c7603863e689a91ff0bdb49e2531dfc7362cb8b561fadefa50f377942cffa4b23b3bf9a8f82d27a044c0033
diff --git a/kde-apps/libkdegames/libkdegames-18.04.0.ebuild b/kde-apps/libkdegames/libkdegames-18.04.0.ebuild
new file mode 100644
index 000000000000..a70604c955d3
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-18.04.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 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 ~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 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 0f552585de4e..17cd16181485 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1 +1,2 @@
 DIST libkdepim-17.12.3.tar.xz 339628 BLAKE2B 318002f913bc16750f89c516a1f85e400caa7e11cd0e166fe5ba476927c49476700bc486ee3e20d38fe910ee109c95eb4cc0e54cbdef4bd80ccb0d3965177dab SHA512 e5e2afa569513d937c4f5f88909f158e7fbb067eed1a5a6ea7d6e91a784f75547e6f63e20a1d0bc9022229a695a010af43da6d7aa34b9f86cac57503aff436c0
+DIST libkdepim-18.04.0.tar.xz 340012 BLAKE2B bd6e6c7ffec7c7450ac921fc1418fe80827f1956662aac1eecab2bf4edd3ef1300b0761f1b0c740692672f60458c4161553101fcfd5efc1223d4a8628c178418 SHA512 185799afc9f1d14295cc8a40888e59cc4f0143cd556686437a30c6a158ce7f50f469a7f54dadaa85bfd950aff556dcda3dd28bf31fc856ae87b394ec376441f6
diff --git a/kde-apps/libkdepim/libkdepim-18.04.0.ebuild b/kde-apps/libkdepim/libkdepim-18.04.0.ebuild
new file mode 100644
index 000000000000..416b05fa49e7
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-18.04.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 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=""
+
+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
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index aa4c4578aa24..18044445146a 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1 +1,2 @@
 DIST libkeduvocdocument-17.12.3.tar.xz 205608 BLAKE2B 5f25f6b96ca0c892fd746ecb3acc1c0799f7fbbef0e33611d28c30a56129ef0f0ae0e94db9abde02152f8394779902951be0c008e41b4938bf84f6a45cfa2799 SHA512 658b3a37483405f70e619054f4e99ddf23e590d4ca02f081f7ba217c6366f1db69c4de3041264fd7aa2610c20f927f810c5904a4b70dc7740609e2bb71349c4a
+DIST libkeduvocdocument-18.04.0.tar.xz 209656 BLAKE2B 9ad8920256e6eaddc8d9dfa49f28844fa29070823c30c7fbc52d1f5bceaf9654e66b07b950a06abe0172e1611e2ee92c0198231312fac439fda8f55abf1fcd03 SHA512 e8de046bd0a6467a6951cc30179d46a1249e490f5bbe3b04273837fc77d1aad256525450bd981c7480927fdc36bafd9884ed98aa73f96d56086f159ffb8545f7
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.0.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.0.ebuild
new file mode 100644
index 000000000000..caf1c7213dda
--- /dev/null
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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 ab4936506b73..7dc39d060147 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1 +1,2 @@
 DIST libkexiv2-17.12.3.tar.xz 64296 BLAKE2B 048fc2190770694fe76d1f0add3586fe3a8db0bddfb86714d1955753c9243863350912dbab670433f32f46051154b5fa9c0090794e3c46b70128cc42b73b8f9c SHA512 a442ab46a7dbcc7fe39e4907851d272dc8645a2e18c7a04de9723f6456aa04131f90def553ad922f51773574be753f13a0107cc85f39d1b136d1c422d1791fe7
+DIST libkexiv2-18.04.0.tar.xz 64320 BLAKE2B c738226de64ec0c6762a52026a4d98d46ef8bbc2bb657e9da8772a528f2601a8986eaac4a91ebd1200b674ab3b1ef89f02fb89211668968c7443d103436aa680 SHA512 a97320eb046bbc211856648625c2b8b02dfaaea0cdcf27bf5b788221bdb40f0cb31ddb27ea9157b7b74cde80099b96f8465a4bfa9dd7913a7d76aa701eeae05b
diff --git a/kde-apps/libkexiv2/libkexiv2-18.04.0.ebuild b/kde-apps/libkexiv2/libkexiv2-18.04.0.ebuild
new file mode 100644
index 000000000000..8566db655bed
--- /dev/null
+++ b/kde-apps/libkexiv2/libkexiv2-18.04.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 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 ~x86"
+IUSE="+xmp"
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	>=media-gfx/exiv2-0.25:=[xmp=]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 9ec13ac4c45e..6c26b1e8b3b0 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1 +1,2 @@
 DIST libkgapi-17.12.3.tar.xz 175460 BLAKE2B debb06dd1619024ac29c9529b638f27896494049fe682b3740355a0e375bd0acf27d6e7e431b6fd241fa9285a6a1b1e076b51323aeef7d592e49c624a7e1fa7f SHA512 953ba55c5e645b38bde930a79daaf6129f7271fd2add45609975e51bfcaf516f87ea6f0e3b6811eb655aa0ae0a40d6408a29ed966acf22ee946f7a2b432079ef
+DIST libkgapi-18.04.0.tar.xz 176520 BLAKE2B 77e6787300503825c6b30618c5915bd136d71f34139acb81ed30bcfb5584939b4d9af68b3a8d5b6de7f1a7630739a55c30eb2c34e0d1d3e6d2849d5d69ec818b SHA512 897f0b6067537d6bb6d9a3fc48c65620ceb4bd74680661a69f67fcdee190d079aba5bb4e87fb706f9d61640dd909eda6e4b4609cb34126203310074f9041bccf
diff --git a/kde-apps/libkgapi/libkgapi-18.04.0.ebuild b/kde-apps/libkgapi/libkgapi-18.04.0.ebuild
new file mode 100644
index 000000000000..9f3e37a77649
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 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://cgit.kde.org/libkgapi.git"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+COMMON_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 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index e1eb7999ecb3..12ad6cbe484e 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1 +1,2 @@
 DIST libkgeomap-17.12.3.tar.xz 149616 BLAKE2B 105229bedee238e85d31e382fde4d3b86e44120f6caa4ed346ba2832f01a71cb9c072a7330679934399a492d4978a72e2cc027810d5f897e4f940d50c19581bd SHA512 8d2a504cd7abf4a70b3ef3d956504279b5e4e8c045771faaced9dec140252a37ccd6ec098e93572530196adb8503de597ba45b340f5a9e787706680e734bbe76
+DIST libkgeomap-18.04.0.tar.xz 149608 BLAKE2B 1c90570eaa7254e14dc211aaf0043b0e1910009e29239d4ef4d5756a663cf54ecfa8d37e8ca4100ed13e3229a5e2bf8ccd9fc48d5e701c2586b6c7fec376ab91 SHA512 1e20c3506f10484d3f390c116eaadcda206fe7647b5fe9368cf3976b90523dc39977a2b14754e332a5060832c19554297db9ace18424eb6be8a2d9e89baf4d5a
diff --git a/kde-apps/libkgeomap/libkgeomap-18.04.0.ebuild b/kde-apps/libkgeomap/libkgeomap-18.04.0.ebuild
new file mode 100644
index 000000000000..5bbaf24dbc0d
--- /dev/null
+++ b/kde-apps/libkgeomap/libkgeomap-18.04.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 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 485ed0ad6bfe..989b1578c7df 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1 +1,2 @@
 DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98df111ddf1742180250248d86413769561f33cb5e32dbf228adc6990684b7376155b502b679a174990c820ae5b9b5 SHA512 de41304046874c95555d25828e4cc89be6391adcad657aa912d0eae62bed1fd52930e420aa24d53ab1fbe47677408416ccd86f3de027839a8cb44cd67a0352a7
+DIST libkipi-18.04.0.tar.xz 103508 BLAKE2B 80b91d70e83342c715f4c44045e648f35bfc0e386afa5bebcaa3b258bd27236f3347b6c5049593ed256de032abc68c28f0959f20d2ce3a5bffea3d919234b540 SHA512 177f4295ccc5c37b0db9cc73bca22adb8c244435663bde054f3960fea90d4e35050c97e9612e2d9f8539b3b3ddb594f3b7596d3d217f80f6d38e3cd26ad183db
diff --git a/kde-apps/libkipi/libkipi-18.04.0.ebuild b/kde-apps/libkipi/libkipi-18.04.0.ebuild
new file mode 100644
index 000000000000..a0615d81f262
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-18.04.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 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 ~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 05df02bd9ffc..f8997786a8cf 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1 +1,2 @@
 DIST libkleo-17.12.3.tar.xz 314656 BLAKE2B 18556390e7dd405f274709df054881ea565973b1fa1b743312506716d9e88dad1680722df35bd0e5d4431394249d5b30caff27456eaa028c61160133374226a6 SHA512 0ed3fd2416b3838a295e877b7f4134f4e5e8abf67229b40a70fb1d2310115e1eb51ee990a3f8f80045169ceddbb5bc4df85b9b9109c3e2fcc9a3f8aaa93cbdb1
+DIST libkleo-18.04.0.tar.xz 317900 BLAKE2B 6b77cc9c3240078f8a18756c78589e7eb2fdb45a65eb5cd0fb122c110185e9bcc4098afb2dec9e84dc01c6a507111ca8ed46cd21b8379634cb07c968a3193e92 SHA512 edcbb8b01bdb30b82b7ae09e673166691b29f0ba7efccda9d1855fc92b1091087dd4c3933c2e77819b70ca1ca3289ea6b01391f19b9b12756b28659b18788f49
diff --git a/kde-apps/libkleo/libkleo-18.04.0.ebuild b/kde-apps/libkleo/libkleo-18.04.0.ebuild
new file mode 100644
index 000000000000..c7fd42409ee4
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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"
+IUSE=""
+
+COMMON_DEPEND="
+	$(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="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 896c25935702..ce29fd752760 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1 +1,2 @@
 DIST libkmahjongg-17.12.3.tar.xz 1684924 BLAKE2B e6be87c90fd56848d7328564478f39451e9f90819ebf5e3df1555e7da2bbfb4417d6c08586b3e91ee4d76d585bff468d1609c9de2a6b0fa1bfe4a9cb6b65bda1 SHA512 ce98494e7f6169176f1ba6bd612adbe69ff725d20881f9ddea358bf31a52a15913653dc774c00ae7f805d6d4e0c563d77ebbc724d57425583d49bb093c94c83f
+DIST libkmahjongg-18.04.0.tar.xz 1685688 BLAKE2B 43e8e7fdcd96e70da12c523d7c33987454950b5af5fd736f187fdd81d33f52416aff9daf4665ec515dd04410741e1e8538eda8e214fc97899a74b6f89340c040 SHA512 7c0f3312722145f5b7e8e7a1ccc6aa6a83e34d95a9192728d38abfb5db00f5328d71603f5fcc568281642ee32b23ccba10b37e788c7ab5bcc29a8a44f8bed219
diff --git a/kde-apps/libkmahjongg/libkmahjongg-18.04.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-18.04.0.ebuild
new file mode 100644
index 000000000000..d8054495d76b
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 ~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 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 8eb10f9ec164..192be10cee30 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1 +1,2 @@
 DIST libkomparediff2-17.12.3.tar.xz 173804 BLAKE2B 51c3b5020ad614e947c69e6134954bfcb31a989970e8a5bb38781ba15c6c25b9c2eb05cb5026b7e22bb8481bf1a7a4c95498331aa4626ee6a86f154b13fb225e SHA512 d0a36eebf6bd64f69a49ff2908cb37672bd1ca8778e515e6638d199a626175026cbbca4ebbc7bd8739c683195e203162139833c24b1be4adcb019730d4ddc1ae
+DIST libkomparediff2-18.04.0.tar.xz 176676 BLAKE2B a9d5b180f3e9240578cf86c499e429589145d3ca631450151f3963798ed7bb57d8535326cce41e8fbdc4fc69adbb4b6716a48c44c7565b695ad413963ad090c7 SHA512 69e5d8461b638bb62b3c07eecec6e9620f41a54aad0d4b93aaac12deb4a78564884d9d87e649755885117e97c1f35320a3f46412133c47e902ee15475bb0be28
diff --git a/kde-apps/libkomparediff2/libkomparediff2-18.04.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-18.04.0.ebuild
new file mode 100644
index 000000000000..78b78d3cb9ce
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 97ac065a6c09..d34ecaacf6c5 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1 +1,2 @@
 DIST libksane-17.12.3.tar.xz 136860 BLAKE2B 35b0a42949e007bdff85f9d6a68bbb52679e7d0307565f526354c21c0e027973ad5953aecb0dad31efc46927eef7b76dfb330083a9a3899a443d19c45868b1c0 SHA512 37c2e0dffb5cfa46254097668988da5691117b5fb4e93154e585025b031374577843d0c34d88515fc6068f80dd54b3865fb8e202b0b2e7c7a16729737dd79dd6
+DIST libksane-18.04.0.tar.xz 137260 BLAKE2B 017afd0330e3cd76b4565e3027e29220c3228d9b320a020ae88992556a8ee497a015ac2bcedf31deaf437caf8cac1c6aa691be5f2f55926930a4c71b82f67bac SHA512 e73ddfccbc28f7afefb058f65dc4313372cdcecf0e149d7b6c5d603b468e8955712f85114401648bdcee1c88ec26fe16dc2b9b3ccd01abbebb9fe5e0593309c0
diff --git a/kde-apps/libksane/libksane-18.04.0.ebuild b/kde-apps/libksane/libksane-18.04.0.ebuild
new file mode 100644
index 000000000000..4e7403dbbfc9
--- /dev/null
+++ b/kde-apps/libksane/libksane-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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="kwallet"
+
+DEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-gfx/sane-backends
+	kwallet? ( $(add_frameworks_dep kwallet) )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libksane-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/libksane/metadata.xml b/kde-apps/libksane/metadata.xml
index 2fdbf33d963d..080de1ce90f6 100644
--- a/kde-apps/libksane/metadata.xml
+++ b/kde-apps/libksane/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 583e64295ca8..66139e7d7f22 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1 +1,2 @@
 DIST libksieve-17.12.3.tar.xz 547852 BLAKE2B 28951b1af9ffec39ae86f718dc4dc860337a57f87a92716dc4db7ea1baac08d972210e655cdee1122fab7c0c30aa3ead36e2b4b52a47fb5d8a5cd4ea9fb9785a SHA512 d22dcb9294ff460511f64385988795d9ef16c3fd1766c9fa4e8696c5cde6250c5b499e135e605d97438aec91cbf831a9bed006aa008599d6d0eb1a30bfa5973c
+DIST libksieve-18.04.0.tar.xz 549664 BLAKE2B 5eb4b840ad6833c04d307c8bf1e51bd61c9acd026573f4de98c9487a5be9b5be731d7362680828828c3fb29c80e2ebde89ec734bf7852fa02b66b04a50a90eed SHA512 26c88483b8dc9a6d645aa6afd7c719e3c64150a31cfd3dbdb45e1c3a97b6b0553acf53617c5f27f91b7fdc9112c0f3df05abef93d12eebecc47043a411709759
diff --git a/kde-apps/libksieve/libksieve-18.04.0.ebuild b/kde-apps/libksieve/libksieve-18.04.0.ebuild
new file mode 100644
index 000000000000..aed045a2025a
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-18.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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=""
+
+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')
+	$(add_qt_dep qtwidgets)
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kimap)
+	$(add_kdeapps_dep kmailtransport)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 6e9b5119fdc9..eac2d8f0a9cc 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1 +1,2 @@
 DIST ktnef-17.12.3.tar.xz 299892 BLAKE2B 1dee6c9babf502d91540e7c0322dcd6c4d8ac6002887b677a8e2f549f9bc90a77c448f3f3cf2eca1beaaf38613f65dce70dd61765dbb2015569936957c30be06 SHA512 77e86827a0bfbe614cbe170b503c88b298f155a58ca381e914779a7ea2f82cc1fbd655735cc6586b07d8e0f73e3b38c7ff5b94cc4513fdb6de74a82940c468c4
+DIST ktnef-18.04.0.tar.xz 300124 BLAKE2B 73d49ae833f67bc0a2835657d3a2c9bc6750243b46cab700124ce3c5d57a1176286c6ae4cca4ee84a5a1bfa955c16fc114cd75255c64d9eecb3e343a88c07a24 SHA512 4d4c75de53082f68905c31077fb97f7ce9a2a4b48e3a0e0f7313027d70dae791933c666702028f397d90af60701a394a6b6698aa9e3ddbc43d8fd1fe74eb7426
diff --git a/kde-apps/libktnef/libktnef-18.04.0.ebuild b/kde-apps/libktnef/libktnef-18.04.0.ebuild
new file mode 100644
index 000000000000..bd9497e32c2e
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index 9e19ea98e930..0a627fee1edd 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1 +1,2 @@
 DIST lokalize-17.12.3.tar.xz 2219220 BLAKE2B 1f3d0617e7a504f643a52cecf1edbd50c62d4fb789914308fef9579649f0c272710ea0ee3682bceb6280d264481c228a52809bfb2623e0957ec4b1fea8256352 SHA512 02249c1aa91309bd7269eac593282d4b52ded71c7fdf251f01d63a56d7d0201b0def95b701cb5ff149468fc22edbe4022d1633d09adbbfdc8a8038460f3eed71
+DIST lokalize-18.04.0.tar.xz 2855348 BLAKE2B 07533eb3f06cb78d66260fc6b938cbc5e04b27c0be009de50c0c3daa69491602476ca1ce6a55b51b0dcfec9dc9d36a4a4b577c708a080b637c64dcdd46670332 SHA512 13d19544cb0b8a2be4d85df463f9a95b7f6ddf3d68c05d01484377c1d4b0b43a340fe09f99d42f7f41010200ae2a5d9bd130697e5b16a842c27079b88825dfc2
diff --git a/kde-apps/lokalize/lokalize-18.04.0.ebuild b/kde-apps/lokalize/lokalize-18.04.0.ebuild
new file mode 100644
index 000000000000..3bd5fd7b1459
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-18.04.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 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
+https://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 78db4e1758ae..61be7dc61371 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1 +1,2 @@
 DIST lskat-17.12.3.tar.xz 1216536 BLAKE2B 74fa8783569827a65a4554cb77a14fd61fb966c766b170f441d3c6655036ba0c582ecdbb06bd23a889ea759ccc34cdd80d6050fa8874d0e4cd8d22342c7f113d SHA512 519f68ab80771cd0704eb7c0afb3ef0c8b0f8e11d7cefed7e30a966dd0445adce9f6fe3a539be126640f70fd827f3f59a876d780a887e1086132ef6fdb8948b8
+DIST lskat-18.04.0.tar.xz 1216240 BLAKE2B 47c3fea707ac10f9068e130718ef943ae04d23d88939ef97c265ee27615bb1f9118e5b3aa74f82415e31d3ca53a2892b01598ad3bbf05807578efff4b3d36feb SHA512 0bdbae37f1f9bc231683a59eb30cf637859c249d9db750735e088d1dfed7576026cdcf34b05a695c3da9a2c5e53212e62cdff8614f395525e60b9bc02697267e
diff --git a/kde-apps/lskat/lskat-18.04.0.ebuild b/kde-apps/lskat/lskat-18.04.0.ebuild
new file mode 100644
index 000000000000..ca1d75ae4777
--- /dev/null
+++ b/kde-apps/lskat/lskat-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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="Skat game by KDE"
+HOMEPAGE="
+	https://www.kde.org/applications/games/lskat/
+	https://games.kde.org/game.php?game=lskat
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(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}
+	!<kde-apps/kde4-l10n-17.07.80
+"
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 0c896cbcb271..40dfcd5bd6f3 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1 +1,2 @@
 DIST mailcommon-17.12.3.tar.xz 683392 BLAKE2B bb4796e8ce8fee59e3b4849c2c7c386ada08f77e2c2c15b9425f29c32efc3c65bc4bf9f667fd4e465e7c5f218ea5830ac8a0416a956606c5c12f6918ee8e3b8e SHA512 49c6ad5844cf5f4f884b7cdbbb855973bf8d0e5b9630700e926b75024b6aab98f5f7e05dec6dace3648181f2c57e07344245b2d49c3f293e378310f4b647450b
+DIST mailcommon-18.04.0.tar.xz 691308 BLAKE2B 37d08ad2e9186817727cc76cadabe10e7a8af19e3d9ab295b295dfc76d74929a1f611d88c027de1c803ad4dbd628bd3925324701d9bd154944980521a3f070f5 SHA512 07ef385484ed649f62c33707012175f9c1449caa558713c776854a19c7415db3a88d6374b3bb07dadbc65e480f042c1b39aaf6481af815ea2c9c110d09beb4e7
diff --git a/kde-apps/mailcommon/mailcommon-18.04.0.ebuild b/kde-apps/mailcommon/mailcommon-18.04.0.ebuild
new file mode 100644
index 000000000000..22fe87d28fff
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-18.04.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 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=""
+
+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 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_frameworks_dep syntax-highlighting)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kcontacts)
+	$(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="${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 1e63946373c1..cfeddd6c5b47 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1 +1,2 @@
 DIST mailimporter-17.12.3.tar.xz 541040 BLAKE2B 42152e6205c7cd0320c6475f731af1cb1877ebbaf7b1b77fd3c84d2474ef7fd9b815e3640fbf962d283627b84cd5096a200e030ff8f22ad4052a8df27fe977ac SHA512 a3485867ef68499660c6b9b078a75892df0fb880a050699543fedfd32992deda641d1477c3f30036d59cdaf926a83ff868cec700a394e595216d0094870f8ded
+DIST mailimporter-18.04.0.tar.xz 540796 BLAKE2B 02cf5f5d360816644531f8a10635668b68b23bda807a47c2b090a9877be91fd973df3e0285f5f21845c399c691973b33dcf74b006ac4f0e9b179597e4ac754ee SHA512 8dcd8a06b8559074c8b0e8bf6e4f988dff56897dbab620001a54bac15d731621d213d5b08516cf7b199f7ce3ff616451fb128a31b791dc6c356ee0f51580a733
diff --git a/kde-apps/mailimporter/mailimporter-18.04.0.ebuild b/kde-apps/mailimporter/mailimporter-18.04.0.ebuild
new file mode 100644
index 000000000000..948285cee867
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-18.04.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index e125dc7907b9..49eb1948b824 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1 +1,2 @@
 DIST marble-17.12.3.tar.xz 52353704 BLAKE2B 529d889631fc5c2409d72bc7b1626673957db3db1b8e40478668596a3993dea67fd9f6d341e62ad426d1cc8e4295726471247bb9c2dc7fdf9439c4304f6bcff8 SHA512 a370f6bbce35ad4d4eb5a6d372939691322c81b7108fe64468ac3a2d491d0eb71e6c3135106e33d59115008a527aba60d2bd3508df721b5728286f526f199064
+DIST marble-18.04.0.tar.xz 52380012 BLAKE2B d4160cd6f29a35c30a1e54bda3d61f2db14a48a43fec36a8a8a53673c96259ccbc72ae3d416a3374745e94ada8fef41d731444f7fd75b9a1d07b127996f1513c SHA512 171c2301273446fbf4bed2283e83ecb6855ae5f25ca5cd2c94021a499af29b4530dfa7d07e5280b1970cef6139d2c622593cabccb2e283f2b2ca6b38e9264ca5
diff --git a/kde-apps/marble/marble-18.04.0.ebuild b/kde-apps/marble/marble-18.04.0.ebuild
new file mode 100644
index 000000000000..428bed2765e2
--- /dev/null
+++ b/kde-apps/marble/marble-18.04.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 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 ~x86"
+
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation 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) )
+	geolocation? ( $(add_qt_dep qtpositioning) )
+	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(+)] )
+	shapefile? ( sci-libs/shapelib:= )
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${RDEPEND}
+	aprs? ( dev-lang/perl )
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+# 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 geolocation 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 e509ad495feb..9bf0d709adea 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1 +1,2 @@
 DIST mbox-importer-17.12.3.tar.xz 32868 BLAKE2B 12d8d215e019a65e4f81239cda524cde0ea16dea78ccdde7fc5c7cef12234b2771ad140e29ba9d96b277188dc43f2faebb98f7ebffe9aa12b92ef5d69f777d0a SHA512 018aaa5f533dd70c1e11b164e9ea948dd04b31d6747cd879ee082fe0544b32a5d5223e9708d489c96b1b95f662d549a207c336555a6e16c28cd57345d8d50bcb
+DIST mbox-importer-18.04.0.tar.xz 33264 BLAKE2B 9f29ecd9615b9261e2fb4b317678f646160738cf85cf9de1e3f4b18783ee8857e2cb41126da3bc1663970e6686c9964652f3be9bdfcaabc289f7c1727011602a SHA512 64ea206c86fb5df1fa6567d2e0cf1fd383e93a254c3c91b84b9ecf4a51c34183de5549e80a62e44a488938e3808bb5994847cc78e6a6969fb3963992ae942660
diff --git a/kde-apps/mbox-importer/mbox-importer-18.04.0.ebuild b/kde-apps/mbox-importer/mbox-importer-18.04.0.ebuild
new file mode 100644
index 000000000000..7e0ab68ff2a9
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 5ac668d9edff..9e977bf45255 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1 +1,2 @@
 DIST messagelib-17.12.3.tar.xz 10462804 BLAKE2B 4fb020e5f351a14fa73cd8a648440bb2da8b9658fafd36fa58b7499726bce480e5d452c64a3ca5cc2e8b99596088b858601dc97311bd3ab6b8fceaf0ac2738f3 SHA512 db83fe6de67a4fb2a805d8aaec8de6455509868e1bf664bcd5a3f6d25ec100dce71ca517d4de11c9bacaf194c2dcab78b83c15ef0d0eb82a789ad1af5a352412
+DIST messagelib-18.04.0.tar.xz 10481152 BLAKE2B 37112b53ac62bddb9b20bd63defcf8d203327936393b52c01cffcf15161c6d642dbf9265cc024ac70095d1408b9f00c136af4c48b2920eb3747bf2bee3dea49a SHA512 d49fdab39e7a574b5b6cbf4977f7727bcfb10ac9225efe10a96157e20115c21d295000a3d45783d96a56a73c3d9cc36b024b191d568ff3c5a7e6a056ab8bfafd
diff --git a/kde-apps/messagelib/messagelib-18.04.0.ebuild b/kde-apps/messagelib/messagelib-18.04.0.ebuild
new file mode 100644
index 000000000000..2c9ae95e4387
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-18.04.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 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="Libraries for messaging functions"
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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)
+	$(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/kdepim-l10n
+	!=kde-apps/kmail-4.4*:4
+"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index ea16d80e6393..622cd1990b8d 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1 +1,2 @@
 DIST minuet-17.12.3.tar.xz 27860148 BLAKE2B 20d897fbebe844fd77da3c1cffd94c021999263b434507a2bc73ce5c2a7e3d0823c2f724a6d51450fbfbc450a72a66cc4823d6c350090372280b51bc5f3458c9 SHA512 ddba91a1d8165412099bd60cc06e57db70b3aa6997bb93c9e3c46ea933df728836cd59f24a2b7ff1e1adc71e802a0c237ea90a72012bbee79c6601f73e650dbd
+DIST minuet-18.04.0.tar.xz 27859352 BLAKE2B 33062189663680105c8ad76c54e2c265cf2979663926425f225bf2ce1756218e2e86bfea954fd963112bb342a4d6a85afcb07f2ae26d31fb7752ddd3ae89f139 SHA512 95eb9712ec61cda975cd9c815423dff21cf5d0e9b1f3c1c1ee5bc1926d78c033b6b631256052cc72facf70ade3d32d8d1a9044e4a0038a90b8dd2ffd91f82e86
diff --git a/kde-apps/minuet/minuet-18.04.0.ebuild b/kde-apps/minuet/minuet-18.04.0.ebuild
new file mode 100644
index 000000000000..c0bd89a53dfc
--- /dev/null
+++ b/kde-apps/minuet/minuet-18.04.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+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/okular/Manifest b/kde-apps/okular/Manifest
index bd6e0e5df8c8..32067a4d76da 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1 +1,2 @@
 DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361
+DIST okular-18.04.0.tar.xz 5777760 BLAKE2B 421d16d2e28fc996b96f6572abe0b251d8b935f62a4f1d2337d85fe63aa71551ef27aa81dff6e4cfeb5b6cda1e386b4e7661a2f5ef668fa3367d543a819fb4a9 SHA512 01ae6f4f4370e16fe67b04837e2ff4000d12d0934ae4c442d137cc99ade2dfca376b4b630aecb85a8efd727801f13fbef432ec37a08dec86739c994e202c79a9
diff --git a/kde-apps/okular/files/okular-18.03.90-kcrash.patch b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
new file mode 100644
index 000000000000..39ce8c3b0354
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
@@ -0,0 +1,60 @@
+From 3e25263d7709524e227207092533397ef65f2c82 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 8 Apr 2018 11:50:18 +0200
+Subject: Use KCrash
+
+---
+ CMakeLists.txt       | 1 +
+ shell/CMakeLists.txt | 2 +-
+ shell/main.cpp       | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b38cac..fd2d55e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,6 +53,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+     Config
+     ConfigWidgets
+     CoreAddons
++    Crash
+     DocTools
+     IconThemes
+     JS
+diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
+index ec2f1ba..e85076d 100644
+--- a/shell/CMakeLists.txt
++++ b/shell/CMakeLists.txt
+@@ -27,7 +27,7 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
+ 
+ add_executable(okular ${okular_SRCS})
+ 
+-target_link_libraries(okular KF5::Parts KF5::WindowSystem)
++target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash)
+ 
+ if(NOT WIN32)
+ 	target_link_libraries(okular KF5::Activities)
+diff --git a/shell/main.cpp b/shell/main.cpp
+index 3f8dc43..de8a5c2 100644
+--- a/shell/main.cpp
++++ b/shell/main.cpp
+@@ -20,6 +20,7 @@
+ #include <kwindowsystem.h>
+ #include <QApplication>
+ #include <KAboutData>
++#include <KCrash>
+ #include <KMessageBox>
+ #include <QCommandLineParser>
+ #include <QCommandLineOption>
+@@ -39,6 +40,8 @@ int main(int argc, char** argv)
+     // set icon for shells which do not use desktop file metadata
+     QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
+ 
++    KCrash::initialize();
++
+     QCommandLineParser parser;
+     // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility
+     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/okular/okular-18.04.0.ebuild b/kde-apps/okular/okular-18.04.0.ebuild
new file mode 100644
index 000000000000..94de9fbb3559
--- /dev/null
+++ b/kde-apps/okular/okular-18.04.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share 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 kcrash)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kwallet)
+	$(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 )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		$(add_kdeapps_dep libkexiv2)
+		$(add_qt_dep qtgui 'gif,jpeg,png')
+	)
+	markdown? ( app-text/discount )
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( app-text/poppler[qt5] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	share? ( $(add_frameworks_dep purpose) )
+	speech? ( $(add_qt_dep qtspeech) )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( $(add_frameworks_dep kimageformats) )
+	mobile? (
+		$(add_frameworks_dep kirigami)
+		$(add_qt_dep qtquickcontrols)
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+
+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 epub EPub)
+		$(cmake-utils_use_find_package image-backend KF5KExiv2)
+		$(cmake-utils_use_find_package markdown Discount)
+		$(cmake-utils_use_find_package mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package plucker JPEG)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
+	local myctestargs=(
+		-E "(mainshelltest|chmgeneratortest|parttest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 4f89cb7324f3..45c89275eeaf 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1 +1,2 @@
 DIST palapeli-17.12.3.tar.xz 2061492 BLAKE2B 677f29453a22a4f48b842f4c8d368251344cf9cd2cfcfee0b3e2fd6aed315a2879e6a6c86003debf2ffbcf083a9b1164171fafc14691df953f909185c74a8edd SHA512 7c43d9854fa8d27290b97d8fbb56594ca45593d80ac029652ed355c0bd59eac3c73d0b226a91801a7dd62c76c41a53783dbfbc62238dc26cd6bf3aad3aadec58
+DIST palapeli-18.04.0.tar.xz 2061472 BLAKE2B 5e26c33ac0a246e59d870156b6da5a696fd731b694b92e03a7f6f8ce4cbd2224811bc342d2a5183b9686c0d88a6f5fcbabfff074ab8024791e25ca331ee8069f SHA512 34cbdb5718376f0d13be64e2cce577377353e0abe8dacd7e4654c9bc34bf7363e4611e43386722f196418b640df2c2cb90347e57fef04090ad3b9f3096e8203f
diff --git a/kde-apps/palapeli/palapeli-18.04.0.ebuild b/kde-apps/palapeli/palapeli-18.04.0.ebuild
new file mode 100644
index 000000000000..40ee410a23a5
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-18.04.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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 kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index c47e48b33ffc..9b6f3ad9e3a9 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1 +1,2 @@
 DIST parley-17.12.3.tar.xz 8826604 BLAKE2B b24d1f7fde26b78c4d7abcdc18994a09adc58a29edd6123c8961d2dc148aa1adb82b0791e98dd4f4f588acf2400ce64b7a911334909b75deca07cfb0dde5dd84 SHA512 301e87605e754aaed520fa1bf96a7cf23b0c0a6523ae59817a6b14a8f69d3689a8646437e580a3257f42b197e6c7f899593cd242e9cd44ea1cd135327e83885f
+DIST parley-18.04.0.tar.xz 8828880 BLAKE2B 0c6d5327ee90c38665c3a6ba624301b3e34bfed752153bc4ece443c46a3f9d56bdc0eba8211fddccc555eb2fcc59d87f8d66b2150432fd821416f1913bd320e3 SHA512 29db546947d7773ed50c3810a64343c1d4db0b89fc92f5cae361bb173b072cb880a87207c0b39ec0527f3f3c13e09f39ef847a18820daa63e57074135e6e7468
diff --git a/kde-apps/parley/parley-18.04.0.ebuild b/kde-apps/parley/parley-18.04.0.ebuild
new file mode 100644
index 000000000000..d059e01c325e
--- /dev/null
+++ b/kde-apps/parley/parley-18.04.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 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)
+	$(add_qt_dep qtwebengine 'widgets')
+	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 d3a884e22489..fe89aded90ca 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1 +1,2 @@
 DIST picmi-17.12.3.tar.xz 1147600 BLAKE2B 9a09704d57b93e6e8ffbd5843570f9c6ab407c31a60313f9c4119aab97237b348b17ad1d8cc1437a664f05411816e91e8870694e8aeb09e9275e3327e0092f5d SHA512 06fff4d49e4e2bea3aab3c0ac9d06552acbe1b4e006ed79d5a1f10c31f4f7255bf132fe6149451536498959eb90fc7dad3c20396f783efe5c16fecb2b4828647
+DIST picmi-18.04.0.tar.xz 1148192 BLAKE2B 4261580e642a587382895372b4085f6114fab149ca66d0d1252a9913c1b35cf3cae4b3ec4ed9c052447d5d7015729d2028955dd6f9e86fc524ea709c23ab8b90 SHA512 522605f350ea6539ecceb5d1b2198c19392e5a12077f093ddb386890714bbefbb9d6cfc534fb6016cb04af065d62bd2a44a2292390b4b51fba11328d81c9423b
diff --git a/kde-apps/picmi/picmi-18.04.0.ebuild b/kde-apps/picmi/picmi-18.04.0.ebuild
new file mode 100644
index 000000000000..c25ff58b234c
--- /dev/null
+++ b/kde-apps/picmi/picmi-18.04.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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 3f3832443aaf..22e05a1ef0ec 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1 +1,2 @@
 DIST pim-data-exporter-17.12.3.tar.xz 267124 BLAKE2B 6c515327b444c9a7ddecdaa4e13f8d2c7f674a6acd1b2d4a5e314f330bb9e505112bad52674639f4a1f2f1ed29f5c5903b5eeba62578b49354a7feea0005fc21 SHA512 e0dd0fd6356b668f662afedb64d3fb9ed68da9b869635b7773bcae23262245e4b3246e0eec9b4e5bd45c28c506a0e54cea5819556bc1681378417830de458a0f
+DIST pim-data-exporter-18.04.0.tar.xz 269208 BLAKE2B 118dd043eac223d192b0fd622346abb104218ee8173a3ed0826515d22de6aa22351c261dbc126f302f68b930b04a50019ac189b3c1d9959b4ac253050a332811 SHA512 c60dc276e154b7003db30dbe0d3ad8a475c3f09a99909d707a024a734ff4435ae893a9ed84867dd56942602b0e3c7dd58d42a1bb2b3d45a6f2c90076284e292b
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-18.04.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.0.ebuild
new file mode 100644
index 000000000000..d6967027d499
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-18.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index f53467a88a6e..a307c61dce4a 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1 +1,2 @@
 DIST pim-sieve-editor-17.12.3.tar.xz 444364 BLAKE2B 621dff6212eb50b328ea5a559cff3322fb7a7e22d7ad33937c0a84e3bd4af5b519e1c1abb4a5586e84b042e4f0d4c39416aa0e8404ebc786f400747c85533e3b SHA512 812508b69ed0d4f0d2312cc74a3f800a06246e0984fcde386fdbb9e9a4ba949dfdb8c41a88f5a6d01d4f4c0c019a791a1c72edc50f446dcd9bd68a18c6623bd9
+DIST pim-sieve-editor-18.04.0.tar.xz 445536 BLAKE2B 7fed134fc7381a43e121e21da66a054460ec1600839ffca19f6d1c7fb2ee6fb92333dddcef9d9819c15bc8a3685c8df65d68e07209c2233954bbd0ae2a07bdf8 SHA512 1feac4310a254ddee7e0bfd47bd6ff7c8c106d803cb30e9b06d0a8cfc5f509e183761416c736ab30de039e6771d83c3d155c7e346574e135be65ceea2a7c766c
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.0.ebuild
new file mode 100644
index 000000000000..844361049fc3
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-18.04.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 8ebb99a746d6..d3b50cef802c 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1 +1,2 @@
 DIST pimcommon-17.12.3.tar.xz 287564 BLAKE2B 862d6bea6398edffca88f78901f8c59ab8721b210cd9d4e7e73f16474c7c58357977981d65a808b2d02501927257e96990b79071056e86aad08d97d23491569d SHA512 79aa5f3b7d61de547a07ef659e1a7d0b2c456010cb7ad929218853d5f1057a97e5a0e2d1197cb50a1f5bb201b3702efa0e3e1c154d530c49ebe51578d2690df1
+DIST pimcommon-18.04.0.tar.xz 294388 BLAKE2B da856103d50a2502d138a16d017b49fc98307949c2408ea8b6e2c80adb311dc9a137291a312ae53086ba984b2c07d491540744c86696f82e7179d92ee6861693 SHA512 cd9cd90cd057acdc675780e1ebb0ebe310b122f7d9e8cd32d48ba7e53d070d9ee2a3758f6159f82f10786f2b01962e92631d1d549578bb5630780271dbd3caf9
diff --git a/kde-apps/pimcommon/pimcommon-18.04.0.ebuild b/kde-apps/pimcommon/pimcommon-18.04.0.ebuild
new file mode 100644
index 000000000000..6295115f9d17
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-18.04.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 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 kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kimap)
+	$(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 qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kiconthemes)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep kmime) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bug 641730
+	local myctestargs=(
+		-E "(autocorrectiontest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.0.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.0.ebuild
new file mode 100644
index 000000000000..c133533744d5
--- /dev/null
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.04.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 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/KTp"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+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)
+	gstreamer? ( $(add_kdeapps_dep ktp-call-ui) )
+"
+
+pkg_postinst() {
+	elog "You can configure the accounts in Plasma System Settings"
+	elog "and then add the Instant Messaging plasma applet to access the contact list."
+}
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 760320b1b9fb..81a024be0932 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1 +1,2 @@
 DIST poxml-17.12.3.tar.xz 43004 BLAKE2B d6a29c953c091cb7df6a181285ed1a9376db87be2617b00efe9de56ae6bc06d11522a0fac69a7a4d1e2b1a085227c0e17935bb1ff0abca6119bb115b72e2a952 SHA512 c9b45bf37c200b206ab4e114964d6dfce941f974f56d2703ce9ce5ea5314be0224cbf3fa1855d0e423b27b7ca1664a9a372f9322305c76b26bb340e9876a0e34
+DIST poxml-18.04.0.tar.xz 43028 BLAKE2B 5b6be8bc5a77e340c0a54697f0ce04c52447b469897839d7d0bf761ef0c2354353add06895702eea0b4b6dc4f0cbae189de1e4cb49e6a0c5e3735a913773d94f SHA512 670b874b0ee2b62b431c141d91da06619b735a9c2085dbb97485693372c4f8bbf9a9c4b3a68beb67670182630f4925d42fe7bdb0cb6ac4046dbd0d571623c43d
diff --git a/kde-apps/poxml/poxml-18.04.0.ebuild b/kde-apps/poxml/poxml-18.04.0.ebuild
new file mode 100644
index 000000000000..3c605a013f0f
--- /dev/null
+++ b/kde-apps/poxml/poxml-18.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 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 e7e055f520ea..44c07f6a9a02 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1 +1,2 @@
 DIST print-manager-17.12.3.tar.xz 237128 BLAKE2B cc1a85c6ed2f160329c5428de7c6de562de7f5c3876fdd504e619801e8ededd792c8b69c9193a787d1600948f7fae3a62a7290e1e50ea5bf39475d9db9c9c66c SHA512 80e40c913da002beb3e473e0e6fa6f02b0e3b699bdc49c390435d9139f46b1fb3ffef54c042b5dc2a1db3b83da2f4f53377710b31281b0154f9654f605b95830
+DIST print-manager-18.04.0.tar.xz 238056 BLAKE2B 3d278db0084c380b164682e3a87f11308be7054dc07c05178027568b911e0dfa72334fcb7a54d2a4510d94467b08551d3ef9410a3d8dcdc92958096c6a7b3c1d SHA512 cceef4517d9bacf5a1b5bfb50f2233a824f0aaade258510e89ce712486e5c667fa79b78bf3cab9090276ec59ea7c0cb25b20d8d94f52c82aff5290f9ae55a65c
diff --git a/kde-apps/print-manager/print-manager-18.04.0.ebuild b/kde-apps/print-manager/print-manager-18.04.0.ebuild
new file mode 100644
index 000000000000..e59f9d37adbc
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-18.04.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 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 542fddcbf367..abf44834919f 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1 +1,2 @@
 DIST rocs-17.12.3.tar.xz 1529908 BLAKE2B 2913e6b609b349c6b4fe2e08c41ba63c90f0a144676ec9dd64203f01ca0240b934e0de48e2e068dfa2c860be5bfdf4fcf883b27b1c11b7dccc6d832dbff520ad SHA512 5b90ed37b62ba5752843d0d9be46e5139fc7017dc5f620ad5bd07de10a6cb6acf601609edf5856048914fa11866045b2e1fcd859881dc6e9bcaf5239ccb2a6e2
+DIST rocs-18.04.0.tar.xz 1535400 BLAKE2B 921a4d9f7951c2f359feea3e5b6c6b580a4d570cb5c780d3f26d081e2688079b473b50e9b9a7dc31414b2c64b3bc1a557e1fda78eaaf8da35fda304f8a21fba8 SHA512 30ca7a0a3eae29472ca021c330bc9426cebf678a3d018f29b57d563e88379d640b4933b54c8c08724adc595e75f82a4c8de97c2a0f4772cdcb3195dd87be88c8
diff --git a/kde-apps/rocs/rocs-18.04.0.ebuild b/kde-apps/rocs/rocs-18.04.0.ebuild
new file mode 100644
index 000000000000..e20797a7baff
--- /dev/null
+++ b/kde-apps/rocs/rocs-18.04.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 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 613abda4ebee..efc94b7b3804 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1 +1,2 @@
 DIST signon-kwallet-extension-17.12.3.tar.xz 10580 BLAKE2B f5b674d99146663411ece436715330a990d15d19befaeb481e97669a9fc84c6e726deabb247c084e9761c713d98ad250ea2fa3cfc4996ab640d1aca3e9e27ea8 SHA512 181f990db14bcb7c2247a85dae98026289bfacf3f6052047c7d8590c3e756f06f072569c295d687bd3fb81a45796e6e2436665dd1bf233c0ec6e84bcd03c7588
+DIST signon-kwallet-extension-18.04.0.tar.xz 10580 BLAKE2B 3e327665058237d3118c7f2b8cdae82cf5009622b40632f65d9ed00a07c8765779e7601b295a0eaa9b54593f3f384e349e1fe47c0010225946eeff6c2a506ccc SHA512 d6c8a62aed70e4818db2cb55ad3caf01e5f9abd27f773383092b8748c7aac96ad9c7df2ae3728f6cee0d671a6504214b7c661c6bffb7419c3ba3d9f9ea40bb55
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.0.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.0.ebuild
new file mode 100644
index 000000000000..ce5d29586a9f
--- /dev/null
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-18.04.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 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 8e585403614e..2d5127287bc4 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1 +1,2 @@
 DIST spectacle-17.12.3.tar.xz 765132 BLAKE2B 824e2f260e6da5daf51463dd9f99d4a4dc405e9b3c9c1149cf8dc6dc4296ac7ae75d2dba7ca341c767b86ef0d6fac44a50cc644e9a8dcee469de7bd5f792e514 SHA512 286a4c4fb0a6d97eb31bed38865f2717b52c215074bee5dc4b5730ba607d6d25ce641d1b611e974178d33d6bff400e88cc0730c6249d21a4308d0092fcff3ef9
+DIST spectacle-18.04.0.tar.xz 1070296 BLAKE2B 2b73f76ef6a0d099bb71d4414940570cccf6380b9c3ffd413d492e9317a2d5cc29d6c6bba049347d0fd44ee23feed66294ac0541a16d02c39139276b2d2a52e3 SHA512 931e11340d59542b6093263fd0183f93692a9cf9524f241ddfd98c1d88a913481593a946e07b3a7bed11a3324cd9ab2e4180a6407181c2023e29e5f735c0c608
diff --git a/kde-apps/spectacle/spectacle-18.04.0.ebuild b/kde-apps/spectacle/spectacle-18.04.0.ebuild
new file mode 100644
index 000000000000..cf8b419f4a56
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-18.04.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 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? ( $(add_frameworks_dep purpose) )
+"
+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 ce1a06e10632..e62f306343cb 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1 +1,2 @@
 DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f384c11a8bed32c9084b5b31debf463645d5b1f697a62a6dc1f08a2e481246be25518cf1c526d58d0f29614a43 SHA512 40de257c593483bf1ddc84c76b8bab608d8e0ac49b0bd5acbb94a3f1bc6dba0cbe18f30d9e4d4ccdcf5e764a21209229b57abb8c3149dc9fca86fe00a732c4f3
+DIST step-18.04.0.tar.xz 862360 BLAKE2B ec64db5b55c19ab39266ccf084caf3a83afb3e739ed23afe51c79bcd0eb36541bf7b5a6649c54e6021b612ae1b48ef1dcb06022540e9c6e721dfdabbcc7a8da6 SHA512 c29b55a76627379d424eb5498e8cb8b98893e214440077c6df9b5d46d5dd3259ab6e9a37658fb811a42206f5a8aa4e5253a5227bb7fa64ac68fe7701d5eaade8
diff --git a/kde-apps/step/step-18.04.0.ebuild b/kde-apps/step/step-18.04.0.ebuild
new file mode 100644
index 000000000000..c14241e8ebe8
--- /dev/null
+++ b/kde-apps/step/step-18.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 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 nls +qalculate"
+
+RDEPEND="
+	$(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 ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtopengl)
+	$(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:= )
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+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 0110e22c16be..816199eb3352 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1 +1,2 @@
 DIST svgpart-17.12.3.tar.xz 20836 BLAKE2B 1c17ed56a304398cde1be7e6c9fd1faab134666c306dd871fef9bd7a8f5d777e4c909159edb7f5ed56b6b709589640fa119bb7daa4df5a88297d557215b2aa2d SHA512 fe49860728452ec4d7dc42ef5532b162f5baa1d50b83254f27f148a3fea41efb179f90162c4dc83aeaa5639cbfcca251f696ba44d63d898357d535080f4fd329
+DIST svgpart-18.04.0.tar.xz 20832 BLAKE2B 27150d11a9cdd83a14be2a21daef96b0a6c8047635f52b5401ded7d386fe449c93105e28366b7b807ba8e2729bf1f0f6b628322a59ea3e51b402ce28ad0a4d0f SHA512 736e9c985238c72bc9938faaa98dbc425fe654a4f396472d62d52cc4dee2c9ebb8fd529270ec91078373b807ebdf321a2b058fae2179e6936d9b50a15fb18f55
diff --git a/kde-apps/svgpart/svgpart-18.04.0.ebuild b/kde-apps/svgpart/svgpart-18.04.0.ebuild
new file mode 100644
index 000000000000..a2929a955b58
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-18.04.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 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 ~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 109fd088c1e4..fc3c92c8f2f0 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1 +1,2 @@
 DIST sweeper-17.12.3.tar.xz 382244 BLAKE2B 9dae94d488241f330b04ade4b07061fd3407020ab6b246339906bdbe9599a316ba90232b2ba684e1f9b502b60347d3b3c8d47b61add4b3b62c1e200c76519eb4 SHA512 0f62ec23f3ab3d6e50787ceceef611cfc02af1c6f7a85e87f59b08f337b064ea34a5a6339f88ef909cb970ac9850eb660a03344cda4772564d4766fa6b727a95
+DIST sweeper-18.04.0.tar.xz 368508 BLAKE2B f87e70f5802c6f9db37b1ee96eab93906e76e6f0d5c2102f80e9031c39f1940e9d570485ccf5931662e7a9e635dd5f0f5495b3c288eccf1c9b0c6d1f5723ba88 SHA512 8a7b978bf50fd64592d59f3488b39c73612d3b12fa6d7ef02122f5d596ff5fe3a275a4d0526bd0e7d61ddf93b1538a212ea49494eba979ad2284db002e25d43e
diff --git a/kde-apps/sweeper/sweeper-18.04.0.ebuild b/kde-apps/sweeper/sweeper-18.04.0.ebuild
new file mode 100644
index 000000000000..41e32c5dd330
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-18.04.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
+HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
+https://utils.kde.org/projects/sweeper"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kactivities-stats)
+	$(add_frameworks_dep kbookmarks)
+	$(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 ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"
diff --git a/kde-apps/syndication/Manifest b/kde-apps/syndication/Manifest
index 8730177be9f0..91d7f3029158 100644
--- a/kde-apps/syndication/Manifest
+++ b/kde-apps/syndication/Manifest
@@ -1 +1,2 @@
 DIST syndication-17.12.3.tar.xz 159804 BLAKE2B bf89604b4976a28016720d74ab5c36de7bbaca08cc15c1db2d03ccad339049fae5fd06eced4e8c60ee278ad4fcaac3ceca3ee8f217839936cc79ea995f4de31f SHA512 a1f2c472194355b570e4128ab4e4be70d6baa3d1c91e35706b7ec242caa950ec3686ab20772aec6fc2ecc7b0d6b390195e6bca5ec8a130951886589df73c1f9c
+DIST syndication-18.04.0.tar.xz 159864 BLAKE2B e86d7c58c84b92bbbf8e517f01df9b2d3bd97f986bd9231e0eaa349f76eb8d92942a13ab0de467208b482bb1ade6f878b6cbd2f8344a8fa2128331f8c03de7a4 SHA512 75dd0c14f22e1fb2cfbb3d11fb242471c8e1dc89f3a79568363ac70eba7ac68ec2c7ec6f9e0d49108621c43fb2d63912ecf2709210e274a65b183b8f147e3ab7
diff --git a/kde-apps/syndication/syndication-18.04.0.ebuild b/kde-apps/syndication/syndication-18.04.0.ebuild
new file mode 100644
index 000000000000..3ee4afc41ebb
--- /dev/null
+++ b/kde-apps/syndication/syndication-18.04.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 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 1c193b10a558..df077b9747bc 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1 +1,2 @@
 DIST kdegraphics-thumbnailers-17.12.3.tar.xz 41628 BLAKE2B 41a95cf201d03d7ef0a4b35c9603c61113f3fbf2a5319724b88a14de979c310e2d50f2ac0fa68d60cdb7bf4d396d21d59bb60622b18ad548cd5389b68e8c0e46 SHA512 67bfea3314008d2024d07afe02b4a9b2d7d952460e831c152b6eb79b9214e73c4a90312b27f6fb02666edf2e40baa59c5c924f5750bb56d731ab09c9b2cddd6c
+DIST kdegraphics-thumbnailers-18.04.0.tar.xz 41336 BLAKE2B 7e3093e88cb8f47fd971baa97157786595cbe50a993fe305bf6f17ae2fcfaad9753cb4c1f042ddb979725e2dc22499d06485647e2b54a6e907c33be9e1e75c3f SHA512 5d5bf5d5cd5deef773275fc279005c6b343efaa89df7318881c17ee62a567e9559e139fa3a64afef13839b253b430ada4149a5255e2d30c28356e704d8cf2234
diff --git a/kde-apps/thumbnailers/thumbnailers-18.04.0.ebuild b/kde-apps/thumbnailers/thumbnailers-18.04.0.ebuild
new file mode 100644
index 000000000000..ff1362dbc75b
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-18.04.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 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 6b5288f390c1..d4880da3fb30 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1 +1,2 @@
 DIST umbrello-17.12.3.tar.xz 2960868 BLAKE2B 1218ff36c08404312c182dddfd21179dd579e07c11b819f08333568bcd1639f56be3d85e268e2815dbdcd7576e8a33638148aa417a1a4830a85585b301912a1c SHA512 e878e4add5301ee60a11522b678c781c54582fb36d4a59451bdc4a1220559cfe4128451271198f93f0333204c3a42cbff73b75e9d6c83ecf4b75e98c4a5b12fd
+DIST umbrello-18.04.0.tar.xz 3023060 BLAKE2B 6f57cae4c4225fddf7cddfc9aba39856674c7c7531b1eb9fec2140607c33905b8219c2d7ad40a8dc3b9e95c12a4e5298ebeff090e0db49b844d82ca47bbcc1bb SHA512 f67aebfd0c666e2b4a0ad4e44e8e4599bcead4fd8fe5468670e58051c72eab99e6add88880e0bfa605f91932ea7872f4e822ab1cd385e441b69bf77ff9b6b5d9
diff --git a/kde-apps/umbrello/umbrello-18.04.0.ebuild b/kde-apps/umbrello/umbrello-18.04.0.ebuild
new file mode 100644
index 000000000000..7b9d3d5c2d81
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-18.04.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+	https://www.kde.org/applications/development/umbrello
+	https://umbrello.kde.org
+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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 kcrash)
+	$(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
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kdelibs4support)
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kde4-l10n-17.07.80
+"
+
+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 31607cb9be7f..0dabf9ce997e 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1 +1,2 @@
 DIST zeroconf-ioslave-17.12.3.tar.xz 38576 BLAKE2B 69b06025f51c5d9c9104e60e35cfc0399dd6b0f40097174a402476630656a2a8f2ea72a14d029a92b9eebd7d4e954c1d3c96cc921c8b23002b5ff16ad7b49228 SHA512 1d41a2da78a0e161f8d31a65e6783a8ffe4820837d8e509b241916f78a046f286bbd129c116b88f98f270c61b8bb1bee358004f01d44112dfe25c391fb96c152
+DIST zeroconf-ioslave-18.04.0.tar.xz 38680 BLAKE2B 50cb62d4a0adb12b34d275be981792a5cddae25301b350183b7dfb20c5d2f7b62c5815cac29e6578e4aafcfb61fe90bfd18c7c677ab2575c3e4e735559eabce8 SHA512 d652dc5e29c38cbb2f59a5a097c373daa0b2e1247d0c83e5d927e88b694b5ff0f7b13e94f3672e402485b0223324d1443b3b0b5ef2ea88674372a3d228a4f15e
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.0.ebuild
new file mode 100644
index 000000000000..9b485d5e9478
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-18.04.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_qt_dep qtdbus)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kde4-l10n
+"