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>

17 files changed, 86 insertions, 452 deletions

diff --git a/Documentation/README b/Documentation/README
index 27e94fd6..fd561992 100644
--- a/Documentation/README
+++ b/Documentation/README
@@ -1,17 +1,19 @@
-This is a trinity Gentoo overlay.
-Please don't report bugs to Gentoo bugzilla. 
-If you want to report a bug feel free to email me at fatzer2@gmail.com. I'm able to read and write in Russian and English.
-Overlay will be filled with ebuilds of ported to cmake programs from the Trinity Project. 
-If you are interested in ebuilds for some packages that are not in the overlay, you can email me too.
+This is now the official trinity Gentoo overlay from the TDE team.
 
-Live ebuilds aren't tested at all, but you still can try to build them on your own risk.
+Currently it only supports the latest master branch, which means live version, which is R14.1.x as of writing, which some TDE team members are using in private life too, so it should be not perfect, but stable for the most part and also Gentoo users are very invited to test and reports bugs to TGW and so to be some part of TDE. This choice is also made because of realism that otherwise the maintaince burden would be most likely too hard for this overlay. So it is better to support one version, but that good instead of mutiple versions which are more likely to broke here and there.
 
-In order to properly use this overlay, you have to unmask the qt3 USE flag and packages. 
-To do so, execute the following commands as root:
+But there are also efforts to support the stable branch of TDE (R14.0.x - R14.0.7 as of writing), if someone is willing to help with that. The support of v3.5.x was removed completely with the clean up progress, because it is too old now.
 
-# mkdir -p /etc/portage/profile
-# echo -qt3 >> /etc/portage/profile/use.mask
-# mkdir -p /etc/portage/packages.keywords/
-# cp /var/lib/layman/trinity /etc/portage/packages.keywords/
+This overlay is largely based on the very good and hard work of Fat-Zer (fatzer2@gmail.com) who created and maintained this overlay many years, to a time when Gentoo users had no other choice, because Gentoo devs don't wanted to support TDE (which they resist to do so still) and TDE had no official overlay for Gentoo users. It also tries to be some central place, in which all goods of other floating around TDE overlays should be centralized. So everyone is welcome to contribute to it, just with creating some PR in TGW.
 
-NOTE: hal compilation is now broken. If you know how to fix it, write me an email.
+Please don't report bugs to Gentoo bugzilla or Fat-Zer and instead of this, report issues to the tde-packages-gentoo repo at TGW.
+
+The overlay will be filled with ebuilds of ported to CMake programs from the Trinity Project mainly and that is the goal, but while CMake conversion is still in work and will be for some time, it will most likely offer also ebuilds of TDE applications not already converted to CMake and using autotools instead.
+
+Another goal is to offer also custom versions of specific libraries like libsdl or xine-lib, with added support for TDE and aRts, for example, which is deactivated from the official Gentoo ebuilds or preserve ebuilds related to TDE and/or TQt, which were removed from Portage. So the hope is, we can get the good old user experience of a KDE3 (now TDE) based Gentoo system back and get back control, like it was until 2008.
+
+While the goal is that this overlay works out the box without any problems, there can't be any guarantee for that and you might expect some problems from time to time, if there are Gentoo or TDE specific changes, for example. If so, you are free to open some issue in TGW to the tde-packaging-gentoo repo about that and maybe the problem can be fixed in some time.
+
+If you are interested in ebuilds for some packages that are not in the overlay or you have any fixes, you can create some PR in TGW and if your work is good, the ebuilds can be added. Also *any* help, from every Gentoo user loving TDE will be highly appreciated. You can also join the TDE IRC channel to get in touch with Chris, if you need any further help or want to help out with this overlay.
+
+Some guideline for this overlay is: Freedom of choice for everything. There should be in no case any forced or hardcoded USE flags, to build in any optional support some Gentoo users don't want to have or want on their systems. All building options TDE is offering, should be reflected in this overlay.
\ No newline at end of file
diff --git a/Documentation/derived-lists/kdeartwork-3.5.13.1 b/Documentation/derived-lists/kdeartwork-3.5.13.1
deleted file mode 100644
index 94dd7375..00000000
--- a/Documentation/derived-lists/kdeartwork-3.5.13.1
+++ /dev/null
@@ -1,9 +0,0 @@
-trinity-base/kdeartwork-emoticons
-trinity-base/kdeartwork-icon-themes
-trinity-base/kdeartwork-icewm-themes
-trinity-base/kdeartwork-kscreensaver
-trinity-base/kdeartwork-kwin-styles
-trinity-base/kdeartwork-kworldclock
-trinity-base/kdeartwork-sounds
-trinity-base/kdeartwork-styles
-trinity-base/kdeartwork-wallpapers
diff --git a/Documentation/derived-lists/kdebase-3.5.13.1 b/Documentation/derived-lists/kdebase-3.5.13.1
deleted file mode 100644
index 9b15eb26..00000000
--- a/Documentation/derived-lists/kdebase-3.5.13.1
+++ /dev/null
@@ -1,42 +0,0 @@
-trinity-base/kdebase-starttde
-trinity-base/drkonqi
-trinity-base/kappfinder
-trinity-base/kate
-trinity-base/kcheckpass
-trinity-base/kcminit
-trinity-base/kcontrol
-trinity-base/kdcop
-trinity-base/kdebugdialog
-trinity-base/kdepasswd
-trinity-base/kdeprint
-trinity-base/kdesktop
-trinity-base/kdesu
-trinity-base/kdialog
-trinity-base/kdm
-trinity-base/kfind
-trinity-base/khelpcenter
-trinity-base/khotkeys
-trinity-base/kicker
-trinity-base/kdebase-kioslaves
-trinity-base/klipper
-trinity-base/kmenuedit
-trinity-base/konqueror
-trinity-base/konsole
-trinity-base/kpager
-trinity-base/kpersonalizer
-trinity-base/kreadconfig
-trinity-base/kscreensaver
-trinity-base/ksmserver
-trinity-base/ksplashml
-trinity-base/kstart
-trinity-base/ksysguard
-trinity-base/ksystraycmd
-trinity-base/ktip
-trinity-base/kwin
-trinity-base/kxkb
-trinity-base/libkonq
-trinity-base/nsplugins
-trinity-base/knetattach
-trinity-base/kdebase-data
-trinity-base/krootbacking
-trinity-base/tqt3integration
diff --git a/Documentation/derived-lists/kdebase-3.5.13.2 b/Documentation/derived-lists/kdebase-3.5.13.2
deleted file mode 100644
index 9b15eb26..00000000
--- a/Documentation/derived-lists/kdebase-3.5.13.2
+++ /dev/null
@@ -1,42 +0,0 @@
-trinity-base/kdebase-starttde
-trinity-base/drkonqi
-trinity-base/kappfinder
-trinity-base/kate
-trinity-base/kcheckpass
-trinity-base/kcminit
-trinity-base/kcontrol
-trinity-base/kdcop
-trinity-base/kdebugdialog
-trinity-base/kdepasswd
-trinity-base/kdeprint
-trinity-base/kdesktop
-trinity-base/kdesu
-trinity-base/kdialog
-trinity-base/kdm
-trinity-base/kfind
-trinity-base/khelpcenter
-trinity-base/khotkeys
-trinity-base/kicker
-trinity-base/kdebase-kioslaves
-trinity-base/klipper
-trinity-base/kmenuedit
-trinity-base/konqueror
-trinity-base/konsole
-trinity-base/kpager
-trinity-base/kpersonalizer
-trinity-base/kreadconfig
-trinity-base/kscreensaver
-trinity-base/ksmserver
-trinity-base/ksplashml
-trinity-base/kstart
-trinity-base/ksysguard
-trinity-base/ksystraycmd
-trinity-base/ktip
-trinity-base/kwin
-trinity-base/kxkb
-trinity-base/libkonq
-trinity-base/nsplugins
-trinity-base/knetattach
-trinity-base/kdebase-data
-trinity-base/krootbacking
-trinity-base/tqt3integration
diff --git a/Documentation/derived-lists/kdegraphics-3.5.13.1 b/Documentation/derived-lists/kdegraphics-3.5.13.1
deleted file mode 100644
index 5a903104..00000000
--- a/Documentation/derived-lists/kdegraphics-3.5.13.1
+++ /dev/null
@@ -1,21 +0,0 @@
-trinity-base/kamera
-trinity-base/kcoloredit
-#! trinity-base/kdvi
-#! trinity-base/kfax
-trinity-base/kdegraphics-doc
-trinity-base/kdegraphics-kfile-plugins
-trinity-base/kgamma
-trinity-base/kghostview
-trinity-base/kiconedit
-trinity-base/kmrml
-trinity-base/kolourpaint
-trinity-base/kooka
-trinity-base/kpdf
-trinity-base/kpovmodeler
-trinity-base/kruler
-trinity-base/ksnapshot
-trinity-base/ksvg
-trinity-base/kuickshow
-trinity-base/kview
-trinity-base/kviewshell
-trinity-base/libkscan
diff --git a/Documentation/derived-lists/kdemultimedia-3.5.13.1 b/Documentation/derived-lists/kdemultimedia-3.5.13.1
deleted file mode 100644
index 7601d50c..00000000
--- a/Documentation/derived-lists/kdemultimedia-3.5.13.1
+++ /dev/null
@@ -1,16 +0,0 @@
-#? trinity-base/akode
-#? trinity-base/apps-artsplugins
-#? trinity-base/juk
-#? trinity-base/kaboodle
-#? trinity-base/kaudiocreator
-#? trinity-base/kdemultimedia-arts
-#? trinity-base/kdemultimedia-kappfinder-data
-#? trinity-base/kdemultimedia-kfile-plugins
-#? trinity-base/kdemultimedia-kioslaves
-#? trinity-base/kmid
-trinity-base/kmix
-#? trinity-base/krec
-#? trinity-base/kscd
-#? trinity-base/libkcddb
-#? trinity-base/mpeglib
-#? trinity-base/noatun
diff --git a/Documentation/derived-lists/kdenetwork-3.5.13.1 b/Documentation/derived-lists/kdenetwork-3.5.13.1
deleted file mode 100644
index db5da8ac..00000000
--- a/Documentation/derived-lists/kdenetwork-3.5.13.1
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/dcoprss
-trinity-base/kdict
-trinity-base/kdnssd
-trinity-base/kget
-trinity-base/knewsticker
-trinity-base/kopete
-trinity-base/kpf
-trinity-base/kppp
-trinity-base/krdc
-trinity-base/krfb
-trinity-base/ksirc
-trinity-base/ktalkd
-trinity-base/kwifimanager
-trinity-base/librss
-trinity-base/lisa
-trinity-base/kdenetwork-doc
-trinity-base/kdenetwork-filesharing
-trinity-base/kdenetwork-kfile-plugins
diff --git a/Documentation/derived-lists/kdepim-3.5.13.1 b/Documentation/derived-lists/kdepim-3.5.13.1
deleted file mode 100644
index 9baa2271..00000000
--- a/Documentation/derived-lists/kdepim-3.5.13.1
+++ /dev/null
@@ -1,37 +0,0 @@
-trinity-base/akregator
-#? trinity-base/certmanager
-#? trinity-base/kdepim-doc
-#? trinity-base/indexlib
-#? trinity-base/kabc
-#? trinity-base/kaddressbook
-#? trinity-base/kalarm
-#? trinity-base/kandy
-#? trinity-base/karm
-#? trinity-base/kfile-plugins
-#? trinity-base/kgantt
-#? trinity-base/kdepim-kioslaves
-#? trinity-base/kitchensync
-#? trinity-base/kmail
-#? trinity-base/kmailcvt
-#? trinity-base/kmobile
-#? trinity-base/knode
-#? trinity-base/knotes
-#? trinity-base/kode
-#? trinity-base/konsolekalendar
-#? trinity-base/kontact
-#? trinity-base/korganizer
-#? trinity-base/korn
-#? trinity-base/kdepim-kresources
-trinity-base/ktnef
-#? trinity-base/libemailfunctions
-trinity-base/libkcal
-#? trinity-base/libkholidays
-trinity-base/libkmime
-#? trinity-base/libkpgp
-#? trinity-base/libkpimexchange
-#? trinity-base/libkpimidentities
-#? trinity-base/libksieve
-#? trinity-base/libkdenetwork
-trinity-base/libkdepim
-#? trinity-base/mimelib
-#? trinity-base/kdepim-wizards
diff --git a/Documentation/derived-lists/kdepim-3.5.13.2 b/Documentation/derived-lists/kdepim-3.5.13.2
deleted file mode 100644
index 552415a1..00000000
--- a/Documentation/derived-lists/kdepim-3.5.13.2
+++ /dev/null
@@ -1,37 +0,0 @@
-trinity-base/akregator
-trinity-base/certmanager
-#? trinity-base/kdepim-doc
-#? trinity-base/indexlib
-#? trinity-base/kabc
-trinity-base/kaddressbook
-#? trinity-base/kalarm
-#? trinity-base/kandy
-#? trinity-base/karm
-#? trinity-base/kfile-plugins
-trinity-base/kgantt
-#? trinity-base/kdepim-kioslaves
-#? trinity-base/kitchensync
-#? trinity-base/kmail
-#? trinity-base/kmailcvt
-#? trinity-base/kmobile
-#? trinity-base/knode
-trinity-base/knotes
-#? trinity-base/kode
-#? trinity-base/konsolekalendar
-trinity-base/kontact
-trinity-base/korganizer
-#? trinity-base/korn
-#? trinity-base/kdepim-kresources
-trinity-base/ktnef
-#? trinity-base/libemailfunctions
-trinity-base/libkcal
-trinity-base/libkholidays
-trinity-base/libkmime
-#? trinity-base/libkpgp
-trinity-base/libkpimexchange
-trinity-base/libkpimidentities
-#? trinity-base/libksieve
-trinity-base/libkdenetwork
-trinity-base/libkdepim
-#? trinity-base/mimelib
-#? trinity-base/kdepim-wizards
diff --git a/Documentation/derived-lists/kdetoys-3.5.13.1 b/Documentation/derived-lists/kdetoys-3.5.13.1
deleted file mode 100644
index d424d6c4..00000000
--- a/Documentation/derived-lists/kdetoys-3.5.13.1
+++ /dev/null
@@ -1,10 +0,0 @@
-trinity-base/amor
-trinity-base/eyesapplet
-trinity-base/fifteenapplet
-trinity-base/kdetoys-doc
-trinity-base/kmoon
-trinity-base/kodo
-trinity-base/kteatime
-trinity-base/ktux
-trinity-base/kweather
-trinity-base/kworldclock
diff --git a/Documentation/derived-lists/kdetoys-3.5.13.2 b/Documentation/derived-lists/kdetoys-3.5.13.2
deleted file mode 100644
index d424d6c4..00000000
--- a/Documentation/derived-lists/kdetoys-3.5.13.2
+++ /dev/null
@@ -1,10 +0,0 @@
-trinity-base/amor
-trinity-base/eyesapplet
-trinity-base/fifteenapplet
-trinity-base/kdetoys-doc
-trinity-base/kmoon
-trinity-base/kodo
-trinity-base/kteatime
-trinity-base/ktux
-trinity-base/kweather
-trinity-base/kworldclock
diff --git a/Documentation/derived-lists/kdeutils-3.5.13.1 b/Documentation/derived-lists/kdeutils-3.5.13.1
deleted file mode 100644
index 9dcaed67..00000000
--- a/Documentation/derived-lists/kdeutils-3.5.13.1
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/ark
-trinity-base/kdeutils-doc
-trinity-base/kcalc
-trinity-base/kcharselect
-trinity-base/kdelirc
-trinity-base/kdf
-trinity-base/kedit
-trinity-base/kfloppy
-trinity-base/kgpg
-trinity-base/khexedit
-trinity-base/kjots
-trinity-base/klaptopdaemon
-trinity-base/kmilo
-trinity-base/kregexpeditor
-trinity-base/ksim
-trinity-base/ktimer
-trinity-base/kwallet
-trinity-base/superkaramba
diff --git a/Documentation/derived-lists/kdeutils-3.5.13.2 b/Documentation/derived-lists/kdeutils-3.5.13.2
deleted file mode 100644
index 9dcaed67..00000000
--- a/Documentation/derived-lists/kdeutils-3.5.13.2
+++ /dev/null
@@ -1,18 +0,0 @@
-trinity-base/ark
-trinity-base/kdeutils-doc
-trinity-base/kcalc
-trinity-base/kcharselect
-trinity-base/kdelirc
-trinity-base/kdf
-trinity-base/kedit
-trinity-base/kfloppy
-trinity-base/kgpg
-trinity-base/khexedit
-trinity-base/kjots
-trinity-base/klaptopdaemon
-trinity-base/kmilo
-trinity-base/kregexpeditor
-trinity-base/ksim
-trinity-base/ktimer
-trinity-base/kwallet
-trinity-base/superkaramba
diff --git a/Documentation/derived-lists/tdegames-9999 b/Documentation/derived-lists/tdegames-9999
index 8731fda7..93b3f528 100644
--- a/Documentation/derived-lists/tdegames-9999
+++ b/Documentation/derived-lists/tdegames-9999
@@ -1,34 +1,34 @@
-trinity-apps/atlantik
+trinity-base/atlantik
 trinity-base/tdegames-doc
-trinity-apps/kasteroids
-trinity-apps/katomic
-trinity-apps/kbackgammon
-trinity-apps/kbattleship
-trinity-apps/kblackbox
-trinity-apps/kbounce
-trinity-apps/kenolaba
-trinity-apps/kfouleggs
-trinity-apps/kgoldrunner
-trinity-apps/kjumpingcube
-trinity-apps/klickety
-trinity-apps/klines
-trinity-apps/kmahjongg
-trinity-apps/kmines
-trinity-apps/knetwalk
-trinity-apps/kolf
-trinity-apps/konquest
-trinity-apps/kpat
-trinity-apps/kpoker
-trinity-apps/kreversi
-trinity-apps/ksame
-trinity-apps/kshisen
-trinity-apps/ksirtet
-trinity-apps/ksmiletris
-trinity-apps/ksnake
-trinity-apps/ksokoban
-trinity-apps/kspaceduel
-trinity-apps/ktron
-trinity-apps/ktuberling
+trinity-base/kasteroids
+trinity-base/katomic
+trinity-base/kbackgammon
+trinity-base/kbattleship
+trinity-base/kblackbox
+trinity-base/kbounce
+trinity-base/kenolaba
+trinity-base/kfouleggs
+trinity-base/kgoldrunner
+trinity-base/kjumpingcube
+trinity-base/klickety
+trinity-base/klines
+trinity-base/kmahjongg
+trinity-base/kmines
+trinity-base/knetwalk
+trinity-base/kolf
+trinity-base/konquest
+trinity-base/kpat
+trinity-base/kpoker
+trinity-base/kreversi
+trinity-base/ksame
+trinity-base/kshisen
+trinity-base/ksirtet
+trinity-base/ksmiletris
+trinity-base/ksnake
+trinity-base/ksokoban
+trinity-base/kspaceduel
+trinity-base/ktron
+trinity-base/ktuberling
 trinity-base/libtdegames
-trinity-apps/lskat
-trinity-apps/twin4
+trinity-base/lskat
+trinity-base/twin4
diff --git a/Documentation/trinity.3.5.13.2.keywords b/Documentation/trinity.3.5.13.2.keywords
deleted file mode 100644
index 5fbfc244..00000000
--- a/Documentation/trinity.3.5.13.2.keywords
+++ /dev/null
@@ -1,90 +0,0 @@
-~trinity-base/akregator-3.5.13.2
-~trinity-base/amor-3.5.13.2
-~trinity-base/ark-3.5.13.2
-~trinity-base/arts-3.5.13.2
-~trinity-base/certmanager-3.5.13.2
-~trinity-base/drkonqi-3.5.13.2
-~trinity-base/eyesapplet-3.5.13.2
-~trinity-base/fifteenapplet-3.5.13.2
-~trinity-base/kaddressbook-3.5.13.2
-~trinity-base/kappfinder-3.5.13.2
-~trinity-base/kate-3.5.13.2
-~trinity-base/kcalc-3.5.13.2
-~trinity-base/kcharselect-3.5.13.2
-~trinity-base/kcheckpass-3.5.13.2
-~trinity-base/kcminit-3.5.13.2
-~trinity-base/kcontrol-3.5.13.2
-~trinity-base/kdcop-3.5.13.2
-~trinity-base/kdebase-data-3.5.13.2
-~trinity-base/kdebase-kioslaves-3.5.13.2
-~trinity-base/kdebase-meta-3.5.13.2
-~trinity-base/kdebase-starttde-3.5.13.2
-~trinity-base/kdebugdialog-3.5.13.2
-~trinity-base/kdeeject-3.5.13.2
-~trinity-base/kdelibs-3.5.13.2
-~trinity-base/kdelirc-3.5.13.2
-~trinity-base/kdepasswd-3.5.13.2
-~trinity-base/kdeprint-3.5.13.2
-~trinity-base/kdesktop-3.5.13.2
-~trinity-base/kdesu-3.5.13.2
-~trinity-base/kdetoys-doc-3.5.13.2
-~trinity-base/kdeutils-doc-3.5.13.2
-~trinity-base/kdeutils-meta-3.5.13.2
-~trinity-base/kdf-3.5.13.2
-~trinity-base/kdialog-3.5.13.2
-~trinity-base/kdm-3.5.13.2
-~trinity-base/kedit-3.5.13.2
-~trinity-base/kfind-3.5.13.2
-~trinity-base/kfloppy-3.5.13.2
-~trinity-base/kgantt-3.5.13.2
-~trinity-base/kgpg-3.5.13.2
-~trinity-base/khelpcenter-3.5.13.2
-~trinity-base/khexedit-3.5.13.2
-~trinity-base/khotkeys-3.5.13.2
-~trinity-base/kicker-3.5.13.2
-~trinity-base/kjots-3.5.13.2
-~trinity-base/klaptopdaemon-3.5.13.2
-~trinity-base/klipper-3.5.13.2
-~trinity-base/kmenuedit-3.5.13.2
-~trinity-base/kmilo-3.5.13.2
-~trinity-base/kmoon-3.5.13.2
-~trinity-base/knetattach-3.5.13.2
-~trinity-base/knotes-3.5.13.2
-~trinity-base/kodo-3.5.13.2
-~trinity-base/konqueror-3.5.13.2
-~trinity-base/konsole-3.5.13.2
-~trinity-base/kontact-3.5.13.2
-~trinity-base/korganizer-3.5.13.2
-~trinity-base/kpager-3.5.13.2
-~trinity-base/kpersonalizer-3.5.13.2
-~trinity-base/kreadconfig-3.5.13.2
-~trinity-base/kregexpeditor-3.5.13.2
-~trinity-base/krootbacking-3.5.13.2
-~trinity-base/kscreensaver-3.5.13.2
-~trinity-base/ksim-3.5.13.2
-~trinity-base/ksmserver-3.5.13.2
-~trinity-base/ksplashml-3.5.13.2
-~trinity-base/kstart-3.5.13.2
-~trinity-base/ksysguard-3.5.13.2
-~trinity-base/ksystraycmd-3.5.13.2
-~trinity-base/kteatime-3.5.13.2
-~trinity-base/ktimer-3.5.13.2
-~trinity-base/ktip-3.5.13.2
-~trinity-base/ktnef-3.5.13.2
-~trinity-base/ktux-3.5.13.2
-~trinity-base/kwallet-3.5.13.2
-~trinity-base/kweather-3.5.13.2
-~trinity-base/kwin-3.5.13.2
-~trinity-base/kworldclock-3.5.13.2
-~trinity-base/kxkb-3.5.13.2
-~trinity-base/libkcal-3.5.13.2
-~trinity-base/libkdenetwork-3.5.13.2
-~trinity-base/libkdepim-3.5.13.2
-~trinity-base/libkholidays-3.5.13.2
-~trinity-base/libkmime-3.5.13.2
-~trinity-base/libkonq-3.5.13.2
-~trinity-base/libkpimexchange-3.5.13.2
-~trinity-base/libkpimidentities-3.5.13.2
-~trinity-base/nsplugins-3.5.13.2
-~trinity-base/superkaramba-3.5.13.2
-~trinity-base/tqt3integration-3.5.13.2
diff --git a/Documentation/trinity.live.keywords b/Documentation/trinity.live.keywords
index 662ac982..e057f38d 100644
--- a/Documentation/trinity.live.keywords
+++ b/Documentation/trinity.live.keywords
@@ -1,42 +1,42 @@
 ~dev-libs/dbus-1-tqt-9999 **
 ~dev-libs/dbus-tqt-9999 **
-~dev-qt/tqt-3.9999 **
-~dev-qt/tqtinterface-9999 **
-~net-irc/konversation-1.1.9999 **
-~trinity-apps/atlantik-9999 **
-~trinity-apps/atlantikdesigner-9999 **
-~trinity-apps/filelight-9999 **
-~trinity-apps/kasteroids-9999 **
-~trinity-apps/katomic-9999 **
-~trinity-apps/kbackgammon-9999 **
-~trinity-apps/kbattleship-9999 **
-~trinity-apps/kblackbox-9999 **
-~trinity-apps/kbounce-9999 **
-~trinity-apps/kenolaba-9999 **
-~trinity-apps/kfouleggs-9999 **
-~trinity-apps/kgoldrunner-9999 **
-~trinity-apps/kjumpingcube-9999 **
-~trinity-apps/klickety-9999 **
-~trinity-apps/klines-9999 **
-~trinity-apps/kmahjongg-9999 **
-~trinity-apps/kmines-9999 **
-~trinity-apps/knetwalk-9999 **
-~trinity-apps/kolf-9999 **
-~trinity-apps/konquest-9999 **
-~trinity-apps/kpat-9999 **
-~trinity-apps/kpoker-9999 **
-~trinity-apps/kreversi-9999 **
-~trinity-apps/ksame-9999 **
-~trinity-apps/kshisen-9999 **
-~trinity-apps/ksirtet-9999 **
-~trinity-apps/ksmiletris-9999 **
-~trinity-apps/ksnake-9999 **
-~trinity-apps/ksokoban-9999 **
-~trinity-apps/kspaceduel-9999 **
-~trinity-apps/ktron-9999 **
-~trinity-apps/ktuberling-9999 **
-~trinity-apps/lskat-9999 **
-~trinity-apps/twin4-9999 **
+~dev-tqt/tqt-9999 **
+~dev-tqt/tqtinterface-9999 **
+~trinity-apps/konversation-9999 **
+~trinity-base/atlantik-9999 **
+~trinity-base/atlantikdesigner-9999 **
+~trinity-base/filelight-9999 **
+~trinity-base/kasteroids-9999 **
+~trinity-base/katomic-9999 **
+~trinity-base/kbackgammon-9999 **
+~trinity-base/kbattleship-9999 **
+~trinity-base/kblackbox-9999 **
+~trinity-base/kbounce-9999 **
+~trinity-base/kenolaba-9999 **
+~trinity-base/kfouleggs-9999 **
+~trinity-base/kgoldrunner-9999 **
+~trinity-base/kjumpingcube-9999 **
+~trinity-base/klickety-9999 **
+~trinity-base/klines-9999 **
+~trinity-base/kmahjongg-9999 **
+~trinity-base/kmines-9999 **
+~trinity-base/knetwalk-9999 **
+~trinity-base/kolf-9999 **
+~trinity-base/konquest-9999 **
+~trinity-base/kpat-9999 **
+~trinity-base/kpoker-9999 **
+~trinity-base/kreversi-9999 **
+~trinity-base/ksame-9999 **
+~trinity-base/kshisen-9999 **
+~trinity-base/ksirtet-9999 **
+~trinity-base/ksmiletris-9999 **
+~trinity-base/ksnake-9999 **
+~trinity-base/ksokoban-9999 **
+~trinity-base/kspaceduel-9999 **
+~trinity-base/ktron-9999 **
+~trinity-base/ktuberling-9999 **
+~trinity-base/lskat-9999 **
+~trinity-base/twin4-9999 **
 ~trinity-base/akregator-9999 **
 ~trinity-base/amor-9999 **
 ~trinity-base/ark-9999 **
diff --git a/Documentation/trinity.overlay b/Documentation/trinity.overlay
index 7c330b3c..cac3983b 100644
--- a/Documentation/trinity.overlay
+++ b/Documentation/trinity.overlay
@@ -1,10 +1,10 @@
 <layman>
-<overlay type="git" src="https://github.com/Fat-Zer/trinity.git" contact="fatzer2@gmail.com" status="unofficial" name="trinity">
+<overlay type="git" src="https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo.git" status="unofficial" name="trinity-official">
 <link>
 http://www.trinitydesktop.org/
 </link>
 <description>
-Gentoo overlay for Trinity Desktop Environment, a fork of KDE3
+Official Gentoo overlay from the TDE team for Trinity Desktop Environment, a fork of KDE3
 </description>
 </overlay>
 </layman>