[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

["Tomas Chvatal" <scarabeus@gentoo.org>]

commit:     0370cfc8e5289006af9d2c35ada2177a38fb2daa
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 12:22:08 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 12:22:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0370cfc8

kde-base/kdebase-startkde Fixup xdg_dirs mangling so they are not added twice.

---
 .../kdebase-startkde/files/4.5.0-fix_malloc.patch  |   22 --------------------
 ...-startkde4-2.patch => gentoo-startkde4-3.patch} |   18 ++++++++++------
 .../kdebase-startkde-4.6.9999.ebuild               |    2 +-
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch b/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch
deleted file mode 100644
index c08d1c0..0000000
--- a/kde-base/kdebase-startkde/files/4.5.0-fix_malloc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN kdebase-workspace-4.5.0/startkde.cmake kdebase-workspace-4.5.0.new//startkde.cmake
---- kdebase-workspace-4.5.0/startkde.cmake	2010-03-10 11:42:55.000000000 +0100
-+++ kdebase-workspace-4.5.0.new//startkde.cmake	2010-08-11 19:04:48.786127814 +0200
-@@ -36,18 +36,6 @@
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
--# Enable lightweight memory corruption checker if not already set
--# -- this is for trunk only, we remove it for releases
--if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
--    # Extract the first two components of the version from the output.
--    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
--
--    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
--    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
--
--    export MALLOC_CHECK_
--fi
--
- # in case we have been started with full pathname spec without being in PATH
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
- if [ -n "$bindir" ]; then

diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
similarity index 82%
rename from kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
rename to kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
index f23dc02..90c1ea2 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4-2.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-3.patch
@@ -1,7 +1,6 @@
-diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/startkde.cmake
---- kdebase-startkde-4.2.0-orig/startkde.cmake	2009-01-17 05:00:28.000000000 -0600
-+++ kdebase-startkde-4.2.0/startkde.cmake	2009-02-21 12:52:02.000000000 -0600
-@@ -7,6 +7,35 @@
+--- startkde.cmake.old	2011-03-24 13:07:04.919889148 +0100
++++ startkde.cmake	2011-03-24 13:14:42.033174445 +0100
+@@ -13,6 +13,40 @@
  # because we still need to do some cleanup.
  trap 'echo GOT SIGHUP' HUP
  
@@ -12,7 +11,12 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
 +fi
 +@REPLACE_LDPATH@
 +export STRIGI_PLUGIN_PATH="${_KDEDIR}/@REPLACE_LIBDIR@/strigi:${STRIGI_PLUGIN_PATH}"
-+export XDG_DATA_DIRS=${_KDEDIR}/share:$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++xdgs=$(echo ${XDG_DATA_DIRS} | sed 's/$/:/g;s#@GENTOO_PORTAGE_EPREFIX@/usr/kde/[^/]*/share/\?:##g;s/:$//g')
++if [ "$xdgs" != *"${_KDEDIR}/share"* ]; then
++	xdgs="${_KDEDIR}/share:${xdgs}"
++fi
++export XDG_DATA_DIRS=${xdgs}
++unset xdgs
 +
 +if [ -z "$HOME" ]; then
 +	xmessage "HOME is unset. Your user config seems to be broken. Aborting."
@@ -37,7 +41,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  # Check if a KDE session already is running and whether it's possible to connect to X
  kcheckrunning
  kcheckrunning_result=$?
-@@ -214,6 +243,13 @@
+@@ -187,6 +221,13 @@
    done
  done
  
@@ -51,7 +55,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  # Set the path for Qt plugins provided by KDE
  if test -n "$QT_PLUGIN_PATH"; then
    QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
-@@ -427,6 +463,13 @@
+@@ -400,6 +441,13 @@
    done
  done
  

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
index a013174..013a898 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.9999.ebuild
@@ -45,7 +45,7 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
+PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 
 src_prepare() {
 	kde4-meta_src_prepare

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 9440d8e..c8fcffa 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -44,7 +44,7 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-2.patch")
+PATCHES=("${FILESDIR}/gentoo-startkde4-3.patch")
 
 src_prepare() {
 	kde4-meta_src_prepare