Stable ebuilds: General cosmetics and sync with live ebuilds.

Also: Some cosmetics for the live ebuilds. Signed-off-by: Chris <xchrisx@uber.space>
5 years ago · 7e24157247
parent c5c06e2505
commit 7e24157247
55 changed files with 110 additions and 90 deletions
--- 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
@ -1,4 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
@ -9,14 +10,13 @@ inherit trinity-base-2

 DESCRIPTION="D-BUS TQt bindings"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""

 DEPEND="sys-apps/dbus
 	=dev-tqt/tqtinterface-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"

 src_configure() {
 	cmake-utils_src_configure
--- a/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild
+++ b/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
 TRINITY_MODULE_NAME="dbus-tqt"
@ -9,14 +10,13 @@ inherit trinity-base-2

 DESCRIPTION="D-BUS TQt bindings"
 HOMEPAGE="http://trinitydesktop.org/"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64"
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""

 DEPEND="sys-apps/dbus
 	=dev-tqt/tqtinterface-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"

 src_configure() {
 	cmake-utils_src_configure
--- a/dev-tqt/tqt/tqt-14.0.6.ebuild
+++ b/dev-tqt/tqt/tqt-14.0.6.ebuild
@ -2,9 +2,9 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI="7"

-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs

 SRCTYPE="free"
 DESCRIPTION="Trinity's Qt3 toolkit fork - a comprehensive C++ application development framework."
@ -165,21 +165,21 @@ src_configure() {

 src_compile() {
 	# Compile TQt with TQmake and TQmoc
-	emake src-qmake src-moc sub-src || die
+	emake src-qmake src-moc sub-src

 	# Compile TQt plugins (if any selected)
-	emake sub-plugins || die
+	emake sub-plugins
 	
 	# Point to libs for the tools to build fine too
 	export DYLD_LIBRARY_PATH="${S}/lib:${DYLD_LIBRARY_PATH}"
 	export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"

 	# Compile TQDesigner (TQuic is needed by tdelibs), TQAssistant and friends (msg2tqm, qembed..)
-	emake sub-tools || die
+	emake sub-tools

 	# Compile examples and tutorials
 	if use examples; then
-		emake sub-tutorial sub-examples || die
+		emake sub-tutorial sub-examples
 	fi
 }

--- a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
@ -1,4 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
@ -10,7 +11,7 @@ inherit trinity-base-2
 DESCRIPTION="Interface and abstraction library for TQt and Trinity"
 HOMEPAGE="http://trinitydesktop.org/"

-LICENSE="GPL-2"
+LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"

@ -25,7 +26,7 @@ pkg_setup() {
 src_configure() {
 	mycmakeargs=(
 		-DUSE_QT3=ON
-		-DQT_PREFIX_DIR="$QTDIR"
+		-DQT_PREFIX_DIR="${QTDIR}"
 	)

 	 cmake-utils_src_configure
--- a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild
@ -1,9 +1,10 @@
 # Copyright 1999-2016 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2

 EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
+TRINITY_MODULE_NAME="tqtinterface"

 inherit trinity-base-2

--- a/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild
@ -1,5 +1,6 @@
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
 TRINITY_MODULE_NAME="libart-lgpl"
--- a/trinity-base/arts/arts-14.0.6.ebuild
+++ b/trinity-base/arts/arts-14.0.6.ebuild
@ -1,9 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="7"

+EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
 TRINITY_MODULE_NAME="arts"

@ -16,6 +15,7 @@ HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"

 KEYWORDS="~amd64 ~x86"
+
 IUSE="alsa -artswrappersuid jack mp3 vorbis"
 SLOT="${TRINITY_VER}"

--- a/trinity-base/drkonqi/drkonqi-14.0.6.ebuild
+++ b/trinity-base/drkonqi/drkonqi-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kappfinder/kappfinder-14.0.6.ebuild
+++ b/trinity-base/kappfinder/kappfinder-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kate/kate-14.0.6.ebuild
+++ b/trinity-base/kate/kate-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kcheckpass/kcheckpass-14.0.6.ebuild
+++ b/trinity-base/kcheckpass/kcheckpass-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -8,6 +9,7 @@ inherit trinity-meta-2

 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
 IUSE="pam"
+
 KEYWORDS="~amd64 ~x86"

 RDEPEND="pam? ( trinity-base/tdebase-pam )"
--- a/trinity-base/kcminit/kcminit-14.0.6.ebuild
+++ b/trinity-base/kcminit/kcminit-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kcontrol/kcontrol-14.0.6.ebuild
+++ b/trinity-base/kcontrol/kcontrol-14.0.6.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
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

 inherit trinity-meta-2

 DESCRIPTION="The Trinity Control Center"
-
 KEYWORDS="~amd64 ~x86"
+
 IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr "

 DEPEND="x11-libs/libX11
--- a/trinity-base/kdcop/kdcop-14.0.6.ebuild
+++ b/trinity-base/kdcop/kdcop-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kdesktop/kdesktop-14.0.6.ebuild
+++ b/trinity-base/kdesktop/kdesktop-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,7 +9,9 @@ inherit trinity-meta-2

 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc"
 IUSE="pam xscreensaver"
+
 KEYWORDS="~amd64 ~x86"
+
 COMMON_DEPEND="x11-libs/libXrender
 	x11-libs/libXcursor
 	=dev-libs/dbus-1-tqt-${PV}
--- a/trinity-base/kdialog/kdialog-14.0.6.ebuild
+++ b/trinity-base/kdialog/kdialog-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kfind/kfind-14.0.6.ebuild
+++ b/trinity-base/kfind/kfind-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild
+++ b/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -13,4 +14,3 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	=trinity-base/tdebase-tdeioslaves-${PV}
 	|| ( www-misc/htdig www-misc/hldig )"
-
--- a/trinity-base/khotkeys/khotkeys-14.0.6.ebuild
+++ b/trinity-base/khotkeys/khotkeys-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -11,8 +12,8 @@ need-arts optional
 DESCRIPTION="Trinity hotkey daemon"
 KEYWORDS="~amd64 ~x86"

-DEPEND+=" x11-libs/libXtst"
-RDEPEND+=" x11-libs/libXtst"
+DEPEND="x11-libs/libXtst"
+RDEPEND="${DEPEND}"

 src_configure() {
 	mycmakeargs=(
--- a/trinity-base/khotkeys/khotkeys-9999.ebuild
+++ b/trinity-base/khotkeys/khotkeys-9999.ebuild
@ -11,9 +11,8 @@ need-arts optional

 DESCRIPTION="Trinity hotkey daemon"

-MY_DEPEND="x11-libs/libXtst"
-DEPEND+=" ${MY_DEPEND}"
-RDEPEND+=" ${MY_DEPEND}"
+DEPEND="x11-libs/libXtst"
+RDEPEND="${DEPEND}"

 src_configure() {
 	mycmakeargs=(
--- a/trinity-base/kicker/kicker-14.0.6.ebuild
+++ b/trinity-base/kicker/kicker-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/klipper/klipper-14.0.6.ebuild
+++ b/trinity-base/klipper/klipper-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -8,6 +9,7 @@ inherit trinity-meta-2

 DESCRIPTION="kicker applet for Trinity and X clipboard management"
 KEYWORDS="~amd64 ~x86"
+
 DEPEND="x11-libs/libXfixes"
 RDEPEND="${DEPEND}"

--- a/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild
+++ b/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/knetattach/knetattach-14.0.6.ebuild
+++ b/trinity-base/knetattach/knetattach-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/konqueror/konqueror-14.0.6.ebuild
+++ b/trinity-base/konqueror/konqueror-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -8,16 +9,17 @@ inherit trinity-meta-2

 DESCRIPTION="Trinity: Web browser, file manager, ..."
 KEYWORDS="~amd64 ~x86"
+
 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}
-	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"
--- a/trinity-base/konsole/konsole-14.0.6.ebuild
+++ b/trinity-base/konsole/konsole-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -10,16 +10,20 @@ inherit trinity-meta-2
 DESCRIPTION="X terminal for use with Trinity."
 KEYWORDS="~amd64 ~x86"

+IUSE="sudo"
+
 DEPEND="x11-libs/libX11
 	x11-libs/libXrender"

 RDEPEND="${DEPEND}
+	sudo? ( app-admin/sudo )
 	x11-apps/bdftopcf
 	=trinity-base/kcontrol-${PV}"

 src_configure() {
 	mycmakeargs=(
 		-DWITH_XRENDER=ON
+		-DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)"
 	)

 	trinity-meta-2_src_configure
--- a/trinity-base/kpager/kpager-14.0.6.ebuild
+++ b/trinity-base/kpager/kpager-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,4 +9,3 @@ inherit trinity-meta-2

 DESCRIPTION="Trinity Virtual Desktop Overview"
 KEYWORDS="~amd64 ~x86"
-
--- a/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild
+++ b/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild
+++ b/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,4 +9,3 @@ inherit trinity-meta-2

 DESCRIPTION="A Trinity tool to read KConfig entries - for use in shell scripts"
 KEYWORDS="~amd64 ~x86"
-
--- a/trinity-base/krootbacking/krootbacking-14.0.6.ebuild
+++ b/trinity-base/krootbacking/krootbacking-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/ksmserver/ksmserver-14.0.6.ebuild
+++ b/trinity-base/ksmserver/ksmserver-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,10 +9,9 @@ inherit trinity-meta-2

 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6"
 KEYWORDS="~amd64 ~x86"
-IUSE="upower"
+IUSE="upower +hwlib"

 DEPEND="
-	=dev-libs/dbus-tqt-${PV}
 	upower? ( =dev-libs/dbus-1-tqt-${PV} ) "

 RDEPEND="${DEPEND}
@ -21,6 +20,7 @@ RDEPEND="${DEPEND}
 src_configure() {
 	mycmakeargs=(
 		-DWITH_UPOWER="$(usex upower)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
 	)

 	trinity-meta-2_src_configure
--- a/trinity-base/ksplashml/ksplashml-14.0.6.ebuild
+++ b/trinity-base/ksplashml/ksplashml-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,11 +9,11 @@ inherit trinity-meta-2

 DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individual apps)"
 KEYWORDS="~amd64 ~x86"
+
 IUSE="xinerama"

-DEPEND="x11-libs/libXcursor
-	xinerama? ( x11-base/xorg-proto )"
-RDEPEND="$DEPEND"
+DEPEND="xinerama? ( x11-base/xorg-proto )"
+RDEPEND="${DEPEND}"

 src_configure() {
 	mycmakeargs=(
--- a/trinity-base/kstart/kstart-14.0.6.ebuild
+++ b/trinity-base/kstart/kstart-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/ksysguard/ksysguard-14.0.6.ebuild
+++ b/trinity-base/ksysguard/ksysguard-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,15 +10,15 @@ inherit trinity-meta-2
 DESCRIPTION="A network enabled task manager/system monitor"

 KEYWORDS="~amd64 ~x86"
-IUSE="dell-laptop lm_sensors"
+IUSE="dell-laptop lm-sensors"

-DEPEND="lm_sensors? ( sys-apps/lm-sensors )"
+DEPEND="lm-sensors? ( sys-apps/lm-sensors )"
 RDEPEND="${DEPEND}"

 src_configure() {
 	mycmakeargs=(
 		-DWITH_I8K="$(usex dell-laptop)"
-		-DWITH_SENSORS="$(usex lm_sensors)"
+		-DWITH_SENSORS="$(usex lm-sensors)"
 	)

 	trinity-meta-2_src_configure
--- a/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild
+++ b/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,4 +9,3 @@ inherit trinity-meta-2

 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray."
 KEYWORDS="~amd64 ~x86"
-
--- a/trinity-base/ktip/ktip-14.0.6.ebuild
+++ b/trinity-base/ktip/ktip-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,4 +9,3 @@ inherit trinity-meta-2

 DESCRIPTION="Trinity tip-of-the-day displayer"
 KEYWORDS="~amd64 ~x86"
-
--- a/trinity-base/kxkb/kxkb-14.0.6.ebuild
+++ b/trinity-base/kxkb/kxkb-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/libkonq/libkonq-14.0.6.ebuild
+++ b/trinity-base/libkonq/libkonq-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/nsplugins/nsplugins-14.0.6.ebuild
+++ b/trinity-base/nsplugins/nsplugins-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,6 +9,7 @@ inherit trinity-meta-2

 DESCRIPTION="Netscape plugins support for Konqueror."
 KEYWORDS="~amd64 ~x86"
+
 DEPEND="x11-libs/libXt
 	dev-libs/glib"
 RDEPEND="${DEPEND}"
--- a/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild
+++ b/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild
+++ b/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"

 inherit trinity-functions-2
--- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,6 +9,7 @@ inherit trinity-meta-2

 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts"
 KEYWORDS="~amd64 ~x86"
+
 RDEPEND="x11-apps/xmessage
 	x11-apps/xsetroot
 	x11-apps/xset
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild
+++ b/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdeeject/tdeeject-14.0.6.ebuild
+++ b/trinity-base/tdeeject/tdeeject-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdeinit/tdeinit-14.0.6.ebuild
+++ b/trinity-base/tdeinit/tdeinit-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild
+++ b/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdeprint/tdeprint-14.0.6.ebuild
+++ b/trinity-base/tdeprint/tdeprint-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
+# Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -17,7 +17,6 @@ DEPEND="x11-libs/libXt
 RDEPEND="${DEPEND}"

 src_configure () {
-
 	mycmakeargs=(
 		-DWITH_OPENGL="$(usex opengl)"
 	)
--- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
+++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild
@ -17,7 +17,6 @@ DEPEND="x11-libs/libXt
 RDEPEND="${DEPEND}"

 src_configure () {
-
 	mycmakeargs=(
 		-DWITH_OPENGL="$(usex opengl)"
 	)
--- a/trinity-base/tdm/tdm-14.0.6.ebuild
+++ b/trinity-base/tdm/tdm-14.0.6.ebuild
@ -1,6 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@ -16,6 +16,7 @@ DEPEND="pam? ( trinity-base/tdebase-pam )
 	xcomposite? ( x11-libs/libXcomposite )
 	svg? ( =media-libs/libart_lgpl-${PV} )
 	=trinity-base/tdelibs-${PV}[xrandr?]
+	sys-apps/dbus
 	x11-libs/libXtst
 	=trinity-base/kcontrol-${PV}"

--- a/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild
+++ b/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -9,4 +9,3 @@ inherit trinity-meta-2

 DESCRIPTION="Makes TQt-only apps use several TDE dialogs."
 KEYWORDS="~amd64 ~x86"
-
--- a/trinity-base/twin/twin-14.0.6.ebuild
+++ b/trinity-base/twin/twin-14.0.6.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Copyright 2020 The Trinity Desktop Project
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
+
 EAPI="7"
 TRINITY_MODULE_NAME="tdebase"

@ -27,6 +27,7 @@ src_configure() {
 		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 		-DWITH_XFIXES="$(usex xcomposite)"
 		-DWITH_XRENDER="$(usex xcomposite)"
+		-DWITH_OPENGL="$(usex opengl)"
 		-DWITH_XRANDR="$(usex xrandr)"
 		-DWITH_LIBCONFIG="$(usex libconfig)"
 		-DWITH_PCRE="$(usex pcre)"