diff options
4 files changed, 85 insertions, 20 deletions
diff --git a/trinity-base/tdebase-starttde/files/tdebase-starttde-14.1.5-gentoo.patch b/trinity-base/tdebase-starttde/files/tdebase-starttde-14.1.5-gentoo.patch new file mode 100644 index 00000000..baa5eadb --- /dev/null +++ b/trinity-base/tdebase-starttde/files/tdebase-starttde-14.1.5-gentoo.patch @@ -0,0 +1,80 @@ +diff --git a/starttde b/starttde +index 69c23611f..8dd8e02c7 100755 +--- a/starttde ++++ b/starttde +@@ -12,18 +12,6 @@ + + # Within this script use full path names to all binaries, scripts, etc. + +-# This block might not be appropriate for all systems. +-# It should work for command line logins but graphical +-# login managers might already source these files. +-# Multiple sourcing is not a problem when the files are only +-# containers for environment variables and such. +-if [ -r /etc/xprofile ]; then +- . /etc/xprofile +-fi +-if [ -r $HOME/.xprofile ]; then +- . $HOME/.xprofile +-fi +- + # Function to check PATH. + # Usage: is_in_path PATH /usr/bin + is_in_path() { +@@ -80,6 +68,56 @@ remove_from_path() { + eval export $var=${NPATH#:} + } + ++# Gentoo: In Gentoo $TDE_DIR/bin is in PATH by default, but it's located after /usr/bin, ++# so to avoid running kf5 apps instead of TDE's one make sure it goes first ++ ++TDE_BIN_DIR="$(dirname -- "$0")" ++if ! is_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin"; then ++ remove_from_path PATH "$TDE_BIN_DIR" ++ place_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin" ++fi ++unset TDE_BIN_DIR ++ ++# Gentoo: to avoid messing PATH that user might have set we moved .xprofile ++# import here rather from the very begining of the script ++# ++# This block might not be appropriate for all systems. ++# It should work for command line logins but graphical ++# login managers might already source these files. ++# Multiple sourcing is not a problem when the files are only ++# containers for environment variables and such. ++if [ -r /etc/xprofile ]; then ++ . /etc/xprofile ++fi ++if [ -r $HOME/.xprofile ]; then ++ . $HOME/.xprofile ++fi ++ ++# Gentoo: In Gentoo $TDE_DIR/bin is in PATH by default, but it's located after /usr/bin, ++# so to avoid running kf5 apps instead of TDE's one make sure it goes first ++ ++TDE_BIN_DIR="$(dirname -- "$0")" ++if ! is_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin"; then ++ remove_from_path PATH "$TDE_BIN_DIR" ++ place_before_in_path PATH "$TDE_BIN_DIR" "/usr/bin" ++fi ++unset TDE_BIN_DIR ++ ++# Gentoo: to avoid messing PATH that user might have set we moved .xprofile ++# import here rather from the very begining of the script ++# ++# This block might not be appropriate for all systems. ++# It should work for command line logins but graphical ++# login managers might already source these files. ++# Multiple sourcing is not a problem when the files are only ++# containers for environment variables and such. ++if [ -r /etc/xprofile ]; then ++ . /etc/xprofile ++fi ++if [ -r $HOME/.xprofile ]; then ++ . $HOME/.xprofile ++fi ++ + # Portable alternative to the file operator -nt (among shells) + is_newer() { + if test -n "$(find $1 -prune -newer $2 -print)" diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild index 3f0e1192..9799623c 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.2.ebuild @@ -40,12 +40,7 @@ src_configure() { } src_compile() { - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${TDEDIR}/${_libdir}" - done - _libdirs=${_libdirs#:} + echo -n ""; } src_install() { diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.4.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.4.ebuild index 1c8ec981..2dc1bff4 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-14.1.4.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.1.4.ebuild @@ -41,12 +41,7 @@ src_configure() { } src_compile() { - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${TDEDIR}/${_libdir}" - done - _libdirs=${_libdirs#:} + echo -n ""; } src_install() { diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild index 1c8ec981..255db203 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild @@ -30,23 +30,18 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" -PATCHES=( "${FILESDIR}/${PN}-14-gentoo.patch" ) +PATCHES=( "${FILESDIR}/${PN}-14.1.5-gentoo.patch" ) src_prepare() { trinity-base-2_src_prepare } src_configure() { - echo -n ""; + echo -n "" } src_compile() { - # List all the multilib libdirs - local _libdir _libdirs - for _libdir in $(get_all_libdirs); do - _libdirs="${_libdirs}:${TDEDIR}/${_libdir}" - done - _libdirs=${_libdirs#:} + echo -n "" } src_install() { |