diff --git a/trinity-base/filelight/filelight-9999.ebuild b/trinity-apps/filelight/filelight-9999.ebuild
similarity index 80%
rename from trinity-base/filelight/filelight-9999.ebuild
rename to trinity-apps/filelight/filelight-9999.ebuild
index b99b9b37..709d434e 100644
--- a/trinity-base/filelight/filelight-9999.ebuild
+++ b/trinity-apps/filelight/filelight-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
@@ -9,13 +10,12 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="az bg br ca cs cy da de el en_GB es et fr ga gl is it ja ka lt nb nl pl pt pt_BR ro ru rw sr sr@Latn sv ta tr uk"
 TRINITY_DOC_LANGS=" da es et it pt ru sv"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS=""
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.0.0
+need-trinity 14.1.0
 
 SLOT="${TRINITY_VER}"
diff --git a/trinity-base/filelight/metadata.xml b/trinity-apps/filelight/metadata.xml
similarity index 100%
rename from trinity-base/filelight/metadata.xml
rename to trinity-apps/filelight/metadata.xml
diff --git a/trinity-apps/knutclient/knutclient-9999.ebuild b/trinity-apps/knutclient/knutclient-9999.ebuild
index 85999806..975f94d3 100644
--- a/trinity-apps/knutclient/knutclient-9999.ebuild
+++ b/trinity-apps/knutclient/knutclient-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
@@ -9,16 +9,12 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="cs de en es fr it pl pt_BR ru uk"
 TRINITY_DOC_LANGS="cs en"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="A TDE GUI client for UPS system NUT"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.0.0
+need-trinity 14.1.0
 
 SLOT="${TRINITY_VER}"
-
-src_configure() {
-	trinity-base_src_configure
-}
diff --git a/trinity-apps/konversation/konversation-9999.ebuild b/trinity-apps/konversation/konversation-9999.ebuild
index c9f07147..c5aebccb 100644
--- a/trinity-apps/konversation/konversation-9999.ebuild
+++ b/trinity-apps/konversation/konversation-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
@@ -9,25 +10,24 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="ar bg ca da de el en_GB es et fi fr gl he hu it ja ka ko pa pt ru sr sr@Latn sv tr zh_CN zh_TW"
 TRINITY_DOC_LANGS="da es et it pt ru sv"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="A user friendly IRC Client for Trinity"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 x86"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-need-trinity 14.0.0
+need-trinity 14.1.0
 
 SLOT="${TRINITY_VER}"
 IUSE="xscreensaver"
 
 DEPEND="xscreensaver? ( x11-libs/libXScrnSaver )"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with xscreensaver XSCREENSAVER)
+		-DWITH_XSCREENSAVER="$(usex xscreensaver)"
 	)
 
-	trinity-base_src_configure
+	trinity-base-2_src_configure
 }
diff --git a/trinity-apps/ksensors/ksensors-9999.ebuild b/trinity-apps/ksensors/ksensors-9999.ebuild
index 50bea495..22a9ff54 100644
--- a/trinity-apps/ksensors/ksensors-9999.ebuild
+++ b/trinity-apps/ksensors/ksensors-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
@@ -9,19 +9,15 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="cs de en es fr nb nl pl sv"
 TRINITY_DOC_LANGS="en"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="A TDE GUI frontend to lm-sensors"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
 DEPEND="sys-apps/lm-sensors"
 RDEPEND="${DEPEND}"
 
-need-trinity 14.0.0
+need-trinity 14.1.0
 
 SLOT="${TRINITY_VER}"
-
-src_configure() {
-	trinity-base_src_configure
-}
diff --git a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
index 80511e8a..3c5aed4f 100644
--- a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
+++ b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019 The Trinity Desktop Project
+# Copyright 2019-2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_TYPE="applications"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
@@ -9,23 +9,19 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="ar bg cs da de en el es fi fr hi hu it ja km lt nb nl pa pl pt pt_BR ru sl_SI sv tr uk zh_CN zh_TW"
 TRINITY_DOC_LANGS="cs de en fi hu nb"
 
-inherit trinity-base
+inherit trinity-base-2
 
 DESCRIPTION="A TDE frontend for power management"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-DEPEND="x11-libs/libXScrnSaver 
+DEPEND="x11-libs/libXScrnSaver
 	x11-libs/libXext
-	x11-libs/libXtst 
-	>=dev-libs/dbus-tqt-${PV}
-	>=dev-libs/dbus-1-tqt-${PV}"
+	x11-libs/libXtst
+	=dev-libs/dbus-tqt-${PV}
+	=dev-libs/dbus-1-tqt-${PV}"
 RDEPEND="${DEPEND}"
 
-need-trinity 14.0.0
+need-trinity 14.1.0
 
 SLOT="${TRINITY_VER}"
-
-src_configure() {
-	trinity-base_src_configure
-}
diff --git a/trinity-base/akregator/akregator-9999.ebuild b/trinity-base/akregator/akregator-9999.ebuild
index 050adbdf..8a7557d5 100644
--- a/trinity-base/akregator/akregator-9999.ebuild
+++ b/trinity-base/akregator/akregator-9999.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity news feed aggregator."
-KEYWORDS=""
-IUSE=""
 
 DEPEND="
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}
-	>=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libkcal-${PV}:${SLOT}"
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}
+	=trinity-base/libtdepim-${PV}
+	=trinity-base/libkcal-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/arts/arts-9999.ebuild b/trinity-base/arts/arts-9999.ebuild
index 4735503b..155b8bf3 100644
--- a/trinity-base/arts/arts-9999.ebuild
+++ b/trinity-base/arts/arts-9999.ebuild
@@ -1,49 +1,49 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 
 TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
+TRINITY_MODULE_NAME="arts"
 
-inherit trinity-base
+inherit trinity-base-2
 
 set-trinityver
 
 DESCRIPTION="aRts, the Trinity sound (and all-around multimedia) server/output manager"
 HOMEPAGE="http://trinitydesktop.org/"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-LICENSE="GPL-2"
-KEYWORDS=
 IUSE="alsa -artswrappersuid jack mp3 nas vorbis"
 SLOT="$TRINITY_VER"
 
-DEPEND="dev-tqt/tqtinterface
-	dev-libs/glib:2
+DEPEND="=dev-tqt/tqtinterface-${PV}
+	dev-libs/glib
 	media-libs/audiofile
 	mp3? ( media-libs/libmad )
 	nas? ( media-libs/nas )
 	alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )"
+	jack? ( media-sound/jack-audio-connection-kit )"
 RDEPEND="${RDEPEND}"
 
 src_configure() {
 	mycmakeargs=(
 		-DAUDIOFILE=ON
-		$(cmake-utils_use_with mp3 MAD)
-		$(cmake-utils_use_with nas NAS)
-		$(cmake-utils_use_with alsa ALSA)
-		$(cmake-utils_use_with vorbis VORBIS)
-		$(cmake-utils_use_with jack JACK)
+		-DWITH_MAD="$(usex mp3)"
+		-DWITH_NAS="$(usex nas)"
+		-DWITH_ALSA="$(usex alsa)"
+		-DWITH_VORBIS="$(usex vorbis)"
+		-DWITH_JACK="$(usex jack)"
 		# NOTE: WITH_ESD dropped due to remove of esound long ago
 	)
 
-	trinity-base_src_configure
+	trinity-base-2_src_configure
 }
 
 src_install() {
-	trinity-base_src_install
+	trinity-base-2_src_install
 
 	# used for realtime priority, but off by default as it is a security hazard
 	use artswrappersuid && chmod u+s "${D}/${PREFIX}/bin/artswrapper"
@@ -54,7 +54,7 @@ pkg_postinst() {
 		elog "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
 		elog "and so avoid possible skips in sound. However, on untrusted systems this"
 		elog "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
-		elog "priority, and so is off by default. See bug #7883."
+		elog "priority, and so is off by default. See Gentoo bug #7883."
 		elog "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
 	fi
 }
diff --git a/trinity-base/atlantik/atlantik-9999.ebuild b/trinity-base/atlantik/atlantik-9999.ebuild
index 91b6e03b..b8f3c96b 100644
--- a/trinity-base/atlantik/atlantik-9999.ebuild
+++ b/trinity-base/atlantik/atlantik-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kaddressbook/kaddressbook-9999.ebuild b/trinity-base/kaddressbook/kaddressbook-9999.ebuild
index 691eec19..0688caf7 100644
--- a/trinity-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/trinity-base/kaddressbook/kaddressbook-9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Address Book"
-KEYWORDS=""
 IUSE+=" gnokii"
 
-COMMON_DEPEND=">=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libkcal-${PV}:${SLOT}
-	>=trinity-base/certmanager-${PV}:${SLOT}
-	>=trinity-base/libtdenetwork-${PV}:${SLOT}
+COMMON_DEPEND="=trinity-base/libtdepim-${PV}
+	=trinity-base/libkcal-${PV}
+	=trinity-base/certmanager-${PV}
+	=trinity-base/libtdenetwork-${PV}
 	gnokii? ( app-mobilephone/gnokii )"
 
 DEPEND+=" ${COMMON_DEPEND}"
@@ -27,7 +27,7 @@ TSM_EXTRACT_ALSO="certmanager/lib/
 
 src_configure () {
 	mycmakeargs=(
-		$(cmake-utils_use_with gnokii GNOKII )
+		-DWITH_GNOKII="$(usex gnokii)"
 	)
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild
index d9691a0c..3eddf69c 100644
--- a/trinity-base/kasteroids/kasteroids-9999.ebuild
+++ b/trinity-base/kasteroids/kasteroids-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Space Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}
-	>=trinity-base/arts-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}
+	=trinity-base/arts-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -18,5 +18,5 @@ src_configure() {
 		-DWITH_ARTS=ON
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild
index 6b601094..9979d123 100644
--- a/trinity-base/katomic/katomic-9999.ebuild
+++ b/trinity-base/katomic/katomic-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Atomic Entertainment Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
index 7f8d4728..3f1aebc8 100644
--- a/trinity-base/kbackgammon/kbackgammon-9999.ebuild
+++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A Backgammon program for Trinity"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild
index 11e94f70..4cea4415 100644
--- a/trinity-base/kbattleship/kbattleship-9999.ebuild
+++ b/trinity-base/kbattleship/kbattleship-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Battleship clone"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild
index 4b8ec143..0a2ef2f3 100644
--- a/trinity-base/kblackbox/kblackbox-9999.ebuild
+++ b/trinity-base/kblackbox/kblackbox-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Blackbox Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild
index ee2216cf..7525f28f 100644
--- a/trinity-base/kbounce/kbounce-9999.ebuild
+++ b/trinity-base/kbounce/kbounce-9999.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Bounce Ball Game"
-KEYWORDS=""
+
 IUSE+="+arts"
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}
-	arts? ( >=trinity-base/arts-${PV}:${SLOT} )"
+
+DEPEND="=trinity-base/libtdegames-${PV}
+	arts? ( >=trinity-base/arts-${PV} )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with arts ARTS)
+		-DWITH_ARTS="$(usex arts)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kdcop/kdcop-9999.ebuild b/trinity-base/kdcop/kdcop-9999.ebuild
index a689eb3a..a701b0b6 100644
--- a/trinity-base/kdcop/kdcop-9999.ebuild
+++ b/trinity-base/kdcop/kdcop-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: graphical DCOP browser/client"
-KEYWORDS=
-IUSE=""
diff --git a/trinity-base/kdf/kdf-9999.ebuild b/trinity-base/kdf/kdf-9999.ebuild
index a439c66a..59ab69e9 100644
--- a/trinity-base/kdf/kdf-9999.ebuild
+++ b/trinity-base/kdf/kdf-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdeutils"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity free disk space utility"
-KEYWORDS=""
-IUSE=""
diff --git a/trinity-base/kenolaba/kenolaba-9999.ebuild b/trinity-base/kenolaba/kenolaba-9999.ebuild
index d086a6fa..10e1f41d 100644
--- a/trinity-base/kenolaba/kenolaba-9999.ebuild
+++ b/trinity-base/kenolaba/kenolaba-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Board game inspired by Abalone"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfouleggs/kfouleggs-9999.ebuild b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
index 382b134d..7a6628b8 100644
--- a/trinity-base/kfouleggs/kfouleggs-9999.ebuild
+++ b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgantt/kgantt-9999.ebuild b/trinity-base/kgantt/kgantt-9999.ebuild
index 1ae99ee9..5c7d850d 100644
--- a/trinity-base/kgantt/kgantt-9999.ebuild
+++ b/trinity-base/kgantt/kgantt-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A Trinity library for drawing and editing gantt-diagramms"
-KEYWORDS=""
-IUSE+=""
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
index 5c14485a..394e5b9b 100644
--- a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
index d26dda60..d7ae6da4 100644
--- a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Tactical one or two player game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klickety/klickety-9999.ebuild b/trinity-base/klickety/klickety-9999.ebuild
index 24cbc450..689b63c6 100644
--- a/trinity-base/klickety/klickety-9999.ebuild
+++ b/trinity-base/klickety/klickety-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Klickety is an adaptation of the clickomania game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klines/klines-9999.ebuild b/trinity-base/klines/klines-9999.ebuild
index bb7aeeeb..0f9401e1 100644
--- a/trinity-base/klines/klines-9999.ebuild
+++ b/trinity-base/klines/klines-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmahjongg/kmahjongg-9999.ebuild b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
index 5e72dfb8..816b608e 100644
--- a/trinity-base/kmahjongg/kmahjongg-9999.ebuild
+++ b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Mahjongg for Trinity"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmines/kmines-9999.ebuild b/trinity-base/kmines/kmines-9999.ebuild
index 20c4b6ad..95fa9edf 100644
--- a/trinity-base/kmines/kmines-9999.ebuild
+++ b/trinity-base/kmines/kmines-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmix/kmix-9999.ebuild b/trinity-base/kmix/kmix-9999.ebuild
index 88cd8032..b4366c3a 100644
--- a/trinity-base/kmix/kmix-9999.ebuild
+++ b/trinity-base/kmix/kmix-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdemultimedia"
 
-inherit trinity-meta
+inherit trinity-meta-2
+
+DESCRIPTION="Trinity mixer GUI"
 
-DESCRIPTION="Trinity mixer gui"
-KEYWORDS=
 IUSE="alsa"
 
 DEPEND="alsa? ( media-libs/alsa-lib )"
@@ -15,8 +16,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with alsa ALSA)
+		-DWITH_ALSA="$(usex alsa)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kmobile/kmobile-9999.ebuild b/trinity-base/kmobile/kmobile-9999.ebuild
index 923f58dc..a46d6437 100644
--- a/trinity-base/kmobile/kmobile-9999.ebuild
+++ b/trinity-base/kmobile/kmobile-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A TDE Mobile Devices Manager"
 
diff --git a/trinity-base/knetwalk/knetwalk-9999.ebuild b/trinity-base/knetwalk/knetwalk-9999.ebuild
index e39a2939..97f7de17 100644
--- a/trinity-base/knetwalk/knetwalk-9999.ebuild
+++ b/trinity-base/knetwalk/knetwalk-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knode/knode-9999.ebuild b/trinity-base/knode/knode-9999.ebuild
index 2eb740cf..5f0c0787 100644
--- a/trinity-base/knode/knode-9999.ebuild
+++ b/trinity-base/knode/knode-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A newsreader for TDE"
 
 DEPEND="
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}
-	>=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libkcal-${PV}:${SLOT}"
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}
+	=trinity-base/libtdepim-${PV}
+	=trinity-base/libkcal-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/knotes/knotes-9999.ebuild b/trinity-base/knotes/knotes-9999.ebuild
index 1f1e939d..2e7814cb 100644
--- a/trinity-base/knotes/knotes-9999.ebuild
+++ b/trinity-base/knotes/knotes-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Notes application"
-KEYWORDS=""
-IUSE+=""
 
-COMMON_DEPEND=">=trinity-base/libkcal-${PV}:${SLOT}
-	>=trinity-base/libtdepim-${PV}:${SLOT}"
+COMMON_DEPEND="=trinity-base/libkcal-${PV}
+	=trinity-base/libtdepim-${PV}"
 DEPEND+=" $COMMON_DEPEND"
 RDEPEND+=" $COMMON_DEPEND"
 
diff --git a/trinity-base/kolf/kolf-9999.ebuild b/trinity-base/kolf/kolf-9999.ebuild
index ea860f5d..b332d41c 100644
--- a/trinity-base/kolf/kolf-9999.ebuild
+++ b/trinity-base/kolf/kolf-9999.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Minigolf Game by Trinity"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}
-	>=trinity-base/arts-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}
+	=trinity-base/arts-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
@@ -18,5 +18,5 @@ src_configure() {
 		-DWITH_ARTS=ON
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/konquest/konquest-9999.ebuild b/trinity-base/konquest/konquest-9999.ebuild
index ef236854..82161d27 100644
--- a/trinity-base/konquest/konquest-9999.ebuild
+++ b/trinity-base/konquest/konquest-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Galactic Strategy Trinity Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kontact/kontact-9999.ebuild b/trinity-base/kontact/kontact-9999.ebuild
index 05f53673..d5ffb6b2 100644
--- a/trinity-base/kontact/kontact-9999.ebuild
+++ b/trinity-base/kontact/kontact-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity personal information manager"
-KEYWORDS=""
-IUSE+=""
-COMMON_DEPEND=">=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libkpimidentities-${PV}:${SLOT}
-	>=trinity-base/libkholidays-${PV}:${SLOT}
-	>=trinity-base/knotes-${PV}:${SLOT}"
+
+COMMON_DEPEND="=trinity-base/libtdepim-${PV}
+	=trinity-base/libkpimidentities-${PV}
+	=trinity-base/libkholidays-${PV}
+	=trinity-base/knotes-${PV}"
 
 DEPEND+=" $COMMON_DEPEND"
 RDEPEND+=" $COMMON_DEPEND"
diff --git a/trinity-base/korganizer/korganizer-9999.ebuild b/trinity-base/korganizer/korganizer-9999.ebuild
index b9f24c9b..04736fdc 100644
--- a/trinity-base/korganizer/korganizer-9999.ebuild
+++ b/trinity-base/korganizer/korganizer-9999.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A Personal Organizer for Trinity"
-KEYWORDS=""
+
 IUSE+=" exchange"
+
 COMMON_DEPEND="
-	>=trinity-base/kgantt-${PV}:${SLOT}
-	>=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libtdenetwork-${PV}:${SLOT}
-	>=trinity-base/libkcal-${PV}:${SLOT}
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}
-	>=trinity-base/libkholidays-${PV}:${SLOT}
-	>=trinity-base/certmanager-${PV}:${SLOT}
-	>=trinity-base/libkpimidentities-${PV}:${SLOT}
-	>=trinity-base/kaddressbook-${PV}:${SLOT}
-	exchange? ( >=trinity-base/libkpimexchange-${PV}:${SLOT} )"
+	=trinity-base/kgantt-${PV}
+	=trinity-base/libtdepim-${PV}
+	=trinity-base/libtdenetwork-${PV}
+	=trinity-base/libkcal-${PV}
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}
+	=trinity-base/libkholidays-${PV}
+	=trinity-base/certmanager-${PV}
+	=trinity-base/libkpimidentities-${PV}
+	=trinity-base/kaddressbook-${PV}
+	exchange? ( =trinity-base/libkpimexchange-${PV} )"
 #	>=trinity-base/tdepim-tderesources-${PV}:${SLOT}
 
 DEPEND+=" ${COMMON_DEPEND}"
@@ -40,7 +42,7 @@ TSM_EXTRACT_ALSO+=" libkpimexchange/core/" # required for USE=exchange
 
 src_configure () {
 	mycmakeargs=(
-		$(cmake-utils_use_with exchange EXCHANGE )
+		-DWITH_EXCHANGE="$(usex exchange)"
 	)
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kpat/kpat-9999.ebuild b/trinity-base/kpat/kpat-9999.ebuild
index 1117828d..dfb517b2 100644
--- a/trinity-base/kpat/kpat-9999.ebuild
+++ b/trinity-base/kpat/kpat-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity patience game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kpoker/kpoker-9999.ebuild b/trinity-base/kpoker/kpoker-9999.ebuild
index 4178bd1a..d6774515 100644
--- a/trinity-base/kpoker/kpoker-9999.ebuild
+++ b/trinity-base/kpoker/kpoker-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity poker game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kreversi/kreversi-9999.ebuild b/trinity-base/kreversi/kreversi-9999.ebuild
index 6412e34d..2d0976f5 100644
--- a/trinity-base/kreversi/kreversi-9999.ebuild
+++ b/trinity-base/kreversi/kreversi-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Board Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksame/ksame-9999.ebuild b/trinity-base/ksame/ksame-9999.ebuild
index f8be7221..6ea0e504 100644
--- a/trinity-base/ksame/ksame-9999.ebuild
+++ b/trinity-base/ksame/ksame-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kshisen/kshisen-9999.ebuild b/trinity-base/kshisen/kshisen-9999.ebuild
index 619a4a2b..bee486fa 100644
--- a/trinity-base/kshisen/kshisen-9999.ebuild
+++ b/trinity-base/kshisen/kshisen-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A Trinity game similiar to Mahjongg"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksirtet/ksirtet-9999.ebuild b/trinity-base/ksirtet/ksirtet-9999.ebuild
index 08a69fc4..c03c6c03 100644
--- a/trinity-base/ksirtet/ksirtet-9999.ebuild
+++ b/trinity-base/ksirtet/ksirtet-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksmiletris/ksmiletris-9999.ebuild b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
index 6a3c7711..0dda554c 100644
--- a/trinity-base/ksmiletris/ksmiletris-9999.ebuild
+++ b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity SmileTris"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksnake/ksnake-9999.ebuild b/trinity-base/ksnake/ksnake-9999.ebuild
index 6660d621..dd24f4ef 100644
--- a/trinity-base/ksnake/ksnake-9999.ebuild
+++ b/trinity-base/ksnake/ksnake-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Tron game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksokoban/ksokoban-9999.ebuild b/trinity-base/ksokoban/ksokoban-9999.ebuild
index 8a60550c..da0555d9 100644
--- a/trinity-base/ksokoban/ksokoban-9999.ebuild
+++ b/trinity-base/ksokoban/ksokoban-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kspaceduel/kspaceduel-9999.ebuild b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
index 1ae883f2..6ab8e904 100644
--- a/trinity-base/kspaceduel/kspaceduel-9999.ebuild
+++ b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Space Game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktnef/ktnef-9999.ebuild b/trinity-base/ktnef/ktnef-9999.ebuild
index ab67e3c4..7124bdc8 100644
--- a/trinity-base/ktnef/ktnef-9999.ebuild
+++ b/trinity-base/ktnef/ktnef-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity Viewer for mail attachments using TNEF format"
-KEYWORDS=""
-IUSE+=""
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/ktron/ktron-9999.ebuild b/trinity-base/ktron/ktron-9999.ebuild
index e39a2939..97f7de17 100644
--- a/trinity-base/ktron/ktron-9999.ebuild
+++ b/trinity-base/ktron/ktron-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktuberling/ktuberling-9999.ebuild b/trinity-base/ktuberling/ktuberling-9999.ebuild
index 500b4b9e..5ea69bea 100644
--- a/trinity-base/ktuberling/ktuberling-9999.ebuild
+++ b/trinity-base/ktuberling/ktuberling-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="A Trinity potato game for kids"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/libkcal/libkcal-9999.ebuild b/trinity-base/libkcal/libkcal-9999.ebuild
index b1483a8d..161305bc 100644
--- a/trinity-base/libkcal/libkcal-9999.ebuild
+++ b/trinity-base/libkcal/libkcal-9999.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity kcal library for KOrganizer etc"
-KEYWORDS=""
-IUSE=""
 
 DEPEND="
 	dev-libs/libical
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}"
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="libemailfunctions/ libtdepim/ libkmime/ ktnef/"
diff --git a/trinity-base/libkholidays/libkholidays-9999.ebuild b/trinity-base/libkholidays/libkholidays-9999.ebuild
index 39b3f687..837fa644 100644
--- a/trinity-base/libkholidays/libkholidays-9999.ebuild
+++ b/trinity-base/libkholidays/libkholidays-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity library to compute holidays."
-KEYWORDS=""
-IUSE+=""
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/libkmime/libkmime-9999.ebuild b/trinity-base/libkmime/libkmime-9999.ebuild
index f42fce88..d2d90f44 100644
--- a/trinity-base/libkmime/libkmime-9999.ebuild
+++ b/trinity-base/libkmime/libkmime-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity kmime library for Message Handling"
-KEYWORDS=""
-IUSE=""
 
 TSM_EXTRACT_ALSO="libtdepim/"
diff --git a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
index ea0c321f..aaca6deb 100644
--- a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
+++ b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity PIM exchange library"
-KEYWORDS=""
-IUSE+=""
-COMMON_DEPEND=">=trinity-base/libkcal-${PV}:${SLOT}
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}"
+
+COMMON_DEPEND="=trinity-base/libkcal-${PV}
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}"
 
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
diff --git a/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild b/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild
index d635315f..9134dd46 100644
--- a/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild
+++ b/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity PIM identities library"
-KEYWORDS=""
-IUSE+=""
 
-COMMON_DEPEND=">=trinity-base/certmanager-${PV}:${SLOT}
-	>=trinity-base/libtdepim-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}"
+COMMON_DEPEND="=trinity-base/certmanager-${PV}
+	=trinity-base/libtdepim-${PV}
+	=trinity-base/libkmime-${PV}"
 DEPEND+=" $COMMON_DEPEND"
 RDEPEND+=" $COMMON_DEPEND"
 
diff --git a/trinity-base/libtdegames/libtdegames-9999.ebuild b/trinity-base/libtdegames/libtdegames-9999.ebuild
index 6ae1f34a..419f82e8 100644
--- a/trinity-base/libtdegames/libtdegames-9999.ebuild
+++ b/trinity-base/libtdegames/libtdegames-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Base library common to many Trinity games"
-KEYWORDS=""
-IUSE+=""
diff --git a/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild b/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild
index 4d7667f6..7c417dd8 100644
--- a/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild
+++ b/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="library common to many tdepim apps interacting to network"
-KEYWORDS=""
-IUSE+=""
 
-COMMON_DEPEND=">=app-crypt/gpgme-1.0.2"
+COMMON_DEPEND="app-crypt/gpgme"
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
 
diff --git a/trinity-base/libtdepim/libtdepim-9999.ebuild b/trinity-base/libtdepim/libtdepim-9999.ebuild
index 972dcef7..adad492e 100644
--- a/trinity-base/libtdepim/libtdepim-9999.ebuild
+++ b/trinity-base/libtdepim/libtdepim-9999.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Common library for Trinity PIM applications."
-KEYWORDS=""
-IUSE+=""
 
 COMMON_DEPEND="
-	>=trinity-base/ktnef-${PV}:${SLOT}
-	>=trinity-base/libkmime-${PV}:${SLOT}
-	>=trinity-base/libkcal-${PV}:${SLOT}"
+	=trinity-base/ktnef-${PV}
+	=trinity-base/libkmime-${PV}
+	=trinity-base/libkcal-${PV}"
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
 
@@ -23,7 +22,7 @@ TSM_EXTRACT_ALSO="libemailfunctions/
 	libkcal/"
 
 src_prepare() {
-	trinity-meta_src_prepare
+	trinity-meta-2_src_prepare
 	# Call TQt designer
 	sed -i -e "s:\"designer\":\"${TQTDIR}/bin/designer\":g" "${S}/libtdepim/kcmdesignerfields.cpp" || die "sed failed"
 }
diff --git a/trinity-base/lskat/lskat-9999.ebuild b/trinity-base/lskat/lskat-9999.ebuild
index 2b72b2f2..a189bf97 100644
--- a/trinity-base/lskat/lskat-9999.ebuild
+++ b/trinity-base/lskat/lskat-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity card game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/mimelib/mimelib-9999.ebuild b/trinity-base/mimelib/mimelib-9999.ebuild
index 00ea3984..83564512 100644
--- a/trinity-base/mimelib/mimelib-9999.ebuild
+++ b/trinity-base/mimelib/mimelib-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 2020 The Trinity Desktop Project
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdepim"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="TDE library for processing messages in MIME format"
\ No newline at end of file
diff --git a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
index 9e59012b..551242e4 100644
--- a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
+++ b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdeaddons"
 
-inherit trinity-meta db-use
+inherit trinity-meta-2 db-use
 
 DESCRIPTION="Various plugins for Noatun."
-KEYWORDS=""
+
 IUSE="arts sdl berkdb"
 
 COMMON_DEPEND="
-	>=trinity-base/noatun-${PV}:${SLOT}
-	arts? ( >=trinity-base/arts-${PV}:${SLOT} )
+	=trinity-base/noatun-${PV}
+	arts? ( =trinity-base/arts-${PV} )
 	berkdb? ( =sys-libs/db-4*:= )
 "
 DEPEND="${COMMON_DEPEND}
-	sdl? ( >=media-libs/libsdl-1.2 )
+	sdl? ( media-libs/libsdl )
 "
 
 RDEPEND="${COMMON_DEPEND}
-	sdl? ( >=media-libs/libsdl-1.2[X] )
+	sdl? ( media-libs/libsdl[X] )
 "
 
 src_compile() {
@@ -41,5 +42,5 @@ src_compile() {
 		)
 	fi
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/tde-i18n/tde-i18n-9999.ebuild b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
index 53f4a81f..fa6a9cff 100644
--- a/trinity-base/tde-i18n/tde-i18n-9999.ebuild
+++ b/trinity-base/tde-i18n/tde-i18n-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tde-i18n"
 
-inherit trinity-base cmake-utils l10n
+inherit trinity-base-2 cmake-utils l10n
 
 set-trinityver
 
 DESCRIPTION="Trinity internationalization package"
 HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
 SLOT="${TRINITY_VER}"
-KEYWORDS=""
-IUSE=""
 
-DEPEND=">=trinity-base/tdelibs-${PV}:${SLOT}"
+DEPEND="=trinity-base/tdelibs-${PV}"
 RDEPEND="${DEPEND}"
 
 PLOCALES="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et
@@ -37,7 +36,7 @@ run_phase() {
 	pushd "$S/$dir" || die "No such dir: $dir"
 	CMAKE_USE_DIR="${S}/${dir}"
 	BUILD_DIR="${WORKDIR}/${dir}-build"
-	trinity-base_${phase}
+	trinity-base-2_${phase}
 	popd
 }
 
diff --git a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
index 36295dd4..453278e6 100644
--- a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
+++ b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
@@ -1,27 +1,26 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Documentaion for tdegames-derived packages"
-KEYWORDS=""
-IUSE+=""
+
 RDEPEND="
-	>=trinity-base/khelpcenter-${PV}:${SLOT}"
+	=trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
-	# we should reduce MAKEOPTS -j parametr to no more than 4
+	# Issue some warning if MAKEOPTS -j parameter is higher than 4
 	local makeopts_j
 	makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')"
 	if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then
-		export MAKEOPTS="${MAKEOPTS//"${makeopts_j}"/-j4}"
 
 		ewarn "This ebuild needs huge amoumt of memmory to compile in highly parallel"
-		ewarn "mode so it can chew it all. MAKEOPTS are reduced to \"$MAKEOPTS\"."
+		ewarn "mode so it can chew it all. Please change your MAKEOPTS if building fails."
 	fi
 
-	trinity-meta_pkg_setup
+	trinity-meta-2_pkg_setup
 }
diff --git a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
index 64768c45..dbd61c9f 100644
--- a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
+++ b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
@@ -1,52 +1,51 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 
-inherit trinity-functions
+inherit trinity-functions-2
 
 set-trinityver
 
-DESCRIPTION="kdegraphics metapackage - merge this to pull in all kdegraphics-derived packages"
+DESCRIPTION="tdegames metapackage - merge this to pull in all tdegames-derived packages"
 HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
 SLOT="${TRINITY_VER}"
-IUSE=""
-KEYWORDS=
 
 RDEPEND="
-	>=trinity-apps/atlantik-${PV}:${SLOT}
-	>=trinity-base/tdegames-doc-${PV}:${SLOT}
-	>=trinity-apps/kasteroids-${PV}:${SLOT}
-	>=trinity-apps/katomic-${PV}:${SLOT}
-	>=trinity-apps/kbackgammon-${PV}:${SLOT}
-	>=trinity-apps/kbattleship-${PV}:${SLOT}
-	>=trinity-apps/kblackbox-${PV}:${SLOT}
-	>=trinity-apps/kbounce-${PV}:${SLOT}
-	>=trinity-apps/kenolaba-${PV}:${SLOT}
-	>=trinity-apps/kfouleggs-${PV}:${SLOT}
-	>=trinity-apps/kgoldrunner-${PV}:${SLOT}
-	>=trinity-apps/kjumpingcube-${PV}:${SLOT}
-	>=trinity-apps/klickety-${PV}:${SLOT}
-	>=trinity-apps/klines-${PV}:${SLOT}
-	>=trinity-apps/kmahjongg-${PV}:${SLOT}
-	>=trinity-apps/kmines-${PV}:${SLOT}
-	>=trinity-apps/knetwalk-${PV}:${SLOT}
-	>=trinity-apps/kolf-${PV}:${SLOT}
-	>=trinity-apps/konquest-${PV}:${SLOT}
-	>=trinity-apps/kpat-${PV}:${SLOT}
-	>=trinity-apps/kpoker-${PV}:${SLOT}
-	>=trinity-apps/kreversi-${PV}:${SLOT}
-	>=trinity-apps/ksame-${PV}:${SLOT}
-	>=trinity-apps/kshisen-${PV}:${SLOT}
-	>=trinity-apps/ksirtet-${PV}:${SLOT}
-	>=trinity-apps/ksmiletris-${PV}:${SLOT}
-	>=trinity-apps/ksnake-${PV}:${SLOT}
-	>=trinity-apps/ksokoban-${PV}:${SLOT}
-	>=trinity-apps/kspaceduel-${PV}:${SLOT}
-	>=trinity-apps/ktron-${PV}:${SLOT}
-	>=trinity-apps/ktuberling-${PV}:${SLOT}
-	>=trinity-base/libtdegames-${PV}:${SLOT}
-	>=trinity-apps/lskat-${PV}:${SLOT}
-	>=trinity-apps/twin4-${PV}:${SLOT}"
+	=trinity-base/atlantik-${PV}
+	=trinity-base/tdegames-doc-${PV}
+	=trinity-base/kasteroids-${PV}
+	=trinity-base/katomic-${PV}
+	=trinity-base/kbackgammon-${PV}
+	=trinity-base/kbattleship-${PV}
+	=trinity-base/kblackbox-${PV}
+	=trinity-base/kbounce-${PV}
+	=trinity-base/kenolaba-${PV}
+	=trinity-base/kfouleggs-${PV}
+	=trinity-base/kgoldrunner-${PV}
+	=trinity-base/kjumpingcube-${PV}
+	=trinity-base/klickety-${PV}
+	=trinity-base/klines-${PV}
+	=trinity-base/kmahjongg-${PV}
+	=trinity-base/kmines-${PV}
+	=trinity-base/knetwalk-${PV}
+	=trinity-base/kolf-${PV}
+	=trinity-base/konquest-${PV}
+	=trinity-base/kpat-${PV}
+	=trinity-base/kpoker-${PV}
+	=trinity-base/kreversi-${PV}
+	=trinity-base/ksame-${PV}
+	=trinity-base/kshisen-${PV}
+	=trinity-base/ksirtet-${PV}
+	=trinity-base/ksmiletris-${PV}
+	=trinity-base/ksnake-${PV}
+	=trinity-base/ksokoban-${PV}
+	=trinity-base/kspaceduel-${PV}
+	=trinity-base/ktron-${PV}
+	=trinity-base/ktuberling-${PV}
+	=trinity-base/libtdegames-${PV}
+	=trinity-base/lskat-${PV}
+	=trinity-base/twin4-${PV}"
diff --git a/trinity-base/tdeinit/tdeinit-9999.ebuild b/trinity-base/tdeinit/tdeinit-9999.ebuild
index 2f7d0c5f..f822d3e8 100644
--- a/trinity-base/tdeinit/tdeinit-9999.ebuild
+++ b/trinity-base/tdeinit/tdeinit-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity init binary particulary replacing funcs of the starttde script"
-KEYWORDS=
-IUSE=""
diff --git a/trinity-base/twin4/twin4-9999.ebuild b/trinity-base/twin4/twin4-9999.ebuild
index 483f2eec..455eccb4 100644
--- a/trinity-base/twin4/twin4-9999.ebuild
+++ b/trinity-base/twin4/twin4-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdegames"
 
 inherit trinity-meta
 
 DESCRIPTION="Trinity four-in-a-row game"
-KEYWORDS=""
-IUSE+=""
-DEPEND=">=trinity-base/libtdegames-${PV}:${SLOT}"
+
+DEPEND="=trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"