kde-apps: Drop kde5-meta-pkg

Add HOMEPAGE to individual *meta ebuilds (half of them already overridden)
Add LICENSE to individual *meta ebuilds (fixing plasma-telepathy-meta)
Add SLOT definition to individual *meta ebuilds
Drop all !kde-apps/${PN} blockers except for kdepim-meta

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

45 files changed, 837 insertions, 774 deletions

diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
index 6b17fb64a63..bd13687b358 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.0.ebuild
@@ -3,22 +3,24 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Meta package for the KDE Applications collection"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="accessibility pim sdk"
 
 RDEPEND="
-	$(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) )
+	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
+	>=kde-apps/kdegames-meta-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
+	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.49.9999.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.49.9999.ebuild
index d0033d921e4..1be73159249 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-18.12.49.9999.ebuild
@@ -3,22 +3,24 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Meta package for the KDE Applications collection"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="accessibility pim sdk"
 
 RDEPEND="
-	$(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) )
+	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
+	>=kde-apps/kdegames-meta-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
+	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
index d0033d921e4..1be73159249 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild
@@ -3,22 +3,24 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Meta package for the KDE Applications collection"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="accessibility pim sdk"
 
 RDEPEND="
-	$(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) )
+	>=kde-apps/kdeadmin-meta-${PV}:${SLOT}
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	>=kde-apps/kdeedu-meta-${PV}:${SLOT}
+	>=kde-apps/kdegames-meta-${PV}:${SLOT}
+	>=kde-apps/kdegraphics-meta-${PV}:${SLOT}
+	>=kde-apps/kdemultimedia-meta-${PV}:${SLOT}
+	>=kde-apps/kdenetwork-meta-${PV}:${SLOT}
+	>=kde-apps/kdeutils-meta-${PV}:${SLOT}
+	accessibility? ( >=kde-apps/kdeaccessibility-meta-${PV}:${SLOT} )
+	pim? ( >=kde-apps/kdepim-meta-${PV}:${SLOT} )
+	sdk? ( >=kde-apps/kdesdk-meta-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kde-meta/kde-meta-18.12.0.ebuild b/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
index 488d578adbf..977c8ae36a3 100644
--- a/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
+++ b/kde-apps/kde-meta/kde-meta-18.12.0.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kde-apps-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta:5
 "
diff --git a/kde-apps/kde-meta/kde-meta-18.12.49.9999.ebuild b/kde-apps/kde-meta/kde-meta-18.12.49.9999.ebuild
index bfc301e15ac..d937d4d6983 100644
--- a/kde-apps/kde-meta/kde-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kde-meta/kde-meta-18.12.49.9999.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kde-apps-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta:5
 "
diff --git a/kde-apps/kde-meta/kde-meta-9999.ebuild b/kde-apps/kde-meta/kde-meta-9999.ebuild
index a17e8d59615..d937d4d6983 100644
--- a/kde-apps/kde-meta/kde-meta-9999.ebuild
+++ b/kde-apps/kde-meta/kde-meta-9999.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kde-apps-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kde-apps-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta:5
 "
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
index bc73a27f1bb..ff81519fdc0 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.0.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kmag)
-	$(add_kdeapps_dep kmousetool)
-	$(add_kdeapps_dep kmouth)
+	>=kde-apps/kmag-${PV}:${SLOT}
+	>=kde-apps/kmousetool-${PV}:${SLOT}
+	>=kde-apps/kmouth-${PV}:${SLOT}
 "
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.49.9999.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.49.9999.ebuild
index 3a906c57793..ba2b9da74ab 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-18.12.49.9999.ebuild
@@ -3,14 +3,16 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kmag)
-	$(add_kdeapps_dep kmousetool)
-	$(add_kdeapps_dep kmouth)
+	>=kde-apps/kmag-${PV}:${SLOT}
+	>=kde-apps/kmousetool-${PV}:${SLOT}
+	>=kde-apps/kmouth-${PV}:${SLOT}
 "
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
index 675abc136b6..ba2b9da74ab 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-9999.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kmag)
-	$(add_kdeapps_dep kmousetool)
-	$(add_kdeapps_dep kmouth)
+	>=kde-apps/kmag-${PV}:${SLOT}
+	>=kde-apps/kmousetool-${PV}:${SLOT}
+	>=kde-apps/kmouth-${PV}:${SLOT}
 "
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
index 1f6e228606f..cbdb7d370e0 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cron"
 
 RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.49.9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.49.9999.ebuild
index 07598a9ef47..ab7e91b8223 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-18.12.49.9999.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+cron"
 
 RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild
index fe81f3fbe81..ab7e91b8223 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+cron"
 
 RDEPEND="
-	$(add_kdeapps_dep ksystemlog)
-	cron? ( $(add_kdeapps_dep kcron) )
+	>=kde-apps/ksystemlog-${PV}:${SLOT}
+	cron? ( >=kde-apps/kcron-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
index 53618fb2da1..2d1a6df395b 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
 "
diff --git a/kde-apps/kdebase-meta/kdebase-meta-18.12.49.9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-18.12.49.9999.ebuild
index a2dfe580f5a..8ec96b9a888 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-18.12.49.9999.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
 "
diff --git a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
index a52b44fab49..8ec96b9a888 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-9999.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="
-	$(add_kdeapps_dep kdecore-meta)
-	$(add_plasma_dep plasma-meta)
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
index 788e6edb672..1a31e8c41e7 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+handbook +webengine webkit"
 
 RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
 	webengine? ( www-client/falkon )
 	webkit? (
-		$(add_kdeapps_dep konqueror 'webengine?')
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
 		kde-misc/kwebkitpart:5
 	)
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-18.12.49.9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-18.12.49.9999.ebuild
index 040df1c7132..b2320dbcd9a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-18.12.49.9999.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+handbook +webengine webkit"
 
 RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
 	webengine? ( www-client/falkon )
 	webkit? (
-		$(add_kdeapps_dep konqueror 'webengine?')
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
 		kde-misc/kwebkitpart:5
 	)
 "
diff --git a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
index 040df1c7132..b2320dbcd9a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-9999.ebuild
@@ -3,23 +3,25 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+handbook +webengine webkit"
 
 RDEPEND="
-	$(add_kdeapps_dep dolphin)
-	$(add_kdeapps_dep kdialog)
-	$(add_kdeapps_dep keditbookmarks)
-	$(add_kdeapps_dep kfind)
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep kwrite)
-	handbook? ( $(add_kdeapps_dep khelpcenter) )
+	>=kde-apps/dolphin-${PV}:${SLOT}
+	>=kde-apps/kdialog-${PV}:${SLOT}
+	>=kde-apps/keditbookmarks-${PV}:${SLOT}
+	>=kde-apps/kfind-${PV}:${SLOT}
+	>=kde-apps/konsole-${PV}:${SLOT}
+	>=kde-apps/kwrite-${PV}:${SLOT}
+	handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
 	webengine? ( www-client/falkon )
 	webkit? (
-		$(add_kdeapps_dep konqueror 'webengine?')
+		>=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
 		kde-misc/kwebkitpart:5
 	)
 "
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
index 141b1ffde66..798b7d6d704 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild
@@ -3,39 +3,40 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="https://edu.kde.org"
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+webengine +webkit"
 
 RDEPEND="
-	$(add_kdeapps_dep analitza)
-	$(add_kdeapps_dep artikulate)
-	$(add_kdeapps_dep blinken)
-	$(add_kdeapps_dep cantor)
-	$(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 step)
+	>=kde-apps/analitza-${PV}:${SLOT}
+	>=kde-apps/artikulate-${PV}:${SLOT}
+	>=kde-apps/blinken-${PV}:${SLOT}
+	>=kde-apps/cantor-${PV}:${SLOT}
+	>=kde-apps/kalzium-${PV}:${SLOT}
+	>=kde-apps/kanagram-${PV}:${SLOT}
+	>=kde-apps/kbruch-${PV}:${SLOT}
+	>=kde-apps/kdeedu-data-${PV}:${SLOT}
+	>=kde-apps/kgeography-${PV}:${SLOT}
+	>=kde-apps/khangman-${PV}:${SLOT}
+	>=kde-apps/kig-${PV}:${SLOT}
+	>=kde-apps/kiten-${PV}:${SLOT}
+	>=kde-apps/klettres-${PV}:${SLOT}
+	>=kde-apps/kmplot-${PV}:${SLOT}
+	>=kde-apps/kqtquickcharts-${PV}:${SLOT}
+	>=kde-apps/ktouch-${PV}:${SLOT}
+	>=kde-apps/kturtle-${PV}:${SLOT}
+	>=kde-apps/kwordquiz-${PV}:${SLOT}
+	>=kde-apps/libkeduvocdocument-${PV}:${SLOT}
+	>=kde-apps/marble-${PV}:${SLOT}
+	>=kde-apps/minuet-${PV}:${SLOT}
+	>=kde-apps/step-${PV}:${SLOT}
 	webengine? (
-		$(add_kdeapps_dep kalgebra)
-		$(add_kdeapps_dep parley)
+		>=kde-apps/kalgebra-${PV}:${SLOT}
+		>=kde-apps/parley-${PV}:${SLOT}
 	)
-	webkit? ( $(add_kdeapps_dep rocs) )
+	webkit? ( >=kde-apps/rocs-${PV}:${SLOT} )
 "
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.49.9999.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.49.9999.ebuild
index 0273f66fbb1..24eb4dbbbc5 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-18.12.49.9999.ebuild
@@ -3,39 +3,40 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived package