diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild
index f3f0eb9f..a35e5025 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.7.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.7.ebuild
index f3f0eb9f..a35e5025 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.7.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.7.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
index 8f4c01f8..8d0968cc 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild b/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild
index 638fad2a..ee2ca4de 100644
--- a/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-libs/dbus-tqt/dbus-tqt-14.0.7.ebuild b/dev-libs/dbus-tqt/dbus-tqt-14.0.7.ebuild
index 638fad2a..ee2ca4de 100644
--- a/dev-libs/dbus-tqt/dbus-tqt-14.0.7.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-14.0.7.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
index a371711b..031e25b5 100644
--- a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 
 DEPEND="sys-apps/dbus
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-tqt/avahi-tqt/avahi-tqt-9999.ebuild b/dev-tqt/avahi-tqt/avahi-tqt-9999.ebuild
index 0213a269..3025ec30 100644
--- a/dev-tqt/avahi-tqt/avahi-tqt-9999.ebuild
+++ b/dev-tqt/avahi-tqt/avahi-tqt-9999.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 
 DEPEND="net-dns/avahi
-	=dev-tqt/tqtinterface-${PV}"
+	~dev-tqt/tqtinterface-${PV}"
 RDEPEND="${DEPEND}"
 
 src_configure() {
diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
index 212535ca..5fcfcddb 100644
--- a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
@@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-DEPEND="=dev-tqt/tqt-${PV}
+DEPEND="~dev-tqt/tqt-${PV}
 	virtual/glu"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.7.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.7.ebuild
index 212535ca..5fcfcddb 100644
--- a/dev-tqt/tqtinterface/tqtinterface-14.0.7.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-14.0.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-DEPEND="=dev-tqt/tqt-${PV}
+DEPEND="~dev-tqt/tqt-${PV}
 	virtual/glu"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
index 55b032d9..4b10382a 100644
--- a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 IUSE="+opengl"
 
-DEPEND="=dev-tqt/tqt-${PV}[opengl=]
+DEPEND="~dev-tqt/tqt-${PV}[opengl=]
 	opengl? ( virtual/glu )"
 RDEPEND="${DEPEND}"
 
diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild
index f0eebbc5..58a33c56 100644
--- a/trinity-apps/amarok/amarok-9999.ebuild
+++ b/trinity-apps/amarok/amarok-9999.ebuild
@@ -48,7 +48,7 @@ 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 )
diff --git a/trinity-apps/basket/basket-9999.ebuild b/trinity-apps/basket/basket-9999.ebuild
index 8bfc0baf..3aa0b4e2 100644
--- a/trinity-apps/basket/basket-9999.ebuild
+++ b/trinity-apps/basket/basket-9999.ebuild
@@ -24,8 +24,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/keep/keep-9999.ebuild b/trinity-apps/keep/keep-9999.ebuild
index 17ec4cdb..76af8f57 100644
--- a/trinity-apps/keep/keep-9999.ebuild
+++ b/trinity-apps/keep/keep-9999.ebuild
@@ -20,7 +20,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-9999.ebuild b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
index a1b62120..75d83e90 100644
--- a/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
+++ b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
@@ -22,7 +22,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-9999.ebuild b/trinity-apps/kshowmail/kshowmail-9999.ebuild
index cff4ba5d..b5169f06 100644
--- a/trinity-apps/kshowmail/kshowmail-9999.ebuild
+++ b/trinity-apps/kshowmail/kshowmail-9999.ebuild
@@ -19,7 +19,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-9999.ebuild b/trinity-apps/kshutdown/kshutdown-9999.ebuild
index 06e0fecb..9544396e 100644
--- a/trinity-apps/kshutdown/kshutdown-9999.ebuild
+++ b/trinity-apps/kshutdown/kshutdown-9999.ebuild
@@ -24,9 +24,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/tdepowersave/tdepowersave-9999.ebuild b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
index 82088c7d..39c95af6 100644
--- a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
+++ b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
@@ -25,7 +25,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/tdmtheme/tdmtheme-9999.ebuild b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
index ecda1390..c33e17e7 100644
--- a/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
+++ b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
@@ -19,7 +19,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-9999.ebuild b/trinity-apps/yakuake/yakuake-9999.ebuild
index 20e1376e..7073908c 100644
--- a/trinity-apps/yakuake/yakuake-9999.ebuild
+++ b/trinity-apps/yakuake/yakuake-9999.ebuild
@@ -20,5 +20,5 @@ need-trinity
 
 SLOT="${TRINITY_VER}"
 
-DEPEND+=" =trinity-base/konsole-${PV}"
+DEPEND+=" ~trinity-base/konsole-${PV}"
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-base/akregator/akregator-9999.ebuild b/trinity-base/akregator/akregator-9999.ebuild
index 93ea2c5d..f62ec878 100644
--- a/trinity-base/akregator/akregator-9999.ebuild
+++ b/trinity-base/akregator/akregator-9999.ebuild
@@ -10,10 +10,10 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity news feed aggregator."
 
 DEPEND="
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}
-	=trinity-base/libtdepim-${PV}
-	=trinity-base/libkcal-${PV}"
+	~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-14.0.6.ebuild b/trinity-base/arts/arts-14.0.6.ebuild
index f97d6765..f187312c 100644
--- a/trinity-base/arts/arts-14.0.6.ebuild
+++ b/trinity-base/arts/arts-14.0.6.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa -artswrappersuid jack mp3 vorbis"
 SLOT="${TRINITY_VER}"
 
-DEPEND="=dev-tqt/tqtinterface-${PV}
+DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/glib
 	media-libs/audiofile
 	mp3? ( media-libs/libmad )
diff --git a/trinity-base/arts/arts-14.0.7.ebuild b/trinity-base/arts/arts-14.0.7.ebuild
index f97d6765..f187312c 100644
--- a/trinity-base/arts/arts-14.0.7.ebuild
+++ b/trinity-base/arts/arts-14.0.7.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa -artswrappersuid jack mp3 vorbis"
 SLOT="${TRINITY_VER}"
 
-DEPEND="=dev-tqt/tqtinterface-${PV}
+DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/glib
 	media-libs/audiofile
 	mp3? ( media-libs/libmad )
diff --git a/trinity-base/arts/arts-9999.ebuild b/trinity-base/arts/arts-9999.ebuild
index e620505b..f64d3278 100644
--- a/trinity-base/arts/arts-9999.ebuild
+++ b/trinity-base/arts/arts-9999.ebuild
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 IUSE="alsa -artswrappersuid jack mp3 vorbis"
 SLOT="${TRINITY_VER}"
 
-DEPEND="=dev-tqt/tqtinterface-${PV}
+DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/glib
 	media-libs/audiofile
 	mp3? ( media-libs/libmad )
diff --git a/trinity-base/atlantik/atlantik-9999.ebuild b/trinity-base/atlantik/atlantik-9999.ebuild
index 02e8b1f2..b72fb7dc 100644
--- a/trinity-base/atlantik/atlantik-9999.ebuild
+++ b/trinity-base/atlantik/atlantik-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="The Atlantic board game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
index 6416fa8f..9fef6d81 100644
--- a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
+++ b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild
@@ -9,4 +9,4 @@ inherit trinity-meta-2
 
 DESCRIPTION="Atlantik gameboard designer"
 
-DEPEND="=trinity-base/atlantik-${PV}"
+DEPEND="~trinity-base/atlantik-${PV}"
diff --git a/trinity-base/certmanager/certmanager-9999.ebuild b/trinity-base/certmanager/certmanager-9999.ebuild
index e67fe39b..bd502e96 100644
--- a/trinity-base/certmanager/certmanager-9999.ebuild
+++ b/trinity-base/certmanager/certmanager-9999.ebuild
@@ -9,7 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity certificate manager gui"
 
-COMMON_DEPEND="=trinity-base/libtdenetwork-${PV}
+COMMON_DEPEND="~trinity-base/libtdenetwork-${PV}
 	app-crypt/gpgme
 	app-crypt/gnupg"
 DEPEND+=" ${COMMON_DEPEND}"
diff --git a/trinity-base/dcoprss/dcoprss-9999.ebuild b/trinity-base/dcoprss/dcoprss-9999.ebuild
index 3dd94261..af43da6f 100644
--- a/trinity-base/dcoprss/dcoprss-9999.ebuild
+++ b/trinity-base/dcoprss/dcoprss-9999.ebuild
@@ -9,7 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity RSS server and client for DCOP"
 
-DEPEND="=trinity-base/librss-${PV}"
+DEPEND="~trinity-base/librss-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="librss/"
diff --git a/trinity-base/kaboodle/kaboodle-9999.ebuild b/trinity-base/kaboodle/kaboodle-9999.ebuild
index 6e279142..d15ccd0a 100644
--- a/trinity-base/kaboodle/kaboodle-9999.ebuild
+++ b/trinity-base/kaboodle/kaboodle-9999.ebuild
@@ -8,4 +8,4 @@ inherit trinity-meta-2
 
 DESCRIPTION="The Lean TDE Media Player"
 
-RDEPEND="=trinity-base/tdemultimedia-arts-${PV}"
\ No newline at end of file
+RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
\ No newline at end of file
diff --git a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild
index 1d9a996c..2e7320c3 100644
--- a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild
+++ b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Plugins for Trinity Addressbook"
 
-DEPEND="=trinity-base/kaddressbook-${PV}"
+DEPEND="~trinity-base/kaddressbook-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kaddressbook/kaddressbook-9999.ebuild b/trinity-base/kaddressbook/kaddressbook-9999.ebuild
index 4abd695d..7f8f8f60 100644
--- a/trinity-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/trinity-base/kaddressbook/kaddressbook-9999.ebuild
@@ -10,10 +10,10 @@ inherit trinity-meta-2
 DESCRIPTION="The Trinity Address Book"
 IUSE+=" gnokii"
 
-COMMON_DEPEND="=trinity-base/libtdepim-${PV}
-	=trinity-base/libkcal-${PV}
-	=trinity-base/certmanager-${PV}
-	=trinity-base/libtdenetwork-${PV}
+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}"
diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild
index f7d23ad7..12cd866a 100644
--- a/trinity-base/kasteroids/kasteroids-9999.ebuild
+++ b/trinity-base/kasteroids/kasteroids-9999.ebuild
@@ -11,6 +11,6 @@ need-arts yes
 
 DESCRIPTION="Trinity Space Game"
 
-MY_DEPEND="=trinity-base/libtdegames-${PV}"
+MY_DEPEND="~trinity-base/libtdegames-${PV}"
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/kate-plugins/kate-plugins-9999.ebuild b/trinity-base/kate-plugins/kate-plugins-9999.ebuild
index 4de59f93..071b5851 100644
--- a/trinity-base/kate-plugins/kate-plugins-9999.ebuild
+++ b/trinity-base/kate-plugins/kate-plugins-9999.ebuild
@@ -10,5 +10,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Kate plugins and docs"
 
-DEPEND="=trinity-base/kate-${PV}"
+DEPEND="~trinity-base/kate-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild
index 97bdbe4a..af1df08c 100644
--- a/trinity-base/katomic/katomic-9999.ebuild
+++ b/trinity-base/katomic/katomic-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Atomic Entertainment Game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
index fe0cccf4..7b7bec49 100644
--- a/trinity-base/kbackgammon/kbackgammon-9999.ebuild
+++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="A Backgammon program for Trinity"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild
index d0c0f7c9..55183082 100644
--- a/trinity-base/kbattleship/kbattleship-9999.ebuild
+++ b/trinity-base/kbattleship/kbattleship-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Battleship clone"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild
index ff7dc6b1..211f7b27 100644
--- a/trinity-base/kblackbox/kblackbox-9999.ebuild
+++ b/trinity-base/kblackbox/kblackbox-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Blackbox Game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild
index 97cf1963..527b7eb2 100644
--- a/trinity-base/kbounce/kbounce-9999.ebuild
+++ b/trinity-base/kbounce/kbounce-9999.ebuild
@@ -13,6 +13,6 @@ need-arts optional
 
 DESCRIPTION="Trinity Bounce Ball Game"
 
-MY_DEPEND="=trinity-base/libtdegames-${PV}"
+MY_DEPEND="~trinity-base/libtdegames-${PV}"
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/kcontrol/kcontrol-14.0.6.ebuild b/trinity-base/kcontrol/kcontrol-14.0.6.ebuild
index eec5d7c5..b0b21919 100644
--- a/trinity-base/kcontrol/kcontrol-14.0.6.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.0.6.ebuild
@@ -18,18 +18,18 @@ DEPEND="x11-libs/libX11
 	samba? ( net-fs/samba )
 	logitech-mouse? ( virtual/libusb:0 )
 	ieee1394? ( sys-libs/libraw1394 )
-	=trinity-base/tdelibs-${PV}[xrandr?]
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kicker-${PV}"
+	~trinity-base/tdelibs-${PV}[xrandr?]
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kicker-${PV}"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
-	=trinity-base/kcminit-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	svg? ( =media-libs/libart_lgpl-${PV} )"
+	~trinity-base/kcminit-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	svg? ( ~media-libs/libart_lgpl-${PV} )"
 
 TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
 
diff --git a/trinity-base/kcontrol/kcontrol-14.0.7.ebuild b/trinity-base/kcontrol/kcontrol-14.0.7.ebuild
index eec5d7c5..b0b21919 100644
--- a/trinity-base/kcontrol/kcontrol-14.0.7.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.0.7.ebuild
@@ -18,18 +18,18 @@ DEPEND="x11-libs/libX11
 	samba? ( net-fs/samba )
 	logitech-mouse? ( virtual/libusb:0 )
 	ieee1394? ( sys-libs/libraw1394 )
-	=trinity-base/tdelibs-${PV}[xrandr?]
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kicker-${PV}"
+	~trinity-base/tdelibs-${PV}[xrandr?]
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kicker-${PV}"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
-	=trinity-base/kcminit-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	svg? ( =media-libs/libart_lgpl-${PV} )"
+	~trinity-base/kcminit-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	svg? ( ~media-libs/libart_lgpl-${PV} )"
 
 TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
 
diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild
index 6d956785..7534260b 100644
--- a/trinity-base/kcontrol/kcontrol-9999.ebuild
+++ b/trinity-base/kcontrol/kcontrol-9999.ebuild
@@ -17,18 +17,18 @@ DEPEND="x11-libs/libX11
 	samba? ( net-fs/samba )
 	logitech-mouse? ( dev-libs/libusb-compat )
 	ieee1394? ( sys-libs/libraw1394 )
-	=trinity-base/tdelibs-${PV}[xrandr?]
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kicker-${PV}"
+	~trinity-base/tdelibs-${PV}[xrandr?]
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kicker-${PV}"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
-	=trinity-base/kcminit-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	svg? ( =media-libs/libart_lgpl-${PV} )"
+	~trinity-base/kcminit-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	svg? ( ~media-libs/libart_lgpl-${PV} )"
 
 TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
 
diff --git a/trinity-base/kdesktop/kdesktop-14.0.6.ebuild b/trinity-base/kdesktop/kdesktop-14.0.6.ebuild
index f6d7d468..90bd9e1b 100644
--- a/trinity-base/kdesktop/kdesktop-14.0.6.ebuild
+++ b/trinity-base/kdesktop/kdesktop-14.0.6.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
-	=dev-libs/dbus-1-tqt-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kcontrol-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kcontrol-${PV}
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -24,9 +24,9 @@ COMMON_DEPEND="x11-libs/libXrender
 DEPEND="${COMMON_DEPEND}
 	xscreensaver? ( x11-base/xorg-proto x11-misc/xscreensaver )"
 RDEPEND="${COMMON_DEPEND}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/konqueror-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/konqueror-${PV}
 	pam? ( trinity-base/tdebase-pam )"
 
 TSM_EXTRACT_ALSO="kcheckpass/"
diff --git a/trinity-base/kdesktop/kdesktop-14.0.7.ebuild b/trinity-base/kdesktop/kdesktop-14.0.7.ebuild
index f6d7d468..90bd9e1b 100644
--- a/trinity-base/kdesktop/kdesktop-14.0.7.ebuild
+++ b/trinity-base/kdesktop/kdesktop-14.0.7.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
-	=dev-libs/dbus-1-tqt-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kcontrol-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kcontrol-${PV}
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -24,9 +24,9 @@ COMMON_DEPEND="x11-libs/libXrender
 DEPEND="${COMMON_DEPEND}
 	xscreensaver? ( x11-base/xorg-proto x11-misc/xscreensaver )"
 RDEPEND="${COMMON_DEPEND}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/konqueror-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/konqueror-${PV}
 	pam? ( trinity-base/tdebase-pam )"
 
 TSM_EXTRACT_ALSO="kcheckpass/"
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index 233d7b84..5fd6a041 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-9999.ebuild
@@ -12,9 +12,9 @@ IUSE="pam xscreensaver"
 
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
-	=dev-libs/dbus-1-tqt-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/kcontrol-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/kcontrol-${PV}
 	xscreensaver? ( x11-libs/libXScrnSaver )"
 	# Requires the desktop background settings module,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
@@ -22,9 +22,9 @@ COMMON_DEPEND="x11-libs/libXrender
 DEPEND="${COMMON_DEPEND}
 	xscreensaver? ( x11-base/xorg-proto x11-misc/xscreensaver )"
 RDEPEND="${COMMON_DEPEND}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/konqueror-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/konqueror-${PV}
 	pam? ( trinity-base/tdebase-pam )"
 
 TSM_EXTRACT_ALSO="kcheckpass/"
diff --git a/trinity-base/kdvi/kdvi-9999.ebuild b/trinity-base/kdvi/kdvi-9999.ebuild
index 750cef3c..aee95714 100644
--- a/trinity-base/kdvi/kdvi-9999.ebuild
+++ b/trinity-base/kdvi/kdvi-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity DVI viewer"
 
 DEPEND="media-libs/freetype
-	=trinity-base/kviewshell-${PV}"
+	~trinity-base/kviewshell-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="kviewshell"
diff --git a/trinity-base/kenolaba/kenolaba-9999.ebuild b/trinity-base/kenolaba/kenolaba-9999.ebuild
index 92a35560..8a7dbbf8 100644
--- a/trinity-base/kenolaba/kenolaba-9999.ebuild
+++ b/trinity-base/kenolaba/kenolaba-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Board game inspired by Abalone"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfax/kfax-9999.ebuild b/trinity-base/kfax/kfax-9999.ebuild
index be6fac8a..f2d147e7 100644
--- a/trinity-base/kfax/kfax-9999.ebuild
+++ b/trinity-base/kfax/kfax-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity G3/G4 fax viewer"
 
-DEPEND="=trinity-base/kviewshell-${PV}"
+DEPEND="~trinity-base/kviewshell-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="kviewshell"
diff --git a/trinity-base/kfind/kfind-14.0.6.ebuild b/trinity-base/kfind/kfind-14.0.6.ebuild
index 61225b6e..ab82db3b 100644
--- a/trinity-base/kfind/kfind-14.0.6.ebuild
+++ b/trinity-base/kfind/kfind-14.0.6.ebuild
@@ -10,5 +10,5 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity file find utility"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfind/kfind-14.0.7.ebuild b/trinity-base/kfind/kfind-14.0.7.ebuild
index 61225b6e..ab82db3b 100644
--- a/trinity-base/kfind/kfind-14.0.7.ebuild
+++ b/trinity-base/kfind/kfind-14.0.7.ebuild
@@ -10,5 +10,5 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity file find utility"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild
index b39ff617..83f2329b 100644
--- a/trinity-base/kfind/kfind-9999.ebuild
+++ b/trinity-base/kfind/kfind-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity file find utility"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kfouleggs/kfouleggs-9999.ebuild b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
index 312c69b5..7e7cd5aa 100644
--- a/trinity-base/kfouleggs/kfouleggs-9999.ebuild
+++ b/trinity-base/kfouleggs/kfouleggs-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgamma/kgamma-9999.ebuild b/trinity-base/kgamma/kgamma-9999.ebuild
index 0968c837..f1600d99 100644
--- a/trinity-base/kgamma/kgamma-9999.ebuild
+++ b/trinity-base/kgamma/kgamma-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity screen gamma values kcontrol module"
 
-DEPEND="=trinity-base/kcontrol-${PV}"
+DEPEND="~trinity-base/kcontrol-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
index f7f4efc9..736c1c57 100644
--- a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
+++ b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: KGoldrunner is a game of action and puzzle solving"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild b/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild
index c8938919..fe34fdc1 100644
--- a/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="The Trinity help center."
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
 	|| ( www-misc/htdig www-misc/hldig )"
diff --git a/trinity-base/khelpcenter/khelpcenter-14.0.7.ebuild b/trinity-base/khelpcenter/khelpcenter-14.0.7.ebuild
index c8938919..fe34fdc1 100644
--- a/trinity-base/khelpcenter/khelpcenter-14.0.7.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-14.0.7.ebuild
@@ -12,5 +12,5 @@ DESCRIPTION="The Trinity help center."
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
 	|| ( www-misc/htdig www-misc/hldig )"
diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
index ab760341..396e704d 100644
--- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
@@ -11,7 +11,7 @@ TRINITY_SUBMODULE="khelpcenter doc"
 DESCRIPTION="The Trinity help center."
 
 RDEPEND="
-	=trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
 	|| ( www-misc/htdig www-misc/hldig )"
 
 pkg_setup() {
diff --git a/trinity-base/kicker-applets/kicker-applets-9999.ebuild b/trinity-base/kicker-applets/kicker-applets-9999.ebuild
index 0df6a2ce..de894d16 100644
--- a/trinity-base/kicker-applets/kicker-applets-9999.ebuild
+++ b/trinity-base/kicker-applets/kicker-applets-9999.ebuild
@@ -9,7 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="kicker applets"
 
-DEPEND="=trinity-base/kicker-${PV}"
+DEPEND="~trinity-base/kicker-${PV}"
 RDEPEND="${DEPEND}"
 
 # no xmms support
diff --git a/trinity-base/kicker/kicker-14.0.6.ebuild b/trinity-base/kicker/kicker-14.0.6.ebuild
index 4ed93945..222f01b1 100644
--- a/trinity-base/kicker/kicker-14.0.6.ebuild
+++ b/trinity-base/kicker/kicker-14.0.6.ebuild
@@ -11,15 +11,15 @@ DESCRIPTION="The Trinity application starter panel, capable of applets and exten
 KEYWORDS="~amd64 ~x86"
 IUSE="xcomposite"
 
-DEPEND="=trinity-base/libkonq-${PV}
-	=trinity-base/tdebase-data-${PV}
+DEPEND="~trinity-base/libkonq-${PV}
+	~trinity-base/tdebase-data-${PV}
 	dev-libs/dbus-tqt
 	xcomposite? ( x11-libs/libXrender
 		x11-libs/libXfixes
 		x11-libs/libXcomposite )"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kmenuedit-${PV}"
+	~trinity-base/kmenuedit-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kicker/kicker-14.0.7.ebuild b/trinity-base/kicker/kicker-14.0.7.ebuild
index 4ed93945..222f01b1 100644
--- a/trinity-base/kicker/kicker-14.0.7.ebuild
+++ b/trinity-base/kicker/kicker-14.0.7.ebuild
@@ -11,15 +11,15 @@ DESCRIPTION="The Trinity application starter panel, capable of applets and exten
 KEYWORDS="~amd64 ~x86"
 IUSE="xcomposite"
 
-DEPEND="=trinity-base/libkonq-${PV}
-	=trinity-base/tdebase-data-${PV}
+DEPEND="~trinity-base/libkonq-${PV}
+	~trinity-base/tdebase-data-${PV}
 	dev-libs/dbus-tqt
 	xcomposite? ( x11-libs/libXrender
 		x11-libs/libXfixes
 		x11-libs/libXcomposite )"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kmenuedit-${PV}"
+	~trinity-base/kmenuedit-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild
index 5b4c3422..88eef36e 100644
--- a/trinity-base/kicker/kicker-9999.ebuild
+++ b/trinity-base/kicker/kicker-9999.ebuild
@@ -10,15 +10,15 @@ inherit trinity-meta-2
 DESCRIPTION="The Trinity application starter panel, capable of applets and extensions"
 IUSE="xcomposite"
 
-DEPEND="=trinity-base/libkonq-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=dev-libs/dbus-tqt-${PV}
+DEPEND="~trinity-base/libkonq-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~dev-libs/dbus-tqt-${PV}
 	xcomposite? ( x11-libs/libXrender
 		x11-libs/libXfixes
 		x11-libs/libXcomposite )"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kmenuedit-${PV}"
+	~trinity-base/kmenuedit-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
index fde3d3a6..7a6e6ae8 100644
--- a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
+++ b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Tactical one or two player game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klickety/klickety-9999.ebuild b/trinity-base/klickety/klickety-9999.ebuild
index 88f42a13..ecd45807 100644
--- a/trinity-base/klickety/klickety-9999.ebuild
+++ b/trinity-base/klickety/klickety-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Klickety is an adaptation of the clickomania game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/klines/klines-9999.ebuild b/trinity-base/klines/klines-9999.ebuild
index 62644c28..d2833a83 100644
--- a/trinity-base/klines/klines-9999.ebuild
+++ b/trinity-base/klines/klines-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Kolor Lines - a little game about balls and how to get rid of them"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmahjongg/kmahjongg-9999.ebuild b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
index 2150fee5..49b04fb7 100644
--- a/trinity-base/kmahjongg/kmahjongg-9999.ebuild
+++ b/trinity-base/kmahjongg/kmahjongg-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Mahjongg for Trinity"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kmail/kmail-9999.ebuild b/trinity-base/kmail/kmail-9999.ebuild
index 47f83498..c5e69c76 100644
--- a/trinity-base/kmail/kmail-9999.ebuild
+++ b/trinity-base/kmail/kmail-9999.ebuild
@@ -14,23 +14,23 @@ IUSE="crypt imap mbox sasl"
 # so we trigger them to be build, depending on USE flags.
 
 COMMON_DEPEND="
-	=trinity-base/libtdepim-${PV}
-	=trinity-base/mimelib-${PV}
-	=trinity-base/libtdenetwork-${PV}
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkcal-${PV}
-	=trinity-base/libkmime-${PV}
-	=trinity-base/libkpgp-${PV}
-	=trinity-base/certmanager-${PV}
-	=trinity-base/libkpimidentities-${PV}
-	=trinity-base/libksieve-${PV}"
+	~trinity-base/libtdepim-${PV}
+	~trinity-base/mimelib-${PV}
+	~trinity-base/libtdenetwork-${PV}
+	~trinity-base/ktnef-${PV}
+	~trinity-base/libkcal-${PV}
+	~trinity-base/libkmime-${PV}
+	~trinity-base/libkpgp-${PV}
+	~trinity-base/certmanager-${PV}
+	~trinity-base/libkpimidentities-${PV}
+	~trinity-base/libksieve-${PV}"
 
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	crypt? ( app-crypt/pinentry )
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	mbox? ( =trinity-base/tdepim-tdeioslaves-${PV} )
-	imap? ( =trinity-base/tdepim-tdeioslaves-${PV}[sasl=] )"
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	mbox? ( ~trinity-base/tdepim-tdeioslaves-${PV} )
+	imap? ( ~trinity-base/tdepim-tdeioslaves-${PV}[sasl=] )"
 
 TSM_EXTRACT_ALSO="
 	ktnef/
diff --git a/trinity-base/kmines/kmines-9999.ebuild b/trinity-base/kmines/kmines-9999.ebuild
index e7f851be..cd4cbb68 100644
--- a/trinity-base/kmines/kmines-9999.ebuild
+++ b/trinity-base/kmines/kmines-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="KMines is a classic mine sweeper game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knetwalk/knetwalk-9999.ebuild b/trinity-base/knetwalk/knetwalk-9999.ebuild
index 5965481c..67b6a9cf 100644
--- a/trinity-base/knetwalk/knetwalk-9999.ebuild
+++ b/trinity-base/knetwalk/knetwalk-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
index aa8929c4..5c8d190f 100644
--- a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
+++ b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Kicker applet - RSS news ticker"
 
-DEPEND="=trinity-base/knewsticker-${PV}"
+DEPEND="~trinity-base/knewsticker-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knewsticker/knewsticker-9999.ebuild b/trinity-base/knewsticker/knewsticker-9999.ebuild
index 05b62eda..90e54640 100644
--- a/trinity-base/knewsticker/knewsticker-9999.ebuild
+++ b/trinity-base/knewsticker/knewsticker-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="kicker plugin: rss news ticker"
 
-DEPEND="=trinity-base/librss-${PV}"
+DEPEND="~trinity-base/librss-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/knode/knode-9999.ebuild b/trinity-base/knode/knode-9999.ebuild
index 72311edf..284c5464 100644
--- a/trinity-base/knode/knode-9999.ebuild
+++ b/trinity-base/knode/knode-9999.ebuild
@@ -9,10 +9,10 @@ inherit trinity-meta-2
 DESCRIPTION="A newsreader for TDE"
 
 DEPEND="
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}
-	=trinity-base/libtdepim-${PV}
-	=trinity-base/libkcal-${PV}"
+	~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 9f03978c..556a8141 100644
--- a/trinity-base/knotes/knotes-9999.ebuild
+++ b/trinity-base/knotes/knotes-9999.ebuild
@@ -9,8 +9,8 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Notes application"
 
-COMMON_DEPEND="=trinity-base/libkcal-${PV}
-	=trinity-base/libtdepim-${PV}"
+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 c644d3e2..264cbb19 100644
--- a/trinity-base/kolf/kolf-9999.ebuild
+++ b/trinity-base/kolf/kolf-9999.ebuild
@@ -11,6 +11,6 @@ need-arts yes
 
 DESCRIPTION="Minigolf Game by Trinity"
 
-MY_DEPEND="=trinity-base/libtdegames-${PV}"
+MY_DEPEND="~trinity-base/libtdegames-${PV}"
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/konq-plugins/konq-plugins-9999.ebuild b/trinity-base/konq-plugins/konq-plugins-9999.ebuild
index 45b4abd3..2ad143ef 100644
--- a/trinity-base/konq-plugins/konq-plugins-9999.ebuild
+++ b/trinity-base/konq-plugins/konq-plugins-9999.ebuild
@@ -11,6 +11,6 @@ need-arts optional
 
 DESCRIPTION="Various plugins for Konqueror."
 
-MY_DEPEND="=trinity-base/konqueror-${PV}"
+MY_DEPEND="~trinity-base/konqueror-${PV}"
 DEPEND+=" ${MY_DEPEND}"
 RDEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/konqueror/konqueror-14.0.6.ebuild b/trinity-base/konqueror/konqueror-14.0.6.ebuild
index e0fcaed1..c8456b9b 100644
--- a/trinity-base/konqueror/konqueror-14.0.6.ebuild
+++ b/trinity-base/konqueror/konqueror-14.0.6.ebuild
@@ -14,12 +14,12 @@ IUSE="java"
 # FIXME: support branding USE flag
 
 DEPEND="
-	=trinity-base/libkonq-${PV}"
+	~trinity-base/libkonq-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/kfind-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/kfind-${PV}
 	java? ( virtual/jre )"
 
 TSM_EXTRACT_ALSO="kdesktop"
diff --git a/trinity-base/konqueror/konqueror-14.0.7.ebuild b/trinity-base/konqueror/konqueror-14.0.7.ebuild
index e0fcaed1..c8456b9b 100644
--- a/trinity-base/konqueror/konqueror-14.0.7.ebuild
+++ b/trinity-base/konqueror/konqueror-14.0.7.ebuild
@@ -14,12 +14,12 @@ IUSE="java"
 # FIXME: support branding USE flag
 
 DEPEND="
-	=trinity-base/libkonq-${PV}"
+	~trinity-base/libkonq-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/kfind-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/kfind-${PV}
 	java? ( virtual/jre )"
 
 TSM_EXTRACT_ALSO="kdesktop"
diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild
index 612a7a2d..cc0a4e28 100644
--- a/trinity-base/konqueror/konqueror-9999.ebuild
+++ b/trinity-base/konqueror/konqueror-9999.ebuild
@@ -13,12 +13,12 @@ IUSE="java"
 # FIXME: support branding USE flag
 
 DEPEND="
-	=trinity-base/libkonq-${PV}"
+	~trinity-base/libkonq-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/kfind-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/kfind-${PV}
 	java? ( virtual/jre )"
 
 TSM_EXTRACT_ALSO="kdesktop"
diff --git a/trinity-base/konquest/konquest-9999.ebuild b/trinity-base/konquest/konquest-9999.ebuild
index ea588162..5013cc05 100644
--- a/trinity-base/konquest/konquest-9999.ebuild
+++ b/trinity-base/konquest/konquest-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Galactic Strategy Trinity Game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/konsole/konsole-14.0.6.ebuild b/trinity-base/konsole/konsole-14.0.6.ebuild
index 1eb7ce0e..0ee6196f 100644
--- a/trinity-base/konsole/konsole-14.0.6.ebuild
+++ b/trinity-base/konsole/konsole-14.0.6.ebuild
@@ -18,7 +18,7 @@ DEPEND="x11-libs/libX11
 RDEPEND="${DEPEND}
 	sudo? ( app-admin/sudo )
 	x11-apps/bdftopcf
-	=trinity-base/kcontrol-${PV}"
+	~trinity-base/kcontrol-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/konsole/konsole-14.0.7.ebuild b/trinity-base/konsole/konsole-14.0.7.ebuild
index 1eb7ce0e..0ee6196f 100644
--- a/trinity-base/konsole/konsole-14.0.7.ebuild
+++ b/trinity-base/konsole/konsole-14.0.7.ebuild
@@ -18,7 +18,7 @@ DEPEND="x11-libs/libX11
 RDEPEND="${DEPEND}
 	sudo? ( app-admin/sudo )
 	x11-apps/bdftopcf
-	=trinity-base/kcontrol-${PV}"
+	~trinity-base/kcontrol-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild
index eff61bc5..abe8312b 100644
--- a/trinity-base/konsole/konsole-9999.ebuild
+++ b/trinity-base/konsole/konsole-9999.ebuild
@@ -17,7 +17,7 @@ DEPEND="x11-libs/libX11
 RDEPEND="${DEPEND}
 	sudo? ( app-admin/sudo )
 	x11-apps/bdftopcf
-	=trinity-base/kcontrol-${PV}"
+	~trinity-base/kcontrol-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kontact/kontact-9999.ebuild b/trinity-base/kontact/kontact-9999.ebuild
index 47f08d06..8fb904ae 100644
--- a/trinity-base/kontact/kontact-9999.ebuild
+++ b/trinity-base/kontact/kontact-9999.ebuild
@@ -9,10 +9,10 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity personal information manager"
 
-COMMON_DEPEND="=trinity-base/libtdepim-${PV}
-	=trinity-base/libkpimidentities-${PV}
-	=trinity-base/libkholidays-${PV}
-	=trinity-base/knotes-${PV}"
+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/kooka/kooka-9999.ebuild b/trinity-base/kooka/kooka-9999.ebuild
index c65998fd..18db89fe 100644
--- a/trinity-base/kooka/kooka-9999.ebuild
+++ b/trinity-base/kooka/kooka-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Kooka is a Trinity application which provides access to scanner hardware"
 
 DEPEND="
-	=trinity-base/libkscan-${PV}
+	~trinity-base/libkscan-${PV}
 	media-libs/tiff:="
 RDEPEND="${DEPEND}"
 
diff --git a/trinity-base/korganizer/korganizer-9999.ebuild b/trinity-base/korganizer/korganizer-9999.ebuild
index 51058f42..5bb6a030 100644
--- a/trinity-base/korganizer/korganizer-9999.ebuild
+++ b/trinity-base/korganizer/korganizer-9999.ebuild
@@ -12,18 +12,18 @@ DESCRIPTION="A Personal Organizer for Trinity"
 IUSE+=" exchange"
 
 COMMON_DEPEND="
-	=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}
+	~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}"
 RDEPEND+=" ${COMMON_DEPEND}"
diff --git a/trinity-base/kpat/kpat-9999.ebuild b/trinity-base/kpat/kpat-9999.ebuild
index ce491e32..28e6ed8e 100644
--- a/trinity-base/kpat/kpat-9999.ebuild
+++ b/trinity-base/kpat/kpat-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity patience game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kpoker/kpoker-9999.ebuild b/trinity-base/kpoker/kpoker-9999.ebuild
index 7078c5e9..92cd2776 100644
--- a/trinity-base/kpoker/kpoker-9999.ebuild
+++ b/trinity-base/kpoker/kpoker-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity poker game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kreversi/kreversi-9999.ebuild b/trinity-base/kreversi/kreversi-9999.ebuild
index c831cc07..0861c36f 100644
--- a/trinity-base/kreversi/kreversi-9999.ebuild
+++ b/trinity-base/kreversi/kreversi-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Board Game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksame/ksame-9999.ebuild b/trinity-base/ksame/ksame-9999.ebuild
index 8ac42d0b..71318931 100644
--- a/trinity-base/ksame/ksame-9999.ebuild
+++ b/trinity-base/ksame/ksame-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Same Game - a little game about balls and how to get rid of them"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kshisen/kshisen-9999.ebuild b/trinity-base/kshisen/kshisen-9999.ebuild
index 3e854248..a44128c2 100644
--- a/trinity-base/kshisen/kshisen-9999.ebuild
+++ b/trinity-base/kshisen/kshisen-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="A Trinity game similiar to Mahjongg"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksirtet/ksirtet-9999.ebuild b/trinity-base/ksirtet/ksirtet-9999.ebuild
index 31990dca..a0d07b8e 100644
--- a/trinity-base/ksirtet/ksirtet-9999.ebuild
+++ b/trinity-base/ksirtet/ksirtet-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksmiletris/ksmiletris-9999.ebuild b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
index 7ac9e039..c2b105c3 100644
--- a/trinity-base/ksmiletris/ksmiletris-9999.ebuild
+++ b/trinity-base/ksmiletris/ksmiletris-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity SmileTris"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksmserver/ksmserver-14.0.6.ebuild b/trinity-base/ksmserver/ksmserver-14.0.6.ebuild
index 91427875..596325a7 100644
--- a/trinity-base/ksmserver/ksmserver-14.0.6.ebuild
+++ b/trinity-base/ksmserver/ksmserver-14.0.6.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="upower +hwlib"
 
 DEPEND="
-	upower? ( =dev-libs/dbus-1-tqt-${PV} ) "
+	upower? ( ~dev-libs/dbus-1-tqt-${PV} ) "
 
 RDEPEND="${DEPEND}
 	upower? ( sys-power/upower ) "
diff --git a/trinity-base/ksmserver/ksmserver-14.0.7.ebuild b/trinity-base/ksmserver/ksmserver-14.0.7.ebuild
index 91427875..596325a7 100644
--- a/trinity-base/ksmserver/ksmserver-14.0.7.ebuild
+++ b/trinity-base/ksmserver/ksmserver-14.0.7.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="upower +hwlib"
 
 DEPEND="
-	upower? ( =dev-libs/dbus-1-tqt-${PV} ) "
+	upower? ( ~dev-libs/dbus-1-tqt-${PV} ) "
 
 RDEPEND="${DEPEND}
 	upower? ( sys-power/upower ) "
diff --git a/trinity-base/ksnake/ksnake-9999.ebuild b/trinity-base/ksnake/ksnake-9999.ebuild
index eb59c9dd..f542a97b 100644
--- a/trinity-base/ksnake/ksnake-9999.ebuild
+++ b/trinity-base/ksnake/ksnake-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Tron game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksokoban/ksokoban-9999.ebuild b/trinity-base/ksokoban/ksokoban-9999.ebuild
index 7ea957dd..2948861b 100644
--- a/trinity-base/ksokoban/ksokoban-9999.ebuild
+++ b/trinity-base/ksokoban/ksokoban-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="The japanese warehouse keeper game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/kspaceduel/kspaceduel-9999.ebuild b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
index 4f735d62..52a07cd8 100644
--- a/trinity-base/kspaceduel/kspaceduel-9999.ebuild
+++ b/trinity-base/kspaceduel/kspaceduel-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity Space Game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ksvg/ksvg-9999.ebuild b/trinity-base/ksvg/ksvg-9999.ebuild
index 64a6b069..8225312a 100644
--- a/trinity-base/ksvg/ksvg-9999.ebuild
+++ b/trinity-base/ksvg/ksvg-9999.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SVG viewer library and embeddable kpart"
 
 DEPEND="media-libs/freetype
 	media-libs/fontconfig
-	=media-libs/libart_lgpl-${PV}
+	~media-libs/libart_lgpl-${PV}
 	media-libs/lcms:0
 	dev-libs/fribidi"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktron/ktron-9999.ebuild b/trinity-base/ktron/ktron-9999.ebuild
index 5965481c..67b6a9cf 100644
--- a/trinity-base/ktron/ktron-9999.ebuild
+++ b/trinity-base/ktron/ktron-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity tron game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/ktuberling/ktuberling-9999.ebuild b/trinity-base/ktuberling/ktuberling-9999.ebuild
index c566ab56..25200de6 100644
--- a/trinity-base/ktuberling/ktuberling-9999.ebuild
+++ b/trinity-base/ktuberling/ktuberling-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="A Trinity potato game for kids"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/libkcal/libkcal-9999.ebuild b/trinity-base/libkcal/libkcal-9999.ebuild
index a950fc73..b1f1bed2 100644
--- a/trinity-base/libkcal/libkcal-9999.ebuild
+++ b/trinity-base/libkcal/libkcal-9999.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="Trinity kcal library for KOrganizer etc"
 
 DEPEND="
 	dev-libs/libical
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}"
+	~trinity-base/ktnef-${PV}
+	~trinity-base/libkmime-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="libemailfunctions/ libtdepim/ libkmime/ ktnef/"
diff --git a/trinity-base/libkpgp/libkpgp-9999.ebuild b/trinity-base/libkpgp/libkpgp-9999.ebuild
index 737bdec3..edf9c1bf 100644
--- a/trinity-base/libkpgp/libkpgp-9999.ebuild
+++ b/trinity-base/libkpgp/libkpgp-9999.ebuild
@@ -10,8 +10,8 @@ DESCRIPTION="Trinity PGP library"
 
 DEPEND="
 	dev-libs/libical
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}"
+	~trinity-base/ktnef-${PV}
+	~trinity-base/libkmime-${PV}"
 RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="libtdepim/"
\ No newline at end of file
diff --git a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
index bf4e69af..ba7f2cf6 100644
--- a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
+++ b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild
@@ -9,9 +9,9 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity PIM exchange library"
 
-COMMON_DEPEND="=trinity-base/libkcal-${PV}
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}"
+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 5d56e5a6..9833f02b 100644
--- a/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild
+++ b/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild
@@ -9,9 +9,9 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity PIM identities library"
 
-COMMON_DEPEND="=trinity-base/certmanager-${PV}
-	=trinity-base/libtdepim-${PV}
-	=trinity-base/libkmime-${PV}"
+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/libtdepim/libtdepim-9999.ebuild b/trinity-base/libtdepim/libtdepim-9999.ebuild
index a2f3076e..4944e3e9 100644
--- a/trinity-base/libtdepim/libtdepim-9999.ebuild
+++ b/trinity-base/libtdepim/libtdepim-9999.ebuild
@@ -10,9 +10,9 @@ inherit trinity-meta-2
 DESCRIPTION="Common library for Trinity PIM applications."
 
 COMMON_DEPEND="
-	=trinity-base/ktnef-${PV}
-	=trinity-base/libkmime-${PV}
-	=trinity-base/libkcal-${PV}"
+	~trinity-base/ktnef-${PV}
+	~trinity-base/libkmime-${PV}
+	~trinity-base/libkcal-${PV}"
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
 
diff --git a/trinity-base/lskat/lskat-9999.ebuild b/trinity-base/lskat/lskat-9999.ebuild
index c653b08c..d7c12415 100644
--- a/trinity-base/lskat/lskat-9999.ebuild
+++ b/trinity-base/lskat/lskat-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity card game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
index f93ade8a..9770b4ae 100644
--- a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
+++ b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Various plugins for Noatun."
 IUSE+=" sdl berkdb"
 
 COMMON_DEPEND="
-	=trinity-base/noatun-${PV}
+	~trinity-base/noatun-${PV}
 	berkdb? ( =sys-libs/db-4*:= )
 "
 DEPEND+=" ${COMMON_DEPEND}
diff --git a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
index 8457f31b..79e45acd 100644
--- a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
+++ b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdeaddons-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
index 276aa888..6a8322ab 100644
--- a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
+++ b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild
@@ -15,16 +15,16 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-apps/atlantikdesigner-${PV}
-	=trinity-base/tdeaddons-doc-${PV}
-	=trinity-base/kaddressbook-plugins-${PV}
-	=trinity-base/kate-plugins-${PV}
-	=trinity-base/kicker-applets-${PV}
-	=trinity-base/knewsticker-scripts-${PV}
-	=trinity-base/konq-plugins-${PV}
-	=trinity-base/ksig-${PV}
-	=trinity-base/renamedlg-plugins-${PV}
-	=trinity-base/tdeaddons-tdefile-plugins-${PV}"
-	
+	~trinity-apps/atlantikdesigner-${PV}
+	~trinity-base/tdeaddons-doc-${PV}
+	~trinity-base/kaddressbook-plugins-${PV}
+	~trinity-base/kate-plugins-${PV}
+	~trinity-base/kicker-applets-${PV}
+	~trinity-base/knewsticker-scripts-${PV}
+	~trinity-base/konq-plugins-${PV}
+	~trinity-base/ksig-${PV}
+	~trinity-base/renamedlg-plugins-${PV}
+	~trinity-base/tdeaddons-tdefile-plugins-${PV}"
+
 # trinity-base/noatun-plugins masked due to missing dependency: noatun
-# But not long anymore.. :-)
\ No newline at end of file
+# But not long anymore.. :-)
diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild
index ca103707..40906275 100644
--- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild
+++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Themes for IceWM from the tdeartwork package."
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/tdeartwork-twin-styles-${PV}"
+	~trinity-base/tdeartwork-twin-styles-${PV}"
 
 pkg_postinst() {
 	elog "For more IceWM themes, install x11-themes/icewm-extra-themes"
diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.7.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.7.ebuild
index ca103707..40906275 100644
--- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.7.ebuild
+++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.7.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Themes for IceWM from the tdeartwork package."
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/tdeartwork-twin-styles-${PV}"
+	~trinity-base/tdeartwork-twin-styles-${PV}"
 
 pkg_postinst() {
 	elog "For more IceWM themes, install x11-themes/icewm-extra-themes"
diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
index 5c882f7d..795214bd 100644
--- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
+++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Themes for IceWM from the tdeartwork package."
 
 RDEPEND="
-	=trinity-base/tdeartwork-twin-styles-${PV}"
+	~trinity-base/tdeartwork-twin-styles-${PV}"
 
 pkg_postinst() {
 	elog "More IceWM themes are available installing x11-themes/icewm-themes"
diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild
index 5461f532..3524cf33 100644
--- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild
+++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="kworldclock from tdeartwork"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/kworldclock-${PV}"
+	~trinity-base/kworldclock-${PV}"
diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.7.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.7.ebuild
index 5461f532..3524cf33 100644
--- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.7.ebuild
+++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.7.ebuild
@@ -11,4 +11,4 @@ DESCRIPTION="kworldclock from tdeartwork"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/kworldclock-${PV}"
+	~trinity-base/kworldclock-${PV}"
diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
index 70618240..f6b2c476 100644
--- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
+++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdeartwork"
 
+TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 DESCRIPTION="kworldclock from tdeartwork"
 
 RDEPEND="
-	=trinity-base/kworldclock-${PV}"
+	~trinity-base/kworldclock-${PV}"
diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild
index c23711f1..caec4d3b 100644
--- a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild
+++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild
@@ -16,12 +16,12 @@ KEYWORDS="~amd64 ~x86"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/tdeartwork-emoticons-${PV}
-	=trinity-base/tdeartwork-icon-themes-${PV}
-	=trinity-base/tdeartwork-icewm-themes-${PV}
-	=trinity-base/tdeartwork-kworldclock-${PV}
-	=trinity-base/tdeartwork-sounds-${PV}
-	=trinity-base/tdeartwork-styles-${PV}
-	=trinity-base/tdeartwork-tdescreensaver-${PV}
-	=trinity-base/tdeartwork-twin-styles-${PV}
-	=trinity-base/tdeartwork-wallpapers-${PV}"
+	~trinity-base/tdeartwork-emoticons-${PV}
+	~trinity-base/tdeartwork-icon-themes-${PV}
+	~trinity-base/tdeartwork-icewm-themes-${PV}
+	~trinity-base/tdeartwork-kworldclock-${PV}
+	~trinity-base/tdeartwork-sounds-${PV}
+	~trinity-base/tdeartwork-styles-${PV}
+	~trinity-base/tdeartwork-tdescreensaver-${PV}
+	~trinity-base/tdeartwork-twin-styles-${PV}
+	~trinity-base/tdeartwork-wallpapers-${PV}"
diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.7.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.7.ebuild
index c23711f1..caec4d3b 100644
--- a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.7.ebuild
+++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.7.ebuild
@@ -16,12 +16,12 @@ KEYWORDS="~amd64 ~x86"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/tdeartwork-emoticons-${PV}
-	=trinity-base/tdeartwork-icon-themes-${PV}
-	=trinity-base/tdeartwork-icewm-themes-${PV}
-	=trinity-base/tdeartwork-kworldclock-${PV}
-	=trinity-base/tdeartwork-sounds-${PV}
-	=trinity-base/tdeartwork-styles-${PV}
-	=trinity-base/tdeartwork-tdescreensaver-${PV}
-	=trinity-base/tdeartwork-twin-styles-${PV}
-	=trinity-base/tdeartwork-wallpapers-${PV}"
+	~trinity-base/tdeartwork-emoticons-${PV}
+	~trinity-base/tdeartwork-icon-themes-${PV}
+	~trinity-base/tdeartwork-icewm-themes-${PV}
+	~trinity-base/tdeartwork-kworldclock-${PV}
+	~trinity-base/tdeartwork-sounds-${PV}
+	~trinity-base/tdeartwork-styles-${PV}
+	~trinity-base/tdeartwork-tdescreensaver-${PV}
+	~trinity-base/tdeartwork-twin-styles-${PV}
+	~trinity-base/tdeartwork-wallpapers-${PV}"
diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
index 210fd984..f5862b23 100644
--- a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
+++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
@@ -15,12 +15,12 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/tdeartwork-emoticons-${PV}
-	=trinity-base/tdeartwork-icon-themes-${PV}
-	=trinity-base/tdeartwork-icewm-themes-${PV}
-	=trinity-base/tdeartwork-tdescreensaver-${PV}
-	=trinity-base/tdeartwork-twin-styles-${PV}
-	=trinity-base/tdeartwork-kworldclock-${PV}
-	=trinity-base/tdeartwork-sounds-${PV}
-	=trinity-base/tdeartwork-styles-${PV}
-	=trinity-base/tdeartwork-wallpapers-${PV}"
+	~trinity-base/tdeartwork-emoticons-${PV}
+	~trinity-base/tdeartwork-icon-themes-${PV}
+	~trinity-base/tdeartwork-icewm-themes-${PV}
+	~trinity-base/tdeartwork-tdescreensaver-${PV}
+	~trinity-base/tdeartwork-twin-styles-${PV}
+	~trinity-base/tdeartwork-kworldclock-${PV}
+	~trinity-base/tdeartwork-sounds-${PV}
+	~trinity-base/tdeartwork-styles-${PV}
+	~trinity-base/tdeartwork-wallpapers-${PV}"
diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild
index 2a4f591a..4d0eb189 100644
--- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild
+++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdeartwork"
 
+TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 need-arts optional
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE+=" opengl xscreensaver kclock"
 
-DEPEND+=" =trinity-base/tdescreensaver-${PV}
-	=trinity-base/krootbacking-${PV}
-	kclock? ( =media-libs/libart_lgpl-${PV} )
+DEPEND+=" ~trinity-base/tdescreensaver-${PV}
+	~trinity-base/krootbacking-${PV}
+	kclock? ( ~media-libs/libart_lgpl-${PV} )
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.7.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.7.ebuild
index 2a4f591a..4d0eb189 100644
--- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.7.ebuild
+++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdeartwork"
 
+TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 need-arts optional
@@ -14,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE+=" opengl xscreensaver kclock"
 
-DEPEND+=" =trinity-base/tdescreensaver-${PV}
-	=trinity-base/krootbacking-${PV}
-	kclock? ( =media-libs/libart_lgpl-${PV} )
+DEPEND+=" ~trinity-base/tdescreensaver-${PV}
+	~trinity-base/krootbacking-${PV}
+	kclock? ( ~media-libs/libart_lgpl-${PV} )
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
index 29a452a6..c762349b 100644
--- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
+++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-TRINITY_MODULE_NAME="tdeartwork"
 
+TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 
 need-arts optional
@@ -13,9 +13,9 @@ DESCRIPTION="Extra screensavers for Trinity"
 
 IUSE+=" opengl xscreensaver kclock"
 
-DEPEND+=" =trinity-base/tdescreensaver-${PV}
-	=trinity-base/krootbacking-${PV}
-	kclock? ( =media-libs/libart_lgpl-${PV} )
+DEPEND+=" ~trinity-base/tdescreensaver-${PV}
+	~trinity-base/krootbacking-${PV}
+	kclock? ( ~media-libs/libart_lgpl-${PV} )
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 RDEPEND+=" ${DEPEND}"
diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild
index e9530d68..7e7a57d7 100644
--- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild
+++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 DESCRIPTION="Window styles for Trinity"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/twin-${PV}"
+DEPEND="~trinity-base/twin-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.7.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.7.ebuild
index e9530d68..7e7a57d7 100644
--- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.7.ebuild
+++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.7.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 DESCRIPTION="Window styles for Trinity"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/twin-${PV}"
+DEPEND="~trinity-base/twin-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
index 5cb772cd..850af613 100644
--- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
+++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
@@ -8,5 +8,5 @@ TRINITY_MODULE_NAME="tdeartwork"
 inherit trinity-meta-2
 DESCRIPTION="Window styles for Trinity"
 
-DEPEND="=trinity-base/twin-${PV}"
+DEPEND="~trinity-base/twin-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild b/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild
index 20e6ff2a..3bc82bb5 100644
--- a/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild
@@ -15,47 +15,47 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="=trinity-base/drkonqi-${PV}
-	=trinity-base/kappfinder-${PV}
-	=trinity-base/kate-${PV}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/kdcop-${PV}
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/kfind-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	=trinity-base/kicker-${PV}
-	=trinity-base/klipper-${PV}
-	=trinity-base/kmenuedit-${PV}
-	=trinity-base/knetattach-${PV}
-	=trinity-base/konqueror-${PV}
-	=trinity-base/konsole-${PV}
-	=trinity-base/kpager-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/krootbacking-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/kstart-${PV}
-	=trinity-base/ksysguard-${PV}
-	=trinity-base/ksystraycmd-${PV}
-	=trinity-base/ktip-${PV}
-	=trinity-base/kxkb-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/nsplugins-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdebase-starttde-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/tdedebugdialog-${PV}
-	=trinity-base/tdeeject-${PV}
-	=trinity-base/tdeinit-${PV}
-	=trinity-base/tdepasswd-${PV}
-	=trinity-base/tdeprint-${PV}
-	=trinity-base/tdescreensaver-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/tdm-${PV}
-	=trinity-base/tqt3integration-${PV}
-	=trinity-base/twin-${PV}"
+RDEPEND="~trinity-base/drkonqi-${PV}
+	~trinity-base/kappfinder-${PV}
+	~trinity-base/kate-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/kdcop-${PV}
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/kfind-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	~trinity-base/kicker-${PV}
+	~trinity-base/klipper-${PV}
+	~trinity-base/kmenuedit-${PV}
+	~trinity-base/knetattach-${PV}
+	~trinity-base/konqueror-${PV}
+	~trinity-base/konsole-${PV}
+	~trinity-base/kpager-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/krootbacking-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/kstart-${PV}
+	~trinity-base/ksysguard-${PV}
+	~trinity-base/ksystraycmd-${PV}
+	~trinity-base/ktip-${PV}
+	~trinity-base/kxkb-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/nsplugins-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdebase-starttde-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdedebugdialog-${PV}
+	~trinity-base/tdeeject-${PV}
+	~trinity-base/tdeinit-${PV}
+	~trinity-base/tdepasswd-${PV}
+	~trinity-base/tdeprint-${PV}
+	~trinity-base/tdescreensaver-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/tdm-${PV}
+	~trinity-base/tqt3integration-${PV}
+	~trinity-base/twin-${PV}"
diff --git a/trinity-base/tdebase-meta/tdebase-meta-14.0.7.ebuild b/trinity-base/tdebase-meta/tdebase-meta-14.0.7.ebuild
index 20e6ff2a..3bc82bb5 100644
--- a/trinity-base/tdebase-meta/tdebase-meta-14.0.7.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-14.0.7.ebuild
@@ -15,47 +15,47 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="=trinity-base/drkonqi-${PV}
-	=trinity-base/kappfinder-${PV}
-	=trinity-base/kate-${PV}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/kdcop-${PV}
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/kfind-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	=trinity-base/kicker-${PV}
-	=trinity-base/klipper-${PV}
-	=trinity-base/kmenuedit-${PV}
-	=trinity-base/knetattach-${PV}
-	=trinity-base/konqueror-${PV}
-	=trinity-base/konsole-${PV}
-	=trinity-base/kpager-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/krootbacking-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/kstart-${PV}
-	=trinity-base/ksysguard-${PV}
-	=trinity-base/ksystraycmd-${PV}
-	=trinity-base/ktip-${PV}
-	=trinity-base/kxkb-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/nsplugins-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdebase-starttde-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/tdedebugdialog-${PV}
-	=trinity-base/tdeeject-${PV}
-	=trinity-base/tdeinit-${PV}
-	=trinity-base/tdepasswd-${PV}
-	=trinity-base/tdeprint-${PV}
-	=trinity-base/tdescreensaver-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/tdm-${PV}
-	=trinity-base/tqt3integration-${PV}
-	=trinity-base/twin-${PV}"
+RDEPEND="~trinity-base/drkonqi-${PV}
+	~trinity-base/kappfinder-${PV}
+	~trinity-base/kate-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/kdcop-${PV}
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/kfind-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	~trinity-base/kicker-${PV}
+	~trinity-base/klipper-${PV}
+	~trinity-base/kmenuedit-${PV}
+	~trinity-base/knetattach-${PV}
+	~trinity-base/konqueror-${PV}
+	~trinity-base/konsole-${PV}
+	~trinity-base/kpager-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/krootbacking-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/kstart-${PV}
+	~trinity-base/ksysguard-${PV}
+	~trinity-base/ksystraycmd-${PV}
+	~trinity-base/ktip-${PV}
+	~trinity-base/kxkb-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/nsplugins-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdebase-starttde-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdedebugdialog-${PV}
+	~trinity-base/tdeeject-${PV}
+	~trinity-base/tdeinit-${PV}
+	~trinity-base/tdepasswd-${PV}
+	~trinity-base/tdeprint-${PV}
+	~trinity-base/tdescreensaver-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/tdm-${PV}
+	~trinity-base/tqt3integration-${PV}
+	~trinity-base/twin-${PV}"
diff --git a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
index ece6eee0..e898bcb6 100644
--- a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
@@ -14,47 +14,47 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 
 SLOT="${TRINITY_VER}"
 
-RDEPEND="=trinity-base/tdeinit-${PV}
-	=trinity-base/drkonqi-${PV}
-	=trinity-base/kappfinder-${PV}
-	=trinity-base/kate-${PV}
-	=trinity-base/kcheckpass-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/kcontrol-${PV}
-	=trinity-base/kdcop-${PV}
-	=trinity-base/tdedebugdialog-${PV}
-	=trinity-base/tdepasswd-${PV}
-	=trinity-base/tdeprint-${PV}
-	=trinity-base/tdeeject-${PV}
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/tdesu-${PV}
-	=trinity-base/kdialog-${PV}
-	=trinity-base/tdm-${PV}
-	=trinity-base/kfind-${PV}
-	=trinity-base/khelpcenter-${PV}
-	=trinity-base/khotkeys-${PV}
-	=trinity-base/kicker-${PV}
-	=trinity-base/tdebase-tdeioslaves-${PV}
-	=trinity-base/klipper-${PV}
-	=trinity-base/kmenuedit-${PV}
-	=trinity-base/konqueror-${PV}
-	=trinity-base/konsole-${PV}
-	=trinity-base/kpager-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/tdescreensaver-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/kstart-${PV}
-	=trinity-base/ksysguard-${PV}
-	=trinity-base/ksystraycmd-${PV}
-	=trinity-base/ktip-${PV}
-	=trinity-base/twin-${PV}
-	=trinity-base/kxkb-${PV}
-	=trinity-base/libkonq-${PV}
-	=trinity-base/nsplugins-${PV}
-	=trinity-base/knetattach-${PV}
-	=trinity-base/tdebase-data-${PV}
-	=trinity-base/tdebase-starttde-${PV}
-	=trinity-base/krootbacking-${PV}
-	=trinity-base/tqt3integration-${PV}"
+RDEPEND="~trinity-base/tdeinit-${PV}
+	~trinity-base/drkonqi-${PV}
+	~trinity-base/kappfinder-${PV}
+	~trinity-base/kate-${PV}
+	~trinity-base/kcheckpass-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/kcontrol-${PV}
+	~trinity-base/kdcop-${PV}
+	~trinity-base/tdedebugdialog-${PV}
+	~trinity-base/tdepasswd-${PV}
+	~trinity-base/tdeprint-${PV}
+	~trinity-base/tdeeject-${PV}
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/tdesu-${PV}
+	~trinity-base/kdialog-${PV}
+	~trinity-base/tdm-${PV}
+	~trinity-base/kfind-${PV}
+	~trinity-base/khelpcenter-${PV}
+	~trinity-base/khotkeys-${PV}
+	~trinity-base/kicker-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/klipper-${PV}
+	~trinity-base/kmenuedit-${PV}
+	~trinity-base/konqueror-${PV}
+	~trinity-base/konsole-${PV}
+	~trinity-base/kpager-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/tdescreensaver-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/kstart-${PV}
+	~trinity-base/ksysguard-${PV}
+	~trinity-base/ksystraycmd-${PV}
+	~trinity-base/ktip-${PV}
+	~trinity-base/twin-${PV}
+	~trinity-base/kxkb-${PV}
+	~trinity-base/libkonq-${PV}
+	~trinity-base/nsplugins-${PV}
+	~trinity-base/knetattach-${PV}
+	~trinity-base/tdebase-data-${PV}
+	~trinity-base/tdebase-starttde-${PV}
+	~trinity-base/krootbacking-${PV}
+	~trinity-base/tqt3integration-${PV}"
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild
index 7e229ad3..80f3d154 100644
--- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild
@@ -16,14 +16,14 @@ RDEPEND="x11-apps/xmessage
 	x11-apps/xrandr
 	x11-apps/mkfontscale
 	x11-apps/xprop
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/twin-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/tdeinit-${PV}"
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/twin-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/tdeinit-${PV}"
 
 TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm"
 
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.7.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.7.ebuild
index 7e229ad3..80f3d154 100644
--- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.7.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.7.ebuild
@@ -16,14 +16,14 @@ RDEPEND="x11-apps/xmessage
 	x11-apps/xrandr
 	x11-apps/mkfontscale
 	x11-apps/xprop
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/twin-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/tdeinit-${PV}"
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/twin-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/tdeinit-${PV}"
 
 TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm"
 
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
index 6959ccf4..89bef13f 100644
--- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
@@ -15,14 +15,14 @@ RDEPEND="x11-apps/xmessage
 	x11-apps/xrandr
 	x11-apps/mkfontscale
 	x11-apps/xprop
-	=trinity-base/kdesktop-${PV}
-	=trinity-base/kcminit-${PV}
-	=trinity-base/ksmserver-${PV}
-	=trinity-base/twin-${PV}
-	=trinity-base/kpersonalizer-${PV}
-	=trinity-base/kreadconfig-${PV}
-	=trinity-base/ksplashml-${PV}
-	=trinity-base/tdeinit-${PV}"
+	~trinity-base/kdesktop-${PV}
+	~trinity-base/kcminit-${PV}
+	~trinity-base/ksmserver-${PV}
+	~trinity-base/twin-${PV}
+	~trinity-base/kpersonalizer-${PV}
+	~trinity-base/kreadconfig-${PV}
+	~trinity-base/ksplashml-${PV}
+	~trinity-base/tdeinit-${PV}"
 
 TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm"
 
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild
index 78b1c937..cf230cf9 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild
@@ -22,7 +22,7 @@ DEPEND="x11-libs/libXcursor
 
 RDEPEND="${DEPEND}
 	virtual/ssh
-	=trinity-base/tdeeject-${PV}"
+	~trinity-base/tdeeject-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.7.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.7.ebuild
index 78b1c937..cf230cf9 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.7.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.7.ebuild
@@ -22,7 +22,7 @@ DEPEND="x11-libs/libXcursor
 
 RDEPEND="${DEPEND}
 	virtual/ssh
-	=trinity-base/tdeeject-${PV}"
+	~trinity-base/tdeeject-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
index bbd19677..3f1bc77d 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
@@ -21,7 +21,7 @@ DEPEND="x11-libs/libXcursor
 
 RDEPEND="${DEPEND}
 	virtual/ssh
-	=trinity-base/tdeeject-${PV}"
+	~trinity-base/tdeeject-${PV}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/tdeeject/tdeeject-14.0.6.ebuild b/trinity-base/tdeeject/tdeeject-14.0.6.ebuild
index 6178a316..0484a1d7 100644
--- a/trinity-base/tdeeject/tdeeject-14.0.6.ebuild
+++ b/trinity-base/tdeeject/tdeeject-14.0.6.ebuild
@@ -10,6 +10,6 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity eject frontend"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/kdialog-${PV}"
+DEPEND="~trinity-base/kdialog-${PV}"
 RDEPEND="${DEPEND}
 	virtual/eject"
diff --git a/trinity-base/tdeeject/tdeeject-14.0.7.ebuild b/trinity-base/tdeeject/tdeeject-14.0.7.ebuild
index 6178a316..0484a1d7 100644
--- a/trinity-base/tdeeject/tdeeject-14.0.7.ebuild
+++ b/trinity-base/tdeeject/tdeeject-14.0.7.ebuild
@@ -10,6 +10,6 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity eject frontend"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/kdialog-${PV}"
+DEPEND="~trinity-base/kdialog-${PV}"
 RDEPEND="${DEPEND}
 	virtual/eject"
diff --git a/trinity-base/tdeeject/tdeeject-9999.ebuild b/trinity-base/tdeeject/tdeeject-9999.ebuild
index 27ac2709..7c0c129a 100644
--- a/trinity-base/tdeeject/tdeeject-9999.ebuild
+++ b/trinity-base/tdeeject/tdeeject-9999.ebuild
@@ -9,6 +9,6 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity eject frontend"
 
-DEPEND="=trinity-base/kdialog-${PV}"
+DEPEND="~trinity-base/kdialog-${PV}"
 RDEPEND="${DEPEND}
 	virtual/eject"
diff --git a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
index c93c3767..e1ce0ae6 100644
--- a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
+++ b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdegames-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
index 5a4c534f..e9d46525 100644
--- a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
+++ b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild
@@ -15,37 +15,37 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=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}"
+	~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/tdegraphics-doc/tdegraphics-doc-9999.ebuild b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
index db6a0217..e1159231 100644
--- a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
+++ b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdegraphics-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
index 04fa171a..08d038f8 100644
--- a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
+++ b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild
@@ -15,24 +15,24 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/kamera-${PV}
-	=trinity-base/kcoloredit-${PV}
-	=trinity-base/kdvi-${PV}
-	=trinity-base/kfax-${PV}
-	=trinity-base/tdegraphics-tdefile-plugins-${PV}
-	=trinity-base/tdegraphics-doc-${PV}
-	=trinity-base/kgamma-${PV}
-	=trinity-base/kghostview-${PV}
-	=trinity-base/tdeiconedit-${PV}
-	=trinity-base/kmrml-${PV}
-	=trinity-base/kolourpaint-${PV}
-	=trinity-base/kooka-${PV}
-	=trinity-base/kpdf-${PV}
-	=trinity-base/kpovmodeler-${PV}
-	=trinity-base/kruler-${PV}
-	=trinity-base/ksnapshot-${PV}
-	=trinity-base/ksvg-${PV}
-	=trinity-base/kuickshow-${PV}
-	=trinity-base/kview-${PV}
-	=trinity-base/kviewshell-${PV}
-	=trinity-base/libkscan-${PV}"
+	~trinity-base/kamera-${PV}
+	~trinity-base/kcoloredit-${PV}
+	~trinity-base/kdvi-${PV}
+	~trinity-base/kfax-${PV}
+	~trinity-base/tdegraphics-tdefile-plugins-${PV}
+	~trinity-base/tdegraphics-doc-${PV}
+	~trinity-base/kgamma-${PV}
+	~trinity-base/kghostview-${PV}
+	~trinity-base/tdeiconedit-${PV}
+	~trinity-base/kmrml-${PV}
+	~trinity-base/kolourpaint-${PV}
+	~trinity-base/kooka-${PV}
+	~trinity-base/kpdf-${PV}
+	~trinity-base/kpovmodeler-${PV}
+	~trinity-base/kruler-${PV}
+	~trinity-base/ksnapshot-${PV}
+	~trinity-base/ksvg-${PV}
+	~trinity-base/kuickshow-${PV}
+	~trinity-base/kview-${PV}
+	~trinity-base/kviewshell-${PV}
+	~trinity-base/libkscan-${PV}"
diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
index 65713ad5..97f2cf63 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
@@ -25,13 +25,13 @@ IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
 
 KEYWORDS="~amd64 ~x86"
 
-MY_DEPEND="=dev-tqt/tqtinterface-${PV}
+MY_DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
 	app-text/ghostscript-gpl
 	media-libs/fontconfig
 	media-libs/freetype
-	=dev-libs/dbus-1-tqt-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
 	x11-libs/libxshmfence
 	x11-libs/libXcursor
 	x11-libs/libXrender
@@ -43,7 +43,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	shm? ( x11-libs/libxshmfence )
 	idn? ( net-dns/libidn )
 	pcre? ( dev-libs/libpcre )
-	svg? ( =media-libs/libart_lgpl-${PV} )
+	svg? ( ~media-libs/libart_lgpl-${PV} )
 	alsa? ( media-libs/alsa-lib )
 	avahi? ( net-dns/avahi )
 	cups? ( net-print/cups )
@@ -59,7 +59,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	hwlib? ( virtual/libudev:= )
 	xrandr? ( x11-libs/libXrandr )
 	xcomposite? ( x11-libs/libXcomposite )
-	elficons? ( =sys-libs/libr-${PV} )
+	elficons? ( ~sys-libs/libr-${PV} )
 	debug? ( sys-libs/binutils-libs:= )"
 
 DEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/tdelibs/tdelibs-14.0.7.ebuild b/trinity-base/tdelibs/tdelibs-14.0.7.ebuild
index 65713ad5..97f2cf63 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.7.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.7.ebuild
@@ -25,13 +25,13 @@ IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma +svg +idn +shm elogind
 
 KEYWORDS="~amd64 ~x86"
 
-MY_DEPEND="=dev-tqt/tqtinterface-${PV}
+MY_DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
 	app-text/ghostscript-gpl
 	media-libs/fontconfig
 	media-libs/freetype
-	=dev-libs/dbus-1-tqt-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
 	x11-libs/libxshmfence
 	x11-libs/libXcursor
 	x11-libs/libXrender
@@ -43,7 +43,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	shm? ( x11-libs/libxshmfence )
 	idn? ( net-dns/libidn )
 	pcre? ( dev-libs/libpcre )
-	svg? ( =media-libs/libart_lgpl-${PV} )
+	svg? ( ~media-libs/libart_lgpl-${PV} )
 	alsa? ( media-libs/alsa-lib )
 	avahi? ( net-dns/avahi )
 	cups? ( net-print/cups )
@@ -59,7 +59,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	hwlib? ( virtual/libudev:= )
 	xrandr? ( x11-libs/libXrandr )
 	xcomposite? ( x11-libs/libXcomposite )
-	elficons? ( =sys-libs/libr-${PV} )
+	elficons? ( ~sys-libs/libr-${PV} )
 	debug? ( sys-libs/binutils-libs:= )"
 
 DEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild
index c13947b6..089b2c99 100644
--- a/trinity-base/tdelibs/tdelibs-9999.ebuild
+++ b/trinity-base/tdelibs/tdelibs-9999.ebuild
@@ -26,13 +26,13 @@ IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua lzma udevil +svg +i
 REQUIRED_USE="
 	spell? ( || ( aspell ispell ) )"
 
-MY_DEPEND="=dev-tqt/tqtinterface-${PV}
+MY_DEPEND="~dev-tqt/tqtinterface-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
 	app-text/ghostscript-gpl
 	media-libs/fontconfig
 	media-libs/freetype
-	=dev-libs/dbus-1-tqt-${PV}
+	~dev-libs/dbus-1-tqt-${PV}
 	x11-libs/libXrender
 	ssl? (
 		app-misc/ca-certificates
@@ -42,9 +42,9 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	shm? ( x11-libs/libxshmfence )
 	idn? ( net-dns/libidn )
 	pcre? ( dev-libs/libpcre )
-	svg? ( =media-libs/libart_lgpl-${PV} )
+	svg? ( ~media-libs/libart_lgpl-${PV} )
 	alsa? ( media-libs/alsa-lib )
-	avahi? ( =dev-tqt/avahi-tqt-${PV} )
+	avahi? ( ~dev-tqt/avahi-tqt-${PV} )
 	cups? ( net-print/cups )
 	fam? ( virtual/fam )
 	jpeg2k? ( media-libs/jasper )
@@ -61,7 +61,7 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
 	hwlib? ( virtual/libudev:= )
 	xrandr? ( x11-libs/libXrandr )
 	xcomposite? ( x11-libs/libXcomposite )
-	elficons? ( =sys-libs/libr-${PV} )
+	elficons? ( ~sys-libs/libr-${PV} )
 	debug? ( sys-libs/binutils-libs:= )"
 
 DEPEND+=" ${MY_DEPEND}"
diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
index 8987bce6..0c6175b2 100644
--- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
+++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The aRts pipeline builder and other tools"
 
 IUSE="alsa akode audiofile mpeg xine"
 
-DEPEND="=trinity-base/arts-${PV}
+DEPEND="~trinity-base/arts-${PV}
 	alsa? ( media-libs/alsa-lib )
 	akode? ( =media-libs/akode-${PV} )
 	audiofile? ( media-libs/audiofile )
diff --git a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
index e2c82336..16fa49b2 100644
--- a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
+++ b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild
@@ -9,7 +9,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdemultimedia-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
index 94afe84a..7618784e 100644
--- a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
+++ b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdenetwork-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
index 63bb4a73..425054ef 100644
--- a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
+++ b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
@@ -15,21 +15,21 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="{$TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/dcoprss-${PV}
-	=trinity-base/kdict-${PV}
-	=trinity-base/tdednssd-${PV}
-	=trinity-base/kget-${PV}
-	=trinity-base/knewsticker-${PV}
-	=trinity-base/kopete-${PV}
-	=trinity-base/kpf-${PV}
-	=trinity-base/kppp-${PV}
-	=trinity-base/krdc-${PV}
-	=trinity-base/krfb-${PV}
-	=trinity-base/ksirc-${PV}
-	=trinity-base/ktalkd-${PV}
-	=trinity-base/kwifimanager-${PV}
-	=trinity-base/librss-${PV}
-	=trinity-base/lisa-${PV}
-	=trinity-base/tdenetwork-doc-${PV}
-	=trinity-base/tdenetwork-filesharing-${PV}
-	=trinity-base/tdenetwork-tdefile-plugins-${PV}"
+	~trinity-base/dcoprss-${PV}
+	~trinity-base/kdict-${PV}
+	~trinity-base/tdednssd-${PV}
+	~trinity-base/kget-${PV}
+	~trinity-base/knewsticker-${PV}
+	~trinity-base/kopete-${PV}
+	~trinity-base/kpf-${PV}
+	~trinity-base/kppp-${PV}
+	~trinity-base/krdc-${PV}
+	~trinity-base/krfb-${PV}
+	~trinity-base/ksirc-${PV}
+	~trinity-base/ktalkd-${PV}
+	~trinity-base/kwifimanager-${PV}
+	~trinity-base/librss-${PV}
+	~trinity-base/lisa-${PV}
+	~trinity-base/tdenetwork-doc-${PV}
+	~trinity-base/tdenetwork-filesharing-${PV}
+	~trinity-base/tdenetwork-tdefile-plugins-${PV}"
diff --git a/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild b/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild
index b4ac4b07..5a16c843 100644
--- a/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild
@@ -10,5 +10,5 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity GUI for passwd"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdepasswd/tdepasswd-14.0.7.ebuild b/trinity-base/tdepasswd/tdepasswd-14.0.7.ebuild
index b4ac4b07..5a16c843 100644
--- a/trinity-base/tdepasswd/tdepasswd-14.0.7.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-14.0.7.ebuild
@@ -10,5 +10,5 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity GUI for passwd"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild
index ecda6f5e..9a63352b 100644
--- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity GUI for passwd"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild
index e8db26e4..989fa80e 100644
--- a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 
 DEPEND="
 	net-libs/libtirpc
-	=trinity-base/libkmime-${PV}
+	~trinity-base/libkmime-${PV}
 	sasl? ( dev-libs/cyrus-sasl )"
 RDEPEND="${DEPEND}"
 
diff --git a/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild b/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild
index 24ab71ca..d937572c 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild
@@ -13,7 +13,7 @@ IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )
-	krootbacking? ( =trinity-base/krootbacking-${PV} )"
+	krootbacking? ( ~trinity-base/krootbacking-${PV} )"
 RDEPEND="${DEPEND}"
 
 src_configure () {
diff --git a/trinity-base/tdescreensaver/tdescreensaver-14.0.7.ebuild b/trinity-base/tdescreensaver/tdescreensaver-14.0.7.ebuild
index 24ab71ca..d937572c 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-14.0.7.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-14.0.7.ebuild
@@ -13,7 +13,7 @@ IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )
-	krootbacking? ( =trinity-base/krootbacking-${PV} )"
+	krootbacking? ( ~trinity-base/krootbacking-${PV} )"
 RDEPEND="${DEPEND}"
 
 src_configure () {
diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
index 296aa491..138e0a95 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
@@ -13,7 +13,7 @@ IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )
-	krootbacking? ( =trinity-base/krootbacking-${PV} )"
+	krootbacking? ( ~trinity-base/krootbacking-${PV} )"
 RDEPEND="${DEPEND}"
 
 src_configure () {
diff --git a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
index 80cbcb15..50789612 100644
--- a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
+++ b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdetoys-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
index e25352ba..412bfb79 100644
--- a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
+++ b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
@@ -15,13 +15,13 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	>=trinity-base/amor-${PV}
-	>=trinity-base/eyesapplet-${PV}
-	>=trinity-base/fifteenapplet-${PV}
-	>=trinity-base/tdetoys-doc-${PV}
-	>=trinity-base/kmoon-${PV}
-	>=trinity-base/kodo-${PV}
-	>=trinity-base/kteatime-${PV}
-	>=trinity-base/ktux-${PV}
-	>=trinity-base/kweather-${PV}
-	>=trinity-base/kworldclock-${PV}"
+	~trinity-base/amor-${PV}
+	~trinity-base/eyesapplet-${PV}
+	~trinity-base/fifteenapplet-${PV}
+	~trinity-base/tdetoys-doc-${PV}
+	~trinity-base/kmoon-${PV}
+	~trinity-base/kodo-${PV}
+	~trinity-base/kteatime-${PV}
+	~trinity-base/ktux-${PV}
+	~trinity-base/kweather-${PV}
+	~trinity-base/kworldclock-${PV}"
diff --git a/trinity-base/tdeutils-doc/tdeutils-doc-14.0.6.ebuild b/trinity-base/tdeutils-doc/tdeutils-doc-14.0.6.ebuild
index 9f4b2bf3..869115e6 100644
--- a/trinity-base/tdeutils-doc/tdeutils-doc-14.0.6.ebuild
+++ b/trinity-base/tdeutils-doc/tdeutils-doc-14.0.6.ebuild
@@ -10,5 +10,5 @@ DESCRIPTION="Documentaion for tdeutils-derived packages"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
diff --git a/trinity-base/tdeutils-doc/tdeutils-doc-14.0.7.ebuild b/trinity-base/tdeutils-doc/tdeutils-doc-14.0.7.ebuild
index a1de2311..2f9ee91e 100644
--- a/trinity-base/tdeutils-doc/tdeutils-doc-14.0.7.ebuild
+++ b/trinity-base/tdeutils-doc/tdeutils-doc-14.0.7.ebuild
@@ -10,4 +10,4 @@ DESCRIPTION="Documentaion for tdeutils-derived packages"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
diff --git a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
index 1c9c1b02..ada30313 100644
--- a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
+++ b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Documentaion for tdeutils-derived packages"
 
 RDEPEND="
-	=trinity-base/khelpcenter-${PV}"
+	~trinity-base/khelpcenter-${PV}"
 
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-14.0.6.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-14.0.6.ebuild
index fd3e8460..86c1671b 100644
--- a/trinity-base/tdeutils-meta/tdeutils-meta-14.0.6.ebuild
+++ b/trinity-base/tdeutils-meta/tdeutils-meta-14.0.6.ebuild
@@ -15,24 +15,24 @@ KEYWORDS="~amd64 ~x86"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/ark-${PV}
-	=trinity-base/kcalc-${PV}
-	=trinity-base/kcharselect-${PV}
-	=trinity-base/kdf-${PV}
-	=trinity-base/kedit-${PV}
-	=trinity-base/kfloppy-${PV}
-	=trinity-base/kgpg-${PV}
-	=trinity-base/khexedit-${PV}
-	=trinity-base/kjots-${PV}
-	=trinity-base/klaptopdaemon-${PV}
-	=trinity-base/kmilo-${PV}
-	=trinity-base/kregexpeditor-${PV}
-	=trinity-base/ksim-${PV}
-	=trinity-base/ktimer-${PV}
-	=trinity-base/superkaramba-${PV}
-	=trinity-base/tdelirc-${PV}
-	=trinity-base/tdeutils-doc-${PV}
-	=trinity-base/tdewallet-${PV}"
+	~trinity-base/ark-${PV}
+	~trinity-base/kcalc-${PV}
+	~trinity-base/kcharselect-${PV}
+	~trinity-base/kdf-${PV}
+	~trinity-base/kedit-${PV}
+	~trinity-base/kfloppy-${PV}
+	~trinity-base/kgpg-${PV}
+	~trinity-base/khexedit-${PV}
+	~trinity-base/kjots-${PV}
+	~trinity-base/klaptopdaemon-${PV}
+	~trinity-base/kmilo-${PV}
+	~trinity-base/kregexpeditor-${PV}
+	~trinity-base/ksim-${PV}
+	~trinity-base/ktimer-${PV}
+	~trinity-base/superkaramba-${PV}
+	~trinity-base/tdelirc-${PV}
+	~trinity-base/tdeutils-doc-${PV}
+	~trinity-base/tdewallet-${PV}"
 
 #Not in <=14.0.7:
-#	=trinity-base/tdefilereplace-${PV}
\ No newline at end of file
+#	~trinity-base/tdefilereplace-${PV}
\ No newline at end of file
diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-14.0.7.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-14.0.7.ebuild
index 27cd81ce..cbbe95ff 100644
--- a/trinity-base/tdeutils-meta/tdeutils-meta-14.0.7.ebuild
+++ b/trinity-base/tdeutils-meta/tdeutils-meta-14.0.7.ebuild
@@ -15,22 +15,22 @@ KEYWORDS="~amd64 ~x86"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/ark-${PV}
-	=trinity-base/kcalc-${PV}
-	=trinity-base/kcharselect-${PV}
-	=trinity-base/kdf-${PV}
-	=trinity-base/kedit-${PV}
-	=trinity-base/kfloppy-${PV}
-	=trinity-base/kgpg-${PV}
-	=trinity-base/khexedit-${PV}
-	=trinity-base/kjots-${PV}
-	=trinity-base/klaptopdaemon-${PV}
-	=trinity-base/kmilo-${PV}
-	=trinity-base/kregexpeditor-${PV}
-	=trinity-base/ksim-${PV}
-	=trinity-base/ktimer-${PV}
-	=trinity-base/superkaramba-${PV}
-	=trinity-base/tdefilereplace-${PV}
-	=trinity-base/tdelirc-${PV}
-	=trinity-base/tdeutils-doc-${PV}
-	=trinity-base/tdewallet-${PV}"
+	~trinity-base/ark-${PV}
+	~trinity-base/kcalc-${PV}
+	~trinity-base/kcharselect-${PV}
+	~trinity-base/kdf-${PV}
+	~trinity-base/kedit-${PV}
+	~trinity-base/kfloppy-${PV}
+	~trinity-base/kgpg-${PV}
+	~trinity-base/khexedit-${PV}
+	~trinity-base/kjots-${PV}
+	~trinity-base/klaptopdaemon-${PV}
+	~trinity-base/kmilo-${PV}
+	~trinity-base/kregexpeditor-${PV}
+	~trinity-base/ksim-${PV}
+	~trinity-base/ktimer-${PV}
+	~trinity-base/superkaramba-${PV}
+	~trinity-base/tdefilereplace-${PV}
+	~trinity-base/tdelirc-${PV}
+	~trinity-base/tdeutils-doc-${PV}
+	~trinity-base/tdewallet-${PV}"
diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
index a06a53f5..8bf19fb7 100644
--- a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
+++ b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
@@ -15,22 +15,22 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="${TRINITY_VER}"
 
 RDEPEND="
-	=trinity-base/ark-${PV}
-	=trinity-base/tdeutils-doc-${PV}
-	=trinity-base/kcalc-${PV}
-	=trinity-base/kcharselect-${PV}
-	=trinity-base/tdelirc-${PV}
-	=trinity-base/kdf-${PV}
-	=trinity-base/kedit-${PV}
-	=trinity-base/kfloppy-${PV}
-	=trinity-base/kgpg-${PV}
-	=trinity-base/khexedit-${PV}
-	=trinity-base/kjots-${PV}
-	=trinity-base/klaptopdaemon-${PV}
-	=trinity-base/kmilo-${PV}
-	=trinity-base/kregexpeditor-${PV}
-	=trinity-base/ksim-${PV}
-	=trinity-base/ktimer-${PV}
-	=trinity-base/tdewallet-${PV}
-	=trinity-base/superkaramba-${PV}
-	=trinity-base/tdefilereplace-${PV}"
+	~trinity-base/ark-${PV}
+	~trinity-base/tdeutils-doc-${PV}
+	~trinity-base/kcalc-${PV}
+	~trinity-base/kcharselect-${PV}
+	~trinity-base/tdelirc-${PV}
+	~trinity-base/kdf-${PV}
+	~trinity-base/kedit-${PV}
+	~trinity-base/kfloppy-${PV}
+	~trinity-base/kgpg-${PV}
+	~trinity-base/khexedit-${PV}
+	~trinity-base/kjots-${PV}
+	~trinity-base/klaptopdaemon-${PV}
+	~trinity-base/kmilo-${PV}
+	~trinity-base/kregexpeditor-${PV}
+	~trinity-base/ksim-${PV}
+	~trinity-base/ktimer-${PV}
+	~trinity-base/tdewallet-${PV}
+	~trinity-base/superkaramba-${PV}
+	~trinity-base/tdefilereplace-${PV}"
diff --git a/trinity-base/tdm/tdm-14.0.6.ebuild b/trinity-base/tdm/tdm-14.0.6.ebuild
index 0bdf7455..efcee332 100644
--- a/trinity-base/tdm/tdm-14.0.6.ebuild
+++ b/trinity-base/tdm/tdm-14.0.6.ebuild
@@ -15,15 +15,15 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
-	svg? ( =media-libs/libart_lgpl-${PV} )
-	=trinity-base/tdelibs-${PV}[xrandr?]
+	svg? ( ~media-libs/libart_lgpl-${PV} )
+	~trinity-base/tdelibs-${PV}[xrandr?]
 	sys-apps/dbus
 	x11-libs/libXtst
-	=trinity-base/kcontrol-${PV}
-	=dev-libs/dbus-tqt-${PV}"
+	~trinity-base/kcontrol-${PV}
+	~dev-libs/dbus-tqt-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/tdepasswd-${PV}
+	~trinity-base/tdepasswd-${PV}
 	x11-apps/xinit
 	x11-apps/xmessage"
 
diff --git a/trinity-base/tdm/tdm-14.0.7.ebuild b/trinity-base/tdm/tdm-14.0.7.ebuild
index 0bdf7455..efcee332 100644
--- a/trinity-base/tdm/tdm-14.0.7.ebuild
+++ b/trinity-base/tdm/tdm-14.0.7.ebuild
@@ -15,15 +15,15 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
-	svg? ( =media-libs/libart_lgpl-${PV} )
-	=trinity-base/tdelibs-${PV}[xrandr?]
+	svg? ( ~media-libs/libart_lgpl-${PV} )
+	~trinity-base/tdelibs-${PV}[xrandr?]
 	sys-apps/dbus
 	x11-libs/libXtst
-	=trinity-base/kcontrol-${PV}
-	=dev-libs/dbus-tqt-${PV}"
+	~trinity-base/kcontrol-${PV}
+	~dev-libs/dbus-tqt-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/tdepasswd-${PV}
+	~trinity-base/tdepasswd-${PV}
 	x11-apps/xinit
 	x11-apps/xmessage"
 
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index 737a27c6..0a0369ac 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -14,14 +14,14 @@ IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg"
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
-	svg? ( =media-libs/libart_lgpl-${PV} )
-	=trinity-base/tdelibs-${PV}[xrandr?]
+	svg? ( ~media-libs/libart_lgpl-${PV} )
+	~trinity-base/tdelibs-${PV}[xrandr?]
 	sys-apps/dbus
 	x11-libs/libXtst
-	=trinity-base/kcontrol-${PV}"
+	~trinity-base/kcontrol-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/tdepasswd-${PV}
+	~trinity-base/tdepasswd-${PV}
 	x11-apps/xinit
 	x11-apps/xmessage"
 
diff --git a/trinity-base/twin4/twin4-9999.ebuild b/trinity-base/twin4/twin4-9999.ebuild
index b0c7846e..998661b5 100644
--- a/trinity-base/twin4/twin4-9999.ebuild
+++ b/trinity-base/twin4/twin4-9999.ebuild
@@ -9,5 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity four-in-a-row game"
 
-DEPEND="=trinity-base/libtdegames-${PV}"
+DEPEND="~trinity-base/libtdegames-${PV}"
 RDEPEND="${DEPEND}"