summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus D. Hanwell <cryos@gentoo.org>2008-09-28 17:24:53 +0000
committerMarcus D. Hanwell <cryos@gentoo.org>2008-09-28 17:24:53 +0000
commit6426cc2d7cc4e8ae754c92eb488f2fe11dba8623 (patch)
tree3bf15c1cb0e4135a2daf4aca94a906b3e6ae40de /kde-base
parentamd64 stable, bug #238535 (diff)
downloadgentoo-2-6426cc2d7cc4e8ae754c92eb488f2fe11dba8623.tar.gz
gentoo-2-6426cc2d7cc4e8ae754c92eb488f2fe11dba8623.tar.bz2
gentoo-2-6426cc2d7cc4e8ae754c92eb488f2fe11dba8623.zip
Push changes to KDEDIRS to allow third party KDE 3.5 apps to function. See bug 237718.
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kdebase-startkde/ChangeLog10
-rw-r--r--kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch2
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild (renamed from kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild)2
3 files changed, 11 insertions, 3 deletions
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 91835001c3a0..32d310f06cd4 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for kde-base/kdebase-startkde
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.126 2008/09/27 18:02:17 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.127 2008/09/28 17:24:53 cryos Exp $
+
+*kdebase-startkde-3.5.10-r2 (28 Sep 2008)
+
+ 28 Sep 2008; Marcus D. Hanwell <cryos@gentoo.org>
+ files/kdebase-startkde-3.5-gentoo.patch,
+ -kdebase-startkde-3.5.10-r1.ebuild, +kdebase-startkde-3.5.10-r2.ebuild:
+ Push changes to KDEDIRS to allow third party KDE 3.5 apps to function. See
+ bug 237718.
*kdebase-startkde-3.5.10-r1 (27 Sep 2008)
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
index 21d5f90b09a8..17373e56c76a 100644
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.5-gentoo.patch
@@ -6,7 +6,7 @@
+# Gentoo: setup environment, filter other slotted KDE installs from PATH
+_KDEDIR=@REPLACE_PREFIX@
-+export KDEDIRS=${_KDEDIR}:/usr/local
++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}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild
index a68a987aa45a..31ec658f0118 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r1.ebuild,v 1.1 2008/09/27 18:02:18 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.10-r2.ebuild,v 1.1 2008/09/28 17:24:53 cryos Exp $
KMNAME=kdebase
KMNOMODULE=true