From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Fri, 19 Jan 2007 17:20:26 +0000 (+0000)
Subject: Set XDG_DATA_DIRS and XDG_CONFIG_DIRS variables in env.d directly; this way KDE appli... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a836c72ccc6db538c4734de31981e61b5da63f87;p=gentoo.git

Set XDG_DATA_DIRS and XDG_CONFIG_DIRS variables in env.d directly; this way KDE applications will show up in GNOME menu. Closes bug #95867 and bug #139697. Thanks to Pacho Ramos for the help.
Package-Manager: portage-2.1.2
---

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 683d3b5225d7..dbd4b1ec64ba 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.405 2007/01/19 10:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.406 2007/01/19 17:20:26 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdelibs-3.5.6.ebuild:
+  Set XDG_DATA_DIRS and XDG_CONFIG_DIRS variables in env.d directly; this way
+  KDE applications will show up in GNOME menu. Closes bug #95867 and bug
+  #139697. Thanks to Pacho Ramos for the help.
 
   19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   kdelibs-3.5.2-r6.ebuild, kdelibs-3.5.5-r4.ebuild, kdelibs-3.5.5-r5.ebuild,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index ed1216e4557a..6814d7413567 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -88,14 +88,14 @@ EBUILD kdelibs-3.5.5-r7.ebuild 6408 RMD160 838c28861d247eab5e91c890f588983810df2
 MD5 05a3e227b6da6252feea4187b02c131b kdelibs-3.5.5-r7.ebuild 6408
 RMD160 838c28861d247eab5e91c890f588983810df2c07 kdelibs-3.5.5-r7.ebuild 6408
 SHA256 cbb891d1636785ad765945a4614485aff8464d9bd214807e29b674b23a260656 kdelibs-3.5.5-r7.ebuild 6408
-EBUILD kdelibs-3.5.6.ebuild 5839 RMD160 865cd5fec0c3bd2a48c66e2bf32e46060f9ea5a2 SHA1 549e3da3e341005267b1e9d09e72ef3959a13a5b SHA256 51c46bed17fd4a37d4ee2fb304f6e1500756f47d62d46891f3ed8dbed12d707e
-MD5 85b5cf70a905b110092555024d634fab kdelibs-3.5.6.ebuild 5839
-RMD160 865cd5fec0c3bd2a48c66e2bf32e46060f9ea5a2 kdelibs-3.5.6.ebuild 5839
-SHA256 51c46bed17fd4a37d4ee2fb304f6e1500756f47d62d46891f3ed8dbed12d707e kdelibs-3.5.6.ebuild 5839
-MISC ChangeLog 66532 RMD160 270903a854a84415bb64c462794953c01b497c50 SHA1 edc1cb0f21d3829e939f21879f867d18d37abe76 SHA256 ceb11620e94991ebc3074e5df34f163ee17716457e3fd40e7b0e8d86059f9e17
-MD5 ee5e4d399bf336cc0dca649e0a974406 ChangeLog 66532
-RMD160 270903a854a84415bb64c462794953c01b497c50 ChangeLog 66532
-SHA256 ceb11620e94991ebc3074e5df34f163ee17716457e3fd40e7b0e8d86059f9e17 ChangeLog 66532
+EBUILD kdelibs-3.5.6.ebuild 5983 RMD160 6b55f984c02b0f8ba65b640be06ee06e601873f4 SHA1 872e885f00a3b158fb0b5cf7851e7c91156177f2 SHA256 aa6c3e58136debf57642c9b3fe2998f32844249222bfb31f294097fa9830e570
+MD5 a433a31777001e558c7b31caeee11e19 kdelibs-3.5.6.ebuild 5983
+RMD160 6b55f984c02b0f8ba65b640be06ee06e601873f4 kdelibs-3.5.6.ebuild 5983
+SHA256 aa6c3e58136debf57642c9b3fe2998f32844249222bfb31f294097fa9830e570 kdelibs-3.5.6.ebuild 5983
+MISC ChangeLog 66806 RMD160 2bb6199a1d9342e9dd992291df06999eb7fa84f1 SHA1 aee54a9fd5738ee166d67957f606a6de8aaaacfd SHA256 51cf6468cf6e15eecbe3bf09654688a4552107b16139904c25d24a4f9e4e6b48
+MD5 052c769afb88878ad0afee78247dd9b3 ChangeLog 66806
+RMD160 2bb6199a1d9342e9dd992291df06999eb7fa84f1 ChangeLog 66806
+SHA256 51cf6468cf6e15eecbe3bf09654688a4552107b16139904c25d24a4f9e4e6b48 ChangeLog 66806
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -121,7 +121,7 @@ SHA256 fdd6e7b644281143cd6919d82e855a24dfa3bcc64de59938c02ea25eebfadb9a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFsJf0AiZjviIA2XgRAg/CAJ9ScSBQWnHKZpDgaufSvSVyksOKtACgy8uy
-cn+LeOGTmAEdeFtYsCI5kJ8=
-=1NRI
+iD8DBQFFsP3jAiZjviIA2XgRAmPgAJ93lIv+26z1WHYR04PAGc+vSSpPkACgoz3e
+wO/tHYTX/O6MWbRZCWdtCqI=
+=t3RI
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.5.6.ebuild b/kde-base/kdelibs/kdelibs-3.5.6.ebuild
index 3a54eaf160d5..c3994c3efb98 100644
--- a/kde-base/kdelibs/kdelibs-3.5.6.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6.ebuild,v 1.3 2007/01/19 10:05:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6.ebuild,v 1.4 2007/01/19 17:20:26 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -178,6 +178,9 @@ LDPATH=${libdirs:1}
 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
 KDEDIRS="${PREFIX}:/usr:/usr/local"
 #KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+XDG_CONFIG_DIRS="${PREFIX}/etc/xdg"
+COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"
 EOF
 }