diff --git a/trinity-apps/amarok/amarok-14.0.8.ebuild b/trinity-apps/amarok/amarok-14.0.8.ebuild
index 561f3b10..94b34426 100644
--- a/trinity-apps/amarok/amarok-14.0.8.ebuild
+++ b/trinity-apps/amarok/amarok-14.0.8.ebuild
@@ -32,6 +32,9 @@ SLOT="${TRINITY_VER}"
 #   Yauap isn't in Portage tree, but could be added later.
 #
 # - Rio Karma support needs libkarma which neeeds to be added to our overlay later.
+#	USE=riokarma 
+# 	DEPEND+="	riokarma? ( media-libs/libkarma )"
+#		-DWITH_RIOKARMA="$(usex riokarma)"
 #
 # - No Support for DAAP because it's not tested if that works with Mongrel2.
 #
@@ -39,7 +42,7 @@ SLOT="${TRINITY_VER}"
 #
 # - Otherwise the ebuild should offer all what can be done with CMake at the moment.
 
-IUSE+=" konqsidebar +xine ipod riokarma ifp njb mtp mp4
+IUSE+=" konqsidebar +xine ipod ifp njb mtp mp4
 	inotify visualization amazon mysql postgres opengl akode"
 
 REQUIRED_USE="|| ( xine akode )"
@@ -49,10 +52,9 @@ DEPEND+="
 	media-libs/taglib
 	dev-db/sqlite
 	xine? ( <media-libs/xine-lib-1.2.10 )
-	akode? ( =media-libs/akode-${PV} )
+	akode? ( ~media-libs/akode-${PV} )
 	mp4? ( media-libs/libmp4v2 )
 	ipod? ( media-libs/libgpod )
-	riokarma? ( media-libs/libkarma )
 	ifp? ( media-libs/libifp )
 	njb? ( media-libs/libnjb )
 	opengl? ( virtual/opengl )
@@ -73,7 +75,6 @@ src_configure() {
 		-DWITH_XINE="$(usex xine)"
 		-DWITH_AKODE="$(usex akode)"
 		-DWITH_IPOD="$(usex ipod)"
-		-DWITH_RIOKARMA="$(usex riokarma)"
 		-DWITH_IFP="$(usex ifp)"
 		-DWITH_NJB="$(usex njb)"
 		-DWITH_MTP="$(usex mtp)"
diff --git a/trinity-apps/basket/basket-14.0.8.ebuild b/trinity-apps/basket/basket-14.0.8.ebuild
index 322363d2..d1a2fba6 100644
--- a/trinity-apps/basket/basket-14.0.8.ebuild
+++ b/trinity-apps/basket/basket-14.0.8.ebuild
@@ -25,8 +25,8 @@ SLOT="${TRINITY_VER}"
 IUSE+=" crypt +svg kontact"
 
 DEPEND+=" crypt? ( app-crypt/gpgme )
-	svg? ( =media-libs/libart_lgpl-${PV} )
-	kontact? ( =trinity-base/kontact-${PV} )"
+	svg? ( ~media-libs/libart_lgpl-${PV} )
+	kontact? ( ~trinity-base/kontact-${PV} )"
 RDEPEND+=" ${DEPEND}"
 
 src_configure() {
diff --git a/trinity-apps/k3b/k3b-14.0.8.ebuild b/trinity-apps/k3b/k3b-14.0.8.ebuild
index 7938b03a..6048243d 100644
--- a/trinity-apps/k3b/k3b-14.0.8.ebuild
+++ b/trinity-apps/k3b/k3b-14.0.8.ebuild
@@ -27,7 +27,7 @@ DEPEND+=" media-libs/libsamplerate
 	alsa? ( media-libs/alsa-lib )
 	dvd? ( media-libs/libdvdread )
 	encode? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	flac? ( media-libs/flac[cxx] )
 	mp3? ( media-libs/libmad )
 	sndfile? ( media-libs/libsndfile )
diff --git a/trinity-apps/kbarcode/kbarcode-14.0.8.ebuild b/trinity-apps/kbarcode/kbarcode-14.0.8.ebuild
index e842c771..1537de51 100644
--- a/trinity-apps/kbarcode/kbarcode-14.0.8.ebuild
+++ b/trinity-apps/kbarcode/kbarcode-14.0.8.ebuild
@@ -22,6 +22,8 @@ SLOT="${TRINITY_VER}"
 
 # Native GNU Barcode support seems to be broken right now.
 # The GNU Barcode binary is needed anyway.
+# Might be related to the following tidbit from Gentoo user ML:
+#"As of version 0.99, GNU Barcode no longer installs its library."
 
 IUSE+=" javascript native_gnu_barcode"
 
diff --git a/trinity-apps/keep/keep-14.0.8.ebuild b/trinity-apps/keep/keep-14.0.8.ebuild
index 16d18da9..fd7b8411 100644
--- a/trinity-apps/keep/keep-14.0.8.ebuild
+++ b/trinity-apps/keep/keep-14.0.8.ebuild
@@ -21,7 +21,7 @@ need-trinity
 
 SLOT="${TRINITY_VER}"
 
-RDEPEND+=" =trinity-base/kcontrol-${PV}
+RDEPEND+=" ~trinity-base/kcontrol-${PV}
 	app-backup/rdiff-backup"
 
 pkg_postinst () {
diff --git a/trinity-apps/kgtk-qt3/kgtk-qt3-14.0.8.ebuild b/trinity-apps/kgtk-qt3/kgtk-qt3-14.0.8.ebuild
index b94ab63a..9a00d45d 100644
--- a/trinity-apps/kgtk-qt3/kgtk-qt3-14.0.8.ebuild
+++ b/trinity-apps/kgtk-qt3/kgtk-qt3-14.0.8.ebuild
@@ -23,7 +23,7 @@ SLOT="${TRINITY_VER}"
 IUSE+=" tqt tde gtk2"
 
 DEPEND+="
-	tqt? ( =dev-tqt/tqtinterface-${PV} )
+	tqt? ( ~dev-tqt/tqtinterface-${PV} )
 	gtk2? ( x11-libs/gtk+:2 )
 "
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-apps/kshowmail/kshowmail-14.0.8.ebuild b/trinity-apps/kshowmail/kshowmail-14.0.8.ebuild
index 2ad1ab75..5e53676c 100644
--- a/trinity-apps/kshowmail/kshowmail-14.0.8.ebuild
+++ b/trinity-apps/kshowmail/kshowmail-14.0.8.ebuild
@@ -20,7 +20,7 @@ need-trinity
 
 SLOT="${TRINITY_VER}"
 
-DEPEND+=" =trinity-base/mimelib-${PV}"
+DEPEND+=" ~trinity-base/mimelib-${PV}"
 RDEPEND+=" ${DEPEND}"
 
 src_configure() {
diff --git a/trinity-apps/kshutdown/kshutdown-14.0.8.ebuild b/trinity-apps/kshutdown/kshutdown-14.0.8.ebuild
index 59aa737d..e10c5c3e 100644
--- a/trinity-apps/kshutdown/kshutdown-14.0.8.ebuild
+++ b/trinity-apps/kshutdown/kshutdown-14.0.8.ebuild
@@ -25,9 +25,9 @@ SLOT="${TRINITY_VER}"
 IUSE+=" extras"
 
 RDEPEND+="
-	=trinity-base/tdesu-${PV}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/kdialog-${PV}"
+	~trinity-base/tdesu-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/kdialog-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-apps/kvpnc/kvpnc-14.0.8.ebuild b/trinity-apps/kvpnc/kvpnc-14.0.8.ebuild
index 09a2f323..b6c88175 100644
--- a/trinity-apps/kvpnc/kvpnc-14.0.8.ebuild
+++ b/trinity-apps/kvpnc/kvpnc-14.0.8.ebuild
@@ -28,7 +28,7 @@ IUSE+=" cisco smartcard +openvpn strongswan pptpd libreswan"
 DEPEND+=" sys-apps/net-tools
 	dev-libs/libgcrypt"
 RDEPEND+=" ${DEPEND}
-	cisco? ( net-misc/vpnc )
+	cisco? ( net-vpn/vpnc )
 	smartcard? ( dev-libs/openct )
 	openvpn? ( net-vpn/openvpn )
 	strongswan? ( net-vpn/strongswan )
diff --git a/trinity-apps/tdepowersave/tdepowersave-14.0.8.ebuild b/trinity-apps/tdepowersave/tdepowersave-14.0.8.ebuild
index 1c5f0c4a..bb861a17 100644
--- a/trinity-apps/tdepowersave/tdepowersave-14.0.8.ebuild
+++ b/trinity-apps/tdepowersave/tdepowersave-14.0.8.ebuild
@@ -26,7 +26,7 @@ SLOT="${TRINITY_VER}"
 DEPEND+=" x11-libs/libXScrnSaver
 	x11-libs/libXext
 	x11-libs/libXtst
-	=dev-libs/dbus-1-tqt-${PV}"
+	~dev-libs/dbus-1-tqt-${PV}"
 RDEPEND+=" ${DEPEND}"
 
 src_configure() {
diff --git a/trinity-apps/tdesvn/tdesvn-14.0.8.ebuild b/trinity-apps/tdesvn/tdesvn-14.0.8.ebuild
index 2456eab3..342c3e70 100644
--- a/trinity-apps/tdesvn/tdesvn-14.0.8.ebuild
+++ b/trinity-apps/tdesvn/tdesvn-14.0.8.ebuild
@@ -22,6 +22,8 @@ SLOT="${TRINITY_VER}"
 
 IUSE+=" test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND+=" dev-vcs/subversion"
 RDEPEND+=" ${DEPEND}"
 
diff --git a/trinity-apps/tdmtheme/tdmtheme-14.0.8.ebuild b/trinity-apps/tdmtheme/tdmtheme-14.0.8.ebuild
index 51813801..dce05383 100644
--- a/trinity-apps/tdmtheme/tdmtheme-14.0.8.ebuild
+++ b/trinity-apps/tdmtheme/tdmtheme-14.0.8.ebuild
@@ -20,7 +20,7 @@ need-trinity
 
 SLOT="${TRINITY_VER}"
 
-RDEPEND+=" =trinity-base/tdm-${PV}"
+RDEPEND+=" ~trinity-base/tdm-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-apps/yakuake/yakuake-14.0.8.ebuild b/trinity-apps/yakuake/yakuake-14.0.8.ebuild
index 0312fecf..2c4f37df 100644
--- a/trinity-apps/yakuake/yakuake-14.0.8.ebuild
+++ b/trinity-apps/yakuake/yakuake-14.0.8.ebuild
@@ -21,5 +21,5 @@ need-trinity
 
 SLOT="${TRINITY_VER}"
 
-DEPEND+=" =trinity-base/konsole-${PV}"
+DEPEND+=" ~trinity-base/konsole-${PV}"
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-base/kontact/Manifest b/trinity-base/kontact/Manifest
new file mode 100644
index 00000000..7add9d33
--- /dev/null
+++ b/trinity-base/kontact/Manifest
@@ -0,0 +1,2 @@
+DIST tdepim-trinity-14.0.7.tar.xz 9367460 BLAKE2B cbb4a16cd18dcfbd09dffd829b086c02af36863e57b72af8496c28870b21cbfe2525809f0116e38ccbfd03ec0216617c240c46248f63fb35c993fe632c434048 SHA512 ebedf72b1454c22dfa60608ce83083e3e366758160b42dbaf881f754a0d95ea3cef9b5bbfe1849f3ef6ecfc2fb9635056cc8595d3f7e910e1c91394aceb2c76d
+DIST tdepim-trinity-14.0.8.tar.xz 9357184 BLAKE2B d5e489faa5a2e7db41dc1f076280e8115fd5c7cfd136c65088418ef1e2f2e5ddb0eaf013818acabeb96d7b4ed72ae4b749b1872066c6f804fd4292aa7c0d1c5f SHA512 f9f4d49d5ec02f1e2f472d4dff5b1f326ffa657e3e33f83a3d396ae729c978afcf2ee6256098f4bf0f958a17838a50633a27cbb11e4d177f19b306b72bb5db62
diff --git a/trinity-base/kontact/kontact-14.0.8.ebuild b/trinity-base/kontact/kontact-14.0.8.ebuild
new file mode 100644
index 00000000..e21dca76
--- /dev/null
+++ b/trinity-base/kontact/kontact-14.0.8.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
+
+EAPI="7"
+TRINITY_MODULE_NAME="tdepim"
+
+inherit trinity-meta-2
+
+DESCRIPTION="Trinity personal information manager"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="~trinity-base/libtdepim-${PV}
+	~trinity-base/libkpimidentities-${PV}
+	~trinity-base/libkholidays-${PV}
+	~trinity-base/knotes-${PV}"
+
+DEPEND+=" $COMMON_DEPEND"
+RDEPEND+=" $COMMON_DEPEND"
+
+TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/"