Live ebuilds: More overlay cleanup.

- Remove superflous files folders.
- Fix wrong or bad variables.
- Remove superfluous dependencies.
- Mainstream hwlib flag for all ebuilds.
- Fix wrong WITH_XCURSOR flag (typo?).
- Fix wrong WITH_XTEST flag (typo?).

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

79 files changed, 17 insertions, 82 deletions

diff --git a/trinity-base/amor/files/shared b/trinity-base/amor/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/amor/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/ark/files/shared b/trinity-base/ark/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/ark/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/drkonqi/files/shared b/trinity-base/drkonqi/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/drkonqi/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/eyesapplet/files/shared b/trinity-base/eyesapplet/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/eyesapplet/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/fifteenapplet/files/shared b/trinity-base/fifteenapplet/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/fifteenapplet/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kamera/kamera-9999.ebuild b/trinity-base/kamera/kamera-9999.ebuild
index c4ee27ed..d054fe36 100644
--- a/trinity-base/kamera/kamera-9999.ebuild
+++ b/trinity-base/kamera/kamera-9999.ebuild
@@ -10,4 +10,4 @@ inherit trinity-meta-2
 DESCRIPTION="Trinity digital camera manager"
 
 DEPEND="media-libs/libgphoto2"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
diff --git a/trinity-base/kappfinder/files/shared b/trinity-base/kappfinder/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kappfinder/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kate/files/shared b/trinity-base/kate/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kate/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kcalc/files/shared b/trinity-base/kcalc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kcalc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kcharselect/files/shared b/trinity-base/kcharselect/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kcharselect/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kcheckpass/files/shared b/trinity-base/kcheckpass/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kcheckpass/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kcontrol/files/shared b/trinity-base/kcontrol/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kcontrol/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kdcop/files/shared b/trinity-base/kdcop/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kdcop/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kdesktop/files/shared b/trinity-base/kdesktop/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kdesktop/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild
index 95eb8970..e9c2e17c 100644
--- a/trinity-base/kdesktop/kdesktop-9999.ebuild
+++ b/trinity-base/kdesktop/kdesktop-9999.ebuild
@@ -30,7 +30,7 @@ TSM_EXTRACT_ALSO="kcheckpass/"
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_XCURSORS=ON
+		-DWITH_XCURSOR=ON
 		-DWITH_XRENDER=ON
 		-DWITH_PAM="$(usex pam)"
 		-DWITH_XSCREENSAVER="$(usex xscreensaver)"
diff --git a/trinity-base/kdf/files/shared b/trinity-base/kdf/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kdf/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kdialog/files/shared b/trinity-base/kdialog/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kdialog/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kdvi/kdvi-9999.ebuild b/trinity-base/kdvi/kdvi-9999.ebuild
index 9bc32669..e1a2bc14 100644
--- a/trinity-base/kdvi/kdvi-9999.ebuild
+++ b/trinity-base/kdvi/kdvi-9999.ebuild
@@ -11,6 +11,6 @@ DESCRIPTION="Trinity DVI viewer"
 
 DEPEND="media-libs/freetype
 	=trinity-base/kviewshell-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 TSM_EXTRACT_ALSO="kviewshell"
diff --git a/trinity-base/kedit/files/shared b/trinity-base/kedit/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kedit/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kfind/files/shared b/trinity-base/kfind/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kfind/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kfloppy/files/shared b/trinity-base/kfloppy/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kfloppy/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kgpg/files/shared b/trinity-base/kgpg/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kgpg/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/khelpcenter/files/shared b/trinity-base/khelpcenter/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/khelpcenter/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/khexedit/files/shared b/trinity-base/khexedit/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/khexedit/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/khotkeys/files/shared b/trinity-base/khotkeys/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/khotkeys/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild
index a85d0651..e270d7e3 100644
--- a/trinity-base/khotkeys/khotkeys-9999.ebuild
+++ b/trinity-base/khotkeys/khotkeys-9999.ebuild
@@ -16,7 +16,7 @@ RDEPEND+=" x11-libs/libXtst"
 
 src_configure() {
 	mycmakeargs=(
-		-D_WITH_XTEST=ON
+		-DWITH_XTEST=ON
 	)
 
 	trinity-meta-2_src_configure
diff --git a/trinity-base/kicker/files/shared b/trinity-base/kicker/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kicker/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild
index 3a9fa0e1..0ca02e29 100644
--- a/trinity-base/kicker/kicker-9999.ebuild
+++ b/trinity-base/kicker/kicker-9999.ebuild
@@ -24,7 +24,7 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_XFIXES="$(usex xcomposite)"
 		-DWITH_XRENDER="$(usex xcomposite)"
-		-DWITH_XCOMPOSITE="$(usex xcomposite)"		
+		-DWITH_XCOMPOSITE="$(usex xcomposite)"
 	)
 
 	trinity-meta-2_src_configure
diff --git a/trinity-base/kjots/files/shared b/trinity-base/kjots/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kjots/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/klaptopdaemon/files/shared b/trinity-base/klaptopdaemon/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/klaptopdaemon/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/klipper/files/shared b/trinity-base/klipper/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/klipper/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/klipper/klipper-9999.ebuild b/trinity-base/klipper/klipper-9999.ebuild
index 669b4fa5..6ad87176 100644
--- a/trinity-base/klipper/klipper-9999.ebuild
+++ b/trinity-base/klipper/klipper-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 DESCRIPTION="kicker applet for Trinity and X clipboard management"
 
 DEPEND="x11-libs/libXfixes"
-RDEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kmenuedit/files/shared b/trinity-base/kmenuedit/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kmenuedit/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kmilo/files/shared b/trinity-base/kmilo/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kmilo/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kmoon/files/shared b/trinity-base/kmoon/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kmoon/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/knetattach/files/shared b/trinity-base/knetattach/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/knetattach/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kodo/files/shared b/trinity-base/kodo/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kodo/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/konqueror/files/shared b/trinity-base/konqueror/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/konqueror/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/konsole/files/shared b/trinity-base/konsole/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/konsole/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/korganizer/korganizer-9999.ebuild b/trinity-base/korganizer/korganizer-9999.ebuild
index 04736fdc..d5259b69 100644
--- a/trinity-base/korganizer/korganizer-9999.ebuild
+++ b/trinity-base/korganizer/korganizer-9999.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	=trinity-base/libkpimidentities-${PV}
 	=trinity-base/kaddressbook-${PV}
 	exchange? ( =trinity-base/libkpimexchange-${PV} )"
-#	>=trinity-base/tdepim-tderesources-${PV}:${SLOT}
+#	=trinity-base/tdepim-tderesources-${PV}:${SLOT}
 
 DEPEND+=" ${COMMON_DEPEND}"
 RDEPEND+=" ${COMMON_DEPEND}"
diff --git a/trinity-base/kpager/files/shared b/trinity-base/kpager/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kpager/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kpersonalizer/files/shared b/trinity-base/kpersonalizer/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kpersonalizer/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kreadconfig/files/shared b/trinity-base/kreadconfig/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kreadconfig/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kregexpeditor/files/shared b/trinity-base/kregexpeditor/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kregexpeditor/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/krootbacking/files/shared b/trinity-base/krootbacking/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/krootbacking/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ksmserver/files/shared b/trinity-base/ksmserver/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/ksmserver/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ksplashml/files/shared b/trinity-base/ksplashml/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/ksplashml/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild
index 9aa49363..b5e0bd41 100644
--- a/trinity-base/ksplashml/ksplashml-9999.ebuild
+++ b/trinity-base/ksplashml/ksplashml-9999.ebuild
@@ -11,9 +11,8 @@ DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individua
 
 IUSE="xinerama"
 
-DEPEND="x11-libs/libXcursor
-	xinerama? ( x11-base/xorg-proto )"
-RDEPEND="$DEPEND"
+DEPEND="xinerama? ( x11-base/xorg-proto )"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
diff --git a/trinity-base/kstart/files/shared b/trinity-base/kstart/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kstart/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ksysguard/files/shared b/trinity-base/ksysguard/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/ksysguard/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ksystraycmd/files/shared b/trinity-base/ksystraycmd/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/ksystraycmd/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/kteatime/files/shared b/trinity-base/kteatime/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kteatime/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/ktimer/files/shared b/trinity-base/ktimer/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/ktimer/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/ktip/files/shared b/trinity-base/ktip/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/ktip/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/ktux/files/shared b/trinity-base/ktux/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/ktux/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kweather/files/shared b/trinity-base/kweather/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kweather/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kworldclock/files/shared b/trinity-base/kworldclock/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/kworldclock/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/kxkb/files/shared b/trinity-base/kxkb/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/kxkb/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/libkonq/files/shared b/trinity-base/libkonq/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/libkonq/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/nsplugins/files/shared b/trinity-base/nsplugins/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/nsplugins/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/superkaramba/files/shared b/trinity-base/superkaramba/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/superkaramba/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
index 7f36891b..48311f3a 100644
--- a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
+++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-deri
 HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-SLOT="$TRINITY_VER"
+SLOT="${TRINITY_VER}"
 
 RDEPEND="
 	=trinity-base/tdeartwork-emoticons-${PV}
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 cef42fdd..e016f425 100644
--- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
+++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild
@@ -9,4 +9,4 @@ inherit trinity-meta-2
 DESCRIPTION="Window styles for Trinity"
 
 DEPEND="=trinity-base/twin-${PV}"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdebase-data/files/shared b/trinity-base/tdebase-data/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdebase-data/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
index 5e125dac..aabdcc80 100644
--- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
+++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild
@@ -38,7 +38,7 @@ src_compile() {
 	# List all the multilib libdirs
 	local _libdir _libdirs
 	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+		_libdirs="${_libdirs}:${TDEDIR}/${_libdir}"
 	done
 	_libdirs=${_libdirs#:}
 }
diff --git a/trinity-base/tdebase-tdeioslaves/files/shared b/trinity-base/tdebase-tdeioslaves/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdebase-tdeioslaves/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
index 88bfc776..b9f030b0 100644
--- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
+++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild
@@ -10,7 +10,7 @@ inherit trinity-meta-2
 TSM_EXTRACT="tdeioslave"
 
 DESCRIPTION="Generic Trinity TDEIOslaves"
-IUSE="samba ldap sasl openexr +tdehw"
+IUSE="samba ldap sasl openexr +hwlib"
 
 DEPEND="x11-libs/libXcursor
 	net-libs/rpcsvc-proto
@@ -30,7 +30,7 @@ src_configure() {
 		-DWITH_LDAP="$(usex ldap)"
 		-DWITH_SASL="$(usex sasl)"
 		-DWITH_OPENEXR="$(usex openexr)"
-		-DWITH_TDEHWLIB="$(usex tdehw)"
+		-DWITH_TDEHWLIB="$(usex hwlib)"
 	)
 
 	trinity-meta-2_src_configure
diff --git a/trinity-base/tdeinit/files/shared b/trinity-base/tdeinit/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdeinit/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdenetwork-doc/files/shared b/trinity-base/tdenetwork-doc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/tdenetwork-doc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
index 7cf8a105..01c8176d 100644
--- a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
+++ b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="tdenetwork metapackage - merge this to pull in all tdenetwork-deriv
 HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-SLOT="$TRINITY_VER"
+SLOT="{$TRINITY_VER}"
 
 RDEPEND="
 	=trinity-base/dcoprss-${PV}
diff --git a/trinity-base/tdepasswd/files/shared b/trinity-base/tdepasswd/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdepasswd/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdeprint/files/shared b/trinity-base/tdeprint/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdeprint/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdesu/files/shared b/trinity-base/tdesu/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tdesu/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/tdetoys-doc/files/shared b/trinity-base/tdetoys-doc/files/shared
deleted file mode 120000
index af62be31..00000000
--- a/trinity-base/tdetoys-doc/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files/
\ No newline at end of file
diff --git a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
index 037ec903..e1c690cf 100644
--- a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
+++ b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="tdetoys metapackage - merge this to pull in all tdetoys-derived pac
 HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-SLOT="$TRINITY_VER"
+SLOT="${TRINITY_VER}"
 
 RDEPEND="
 	>=trinity-base/amor-${PV}
diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
index 18efe220..ecbe3f43 100644
--- a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
+++ b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="tdeutils metapackage - merge this to pull in all tdeutils-derived p
 HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="|| ( GPL-2 GPL-3 )"
 
-SLOT="$TRINITY_VER"
+SLOT="${TRINITY_VER}"
 
 RDEPEND="
 	=trinity-base/ark-${PV}
diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild
index 2c17974c..023fcb74 100644
--- a/trinity-base/tdm/tdm-9999.ebuild
+++ b/trinity-base/tdm/tdm-9999.ebuild
@@ -16,7 +16,6 @@ DEPEND="pam? ( trinity-base/tdebase-pam )
 	xcomposite? ( x11-libs/libXcomposite )
 	xrandr? ( x11-libs/libXrandr )
 	=trinity-base/tdelibs-${PV}[xrandr?]
-	sys-apps/dbus
 	x11-libs/libXtst
 	=trinity-base/kcontrol-${PV}
 	=dev-libs/dbus-tqt-${PV}"
diff --git a/trinity-base/tqt3integration/files/shared b/trinity-base/tqt3integration/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/tqt3integration/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file
diff --git a/trinity-base/twin/files/shared b/trinity-base/twin/files/shared
deleted file mode 120000
index ffc28680..00000000
--- a/trinity-base/twin/files/shared
+++ /dev/null
@@ -1 +0,0 @@
-../../../eclass/trinity-shared-files
\ No newline at end of file