Clean up and fix TDE Gentoo overlay.

- Remove old v3.5.13 ebuilds and eclasses
- Change repo URL to official TGW
- Remove old HAL and traces (TDEHW is used now)
- Make split between TDE applications and tdebase consistent
- Move TQt into own category (for users filtering dev-qt/ out)
- Change to new TQTDIR var
- Move away from virtual/pam dependency
- Change to use new xorg-proto dependency
- Some cosmetic fixes and removal of unneeded files
- Remove some now obsolete patches
- Change to clean 9999 naming scheme for anything
- Add some potential workaround for newer portage versions
- Add own README

... thanks to Aggi from IRC for some fixes too.

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

9 files changed, 0 insertions, 420 deletions

diff --git a/trinity-base/kdebase-starttde/Manifest b/trinity-base/kdebase-starttde/Manifest
deleted file mode 100644
index 381340c4..00000000
--- a/trinity-base/kdebase-starttde/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST kdebase-3.5.13.1.tar.gz 29403228 SHA256 ddd4bd4b508ad027b9d1af2701c6ba64bfc9f8f1d32099e6dd5e7866714f759e SHA512 e1aac19c941a5f2b43a57928fdb43e5ebd646f49c60911d9d317550df96642870792c4e77ecd06e123244e2425ccd4bcb00f0a21011ba7e651d7fcf4553e79cf WHIRLPOOL 931debbf6a65c280221025dcbc02cbb3387b66eb72eddd28a510ee8f97075cd2cc96535dde25d0a32280c399e4a868e9c027772f5d28e7e79b7c1a9080c58034
-DIST kdebase-trinity-3.5.13.2.tar.xz 25890636 SHA256 b9d552226daff64437dfb9699669b95dd7ebc2ca7c43755ba71c10cc6c9ed789 SHA512 df545d44c7d4550d1d77ff6504572b622853c2b8d80062b1aee1a5bdca19f0e708cde35cff54cf2d5098f06a41bde0c89522a3958dea9bb18205dea87c11b797 WHIRLPOOL 79144273bc7985c59a593a3394b12a2053532d2c4c890ce96adad21f6de0413baf3c6270d6d06173ec4546b20d401aa0cc81603d01b8ee41dbdefc825b39b2b1
diff --git a/trinity-base/kdebase-starttde/files/agent-shutdown.sh b/trinity-base/kdebase-starttde/files/agent-shutdown.sh
deleted file mode 100644
index 07cf7477..00000000
--- a/trinity-base/kdebase-starttde/files/agent-shutdown.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# This file is executed at kde shutdown.
-# Uncomment the following lines to kill the agents
-# that were started at session startup.
-
-#if [ -n "${GPG_AGENT_INFO}" ]; then
-#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
-#fi
-
-#if [ -n "${SSH_AGENT_PID}" ]; then
-#  eval "$(ssh-agent -s -k)"
-#fi
diff --git a/trinity-base/kdebase-starttde/files/agent-startup.sh b/trinity-base/kdebase-starttde/files/agent-startup.sh
deleted file mode 100644
index e97c7b65..00000000
--- a/trinity-base/kdebase-starttde/files/agent-startup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Agents startup file
-#
-# This file is sourced at trinity startup, so that
-# the environment variables set here are available
-# throughout the session.
-
-# Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at kde startup.
-# If you do so, do not forget to uncomment the respective
-# lines in TDEDIR/shutdown/agent-shutdown.sh to
-# properly kill the agents when the session ends.
-
-#if [ -x /usr/bin/gpg-agent ]; then
-#  eval "$(/usr/bin/gpg-agent --daemon)"
-#fi 
-
-#if [ -x /usr/bin/ssh-agent ]; then
-#  eval "$(/usr/bin/ssh-agent -s)"
-#fi
-
-# Uncomment the following lines to start rxvt-unicode which has the ability to
-# run multiple terminals in one single process, thus starting up faster and 
-# saving resources.
-# The --opendisplay ensures that the daemon quits when the X server terminates,
-# therefore we don't need matching lines in agent-shutdown.sh.
-
-#if [ -x /usr/bin/urxvtd ]; then
-#	/usr/bin/urxvtd --opendisplay --fork --quiet
-#fi
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch
deleted file mode 100644
index 9f84aa30..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.1-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- startkde	2012-12-08 19:03:57.264176845 +0400
-+++ startkde.gentoo	2012-12-08 19:42:37.448228534 +0400
-@@ -45,6 +45,16 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
- 
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/trinity/[^/]*/share/\?:##g;s/:$//g')
-+unset _KDEDIR
-+# Gentoo part ends
-+
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
-   echo "[startkde] TDE seems to be already running on this display."
-@@ -52,6 +62,20 @@
-   exit 1
- fi
- 
-+# Gentoo part:
-+# Scrapped old TDE-x -> TDE-y update code, but keep symlink code
-+pushd ${HOME}
-+if [ -L .trinity -o ! -e .trinity ]; then
-+	# handle ~/.trinity* dirs - separate ones for separate trinity instances
-+	rm -f .trinity
-+	if [ ! -e .trinity-3.5 ]; then
-+		mkdir .trinity-3.5
-+	fi
-+	ln -sf .trinity-3.5 .trinity
-+fi
-+popd
-+# Gentoo part ends
-+
- # Set the background color.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard TDE palette for those with
-@@ -435,6 +459,13 @@
-   done
- done
- 
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+  for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+    test -x "$file" && . "$file"
-+  done
-+fi
-+
- # Activate the TDE font directories.
- #
- # There are 4 directories that may be used for supplying fonts for TDE.
-@@ -688,7 +719,7 @@
- # Clean up
- $KDEDIR/bin/kdeinit_shutdown
- $KDEDIR/bin/dcopserver_shutdown --wait
--$KDEDIR/bin/artsshell -q terminate
-+[ -x ${KDEDIR}/bin/artsshell ] && $KDEDIR/bin/artsshell -q terminate
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
-   /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch
deleted file mode 100644
index 9f84aa30..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-3.5.13.2-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- startkde	2012-12-08 19:03:57.264176845 +0400
-+++ startkde.gentoo	2012-12-08 19:42:37.448228534 +0400
-@@ -45,6 +45,16 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
- 
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/trinity/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/trinity/[^/]*/share/\?:##g;s/:$//g')
-+unset _KDEDIR
-+# Gentoo part ends
-+
- # Check if a TDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
-   echo "[startkde] TDE seems to be already running on this display."
-@@ -52,6 +62,20 @@
-   exit 1
- fi
- 
-+# Gentoo part:
-+# Scrapped old TDE-x -> TDE-y update code, but keep symlink code
-+pushd ${HOME}
-+if [ -L .trinity -o ! -e .trinity ]; then
-+	# handle ~/.trinity* dirs - separate ones for separate trinity instances
-+	rm -f .trinity
-+	if [ ! -e .trinity-3.5 ]; then
-+		mkdir .trinity-3.5
-+	fi
-+	ln -sf .trinity-3.5 .trinity
-+fi
-+popd
-+# Gentoo part ends
-+
- # Set the background color.
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard TDE palette for those with
-@@ -435,6 +459,13 @@
-   done
- done
- 
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+  for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+    test -x "$file" && . "$file"
-+  done
-+fi
-+
- # Activate the TDE font directories.
- #
- # There are 4 directories that may be used for supplying fonts for TDE.
-@@ -688,7 +719,7 @@
- # Clean up
- $KDEDIR/bin/kdeinit_shutdown
- $KDEDIR/bin/dcopserver_shutdown --wait
--$KDEDIR/bin/artsshell -q terminate
-+[ -x ${KDEDIR}/bin/artsshell ] && $KDEDIR/bin/artsshell -q terminate
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
-   /usr/bin/kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch b/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch
deleted file mode 100644
index 0d37eab5..00000000
--- a/trinity-base/kdebase-starttde/files/kdebase-startkde-trinity-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- startkde.orig	2011-09-19 14:54:22.812972431 +0400
-+++ startkde	2011-09-19 15:02:54.050401619 +0400
-@@ -9,6 +9,15 @@
- # because we still need to do some cleanup.
- trap '[startkde] echo GOT SIGHUP' HUP
- 
-+# Gentoo: setup environment, filter other slotted KDE installs from PATH
-+_KDEDIR=@REPLACE_PREFIX@
-+#export KDEDIRS=${_KDEDIR}:/usr:/usr/local
-+export PATH=${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export ROOTPATH=${_KDEDIR}/sbin:${_KDEDIR}/bin:$(echo ${PATH} | sed 's/$/:/g;s#/usr/kde/[^/]*/s\?bin/\?:##g;s/:$//g')
-+export LDPATH=@REPLACE_LIBS@:${LDPATH}
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#/usr/kde/[^/]*/share/\?:##g;s/:$//g')
-+# Gentoo part ends
-+
- # Check if a KDE session is already running.
- if kcheckrunning >/dev/null 2>&1; then
- 	echo "[startkde] KDE seems to be already running on this display."
-@@ -340,6 +349,13 @@
-   done
- done
- 
-+# Source scripts in /etc/X11/xinit/xinitrc.d/ for system-level defined stuff
-+if test -d "/etc/X11/xinit/xinitrc.d/"; then
-+  for file in "/etc/X11/xinit/xinitrc.d/"*; do
-+    test -x "$file" && . "$file"
-+  done
-+fi
-+
- # Activate the kde font directories.
- #
- # There are 4 directories that may be used for supplying fonts for KDE.
-@@ -593,7 +609,12 @@
- # Clean up
- kdeinit_shutdown
- dcopserver_shutdown --wait
--artsshell -q terminate
-+
-+# Terminate artsshell if it exists
-+if [ -e ${_KDEDIR}/bin/artsshell ] ; then 
-+	artsshell -q terminate ; 
-+fi
-+
- # KDE4 support
- if [ -f /usr/bin/kdeinit4_shutdown ]; then
-   kde4 kdeinit4_shutdown 2>/dev/null
diff --git a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild b/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild
deleted file mode 100644
index 2a14b29c..00000000
--- a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdebase"
-
-inherit trinity-meta
-
-DESCRIPTION="starttde script, which starts a complete Trinity session, and associated scripts"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-RDEPEND="x11-apps/xmessage
-	x11-apps/xsetroot
-	x11-apps/xset
-	x11-apps/xrandr
-	x11-apps/mkfontdir
-	x11-apps/xprop
-	>=trinity-base/kdesktop-${PV}:${SLOT}
-	>=trinity-base/kcminit-${PV}:${SLOT}
-	>=trinity-base/ksmserver-${PV}:${SLOT}
-	>=trinity-base/kwin-${PV}:${SLOT}
-	>=trinity-base/kpersonalizer-${PV}:${SLOT}
-	>=trinity-base/kreadconfig-${PV}:${SLOT}
-	>=trinity-base/ksplashml-${PV}:${SLOT}"
-
-TSM_EXTRACT="startkde README.pam INSTALL AUTHORS COPYING COPYING-DOCS kdm"
-
-src_prepare() {
-	epatch "${FILESDIR}/kdebase-startkde-${PV}-gentoo.patch"
-
-	trinity-base_src_prepare
-}
-
-src_configure() {
-	echo -n "";
-}
-
-src_compile() {
-	# Patch the starttde script to setup the environment for KDE 4.0
-	# Add our TDEDIR
-	sed -e "s#@REPLACE_PREFIX@#${TDEDIR}#" \
-		"${S}/startkde" >"${S}/starttde" || die "Sed for PREFIX failed."
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	# Complete LDPATH
-	sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
-		"${S}/starttde" || die "Sed for LDPATH failed."
-}
-
-src_install() {
-	# starttde script
-	exeinto "${TDEDIR}/bin"
-	doexe starttde
-
-	# startup and shutdown scripts
-	exeinto "${TDEDIR}/env"
-	doexe "${FILESDIR}/agent-startup.sh"
-
-	exeinto "${TDEDIR}/shutdown"
-	doexe "${FILESDIR}/agent-shutdown.sh"
-
-	# freedesktop environment variables
-	cat <<EOF > "${T}/xdg.sh"
-export XDG_CONFIG_DIRS="${TDEDIR}/etc/xdg"
-EOF
-	exeinto "${TDEDIR}/env"
-	doexe "${T}/xdg.sh"
-
-	# x11 session script
-	cat <<EOF > "${T}/tde-${SLOT}"
-#!/bin/sh
-exec ${TDEDIR}/bin/starttde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe "${T}/tde-${SLOT}" # FIXME: change script branding to trinity
-
-	# (not really) freedesktop compliant session script
-	sed -e "s:@TDE_BINDIR@:${TDEDIR}/bin:g;s:Name=Trinity:Name=Trinity ${SLOT}:" \
-	    -e "s/startkde/starttde/" \
-		"${S}/kdm/kfrontend/sessions/tde.desktop.in" > "${T}/tde-${SLOT}.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/tde-${SLOT}.desktop"
-}
-
-pkg_postinst () {
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Trinity sessions,"
-	elog "edit ${TDEDIR}/env/agent-startup.sh and"
-	elog "${TDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild b/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild
deleted file mode 100644
index 2a66ee3a..00000000
--- a/trinity-base/kdebase-starttde/kdebase-starttde-3.5.13.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-TRINITY_MODULE_NAME="kdebase"
-
-inherit trinity-meta
-
-DESCRIPTION="starttde script, which starts a complete Trinity session, and associated scripts"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-apps/xmessage
-	x11-apps/xsetroot
-	x11-apps/xset
-	x11-apps/xrandr
-	x11-apps/mkfontdir
-	x11-apps/xprop
-	>=trinity-base/kdesktop-${PV}:${SLOT}
-	>=trinity-base/kcminit-${PV}:${SLOT}
-	>=trinity-base/ksmserver-${PV}:${SLOT}
-	>=trinity-base/kwin-${PV}:${SLOT}
-	>=trinity-base/kpersonalizer-${PV}:${SLOT}
-	>=trinity-base/kreadconfig-${PV}:${SLOT}
-	>=trinity-base/ksplashml-${PV}:${SLOT}"
-
-TSM_EXTRACT="startkde README.pam INSTALL AUTHORS COPYING COPYING-DOCS kdm"
-
-src_prepare() {
-	epatch "${FILESDIR}/kdebase-startkde-${PV}-gentoo.patch"
-
-	trinity-base_src_prepare
-}
-
-src_configure() {
-	echo -n "";
-}
-
-src_compile() {
-	# Patch the starttde script to setup the environment for KDE 4.0
-	# Add our TDEDIR
-	sed -e "s#@REPLACE_PREFIX@#${TDEDIR}#" \
-		"${S}/startkde" >"${S}/starttde" || die "Sed for PREFIX failed."
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	# Complete LDPATH
-	sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \
-		"${S}/starttde" || die "Sed for LDPATH failed."
-}
-
-src_install() {
-	# starttde script
-	exeinto "${TDEDIR}/bin"
-	doexe starttde
-
-	# startup and shutdown scripts
-	exeinto "${TDEDIR}/env"
-	doexe "${FILESDIR}/agent-startup.sh"
-
-	exeinto "${TDEDIR}/shutdown"
-	doexe "${FILESDIR}/agent-shutdown.sh"
-
-	# freedesktop environment variables
-	cat <<EOF > "${T}/xdg.sh"
-export XDG_CONFIG_DIRS="${TDEDIR}/etc/xdg"
-EOF
-	exeinto "${TDEDIR}/env"
-	doexe "${T}/xdg.sh"
-
-	# x11 session script
-	cat <<EOF > "${T}/tde-${SLOT}"
-#!/bin/sh
-exec ${TDEDIR}/bin/starttde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe "${T}/tde-${SLOT}" # FIXME: change script branding to trinity
-
-	# (not really) freedesktop compliant session script
-	sed -e "s:@TDE_BINDIR@:${TDEDIR}/bin:g;s:Name=Trinity:Name=Trinity ${SLOT}:" \
-	    -e "s/startkde/starttde/" \
-		"${S}/kdm/kfrontend/sessions/tde.desktop.in" > "${T}/tde-${SLOT}.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/tde-${SLOT}.desktop"
-}
-
-pkg_postinst () {
-	echo
-	elog "To enable gpg-agent and/or ssh-agent in Trinity sessions,"
-	elog "edit ${TDEDIR}/env/agent-startup.sh and"
-	elog "${TDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/trinity-base/kdebase-starttde/metadata.xml b/trinity-base/kdebase-starttde/metadata.xml
deleted file mode 100644
index 6e9f5e4a..00000000
--- a/trinity-base/kdebase-starttde/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fatzer2@gmail.com</email>
-		<name>Alexander Golubev</name>
-	</maintainer>
-</pkgmetadata>