tdebase-meta fixedother/trinity-nomodules

Signed-off-by: ormorph <roma251078@mail.ru>

56 files changed, 283 insertions, 169 deletions

diff --git a/trinity-base/drkonqi/drkonqi-14.0.9.ebuild b/trinity-base/drkonqi/drkonqi-14.0.9.ebuild
index 9b06459f..529847e9 100644
--- a/trinity-base/drkonqi/drkonqi-14.0.9.ebuild
+++ b/trinity-base/drkonqi/drkonqi-14.0.9.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
 
@@ -8,9 +8,9 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="+hwlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="sys-devel/gdb"
 
@@ -21,3 +21,5 @@ src_configure() {
 
 	trinity-meta-2_src_configure
 }
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/drkonqi/drkonqi-9999.ebuild b/trinity-base/drkonqi/drkonqi-9999.ebuild
index e3488779..dc3e966a 100644
--- a/trinity-base/drkonqi/drkonqi-9999.ebuild
+++ b/trinity-base/drkonqi/drkonqi-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
 
@@ -19,4 +19,6 @@ src_configure() {
 	)
 
 	trinity-meta-2_src_configure
-}
\ No newline at end of file
+}
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kappfinder/kappfinder-14.0.9.ebuild b/trinity-base/kappfinder/kappfinder-14.0.9.ebuild
index 550ab7f2..8859302a 100644
--- a/trinity-base/kappfinder/kappfinder-14.0.9.ebuild
+++ b/trinity-base/kappfinder/kappfinder-14.0.9.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
 
@@ -9,3 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kappfinder/kappfinder-9999.ebuild b/trinity-base/kappfinder/kappfinder-9999.ebuild
index 794aef01..58fb36d8 100644
--- a/trinity-base/kappfinder/kappfinder-9999.ebuild
+++ b/trinity-base/kappfinder/kappfinder-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kate/kate-14.0.9.ebuild b/trinity-base/kate/kate-14.0.9.ebuild
index c2916a6f..832a982b 100644
--- a/trinity-base/kate/kate-14.0.9.ebuild
+++ b/trinity-base/kate/kate-14.0.9.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
 
@@ -9,3 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Kate is an MDI texteditor."
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kate/kate-9999.ebuild b/trinity-base/kate/kate-9999.ebuild
index 53f94f5e..efe0b432 100644
--- a/trinity-base/kate/kate-9999.ebuild
+++ b/trinity-base/kate/kate-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Kate is an MDI texteditor."
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kcontrol/kcontrol-14.0.9.ebuild b/trinity-base/kcontrol/kcontrol-14.0.9.ebuild
index 10193320..d33773a2 100644
--- a/trinity-base/kcontrol/kcontrol-14.0.9.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.0.9.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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Control Center"
@@ -16,25 +16,25 @@ DEPEND="x11-libs/libX11
 	x11-libs/libXrender
 	x11-libs/libXcursor
 	samba? ( net-fs/samba )
-	logitech-mouse? ( virtual/libusb:0 )
+	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}
+	~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 )"
 
-TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
+TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XCURSOR=ON
 		-DWITH_XRENDER=ON
 		-DWITH_USBIDS=/usr/share/misc/usb.ids
diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild
index 4df07e32..ff76e6e1 100644
--- a/trinity-base/kcontrol/kcontrol-9999.ebuild
+++ b/trinity-base/kcontrol/kcontrol-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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Control Center"
@@ -17,23 +17,23 @@ 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}
+	~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 )"
 
-TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
+TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XCURSOR=ON
 		-DWITH_XRENDER=ON
 		-DWITH_USBIDS=/usr/share/misc/usb.ids
diff --git a/trinity-base/kdesktop/kdesktop-14.0.9.ebuild b/trinity-base/kdesktop/kdesktop-14.0.9.ebuild
index d0906a15..f040992d 100644
--- a/trinity-base/kdesktop/kdesktop-14.0.9.ebuild
+++ b/trinity-base/kdesktop/kdesktop-14.0.9.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
 
@@ -8,15 +8,14 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc"
-IUSE="pam xscreensaver"
-
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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 :-),
@@ -24,12 +23,12 @@ 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/"
+TSM_EXTRACT_ALSO="kcheckpass/ translations/"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index 233d7b84..9e1a156d 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-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
 
@@ -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,12 +22,12 @@ 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/"
+TSM_EXTRACT_ALSO="kcheckpass/ translations/"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kfind/kfind-14.0.9.ebuild b/trinity-base/kfind/kfind-14.0.9.ebuild
index 47c6e8f6..0e4e555f 100644
--- a/trinity-base/kfind/kfind-14.0.9.ebuild
+++ b/trinity-base/kfind/kfind-14.0.9.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
 
@@ -10,5 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity file find utility"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild
index b39ff617..85bb4a78 100644
--- a/trinity-base/kfind/kfind-9999.ebuild
+++ b/trinity-base/kfind/kfind-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
 
@@ -9,5 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity file find utility"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/khelpcenter/khelpcenter-14.0.9.ebuild b/trinity-base/khelpcenter/khelpcenter-14.0.9.ebuild
index d340fbae..611c5d86 100644
--- a/trinity-base/khelpcenter/khelpcenter-14.0.9.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-14.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundatio
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
@@ -12,5 +12,20 @@ DESCRIPTION="The Trinity help center."
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
-	=trinity-base/tdebase-tdeioslaves-${PV}
+	~trinity-base/tdebase-tdeioslaves-${PV}
 	|| ( www-misc/htdig www-misc/hldig )"
+
+TSM_EXTRACT_ALSO="translations/"
+
+pkg_setup() {
+	# Issue some warning if MAKEOPTS -j parameter is higher than 4
+	local makeopts_j
+	makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')"
+	if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then
+
+		ewarn "This ebuild needs huge amount of memmory to compile in highly parallel"
+		ewarn "mode so it can chew it all. Please change your MAKEOPTS if building fails."
+	fi
+
+	trinity-meta-2_pkg_setup
+}
diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
index ab760341..16727b8e 100644
--- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild
@@ -11,9 +11,11 @@ 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 )"
 
+TSM_EXTRACT_ALSO="translations/"
+
 pkg_setup() {
 	# Issue some warning if MAKEOPTS -j parameter is higher than 4
 	local makeopts_j
diff --git a/trinity-base/khotkeys/khotkeys-14.0.9.ebuild b/trinity-base/khotkeys/khotkeys-14.0.9.ebuild
index ec92e7cb..0c6c4b7b 100644
--- a/trinity-base/khotkeys/khotkeys-14.0.9.ebuild
+++ b/trinity-base/khotkeys/khotkeys-14.0.9.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,6 +15,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 DEPEND="x11-libs/libXtst"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XTEST=ON
diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild
index 896a4c9d..dbc26dbc 100644
--- a/trinity-base/khotkeys/khotkeys-9999.ebuild
+++ b/trinity-base/khotkeys/khotkeys-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
 
@@ -14,6 +14,8 @@ DESCRIPTION="Trinity hotkey daemon"
 DEPEND="x11-libs/libXtst"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XTEST=ON
diff --git a/trinity-base/kicker/kicker-14.0.9.ebuild b/trinity-base/kicker/kicker-14.0.9.ebuild
index fe0965a4..f451007d 100644
--- a/trinity-base/kicker/kicker-14.0.9.ebuild
+++ b/trinity-base/kicker/kicker-14.0.9.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
 
@@ -11,15 +11,17 @@ DESCRIPTION="The Trinity application starter panel, capable of applets and exten
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="xcomposite"
 
-DEPEND="=trinity-base/libkonq-${PV}
-	=trinity-base/tdebase-data-${PV}
-	dev-libs/dbus-tqt
+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}"
+
+TSM_EXTRACT_ALSO="translations/"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild
index 5b4c3422..81ccba2e 100644
--- a/trinity-base/kicker/kicker-9999.ebuild
+++ b/trinity-base/kicker/kicker-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
 
@@ -10,15 +10,17 @@ 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}"
+
+TSM_EXTRACT_ALSO="translations/"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kmenuedit/kmenuedit-14.0.9.ebuild b/trinity-base/kmenuedit/kmenuedit-14.0.9.ebuild
index 7c333bec..71831936 100644
--- a/trinity-base/kmenuedit/kmenuedit-14.0.9.ebuild
+++ b/trinity-base/kmenuedit/kmenuedit-14.0.9.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
 
@@ -9,3 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity menu editor"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kmenuedit/kmenuedit-9999.ebuild b/trinity-base/kmenuedit/kmenuedit-9999.ebuild
index af865677..a4492f99 100644
--- a/trinity-base/kmenuedit/kmenuedit-9999.ebuild
+++ b/trinity-base/kmenuedit/kmenuedit-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity menu editor"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/knetattach/knetattach-14.0.9.ebuild b/trinity-base/knetattach/knetattach-14.0.9.ebuild
index f099913a..ce3143df 100644
--- a/trinity-base/knetattach/knetattach-14.0.9.ebuild
+++ b/trinity-base/knetattach/knetattach-14.0.9.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
 
@@ -8,4 +8,6 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity network wizard"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
\ No newline at end of file
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/knetattach/knetattach-9999.ebuild b/trinity-base/knetattach/knetattach-9999.ebuild
index bda5425b..56de279d 100644
--- a/trinity-base/knetattach/knetattach-9999.ebuild
+++ b/trinity-base/knetattach/knetattach-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity network wizard"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/konqueror/konqueror-14.0.9.ebuild b/trinity-base/konqueror/konqueror-14.0.9.ebuild
index ec1a1011..26c9b9d3 100644
--- a/trinity-base/konqueror/konqueror-14.0.9.ebuild
+++ b/trinity-base/konqueror/konqueror-14.0.9.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
 
@@ -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"
+TSM_EXTRACT_ALSO="kdesktop translations/"
diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild
index 612a7a2d..80c20b14 100644
--- a/trinity-base/konqueror/konqueror-9999.ebuild
+++ b/trinity-base/konqueror/konqueror-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
 
@@ -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"
+TSM_EXTRACT_ALSO="kdesktop translations/"
diff --git a/trinity-base/konsole/konsole-14.0.9.ebuild b/trinity-base/konsole/konsole-14.0.9.ebuild
index eadef24d..2daae952 100644
--- a/trinity-base/konsole/konsole-14.0.9.ebuild
+++ b/trinity-base/konsole/konsole-14.0.9.ebuild
@@ -1,27 +1,30 @@
-# 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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
-DESCRIPTION="X terminal for use with Trinity."
+DESCRIPTION="X terminal for use with Trinity"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="sudo"
 
-DEPEND="x11-libs/libX11
+DEPEND="
+	x11-libs/libX11
 	x11-libs/libXrender"
 
 RDEPEND="${DEPEND}
-	sudo? ( app-admin/sudo )
+	~trinity-base/kcontrol-${PV}
 	x11-apps/bdftopcf
-	=trinity-base/kcontrol-${PV}"
+	sudo? ( app-admin/sudo )"
+
+TSM_EXTRACT_ALSO="translations/"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XRENDER=ON
 		-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)"
 	)
diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild
index eff61bc5..76861317 100644
--- a/trinity-base/konsole/konsole-9999.ebuild
+++ b/trinity-base/konsole/konsole-9999.ebuild
@@ -1,26 +1,29 @@
-# 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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
-DESCRIPTION="X terminal for use with Trinity."
+DESCRIPTION="X terminal for use with Trinity"
 
 IUSE="sudo"
 
-DEPEND="x11-libs/libX11
+DEPEND="
+	x11-libs/libX11
 	x11-libs/libXrender"
 
 RDEPEND="${DEPEND}
-	sudo? ( app-admin/sudo )
+	~trinity-base/kcontrol-${PV}
 	x11-apps/bdftopcf
-	=trinity-base/kcontrol-${PV}"
+	sudo? ( app-admin/sudo )"
+
+TSM_EXTRACT_ALSO="translations/"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XRENDER=ON
 		-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)"
 	)
diff --git a/trinity-base/kpersonalizer/kpersonalizer-14.0.9.ebuild b/trinity-base/kpersonalizer/kpersonalizer-14.0.9.ebuild
index 55f6b6df..8b57e8b0 100644
--- a/trinity-base/kpersonalizer/kpersonalizer-14.0.9.ebuild
+++ b/trinity-base/kpersonalizer/kpersonalizer-14.0.9.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
 
@@ -10,4 +10,4 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity user settings wizard."
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-TSM_EXTRACT_ALSO="libkonq/"
+TSM_EXTRACT_ALSO="libkonq/ translations/"
diff --git a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild
index 8ec232ce..684b5697 100644
--- a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild
+++ b/trinity-base/kpersonalizer/kpersonalizer-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
 
@@ -9,4 +9,4 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity user settings wizard."
 
-TSM_EXTRACT_ALSO="libkonq/"
+TSM_EXTRACT_ALSO="libkonq/ translations/"
diff --git a/trinity-base/ksplashml/ksplashml-14.0.9.ebuild b/trinity-base/ksplashml/ksplashml-14.0.9.ebuild
index cea8b0b4..98d699d2 100644
--- a/trinity-base/ksplashml/ksplashml-14.0.9.ebuild
+++ b/trinity-base/ksplashml/ksplashml-14.0.9.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,6 +15,8 @@ IUSE="xinerama"
 DEPEND="xinerama? ( x11-base/xorg-proto )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XINERAMA="$(usex xinerama)"
diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild
index 5781b769..d8042e1e 100644
--- a/trinity-base/ksplashml/ksplashml-9999.ebuild
+++ b/trinity-base/ksplashml/ksplashml-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
 
@@ -14,6 +14,8 @@ IUSE="xinerama"
 DEPEND="xinerama? ( x11-base/xorg-proto )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XINERAMA="$(usex xinerama)"
diff --git a/trinity-base/ksysguard/ksysguard-14.0.9.ebuild b/trinity-base/ksysguard/ksysguard-14.0.9.ebuild
index d3e61a5b..fc827d9c 100644
--- a/trinity-base/ksysguard/ksysguard-14.0.9.ebuild
+++ b/trinity-base/ksysguard/ksysguard-14.0.9.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
 
@@ -8,13 +8,15 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="A network enabled task manager/system monitor"
-
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
 IUSE="dell-laptop lm-sensors"
 
 DEPEND="lm-sensors? ( sys-apps/lm-sensors )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_I8K="$(usex dell-laptop)"
diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild
index 02f13ed1..f420376b 100644
--- a/trinity-base/ksysguard/ksysguard-9999.ebuild
+++ b/trinity-base/ksysguard/ksysguard-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
 
@@ -14,6 +14,8 @@ IUSE="dell-laptop lm-sensors"
 DEPEND="lm-sensors? ( sys-apps/lm-sensors )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_I8K="$(usex dell-laptop)"
diff --git a/trinity-base/ktip/ktip-14.0.9.ebuild b/trinity-base/ktip/ktip-14.0.9.ebuild
index da506527..c3d480ac 100644
--- a/trinity-base/ktip/ktip-14.0.9.ebuild
+++ b/trinity-base/ktip/ktip-14.0.9.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
 
@@ -9,3 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity tip-of-the-day displayer"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/ktip/ktip-9999.ebuild b/trinity-base/ktip/ktip-9999.ebuild
index ba2f8d57..b6d43ad1 100644
--- a/trinity-base/ktip/ktip-9999.ebuild
+++ b/trinity-base/ktip/ktip-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity tip-of-the-day displayer"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/kxkb/kxkb-14.0.9.ebuild b/trinity-base/kxkb/kxkb-14.0.9.ebuild
index 2c1b8fe5..91acaf5b 100644
--- a/trinity-base/kxkb/kxkb-14.0.9.ebuild
+++ b/trinity-base/kxkb/kxkb-14.0.9.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
 
@@ -7,7 +7,7 @@ TRINITY_MODULE_NAME="tdebase"
 
 inherit trinity-meta-2
 
-DESCRIPTION="KControl module to configure and switch keyboard layouts"
+DESCRIPTION="KControl module for the X11 to configure and switch keyboard layouts"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="x11-libs/libXtst"
@@ -15,6 +15,8 @@ RDEPEND="${DEPEND}
 	x11-misc/xkeyboard-config
 	x11-apps/setxkbmap"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XTEST=ON
diff --git a/trinity-base/kxkb/kxkb-9999.ebuild b/trinity-base/kxkb/kxkb-9999.ebuild
index 0d636677..a994416d 100644
--- a/trinity-base/kxkb/kxkb-9999.ebuild
+++ b/trinity-base/kxkb/kxkb-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
 
@@ -14,6 +14,8 @@ RDEPEND="${DEPEND}
 	x11-misc/xkeyboard-config
 	x11-apps/setxkbmap"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XTEST=ON
diff --git a/trinity-base/libkonq/libkonq-14.0.9.ebuild b/trinity-base/libkonq/libkonq-14.0.9.ebuild
index ba1825b2..57f85f90 100644
--- a/trinity-base/libkonq/libkonq-14.0.9.ebuild
+++ b/trinity-base/libkonq/libkonq-14.0.9.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
 
@@ -11,3 +11,5 @@ need-arts optional
 
 DESCRIPTION="The embeddable part of konqueror"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/libkonq/libkonq-9999.ebuild b/trinity-base/libkonq/libkonq-9999.ebuild
index 4a5e300f..27740145 100644
--- a/trinity-base/libkonq/libkonq-9999.ebuild
+++ b/trinity-base/libkonq/libkonq-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
 
@@ -10,3 +10,5 @@ inherit trinity-meta-2
 need-arts optional
 
 DESCRIPTION="The embeddable part of konqueror"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/nsplugins/nsplugins-14.0.9.ebuild b/trinity-base/nsplugins/nsplugins-14.0.9.ebuild
index 111e8b7b..4bd67f51 100644
--- a/trinity-base/nsplugins/nsplugins-14.0.9.ebuild
+++ b/trinity-base/nsplugins/nsplugins-14.0.9.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
 
@@ -13,3 +13,5 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 DEPEND="x11-libs/libXt
 	dev-libs/glib"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/nsplugins/nsplugins-9999.ebuild b/trinity-base/nsplugins/nsplugins-9999.ebuild
index 03d3baea..399e4f1b 100644
--- a/trinity-base/nsplugins/nsplugins-9999.ebuild
+++ b/trinity-base/nsplugins/nsplugins-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
 
@@ -12,3 +12,5 @@ DESCRIPTION="Netscape plugins support for Konqueror."
 DEPEND="x11-libs/libXt
 	dev-libs/glib"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdebase-data/tdebase-data-14.0.9.ebuild b/trinity-base/tdebase-data/tdebase-data-14.0.9.ebuild
index 7f7d4281..f989a905 100644
--- a/trinity-base/tdebase-data/tdebase-data-14.0.9.ebuild
+++ b/trinity-base/tdebase-data/tdebase-data-14.0.9.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
 
@@ -11,3 +11,5 @@ TRINITY_SUBMODULE="l10n pics applnk"
 
 DESCRIPTION="Icons, localization data and .desktop files from tdebase."
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdebase-data/tdebase-data-9999.ebuild b/trinity-base/tdebase-data/tdebase-data-9999.ebuild
index 14445416..a9e7d64b 100644
--- a/trinity-base/tdebase-data/tdebase-data-9999.ebuild
+++ b/trinity-base/tdebase-data/tdebase-data-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
 
@@ -9,4 +9,6 @@ inherit trinity-meta-2
 
 TRINITY_SUBMODULE="l10n pics applnk"
 
-DESCRIPTION="Icons, localization data and .desktop files from tdebase."
\ No newline at end of file
+DESCRIPTION="Icons, localization data and .desktop files from tdebase."
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.9.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.9.ebuild
index 114c938a..bdc3aabc 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.9.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.9.ebuild
@@ -1,31 +1,34 @@
-# 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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 TSM_EXTRACT="tdeioslave"
+TSM_EXTRACT_ALSO="translations/"
 
 DESCRIPTION="Generic Trinity TDEIOslaves"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="samba ldap sasl openexr +hwlib"
 
-DEPEND="x11-libs/libXcursor
+IUSE="+hwlib ldap openexr samba sasl"
+
+DEPEND="
 	net-libs/rpcsvc-proto
+	x11-libs/libXcursor
+	ldap? ( net-nds/openldap )
 	openexr? ( media-libs/openexr )
 	samba? ( net-fs/samba )
-	ldap? ( net-nds/openldap )
 	sasl? ( dev-libs/cyrus-sasl )"
 
 RDEPEND="${DEPEND}
-	virtual/ssh
-	=trinity-base/tdeeject-${PV}"
+	~trinity-base/tdeeject-${PV}
+	virtual/ssh"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XCURSOR=ON
 		-DWITH_SAMBA="$(usex samba)"
 		-DWITH_LDAP="$(usex ldap)"
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
index bbd19677..fd45cbec 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
@@ -1,30 +1,33 @@
-# 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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 TSM_EXTRACT="tdeioslave"
+TSM_EXTRACT_ALSO="translations/"
 
 DESCRIPTION="Generic Trinity TDEIOslaves"
-IUSE="samba ldap sasl openexr +hwlib"
 
-DEPEND="x11-libs/libXcursor
+IUSE="+hwlib ldap openexr samba sasl"
+
+DEPEND="
 	net-libs/rpcsvc-proto
+	x11-libs/libXcursor
+	ldap? ( net-nds/openldap )
 	openexr? ( media-libs/openexr )
 	samba? ( net-fs/samba )
-	ldap? ( net-nds/openldap )
 	sasl? ( dev-libs/cyrus-sasl )"
 
 RDEPEND="${DEPEND}
-	virtual/ssh
-	=trinity-base/tdeeject-${PV}"
+	~trinity-base/tdeeject-${PV}
+	virtual/ssh"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XCURSOR=ON
 		-DWITH_SAMBA="$(usex samba)"
 		-DWITH_LDAP="$(usex ldap)"
diff --git a/trinity-base/tdepasswd/tdepasswd-14.0.9.ebuild b/trinity-base/tdepasswd/tdepasswd-14.0.9.ebuild
index 03ac8529..153e9a90 100644
--- a/trinity-base/tdepasswd/tdepasswd-14.0.9.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-14.0.9.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
 
@@ -10,5 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity GUI for passwd"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild
index ecda6f5e..3c288041 100644
--- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-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
 
@@ -9,5 +9,7 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity GUI for passwd"
 
-DEPEND="=trinity-base/libkonq-${PV}"
+DEPEND="~trinity-base/libkonq-${PV}"
 RDEPEND="${DEPEND}"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdeprint/tdeprint-14.0.9.ebuild b/trinity-base/tdeprint/tdeprint-14.0.9.ebuild
index 6bec3c9b..c62d541a 100644
--- a/trinity-base/tdeprint/tdeprint-14.0.9.ebuild
+++ b/trinity-base/tdeprint/tdeprint-14.0.9.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
 
@@ -9,9 +9,12 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity printer queue/device manager"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
 RDEPEND="${DEPEND}
 	app-text/enscript
 	app-text/psutils"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdeprint/tdeprint-9999.ebuild b/trinity-base/tdeprint/tdeprint-9999.ebuild
index af2ccc0e..552d7e34 100644
--- a/trinity-base/tdeprint/tdeprint-9999.ebuild
+++ b/trinity-base/tdeprint/tdeprint-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,3 +15,5 @@ DEPEND="cups? ( net-print/cups )"
 RDEPEND="${DEPEND}
 	app-text/enscript
 	app-text/psutils"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tdescreensaver/tdescreensaver-14.0.9.ebuild b/trinity-base/tdescreensaver/tdescreensaver-14.0.9.ebuild
index dcdd26ce..f8579c65 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-14.0.9.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-14.0.9.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
 
@@ -9,13 +9,16 @@ inherit trinity-meta-2
 
 DESCRIPTION="Trinity screensaver framework"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
 IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )
-	krootbacking? ( =trinity-base/krootbacking-${PV} )"
+	krootbacking? ( ~trinity-base/krootbacking-${PV} )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure () {
 	mycmakeargs=(
 		-DWITH_OPENGL="$(usex opengl)"
diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
index 296aa491..3d312b98 100644
--- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-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
 
@@ -13,9 +13,11 @@ IUSE="opengl +krootbacking"
 
 DEPEND="x11-libs/libXt
 	opengl? ( virtual/opengl )
-	krootbacking? ( =trinity-base/krootbacking-${PV} )"
+	krootbacking? ( ~trinity-base/krootbacking-${PV} )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure () {
 	mycmakeargs=(
 		-DWITH_OPENGL="$(usex opengl)"
diff --git a/trinity-base/tdm/tdm-14.0.9.ebuild b/trinity-base/tdm/tdm-14.0.9.ebuild
index aa4f34ef..2b6f1083 100644
--- a/trinity-base/tdm/tdm-14.0.9.ebuild
+++ b/trinity-base/tdm/tdm-14.0.9.ebuild
@@ -1,42 +1,43 @@
-# 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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity login manager, similar to XDM and GDM"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
 	svg? ( media-libs/libart_lgpl )
-	=trinity-base/tdelibs-${PV}[xrandr?]
+	~trinity-base/tdelibs-${PV}[xrandr?]
 	sys-apps/dbus
 	x11-libs/libXtst
-	=trinity-base/kcontrol-${PV}
-	=dev-libs/dbus-tqt-${PV}"
+	~trinity-base/kcontrol-${PV}"
 
 RDEPEND="${DEPEND}
-	=trinity-base/tdepasswd-${PV}
+	~trinity-base/tdepasswd-${PV}
 	x11-apps/xinit
 	x11-apps/xmessage"
 
+TSM_EXTRACT_ALSO="translations/"
+
 pkg_setup() {
 	trinity-meta-2_pkg_setup;
 	use sak && TRINITY_SUBMODULE+=" tsak"
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XTEST=ON
-		-DWITH_LIBART="$(usex svg)"
 		-DWITH_SHADOW=ON
+		-DWITH_LIBART="$(usex svg)"
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 		-DWITH_XDMCP="$(usex xdmcp)"
 		-DWITH_XRANDR="$(usex xrandr)"
@@ -83,8 +84,8 @@ pkg_postinst() {
 			sak_ok=no
 		else
 			if ! linux_chkconfig_present INPUT_UINPUT; then
-				eerror "You have built tdm with the Secure Attention Key (SAK) feature enabled. "
-				eerror "It requires INPUT_UINPUT support to be enabled in the kernel."
+				eerror "You build TDM with SAK feature enabled. "
+				eerror "It requires the INPUT_UINPUT support enabled."
 				eerror "Please enable it:"
 				eerror "    CONFIG_INPUT_UINPUT=y"
 				eerror "in /usr/src/linux/.config or"
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index 8eff9e50..3dec9137 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-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="tdebase"
 
+TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Trinity login manager, similar to XDM and GDM"
@@ -15,23 +15,25 @@ DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
 	svg? ( media-libs/libart_lgpl )
-	=trinity-base/tdelibs-${PV}[xrandr?]
+	~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"
 
+TSM_EXTRACT_ALSO="translations/"
+
 pkg_setup() {
 	trinity-meta-2_pkg_setup;
 	use sak && TRINITY_SUBMODULE+=" tsak"
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_XTEST=ON
 		-DWITH_SHADOW=ON
 		-DWITH_LIBART="$(usex svg)"
diff --git a/trinity-base/tqt3integration/tqt3integration-14.0.9.ebuild b/trinity-base/tqt3integration/tqt3integration-14.0.9.ebuild
index 3cdff9da..094192b2 100644
--- a/trinity-base/tqt3integration/tqt3integration-14.0.9.ebuild
+++ b/trinity-base/tqt3integration/tqt3integration-14.0.9.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
 
@@ -9,3 +9,5 @@ inherit trinity-meta-2
 
 DESCRIPTION="Makes TQt-only apps use several TDE dialogs."
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/tqt3integration/tqt3integration-9999.ebuild b/trinity-base/tqt3integration/tqt3integration-9999.ebuild
index 53b9aa0b..de120f63 100644
--- a/trinity-base/tqt3integration/tqt3integration-9999.ebuild
+++ b/trinity-base/tqt3integration/tqt3integration-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
 
@@ -8,3 +8,5 @@ TRINITY_MODULE_NAME="tdebase"
 inherit trinity-meta-2
 
 DESCRIPTION="Makes TQt-only apps use several TDE dialogs."
+
+TSM_EXTRACT_ALSO="translations/"
diff --git a/trinity-base/twin/twin-14.0.9.ebuild b/trinity-base/twin/twin-14.0.9.ebuild
index f09afc4c..4cb31dfd 100644
--- a/trinity-base/twin/twin-14.0.9.ebuild
+++ b/trinity-base/twin/twin-14.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
@@ -9,6 +9,7 @@ inherit trinity-meta-2 eutils
 
 DESCRIPTION="Trinity window manager"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
 IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl"
 
 DEPEND="x11-libs/libXext
@@ -22,6 +23,8 @@ DEPEND="x11-libs/libXext
 	pcre? ( dev-libs/libpcre[jit] )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild
index 49c04724..e22a53f3 100644
--- a/trinity-base/twin/twin-9999.ebuild
+++ b/trinity-base/twin/twin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 
@@ -22,6 +22,8 @@ DEPEND="x11-libs/libXext
 	pcre? ( dev-libs/libpcre[jit] )"
 RDEPEND="${DEPEND}"
 
+TSM_EXTRACT_ALSO="translations/"
+
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"