commit:     cc049b8e832cbe760638c031774dabdf429a858a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 13:31:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 14:03:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc049b8e

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 <AT> gentoo.org>

 .../kde-apps-meta/kde-apps-meta-18.12.0.ebuild     |  28 ++---
 .../kde-apps-meta-18.12.49.9999.ebuild             |  28 ++---
 kde-apps/kde-apps-meta/kde-apps-meta-9999.ebuild   |  28 ++---
 kde-apps/kde-meta/kde-meta-18.12.0.ebuild          |  10 +-
 kde-apps/kde-meta/kde-meta-18.12.49.9999.ebuild    |  10 +-
 kde-apps/kde-meta/kde-meta-9999.ebuild             |  12 ++-
 .../kdeaccessibility-meta-18.12.0.ebuild           |  12 ++-
 .../kdeaccessibility-meta-18.12.49.9999.ebuild     |  12 ++-
 .../kdeaccessibility-meta-9999.ebuild              |  14 +--
 .../kdeadmin-meta/kdeadmin-meta-18.12.0.ebuild     |  10 +-
 .../kdeadmin-meta-18.12.49.9999.ebuild             |  10 +-
 kde-apps/kdeadmin-meta/kdeadmin-meta-9999.ebuild   |  12 ++-
 kde-apps/kdebase-meta/kdebase-meta-18.12.0.ebuild  |  10 +-
 .../kdebase-meta/kdebase-meta-18.12.49.9999.ebuild |  10 +-
 kde-apps/kdebase-meta/kdebase-meta-9999.ebuild     |  12 ++-
 kde-apps/kdecore-meta/kdecore-meta-18.12.0.ebuild  |  22 ++--
 .../kdecore-meta/kdecore-meta-18.12.49.9999.ebuild |  22 ++--
 kde-apps/kdecore-meta/kdecore-meta-9999.ebuild     |  22 ++--
 kde-apps/kdeedu-meta/kdeedu-meta-18.12.0.ebuild    |  55 +++++-----
 .../kdeedu-meta/kdeedu-meta-18.12.49.9999.ebuild   |  55 +++++-----
 kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild       |  55 +++++-----
 .../kdegames-meta/kdegames-meta-18.12.0.ebuild     |  89 ++++++++--------
 .../kdegames-meta-18.12.49.9999.ebuild             |  89 ++++++++--------
 kde-apps/kdegames-meta/kdegames-meta-9999.ebuild   |  89 ++++++++--------
 .../kdegraphics-meta-18.12.0.ebuild                |  33 +++---
 .../kdegraphics-meta-18.12.49.9999.ebuild          |  33 +++---
 .../kdegraphics-meta/kdegraphics-meta-9999.ebuild  |  35 +++---
 .../kdemultimedia-meta-18.12.0.ebuild              |  27 ++---
 .../kdemultimedia-meta-18.12.49.9999.ebuild        |  27 ++---
 .../kdemultimedia-meta-9999.ebuild                 |  29 ++---
 .../kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild |  20 ++--
 .../kdenetwork-meta-18.12.49.9999.ebuild           |  20 ++--
 .../kdenetwork-meta/kdenetwork-meta-9999.ebuild    |  22 ++--
 kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild    | 116 ++++++++++----------
 .../kdepim-meta/kdepim-meta-18.12.49.9999.ebuild   | 116 ++++++++++----------
 kde-apps/kdepim-meta/kdepim-meta-9999.ebuild       | 118 +++++++++++----------
 kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild    |  33 +++---
 .../kdesdk-meta/kdesdk-meta-18.12.49.9999.ebuild   |  33 +++---
 kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild       |  33 +++---
 .../kdeutils-meta/kdeutils-meta-18.12.0.ebuild     |  37 +++----
 .../kdeutils-meta-18.12.49.9999.ebuild             |  37 +++----
 kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild   |  37 +++----
 .../plasma-telepathy-meta-18.12.0.ebuild           |  29 +++--
 .../plasma-telepathy-meta-18.12.49.9999.ebuild     |  29 +++--
 .../plasma-telepathy-meta-9999.ebuild              |  31 +++---
 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 6b17fb64a6..bd13687b35 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 d0033d921e..1be7315924 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 d0033d921e..1be7315924 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 488d578adb..977c8ae36a 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 bfc301e15a..d937d4d698 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 a17e8d5961..d937d4d698 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 bc73a27f1b..ff81519fdc 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 3a906c5779..ba2b9da74a 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 675abc136b..ba2b9da74a 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 1f6e228606..cbdb7d370e 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 07598a9ef4..ab7e91b822 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 fe81f3fbe8..ab7e91b822 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 53618fb2da..2d1a6df395 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 a2dfe580f5..8ec96b9a88 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 a52b44fab4..8ec96b9a88 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 788e6edb67..1a31e8c41e 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 040df1c713..b2320dbcd9 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 040df1c713..b2320dbcd9 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 141b1ffde6..798b7d6d70 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 0273f66fbb..24eb4dbbbc 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 
packages"
 HOMEPAGE="https://edu.kde.org";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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-9999.ebuild 
b/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
index 0273f66fbb..24eb4dbbbc 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-9999.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-9999.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=""
 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/kdegames-meta/kdegames-meta-18.12.0.ebuild 
b/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
index cc4ff27b88..0f37c61c3f 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.12.0.ebuild
@@ -3,56 +3,57 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 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 knights)
-       $(add_kdeapps_dep kolf)
-       $(add_kdeapps_dep kollision)
-       $(add_kdeapps_dep konquest)
-       $(add_kdeapps_dep kpat '' 18.04.3)
-       $(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)
+       >=kde-apps/bomber-${PV}:${SLOT}
+       >=kde-apps/bovo-${PV}:${SLOT}
+       >=kde-apps/granatier-${PV}:${SLOT}
+       >=kde-apps/kapman-${PV}:${SLOT}
+       >=kde-apps/katomic-${PV}:${SLOT}
+       >=kde-apps/kblackbox-${PV}:${SLOT}
+       >=kde-apps/kblocks-${PV}:${SLOT}
+       >=kde-apps/kbounce-${PV}:${SLOT}
+       >=kde-apps/kbreakout-${PV}:${SLOT}
+       >=kde-apps/kdiamond-${PV}:${SLOT}
+       >=kde-apps/kfourinline-${PV}:${SLOT}
+       >=kde-apps/kgoldrunner-${PV}:${SLOT}
+       >=kde-apps/kigo-${PV}:${SLOT}
+       >=kde-apps/killbots-${PV}:${SLOT}
+       >=kde-apps/kiriki-${PV}:${SLOT}
+       >=kde-apps/kjumpingcube-${PV}:${SLOT}
+       >=kde-apps/klickety-${PV}:${SLOT}
+       >=kde-apps/klines-${PV}:${SLOT}
+       >=kde-apps/kmahjongg-${PV}:${SLOT}
+       >=kde-apps/kmines-${PV}:${SLOT}
+       >=kde-apps/knavalbattle-${PV}:${SLOT}
+       >=kde-apps/knetwalk-${PV}:${SLOT}
+       >=kde-apps/knights-${PV}:${SLOT}
+       >=kde-apps/kolf-${PV}:${SLOT}
+       >=kde-apps/kollision-${PV}:${SLOT}
+       >=kde-apps/konquest-${PV}:${SLOT}
+       >=kde-apps/kpat-18.04.3:${SLOT}
+       >=kde-apps/kreversi-${PV}:${SLOT}
+       >=kde-apps/kshisen-${PV}:${SLOT}
+       >=kde-apps/ksirk-${PV}:${SLOT}
+       >=kde-apps/ksnakeduel-${PV}:${SLOT}
+       >=kde-apps/kspaceduel-${PV}:${SLOT}
+       >=kde-apps/ksquares-${PV}:${SLOT}
+       >=kde-apps/ktuberling-${PV}:${SLOT}
+       >=kde-apps/libkdegames-${PV}:${SLOT}
+       >=kde-apps/libkmahjongg-${PV}:${SLOT}
+       >=kde-apps/lskat-${PV}:${SLOT}
+       >=kde-apps/palapeli-${PV}:${SLOT}
+       >=kde-apps/picmi-${PV}:${SLOT}
        opengl? (
-               $(add_kdeapps_dep ksudoku)
-               $(add_kdeapps_dep kubrick)
+               >=kde-apps/ksudoku-${PV}:${SLOT}
+               >=kde-apps/kubrick-${PV}:${SLOT}
        )
-       python? ( $(add_kdeapps_dep kajongg) )
+       python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdegames-meta/kdegames-meta-18.12.49.9999.ebuild 
b/kde-apps/kdegames-meta/kdegames-meta-18.12.49.9999.ebuild
index 4957b3adbc..43cc0b94ea 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-18.12.49.9999.ebuild
@@ -3,56 +3,57 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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 knights)
-       $(add_kdeapps_dep kolf)
-       $(add_kdeapps_dep kollision)
-       $(add_kdeapps_dep konquest)
-       $(add_kdeapps_dep kpat '' 18.04.3)
-       $(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)
+       >=kde-apps/bomber-${PV}:${SLOT}
+       >=kde-apps/bovo-${PV}:${SLOT}
+       >=kde-apps/granatier-${PV}:${SLOT}
+       >=kde-apps/kapman-${PV}:${SLOT}
+       >=kde-apps/katomic-${PV}:${SLOT}
+       >=kde-apps/kblackbox-${PV}:${SLOT}
+       >=kde-apps/kblocks-${PV}:${SLOT}
+       >=kde-apps/kbounce-${PV}:${SLOT}
+       >=kde-apps/kbreakout-${PV}:${SLOT}
+       >=kde-apps/kdiamond-${PV}:${SLOT}
+       >=kde-apps/kfourinline-${PV}:${SLOT}
+       >=kde-apps/kgoldrunner-${PV}:${SLOT}
+       >=kde-apps/kigo-${PV}:${SLOT}
+       >=kde-apps/killbots-${PV}:${SLOT}
+       >=kde-apps/kiriki-${PV}:${SLOT}
+       >=kde-apps/kjumpingcube-${PV}:${SLOT}
+       >=kde-apps/klickety-${PV}:${SLOT}
+       >=kde-apps/klines-${PV}:${SLOT}
+       >=kde-apps/kmahjongg-${PV}:${SLOT}
+       >=kde-apps/kmines-${PV}:${SLOT}
+       >=kde-apps/knavalbattle-${PV}:${SLOT}
+       >=kde-apps/knetwalk-${PV}:${SLOT}
+       >=kde-apps/knights-${PV}:${SLOT}
+       >=kde-apps/kolf-${PV}:${SLOT}
+       >=kde-apps/kollision-${PV}:${SLOT}
+       >=kde-apps/konquest-${PV}:${SLOT}
+       >=kde-apps/kpat-18.04.3:${SLOT}
+       >=kde-apps/kreversi-${PV}:${SLOT}
+       >=kde-apps/kshisen-${PV}:${SLOT}
+       >=kde-apps/ksirk-${PV}:${SLOT}
+       >=kde-apps/ksnakeduel-${PV}:${SLOT}
+       >=kde-apps/kspaceduel-${PV}:${SLOT}
+       >=kde-apps/ksquares-${PV}:${SLOT}
+       >=kde-apps/ktuberling-${PV}:${SLOT}
+       >=kde-apps/libkdegames-${PV}:${SLOT}
+       >=kde-apps/libkmahjongg-${PV}:${SLOT}
+       >=kde-apps/lskat-${PV}:${SLOT}
+       >=kde-apps/palapeli-${PV}:${SLOT}
+       >=kde-apps/picmi-${PV}:${SLOT}
        opengl? (
-               $(add_kdeapps_dep ksudoku)
-               $(add_kdeapps_dep kubrick)
+               >=kde-apps/ksudoku-${PV}:${SLOT}
+               >=kde-apps/kubrick-${PV}:${SLOT}
        )
-       python? ( $(add_kdeapps_dep kajongg) )
+       python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild 
b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
index 4957b3adbc..43cc0b94ea 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-9999.ebuild
@@ -3,56 +3,57 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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 knights)
-       $(add_kdeapps_dep kolf)
-       $(add_kdeapps_dep kollision)
-       $(add_kdeapps_dep konquest)
-       $(add_kdeapps_dep kpat '' 18.04.3)
-       $(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)
+       >=kde-apps/bomber-${PV}:${SLOT}
+       >=kde-apps/bovo-${PV}:${SLOT}
+       >=kde-apps/granatier-${PV}:${SLOT}
+       >=kde-apps/kapman-${PV}:${SLOT}
+       >=kde-apps/katomic-${PV}:${SLOT}
+       >=kde-apps/kblackbox-${PV}:${SLOT}
+       >=kde-apps/kblocks-${PV}:${SLOT}
+       >=kde-apps/kbounce-${PV}:${SLOT}
+       >=kde-apps/kbreakout-${PV}:${SLOT}
+       >=kde-apps/kdiamond-${PV}:${SLOT}
+       >=kde-apps/kfourinline-${PV}:${SLOT}
+       >=kde-apps/kgoldrunner-${PV}:${SLOT}
+       >=kde-apps/kigo-${PV}:${SLOT}
+       >=kde-apps/killbots-${PV}:${SLOT}
+       >=kde-apps/kiriki-${PV}:${SLOT}
+       >=kde-apps/kjumpingcube-${PV}:${SLOT}
+       >=kde-apps/klickety-${PV}:${SLOT}
+       >=kde-apps/klines-${PV}:${SLOT}
+       >=kde-apps/kmahjongg-${PV}:${SLOT}
+       >=kde-apps/kmines-${PV}:${SLOT}
+       >=kde-apps/knavalbattle-${PV}:${SLOT}
+       >=kde-apps/knetwalk-${PV}:${SLOT}
+       >=kde-apps/knights-${PV}:${SLOT}
+       >=kde-apps/kolf-${PV}:${SLOT}
+       >=kde-apps/kollision-${PV}:${SLOT}
+       >=kde-apps/konquest-${PV}:${SLOT}
+       >=kde-apps/kpat-18.04.3:${SLOT}
+       >=kde-apps/kreversi-${PV}:${SLOT}
+       >=kde-apps/kshisen-${PV}:${SLOT}
+       >=kde-apps/ksirk-${PV}:${SLOT}
+       >=kde-apps/ksnakeduel-${PV}:${SLOT}
+       >=kde-apps/kspaceduel-${PV}:${SLOT}
+       >=kde-apps/ksquares-${PV}:${SLOT}
+       >=kde-apps/ktuberling-${PV}:${SLOT}
+       >=kde-apps/libkdegames-${PV}:${SLOT}
+       >=kde-apps/libkmahjongg-${PV}:${SLOT}
+       >=kde-apps/lskat-${PV}:${SLOT}
+       >=kde-apps/palapeli-${PV}:${SLOT}
+       >=kde-apps/picmi-${PV}:${SLOT}
        opengl? (
-               $(add_kdeapps_dep ksudoku)
-               $(add_kdeapps_dep kubrick)
+               >=kde-apps/ksudoku-${PV}:${SLOT}
+               >=kde-apps/kubrick-${PV}:${SLOT}
        )
-       python? ( $(add_kdeapps_dep kajongg) )
+       python? ( >=kde-apps/kajongg-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild 
b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
index b8adce6621..c67c6f805c 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.0.ebuild
@@ -3,26 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived 
packages"
 HOMEPAGE="https://www.kde.org/applications/graphics/";
+
+LICENSE="metapackage"
+SLOT="5"
 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) )
+       >=kde-apps/gwenview-${PV}:${SLOT}
+       >=kde-apps/kamera-${PV}:${SLOT}
+       >=kde-apps/kcolorchooser-${PV}:${SLOT}
+       >=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
+       >=kde-apps/kolourpaint-${PV}:${SLOT}
+       >=kde-apps/kruler-${PV}:${SLOT}
+       >=kde-apps/libkdcraw-${PV}:${SLOT}
+       >=kde-apps/libkexiv2-${PV}:${SLOT}
+       >=kde-apps/libkipi-${PV}:${SLOT}
+       >=kde-apps/okular-${PV}:${SLOT}
+       >=kde-apps/spectacle-${PV}:${SLOT}
+       >=kde-apps/svgpart-${PV}:${SLOT}
+       >=kde-apps/thumbnailers-${PV}:${SLOT}
+       scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.49.9999.ebuild 
b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.49.9999.ebuild
index 9e3e92c21e..0ff8bc8562 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-18.12.49.9999.ebuild
@@ -3,26 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived 
packages"
 HOMEPAGE="https://www.kde.org/applications/graphics/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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) )
+       >=kde-apps/gwenview-${PV}:${SLOT}
+       >=kde-apps/kamera-${PV}:${SLOT}
+       >=kde-apps/kcolorchooser-${PV}:${SLOT}
+       >=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
+       >=kde-apps/kolourpaint-${PV}:${SLOT}
+       >=kde-apps/kruler-${PV}:${SLOT}
+       >=kde-apps/libkdcraw-${PV}:${SLOT}
+       >=kde-apps/libkexiv2-${PV}:${SLOT}
+       >=kde-apps/libkipi-${PV}:${SLOT}
+       >=kde-apps/okular-${PV}:${SLOT}
+       >=kde-apps/spectacle-${PV}:${SLOT}
+       >=kde-apps/svgpart-${PV}:${SLOT}
+       >=kde-apps/thumbnailers-${PV}:${SLOT}
+       scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild 
b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
index de3d8146ab..0ff8bc8562 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-9999.ebuild
@@ -1,28 +1,29 @@
-# 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="kdegraphics - merge this to pull in all kdegraphics-derived 
packages"
 HOMEPAGE="https://www.kde.org/applications/graphics/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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) )
+       >=kde-apps/gwenview-${PV}:${SLOT}
+       >=kde-apps/kamera-${PV}:${SLOT}
+       >=kde-apps/kcolorchooser-${PV}:${SLOT}
+       >=kde-apps/kdegraphics-mobipocket-${PV}:${SLOT}
+       >=kde-apps/kolourpaint-${PV}:${SLOT}
+       >=kde-apps/kruler-${PV}:${SLOT}
+       >=kde-apps/libkdcraw-${PV}:${SLOT}
+       >=kde-apps/libkexiv2-${PV}:${SLOT}
+       >=kde-apps/libkipi-${PV}:${SLOT}
+       >=kde-apps/okular-${PV}:${SLOT}
+       >=kde-apps/spectacle-${PV}:${SLOT}
+       >=kde-apps/svgpart-${PV}:${SLOT}
+       >=kde-apps/thumbnailers-${PV}:${SLOT}
+       scanner? ( >=kde-apps/libksane-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild 
b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
index b868d17825..7cec145c80 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.0.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-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/
 "
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
-       $(add_kdeapps_dep dragon)
-       $(add_kdeapps_dep juk)
-       $(add_kdeapps_dep kdenlive)
-       $(add_kdeapps_dep kmix)
-       $(add_kdeapps_dep kwave)
-       $(add_kdeapps_dep libkcddb)
+       >=kde-apps/dragon-${PV}:${SLOT}
+       >=kde-apps/juk-${PV}:${SLOT}
+       >=kde-apps/kdenlive-${PV}:${SLOT}
+       >=kde-apps/kmix-${PV}:${SLOT}
+       >=kde-apps/kwave-${PV}:${SLOT}
+       >=kde-apps/libkcddb-${PV}:${SLOT}
        cdrom? (
-               $(add_kdeapps_dep audiocd-kio)
-               $(add_kdeapps_dep k3b)
-               $(add_kdeapps_dep libkcompactdisc)
+               >=kde-apps/audiocd-kio-${PV}:${SLOT}
+               >=kde-apps/k3b-${PV}:${SLOT}
+               >=kde-apps/libkcompactdisc-${PV}:${SLOT}
        )
-       ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-       gstreamer? ( $(add_kdeapps_dep kamoso) )
+       ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+       gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
 "

diff --git 
a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.49.9999.ebuild 
b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.49.9999.ebuild
index 011cc7680a..5ce5109eda 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-18.12.49.9999.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-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/
 "
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
-       $(add_kdeapps_dep dragon)
-       $(add_kdeapps_dep juk)
-       $(add_kdeapps_dep kdenlive)
-       $(add_kdeapps_dep kmix)
-       $(add_kdeapps_dep kwave)
-       $(add_kdeapps_dep libkcddb)
+       >=kde-apps/dragon-${PV}:${SLOT}
+       >=kde-apps/juk-${PV}:${SLOT}
+       >=kde-apps/kdenlive-${PV}:${SLOT}
+       >=kde-apps/kmix-${PV}:${SLOT}
+       >=kde-apps/kwave-${PV}:${SLOT}
+       >=kde-apps/libkcddb-${PV}:${SLOT}
        cdrom? (
-               $(add_kdeapps_dep audiocd-kio)
-               $(add_kdeapps_dep k3b)
-               $(add_kdeapps_dep libkcompactdisc)
+               >=kde-apps/audiocd-kio-${PV}:${SLOT}
+               >=kde-apps/k3b-${PV}:${SLOT}
+               >=kde-apps/libkcompactdisc-${PV}:${SLOT}
        )
-       ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-       gstreamer? ( $(add_kdeapps_dep kamoso) )
+       ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+       gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild 
b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
index b9f1fbba58..5ce5109eda 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-9999.ebuild
@@ -1,30 +1,31 @@
-# 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="kdemultimedia - merge this to pull in all kdemultimedia-derived 
packages"
 HOMEPAGE="
        https://www.kde.org/applications/multimedia/
        https://multimedia.kde.org/
 "
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
-       $(add_kdeapps_dep dragon)
-       $(add_kdeapps_dep juk)
-       $(add_kdeapps_dep kdenlive)
-       $(add_kdeapps_dep kmix)
-       $(add_kdeapps_dep kwave)
-       $(add_kdeapps_dep libkcddb)
+       >=kde-apps/dragon-${PV}:${SLOT}
+       >=kde-apps/juk-${PV}:${SLOT}
+       >=kde-apps/kdenlive-${PV}:${SLOT}
+       >=kde-apps/kmix-${PV}:${SLOT}
+       >=kde-apps/kwave-${PV}:${SLOT}
+       >=kde-apps/libkcddb-${PV}:${SLOT}
        cdrom? (
-               $(add_kdeapps_dep audiocd-kio)
-               $(add_kdeapps_dep k3b)
-               $(add_kdeapps_dep libkcompactdisc)
+               >=kde-apps/audiocd-kio-${PV}:${SLOT}
+               >=kde-apps/k3b-${PV}:${SLOT}
+               >=kde-apps/libkcompactdisc-${PV}:${SLOT}
        )
-       ffmpeg? ( $(add_kdeapps_dep ffmpegthumbs) )
-       gstreamer? ( $(add_kdeapps_dep kamoso) )
+       ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+       gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild 
b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
index 2f34e18afa..d3741fa9e4 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.0.ebuild
@@ -3,18 +3,20 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived 
packages"
+HOMEPAGE="https://www.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="+telepathy"
 
 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 zeroconf-ioslave)
-       telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+       >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+       >=kde-apps/kget-${PV}:${SLOT}
+       >=kde-apps/krdc-${PV}:${SLOT}
+       >=kde-apps/kopete-${PV}:${SLOT}
+       >=kde-apps/krfb-${PV}:${SLOT}
+       >=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+       telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.49.9999.ebuild 
b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.49.9999.ebuild
index 9b94c5be9b..aea15d2d40 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-18.12.49.9999.ebuild
@@ -3,18 +3,20 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived 
packages"
+HOMEPAGE="https://www.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+telepathy"
 
 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 zeroconf-ioslave)
-       telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+       >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+       >=kde-apps/kget-${PV}:${SLOT}
+       >=kde-apps/krdc-${PV}:${SLOT}
+       >=kde-apps/kopete-${PV}:${SLOT}
+       >=kde-apps/krfb-${PV}:${SLOT}
+       >=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+       telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild 
b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
index 5991ecadc4..aea15d2d40 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-9999.ebuild
@@ -1,20 +1,22 @@
-# 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="kdenetwork - merge this to pull in all kdenetwork-derived 
packages"
+HOMEPAGE="https://www.kde.org/";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="+telepathy"
 
 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 zeroconf-ioslave)
-       telepathy? ( $(add_kdeapps_dep plasma-telepathy-meta) )
+       >=kde-apps/kdenetwork-filesharing-${PV}:${SLOT}
+       >=kde-apps/kget-${PV}:${SLOT}
+       >=kde-apps/krdc-${PV}:${SLOT}
+       >=kde-apps/kopete-${PV}:${SLOT}
+       >=kde-apps/krfb-${PV}:${SLOT}
+       >=kde-apps/zeroconf-ioslave-${PV}:${SLOT}
+       telepathy? ( >=kde-apps/plasma-telepathy-meta-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
index f9291a831b..28533e9a64 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.12.0.ebuild
@@ -3,67 +3,69 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 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 kitinerary)
-       $(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 kpkpass)
-       $(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)
+       >=kde-apps/akonadi-${PV}:${SLOT}
+       >=kde-apps/akonadiconsole-${PV}:${SLOT}
+       >=kde-apps/akonadi-calendar-${PV}:${SLOT}
+       >=kde-apps/akonadi-contacts-${PV}:${SLOT}
+       >=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+       >=kde-apps/akonadi-mime-${PV}:${SLOT}
+       >=kde-apps/akonadi-notes-${PV}:${SLOT}
+       >=kde-apps/akonadi-search-${PV}:${SLOT}
+       >=kde-apps/akregator-${PV}:${SLOT}
+       >=kde-apps/calendarjanitor-${PV}:${SLOT}
+       >=kde-apps/calendarsupport-${PV}:${SLOT}
+       >=kde-apps/eventviews-${PV}:${SLOT}
+       >=kde-apps/grantlee-editor-${PV}:${SLOT}
+       >=kde-apps/grantleetheme-${PV}:${SLOT}
+       >=kde-apps/incidenceeditor-${PV}:${SLOT}
+       >=kde-apps/kaddressbook-${PV}:${SLOT}
+       >=kde-apps/kalarm-${PV}:${SLOT}
+       >=kde-apps/kalarmcal-${PV}:${SLOT}
+       >=kde-apps/kcalcore-${PV}:${SLOT}
+       >=kde-apps/kcalutils-${PV}:${SLOT}
+       >=kde-apps/kcontacts-${PV}:${SLOT}
+       >=kde-apps/kdepim-addons-${PV}:${SLOT}
+       >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+       >=kde-apps/kdepim-runtime-${PV}:${SLOT}
+       >=kde-apps/kidentitymanagement-${PV}:${SLOT}
+       >=kde-apps/kimap-${PV}:${SLOT}
+       >=kde-apps/kitinerary-${PV}:${SLOT}
+       >=kde-apps/kldap-${PV}:${SLOT}
+       >=kde-apps/kleopatra-${PV}:${SLOT}
+       >=kde-apps/kmail-${PV}:${SLOT}
+       >=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+       >=kde-apps/kmailtransport-${PV}:${SLOT}
+       >=kde-apps/kmbox-${PV}:${SLOT}
+       >=kde-apps/kmime-${PV}:${SLOT}
+       >=kde-apps/knotes-${PV}:${SLOT}
+       >=kde-apps/konsolekalendar-${PV}:${SLOT}
+       >=kde-apps/kontact-${PV}:${SLOT}
+       >=kde-apps/kontactinterface-${PV}:${SLOT}
+       >=kde-apps/korganizer-${PV}:${SLOT}
+       >=kde-apps/kpimtextedit-${PV}:${SLOT}
+       >=kde-apps/kpkpass-${PV}:${SLOT}
+       >=kde-apps/ksmtp-${PV}:${SLOT}
+       >=kde-apps/libgravatar-${PV}:${SLOT}
+       >=kde-apps/libkdepim-${PV}:${SLOT}
+       >=kde-apps/libkgapi-${PV}:${SLOT}
+       >=kde-apps/libkleo-${PV}:${SLOT}
+       >=kde-apps/libksieve-${PV}:${SLOT}
+       >=kde-apps/libktnef-${PV}:${SLOT}
+       >=kde-apps/mailcommon-${PV}:${SLOT}
+       >=kde-apps/mailimporter-${PV}:${SLOT}
+       >=kde-apps/mbox-importer-${PV}:${SLOT}
+       >=kde-apps/messagelib-${PV}:${SLOT}
+       >=kde-apps/pim-data-exporter-${PV}:${SLOT}
+       >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+       >=kde-apps/pimcommon-${PV}:${SLOT}
+       !kde-apps/kdepim-meta:4
 "

diff --git a/kde-apps/kdepim-meta/kdepim-meta-18.12.49.9999.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-18.12.49.9999.ebuild
index 5a5545f7c1..0c6338dcd2 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-18.12.49.9999.ebuild
@@ -3,67 +3,69 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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 kitinerary)
-       $(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 kpkpass)
-       $(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)
+       >=kde-apps/akonadi-${PV}:${SLOT}
+       >=kde-apps/akonadiconsole-${PV}:${SLOT}
+       >=kde-apps/akonadi-calendar-${PV}:${SLOT}
+       >=kde-apps/akonadi-contacts-${PV}:${SLOT}
+       >=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+       >=kde-apps/akonadi-mime-${PV}:${SLOT}
+       >=kde-apps/akonadi-notes-${PV}:${SLOT}
+       >=kde-apps/akonadi-search-${PV}:${SLOT}
+       >=kde-apps/akregator-${PV}:${SLOT}
+       >=kde-apps/calendarjanitor-${PV}:${SLOT}
+       >=kde-apps/calendarsupport-${PV}:${SLOT}
+       >=kde-apps/eventviews-${PV}:${SLOT}
+       >=kde-apps/grantlee-editor-${PV}:${SLOT}
+       >=kde-apps/grantleetheme-${PV}:${SLOT}
+       >=kde-apps/incidenceeditor-${PV}:${SLOT}
+       >=kde-apps/kaddressbook-${PV}:${SLOT}
+       >=kde-apps/kalarm-${PV}:${SLOT}
+       >=kde-apps/kalarmcal-${PV}:${SLOT}
+       >=kde-apps/kcalcore-${PV}:${SLOT}
+       >=kde-apps/kcalutils-${PV}:${SLOT}
+       >=kde-apps/kcontacts-${PV}:${SLOT}
+       >=kde-apps/kdepim-addons-${PV}:${SLOT}
+       >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+       >=kde-apps/kdepim-runtime-${PV}:${SLOT}
+       >=kde-apps/kidentitymanagement-${PV}:${SLOT}
+       >=kde-apps/kimap-${PV}:${SLOT}
+       >=kde-apps/kitinerary-${PV}:${SLOT}
+       >=kde-apps/kldap-${PV}:${SLOT}
+       >=kde-apps/kleopatra-${PV}:${SLOT}
+       >=kde-apps/kmail-${PV}:${SLOT}
+       >=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+       >=kde-apps/kmailtransport-${PV}:${SLOT}
+       >=kde-apps/kmbox-${PV}:${SLOT}
+       >=kde-apps/kmime-${PV}:${SLOT}
+       >=kde-apps/knotes-${PV}:${SLOT}
+       >=kde-apps/konsolekalendar-${PV}:${SLOT}
+       >=kde-apps/kontact-${PV}:${SLOT}
+       >=kde-apps/kontactinterface-${PV}:${SLOT}
+       >=kde-apps/korganizer-${PV}:${SLOT}
+       >=kde-apps/kpimtextedit-${PV}:${SLOT}
+       >=kde-apps/kpkpass-${PV}:${SLOT}
+       >=kde-apps/ksmtp-${PV}:${SLOT}
+       >=kde-apps/libgravatar-${PV}:${SLOT}
+       >=kde-apps/libkdepim-${PV}:${SLOT}
+       >=kde-apps/libkgapi-${PV}:${SLOT}
+       >=kde-apps/libkleo-${PV}:${SLOT}
+       >=kde-apps/libksieve-${PV}:${SLOT}
+       >=kde-apps/libktnef-${PV}:${SLOT}
+       >=kde-apps/mailcommon-${PV}:${SLOT}
+       >=kde-apps/mailimporter-${PV}:${SLOT}
+       >=kde-apps/mbox-importer-${PV}:${SLOT}
+       >=kde-apps/messagelib-${PV}:${SLOT}
+       >=kde-apps/pim-data-exporter-${PV}:${SLOT}
+       >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+       >=kde-apps/pimcommon-${PV}:${SLOT}
+       !kde-apps/kdepim-meta:4
 "

diff --git a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild 
b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
index ba1423cf20..0c6338dcd2 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-9999.ebuild
@@ -1,69 +1,71 @@
-# 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 PIM - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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 kitinerary)
-       $(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 kpkpass)
-       $(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)
+       >=kde-apps/akonadi-${PV}:${SLOT}
+       >=kde-apps/akonadiconsole-${PV}:${SLOT}
+       >=kde-apps/akonadi-calendar-${PV}:${SLOT}
+       >=kde-apps/akonadi-contacts-${PV}:${SLOT}
+       >=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+       >=kde-apps/akonadi-mime-${PV}:${SLOT}
+       >=kde-apps/akonadi-notes-${PV}:${SLOT}
+       >=kde-apps/akonadi-search-${PV}:${SLOT}
+       >=kde-apps/akregator-${PV}:${SLOT}
+       >=kde-apps/calendarjanitor-${PV}:${SLOT}
+       >=kde-apps/calendarsupport-${PV}:${SLOT}
+       >=kde-apps/eventviews-${PV}:${SLOT}
+       >=kde-apps/grantlee-editor-${PV}:${SLOT}
+       >=kde-apps/grantleetheme-${PV}:${SLOT}
+       >=kde-apps/incidenceeditor-${PV}:${SLOT}
+       >=kde-apps/kaddressbook-${PV}:${SLOT}
+       >=kde-apps/kalarm-${PV}:${SLOT}
+       >=kde-apps/kalarmcal-${PV}:${SLOT}
+       >=kde-apps/kcalcore-${PV}:${SLOT}
+       >=kde-apps/kcalutils-${PV}:${SLOT}
+       >=kde-apps/kcontacts-${PV}:${SLOT}
+       >=kde-apps/kdepim-addons-${PV}:${SLOT}
+       >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+       >=kde-apps/kdepim-runtime-${PV}:${SLOT}
+       >=kde-apps/kidentitymanagement-${PV}:${SLOT}
+       >=kde-apps/kimap-${PV}:${SLOT}
+       >=kde-apps/kitinerary-${PV}:${SLOT}
+       >=kde-apps/kldap-${PV}:${SLOT}
+       >=kde-apps/kleopatra-${PV}:${SLOT}
+       >=kde-apps/kmail-${PV}:${SLOT}
+       >=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+       >=kde-apps/kmailtransport-${PV}:${SLOT}
+       >=kde-apps/kmbox-${PV}:${SLOT}
+       >=kde-apps/kmime-${PV}:${SLOT}
+       >=kde-apps/knotes-${PV}:${SLOT}
+       >=kde-apps/konsolekalendar-${PV}:${SLOT}
+       >=kde-apps/kontact-${PV}:${SLOT}
+       >=kde-apps/kontactinterface-${PV}:${SLOT}
+       >=kde-apps/korganizer-${PV}:${SLOT}
+       >=kde-apps/kpimtextedit-${PV}:${SLOT}
+       >=kde-apps/kpkpass-${PV}:${SLOT}
+       >=kde-apps/ksmtp-${PV}:${SLOT}
+       >=kde-apps/libgravatar-${PV}:${SLOT}
+       >=kde-apps/libkdepim-${PV}:${SLOT}
+       >=kde-apps/libkgapi-${PV}:${SLOT}
+       >=kde-apps/libkleo-${PV}:${SLOT}
+       >=kde-apps/libksieve-${PV}:${SLOT}
+       >=kde-apps/libktnef-${PV}:${SLOT}
+       >=kde-apps/mailcommon-${PV}:${SLOT}
+       >=kde-apps/mailimporter-${PV}:${SLOT}
+       >=kde-apps/mbox-importer-${PV}:${SLOT}
+       >=kde-apps/messagelib-${PV}:${SLOT}
+       >=kde-apps/pim-data-exporter-${PV}:${SLOT}
+       >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+       >=kde-apps/pimcommon-${PV}:${SLOT}
+       !kde-apps/kdepim-meta:4
 "

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild 
b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
index dba9b9bbfa..7199b184e2 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.0.ebuild
@@ -3,26 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="cvs +webkit"
 
 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)
-       cvs? ( $(add_kdeapps_dep cervisia) )
-       webkit? ( $(add_kdeapps_dep umbrello) )
+       >=kde-apps/dolphin-plugins-${PV}:${SLOT}
+       >=kde-apps/kapptemplate-${PV}:${SLOT}
+       >=kde-apps/kcachegrind-${PV}:${SLOT}
+       >=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+       >=kde-apps/kde-dev-utils-${PV}:${SLOT}
+       >=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+       >=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+       >=kde-apps/kompare-${PV}:${SLOT}
+       >=kde-apps/kross-interpreters-${PV}:${SLOT}
+       >=kde-apps/libkomparediff2-${PV}:${SLOT}
+       >=kde-apps/lokalize-${PV}:${SLOT}
+       >=kde-apps/poxml-${PV}:${SLOT}
+       cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+       webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.49.9999.ebuild 
b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.49.9999.ebuild
index 6d22cf9f77..b165450366 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-18.12.49.9999.ebuild
@@ -3,26 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="cvs +webkit"
 
 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)
-       cvs? ( $(add_kdeapps_dep cervisia) )
-       webkit? ( $(add_kdeapps_dep umbrello) )
+       >=kde-apps/dolphin-plugins-${PV}:${SLOT}
+       >=kde-apps/kapptemplate-${PV}:${SLOT}
+       >=kde-apps/kcachegrind-${PV}:${SLOT}
+       >=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+       >=kde-apps/kde-dev-utils-${PV}:${SLOT}
+       >=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+       >=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+       >=kde-apps/kompare-${PV}:${SLOT}
+       >=kde-apps/kross-interpreters-${PV}:${SLOT}
+       >=kde-apps/libkomparediff2-${PV}:${SLOT}
+       >=kde-apps/lokalize-${PV}:${SLOT}
+       >=kde-apps/poxml-${PV}:${SLOT}
+       cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+       webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild 
b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
index 6d22cf9f77..b165450366 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-9999.ebuild
@@ -3,26 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="cvs +webkit"
 
 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)
-       cvs? ( $(add_kdeapps_dep cervisia) )
-       webkit? ( $(add_kdeapps_dep umbrello) )
+       >=kde-apps/dolphin-plugins-${PV}:${SLOT}
+       >=kde-apps/kapptemplate-${PV}:${SLOT}
+       >=kde-apps/kcachegrind-${PV}:${SLOT}
+       >=kde-apps/kde-dev-scripts-${PV}:${SLOT}
+       >=kde-apps/kde-dev-utils-${PV}:${SLOT}
+       >=kde-apps/kdesdk-kioslaves-${PV}:${SLOT}
+       >=kde-apps/kdesdk-thumbnailers-${PV}:${SLOT}
+       >=kde-apps/kompare-${PV}:${SLOT}
+       >=kde-apps/kross-interpreters-${PV}:${SLOT}
+       >=kde-apps/libkomparediff2-${PV}:${SLOT}
+       >=kde-apps/lokalize-${PV}:${SLOT}
+       >=kde-apps/poxml-${PV}:${SLOT}
+       cvs? ( >=kde-apps/cervisia-${PV}:${SLOT} )
+       webkit? ( >=kde-apps/umbrello-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild 
b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
index d7ffe5771b..e179807962 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.0.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-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";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="cups floppy"
 
 RDEPEND="
-       $(add_kdeapps_dep ark)
-       $(add_kdeapps_dep filelight)
-       $(add_kdeapps_dep kate)
-       $(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) )
+       >=kde-apps/ark-${PV}:${SLOT}
+       >=kde-apps/filelight-${PV}:${SLOT}
+       >=kde-apps/kate-${PV}:${SLOT}
+       >=kde-apps/kbackup-${PV}:${SLOT}
+       >=kde-apps/kcalc-${PV}:${SLOT}
+       >=kde-apps/kcharselect-${PV}:${SLOT}
+       >=kde-apps/kdebugsettings-${PV}:${SLOT}
+       >=kde-apps/kdf-${PV}:${SLOT}
+       >=kde-apps/kgpg-${PV}:${SLOT}
+       >=kde-apps/kimagemapeditor-${PV}:${SLOT}
+       >=kde-apps/kteatime-${PV}:${SLOT}
+       >=kde-apps/ktimer-${PV}:${SLOT}
+       >=kde-apps/kwalletmanager-${PV}:${SLOT}
+       >=kde-apps/sweeper-${PV}:${SLOT}
+       cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+       floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.49.9999.ebuild 
b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.49.9999.ebuild
index 40a7d5e5d7..cc0fcb207f 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-18.12.49.9999.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-18.12.49.9999.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-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";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="cups floppy"
 
 RDEPEND="
-       $(add_kdeapps_dep ark)
-       $(add_kdeapps_dep filelight)
-       $(add_kdeapps_dep kate)
-       $(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) )
+       >=kde-apps/ark-${PV}:${SLOT}
+       >=kde-apps/filelight-${PV}:${SLOT}
+       >=kde-apps/kate-${PV}:${SLOT}
+       >=kde-apps/kbackup-${PV}:${SLOT}
+       >=kde-apps/kcalc-${PV}:${SLOT}
+       >=kde-apps/kcharselect-${PV}:${SLOT}
+       >=kde-apps/kdebugsettings-${PV}:${SLOT}
+       >=kde-apps/kdf-${PV}:${SLOT}
+       >=kde-apps/kgpg-${PV}:${SLOT}
+       >=kde-apps/kimagemapeditor-${PV}:${SLOT}
+       >=kde-apps/kteatime-${PV}:${SLOT}
+       >=kde-apps/ktimer-${PV}:${SLOT}
+       >=kde-apps/kwalletmanager-${PV}:${SLOT}
+       >=kde-apps/sweeper-${PV}:${SLOT}
+       cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+       floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
 "

diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild 
b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
index 40a7d5e5d7..cc0fcb207f 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-9999.ebuild
@@ -3,28 +3,29 @@
 
 EAPI=7
 
-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";
+
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 IUSE="cups floppy"
 
 RDEPEND="
-       $(add_kdeapps_dep ark)
-       $(add_kdeapps_dep filelight)
-       $(add_kdeapps_dep kate)
-       $(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) )
+       >=kde-apps/ark-${PV}:${SLOT}
+       >=kde-apps/filelight-${PV}:${SLOT}
+       >=kde-apps/kate-${PV}:${SLOT}
+       >=kde-apps/kbackup-${PV}:${SLOT}
+       >=kde-apps/kcalc-${PV}:${SLOT}
+       >=kde-apps/kcharselect-${PV}:${SLOT}
+       >=kde-apps/kdebugsettings-${PV}:${SLOT}
+       >=kde-apps/kdf-${PV}:${SLOT}
+       >=kde-apps/kgpg-${PV}:${SLOT}
+       >=kde-apps/kimagemapeditor-${PV}:${SLOT}
+       >=kde-apps/kteatime-${PV}:${SLOT}
+       >=kde-apps/ktimer-${PV}:${SLOT}
+       >=kde-apps/kwalletmanager-${PV}:${SLOT}
+       >=kde-apps/sweeper-${PV}:${SLOT}
+       cups? ( >=kde-apps/print-manager-${PV}:${SLOT} )
+       floppy? ( >=kde-apps/kfloppy-${PV}:${SLOT} )
 "

diff --git 
a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild 
b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
index 849c3b45f1..584280dc8c 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.0.ebuild
@@ -3,28 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/KTp";
 
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+LICENSE="metapackage"
+SLOT="5"
 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) )
+       >=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
+       >=kde-apps/ktp-approver-${PV}:${SLOT}
+       >=kde-apps/ktp-auth-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-common-internals-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-list-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-runner-${PV}:${SLOT}
+       >=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
+       >=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-kded-module-${PV}:${SLOT}
+       >=kde-apps/ktp-send-file-${PV}:${SLOT}
+       >=kde-apps/ktp-text-ui-${PV}:${SLOT}
+       gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
 "
 
 pkg_postinst() {

diff --git 
a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.49.9999.ebuild 
b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.49.9999.ebuild
index f44e9f356a..5f6f11370c 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.49.9999.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-18.12.49.9999.ebuild
@@ -3,28 +3,27 @@
 
 EAPI=7
 
-inherit kde5-meta-pkg
-
 DESCRIPTION="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/KTp";
 
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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) )
+       >=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
+       >=kde-apps/ktp-approver-${PV}:${SLOT}
+       >=kde-apps/ktp-auth-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-common-internals-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-list-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-runner-${PV}:${SLOT}
+       >=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
+       >=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-kded-module-${PV}:${SLOT}
+       >=kde-apps/ktp-send-file-${PV}:${SLOT}
+       >=kde-apps/ktp-text-ui-${PV}:${SLOT}
+       gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
 "
 
 pkg_postinst() {

diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild 
b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
index 148f0aeb95..5f6f11370c 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-9999.ebuild
@@ -1,30 +1,29 @@
-# 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="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/KTp";
 
-LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
+LICENSE="metapackage"
+SLOT="5"
 KEYWORDS=""
 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) )
+       >=kde-apps/ktp-accounts-kcm-${PV}:${SLOT}
+       >=kde-apps/ktp-approver-${PV}:${SLOT}
+       >=kde-apps/ktp-auth-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-common-internals-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-list-${PV}:${SLOT}
+       >=kde-apps/ktp-contact-runner-${PV}:${SLOT}
+       >=kde-apps/ktp-desktop-applets-${PV}:${SLOT}
+       >=kde-apps/ktp-filetransfer-handler-${PV}:${SLOT}
+       >=kde-apps/ktp-kded-module-${PV}:${SLOT}
+       >=kde-apps/ktp-send-file-${PV}:${SLOT}
+       >=kde-apps/ktp-text-ui-${PV}:${SLOT}
+       gstreamer? ( >=kde-apps/ktp-call-ui-${PV}:${SLOT} )
 "
 
 pkg_postinst() {

Reply via email to