diff options
author | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
---|---|---|
committer | Chris <xchrisx@uber.space> | 2019-12-31 17:21:13 +0100 |
commit | 55d2aaa4eb5201ac97e269fc141e4ee1778379b8 (patch) | |
tree | 810ece5e004aa9e97e26a1ad988ed52552175fb6 /trinity-base/kdebase-starttde/files | |
parent | 644110a847c5911c2eb04eb53c93031740561efc (diff) | |
download | tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.tar.gz tde-packaging-gentoo-55d2aaa4eb5201ac97e269fc141e4ee1778379b8.zip |
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>
Diffstat (limited to 'trinity-base/kdebase-starttde/files')
5 files changed, 0 insertions, 214 deletions
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 |