6 files changed, 54 insertions, 37 deletions
diff --git a/trinity-apps/filelight/filelight-9999.ebuild b/trinity-apps/filelight/filelight-9999.ebuild
new file mode 100644
index 00000000..709d434e
--- /dev/null
+++ b/trinity-apps/filelight/filelight-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI="7"
+TRINITY_MODULE_TYPE="applications"
+
+TRINITY_EXTRAGEAR_PACKAGING="yes"
+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-2
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="http://trinitydesktop.org/"
+LICENSE="|| ( GPL-2 GPL-3 )"
+
+need-trinity 14.1.0
+
+SLOT="${TRINITY_VER}"
diff --git a/trinity-apps/filelight/metadata.xml b/trinity-apps/filelight/metadata.xml
new file mode 100644
index 00000000..6e9f5e4a
--- /dev/null
+++ b/trinity-apps/filelight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fatzer2@gmail.com</email>
+		<name>Alexander Golubev</name>
+	</maintainer>
+</pkgmetadata>
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
-}