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

["Jonathan Callen" <abcd@gentoo.org>]

commit:     ff970431bb0db3643e8c66a492fdcea8e0a217cc
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:58:46 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 19:59:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ff970431

[kde-base/kdebase-startkde] Upstream changed a variable

---
 .../kdebase-startkde_do_not_set_MALLOC_CHECK.patch |   21 --------------------
 .../kdebase-startkde/kdebase-startkde-9999.ebuild  |    2 +-
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
deleted file mode 100644
index 8c62f8c..0000000
--- a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -36,18 +36,6 @@ fi
- # 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/kdebase-startkde-9999.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
index 7df5355..7e9525c 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-9999.ebuild
@@ -71,7 +71,7 @@ src_install() {
 	doexe "${T}/KDE-4"
 
 	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
+	sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
 		"${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
 	insinto /usr/share/xsessions
 	doins "${T}/KDE-4.desktop"