Live ebuilds: Port to EAPI7 and cleanup - Round 1.

This time: kcminit, kcontrol, kdesktop, kicker, konqueror,
           libkonq, tdebase-data, tdebase-meta, tdm,
           and tdebase-tdeioslaves

Also:      Add additional dependency for rpcgen.
           Add additional USE flag for tdehwlib.

Signed-off-by: Chris <xchrisx@uber.space>

10 files changed, 140 insertions, 146 deletions

diff --git a/trinity-base/kcminit/kcminit-9999.ebuild b/trinity-base/kcminit/kcminit-9999.ebuild
index 37d0f409..94db9c35 100644
--- a/trinity-base/kcminit/kcminit-9999.ebuild
+++ b/trinity-base/kcminit/kcminit-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS=
-IUSE=""
 
 DEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild
index 3bcfb30d..74b0977b 100644
--- a/trinity-base/kcontrol/kcontrol-9999.ebuild
+++ b/trinity-base/kcontrol/kcontrol-9999.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The Trinity Control Center"
-KEYWORDS=
-IUSE="samba logitech-mouse ieee1394 +xrandr +tdehw"
+
+IUSE="samba logitech-mouse ieee1394 hwlib +xrandr "
 
 DEPEND="x11-libs/libX11
 	x11-libs/libXrender
@@ -17,17 +18,17 @@ DEPEND="x11-libs/libX11
 	logitech-mouse? ( virtual/libusb:0 )
 	ieee1394? ( sys-libs/libraw1394 )
 	xrandr? ( x11-libs/libXrandr )
-	>=trinity-base/tdelibs-${PV}:${SLOT}[xrandr?]
-	>=trinity-base/libkonq-${PV}:${SLOT}
-	>=trinity-base/kicker-${PV}:${SLOT}"
+	=trinity-base/tdelibs-${PV}[xrandr?]
+	=trinity-base/libkonq-${PV}
+	=trinity-base/kicker-${PV}"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
-	>=trinity-base/kcminit-${PV}:${SLOT}
-	>=trinity-base/tdebase-data-${PV}:${SLOT}
-	>=trinity-base/tdesu-${PV}:${SLOT}
-	>=trinity-base/khelpcenter-${PV}:${SLOT}
-	>=trinity-base/khotkeys-${PV}:${SLOT}"
+	=trinity-base/kcminit-${PV}
+	=trinity-base/tdebase-data-${PV}
+	=trinity-base/tdesu-${PV}
+	=trinity-base/khelpcenter-${PV}
+	=trinity-base/khotkeys-${PV}"
 
 TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/"
 
@@ -36,12 +37,12 @@ src_configure() {
 		-DWITH_XCURSOR=ON
 		-DWITH_XRENDER=ON
 		-DWITH_USBIDS=/usr/share/misc/usb.ids
-		$(cmake-utils_use_with samba SAMBA)
-		$(cmake-utils_use_with logitech-mouse LIBUSB)
-		$(cmake-utils_use_with ieee1394 LIBRAW1394)
-		$(cmake-utils_use_with xrandr XRANDR)
-		$(cmake-utils_use_with tdehw TDEHWLIB)
+		-DWITH_SAMBA="$(usex samba)"
+		-DWITH_LIBUSB="$(usex logitech-mouse)"
+		-DWITH_LIBRAW1394="$(usex ieee1394)"
+		-DWITH_XRANDR="$(usex xrandr)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index 9b2e26d8..9ef07666 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-9999.ebuild
@@ -1,31 +1,29 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc"
-KEYWORDS=
 IUSE="pam xscreensaver"
 
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
-	>=trinity-base/libkonq-${PV}:${SLOT}
-	>=trinity-base/kcontrol-${PV}:${SLOT}
+	=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 :-),
 	# there's a dep here
 DEPEND="${COMMON_DEPEND}
-	xscreensaver? ( x11-base/xorg-proto )
-	xscreensaver? ( x11-misc/xscreensaver )"
-# TODO remove x11-misc/xscreensaver after TDE bug # will be fixed
+	xscreensaver? ( x11-base/xorg-proto x11-misc/xscreensaver )"
 RDEPEND="${COMMON_DEPEND}
-	>=trinity-base/kcheckpass-${PV}:${SLOT}
-	>=trinity-base/kdialog-${PV}:${SLOT}
-	>=trinity-base/konqueror-${PV}:${SLOT}
+	=trinity-base/kcheckpass-${PV}
+	=trinity-base/kdialog-${PV}
+	=trinity-base/konqueror-${PV}
 	pam? ( trinity-base/tdebase-pam )"
 
 TSM_EXTRACT_ALSO="kcheckpass/"
@@ -34,9 +32,9 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_XCURSORS=ON
 		-DWITH_XRENDER=ON
-		$(cmake-utils_use_with pam PAM)
-		$(cmake-utils_use_with xscreensaver XSCREENSAVER)
+		-DWITH_PAM="$(usex pam)"
+		-DWITH_XSCREENSAVER="$(usex xscreensaver)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild
index cb5dafda..3a9fa0e1 100644
--- a/trinity-base/kicker/kicker-9999.ebuild
+++ b/trinity-base/kicker/kicker-9999.ebuild
@@ -1,31 +1,31 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="The Trinity application starter panel, capable of applets and extensions"
-KEYWORDS=
 IUSE="xcomposite"
 
-DEPEND=">=trinity-base/libkonq-${PV}:${SLOT}
-	>=trinity-base/tdebase-data-${PV}:${SLOT}
-	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:${SLOT}"
+	=trinity-base/kmenuedit-${PV}"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with xcomposite XFIXES)
-		$(cmake-utils_use_with xcomposite XRENDER)
-		$(cmake-utils_use_with xcomposite XCOMPOSITE)
+		-DWITH_XFIXES="$(usex xcomposite)"
+		-DWITH_XRENDER="$(usex xcomposite)"
+		-DWITH_XCOMPOSITE="$(usex xcomposite)"		
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild
index 3a092796..1df6808c 100644
--- a/trinity-base/konqueror/konqueror-9999.ebuild
+++ b/trinity-base/konqueror/konqueror-9999.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 DESCRIPTION="Trinity: Web browser, file manager, ..."
-KEYWORDS=
+
 IUSE="java"
 # FIXME: support branding USE flag
 
 DEPEND="
-	>=trinity-base/libkonq-${PV}:${SLOT}"
+	=trinity-base/libkonq-${PV}"
 
 RDEPEND="${DEPEND}
-	>=trinity-base/kcontrol-${PV}:${SLOT}
-	>=trinity-base/tdebase-tdeioslaves-${PV}:${SLOT}
-	>=trinity-base/kfind-${PV}:${SLOT}
-	java? ( >=virtual/jre-1.4 )"
+	=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/libkonq/libkonq-9999.ebuild b/trinity-base/libkonq/libkonq-9999.ebuild
index 45b06ee5..215ab465 100644
--- a/trinity-base/libkonq/libkonq-9999.ebuild
+++ b/trinity-base/libkonq/libkonq-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 need-arts optional
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=
diff --git a/trinity-base/tdebase-data/tdebase-data-9999.ebuild b/trinity-base/tdebase-data/tdebase-data-9999.ebuild
index 856d4d1b..8a1f8f6d 100644
--- a/trinity-base/tdebase-data/tdebase-data-9999.ebuild
+++ b/trinity-base/tdebase-data/tdebase-data-9999.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 TRINITY_SUBMODULE="l10n pics applnk"
 
-DESCRIPTION="Icons, localization data and .desktop files from kdebase."
-KEYWORDS=
-IUSE=""
+DESCRIPTION="Icons, localization data and .desktop files from tdebase."
\ No newline at end of file
diff --git a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
index 478ace28..89dbb279 100644
--- a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild
@@ -1,61 +1,60 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 
-inherit trinity-functions
+inherit trinity-functions-2
 
 set-trinityver
 
 DESCRIPTION="tdebase metapackage - merge this to pull in all tdebase-derived packages"
 HOMEPAGE="http://www.trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 
-SLOT="$TRINITY_VER"
-KEYWORDS=
-IUSE=""
+SLOT="${TRINITY_VER}"
 
-RDEPEND=">=trinity-base/tdeinit-${PV}:${SLOT}
-	>=trinity-base/drkonqi-${PV}:${SLOT}
-	>=trinity-base/kappfinder-${PV}:${SLOT}
-	>=trinity-base/kate-${PV}:${SLOT}
-	>=trinity-base/kcheckpass-${PV}:${SLOT}
-	>=trinity-base/kcminit-${PV}:${SLOT}
-	>=trinity-base/kcontrol-${PV}:${SLOT}
-	>=trinity-base/kdcop-${PV}:${SLOT}
-	>=trinity-base/tdedebugdialog-${PV}:${SLOT}
-	>=trinity-base/tdepasswd-${PV}:${SLOT}
-	>=trinity-base/tdeprint-${PV}:${SLOT}
-	>=trinity-base/tdeeject-${PV}:${SLOT}
-	>=trinity-base/kdesktop-${PV}:${SLOT}
-	>=trinity-base/tdesu-${PV}:${SLOT}
-	>=trinity-base/kdialog-${PV}:${SLOT}
-	>=trinity-base/tdm-${PV}:${SLOT}
-	>=trinity-base/kfind-${PV}:${SLOT}
-	>=trinity-base/khelpcenter-${PV}:${SLOT}
-	>=trinity-base/khotkeys-${PV}:${SLOT}
-	>=trinity-base/kicker-${PV}:${SLOT}
-	>=trinity-base/tdebase-tdeioslaves-${PV}:${SLOT}
-	>=trinity-base/klipper-${PV}:${SLOT}
-	>=trinity-base/kmenuedit-${PV}:${SLOT}
-	>=trinity-base/konqueror-${PV}:${SLOT}
-	>=trinity-base/konsole-${PV}:${SLOT}
-	>=trinity-base/kpager-${PV}:${SLOT}
-	>=trinity-base/kpersonalizer-${PV}:${SLOT}
-	>=trinity-base/kreadconfig-${PV}:${SLOT}
-	>=trinity-base/tdescreensaver-${PV}:${SLOT}
-	>=trinity-base/ksmserver-${PV}:${SLOT}
-	>=trinity-base/ksplashml-${PV}:${SLOT}
-	>=trinity-base/kstart-${PV}:${SLOT}
-	>=trinity-base/ksysguard-${PV}:${SLOT}
-	>=trinity-base/ksystraycmd-${PV}:${SLOT}
-	>=trinity-base/ktip-${PV}:${SLOT}
-	>=trinity-base/twin-${PV}:${SLOT}
-	>=trinity-base/kxkb-${PV}:${SLOT}
-	>=trinity-base/libkonq-${PV}:${SLOT}
-	>=trinity-base/nsplugins-${PV}:${SLOT}
-	>=trinity-base/knetattach-${PV}:${SLOT}
-	>=trinity-base/tdebase-data-${PV}:${SLOT}
-	>=trinity-base/tdebase-starttde-${PV}:${SLOT}
-	>=trinity-base/krootbacking-${PV}:${SLOT}
-	>=trinity-base/tqt3integration-${PV}:${SLOT}"
+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-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
index 130e9f02..88bfc776 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
@@ -1,41 +1,37 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
 
 TSM_EXTRACT="tdeioslave"
 
 DESCRIPTION="Generic Trinity TDEIOslaves"
-KEYWORDS=
 IUSE="samba ldap sasl openexr +tdehw"
 
 DEPEND="x11-libs/libXcursor
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	net-libs/rpcsvc-proto
+	openexr? ( media-libs/openexr )
 	samba? ( net-fs/samba )
 	ldap? ( net-nds/openldap )
 	sasl? ( dev-libs/cyrus-sasl )"
 
-RDEPEND="${DEPEND}"
-# CHECKME: optional dependencies
-#DEPEND="
-#	>=dev-libs/cyrus-sasl-2
-#	x11-apps/xhost
 RDEPEND="${DEPEND}
 	virtual/ssh
-	trinity-base/tdeeject:${SLOT}"
+	=trinity-base/tdeeject-${PV}"
 
 src_configure() {
 	mycmakeargs=(
 		-DWITH_XCURSOR=ON
-		$(cmake-utils_use_with samba SAMBA)
-		$(cmake-utils_use_with ldap LDAP)
-		$(cmake-utils_use_with sasl SASL)
-		$(cmake-utils_use_with openexr OPENEXR)
-		$(cmake-utils_use_with tdehw TDEHWLIB)
+		-DWITH_SAMBA="$(usex samba)"
+		-DWITH_LDAP="$(usex ldap)"
+		-DWITH_SASL="$(usex sasl)"
+		-DWITH_OPENEXR="$(usex openexr)"
+		-DWITH_TDEHWLIB="$(usex tdehw)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index 5d4d6160..879b03bc 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -1,32 +1,33 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="5"
+EAPI="7"
 TRINITY_MODULE_NAME="tdebase"
 
-inherit trinity-meta
+inherit trinity-meta-2
+
+DESCRIPTION="Trinity login manager, similar to XDM and GDM"
 
-DESCRIPTION="Trinity login manager, similar to xdm and gdm"
-KEYWORDS=
 IUSE="pam xdmcp xcomposite sak +xrandr"
 
 DEPEND="pam? ( trinity-base/tdebase-pam )
 	xdmcp? ( x11-libs/libXdmcp )
 	xcomposite? ( x11-libs/libXcomposite )
 	xrandr? ( x11-libs/libXrandr )
-	>=trinity-base/tdelibs-${PV}:${SLOT}[xrandr?]
+	=trinity-base/tdelibs-${PV}[xrandr?]
 	sys-apps/dbus
 	x11-libs/libXtst
-	>=trinity-base/kcontrol-${PV}:${SLOT}
-	dev-libs/dbus-tqt"
+	=trinity-base/kcontrol-${PV}
+	=dev-libs/dbus-tqt-${PV}"
 
 RDEPEND="${DEPEND}
-	>=trinity-base/tdepasswd-${PV}:${SLOT}
+	=trinity-base/tdepasswd-${PV}
 	x11-apps/xinit
 	x11-apps/xmessage"
 
 pkg_setup() {
-	trinity-meta_pkg_setup;
+	trinity-meta-2_pkg_setup;
 	use sak && TRINITY_SUBMODULE+=" tsak"
 }
 
@@ -35,30 +36,30 @@ src_configure() {
 		-DWITH_XTEST=ON
 		-DWITH_LIBART=ON
 		-DWITH_SHADOW=ON
-		$(cmake-utils_use_with xcomposite XCOMPOSITE )
-		$(cmake-utils_use_with xdmcp XDMCP )
-		$(cmake-utils_use_with xrandr XRANDR )
-		$(cmake-utils_use_with pam PAM )
+		-DWITH_XCOMPOSITE="$(usex xcomposite)"
+		-DWITH_XDMCP="$(usex xdmcp)"
+		-DWITH_XRANDR="$(usex xrandr)"
+		-DWITH_PAM="$(usex pam)"
 	)
 
-	trinity-meta_src_configure
+	trinity-meta-2_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
 
-	# Customize the kdmrc configuration
+	# Customize the tdmrc configuration
 	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
 		"${D}/${TDEDIR}/share/config/tdm/tdmrc" || die "sed tdmrc failed"
 
-	# install XSession upstream script seems to be debian-cpecific
+	# Install XSession upstream script seems to be debian-cpecific
 	cp "${FILESDIR}/${P}-xsession.script" "${D}/${TDEDIR}/share/config/tdm/Xsession"
 	sed -i -e "s!@TRINITY_INSTALL_PATH@!${TDEDIR}!" "${D}/${TDEDIR}/share/config/tdm/Xsession" \
 		|| die "sed tdmrc failed"
 }
 
 pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
+	# Set the default TDM face icon if it's not already set by the system admin
 	# because this is user-overrideable in that way, it's not in src_install
 	if [ ! -e "${ROOT}${TDEDIR}/share/apps/tdm/faces/.default.face.icon" ];	then
 		mkdir -p "${ROOT}${TDEDIR}/share/apps/tdm/faces"