Fixed bug 308359, quote DESKTOP_SESSION in case it's not defined

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index e233e5759221b9a6787cb15d34051c60dbf1be6d..bf564b0a8fd1d5ded49964cdc66a024bd2cffc46 100644 (file)
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kde-env
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.70 2010/03/11 18:37:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.71 2010/03/26 23:19:57 reavertm Exp $
+
+*kde-env-4.4.1-r2 (26 Mar 2010)
+
+  26 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kde-env-4.4.1-r1.ebuild, +kde-env-4.4.1-r2.ebuild:
+  Fixed bug 308359, quote DESKTOP_SESSION in case it's not defined
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> kde-env-4.3.5-r1.ebuild:
   Marking kde-env-4.3.5-r1 ppc stable for bug 300393

diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index 2f2e53db72531b1d1eb7fba24dedc83fedf77ff8..42c627726c4c42cbd8d06ce57034609028d01841 100644 (file)
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -2,6 +2,6 @@ EBUILD kde-env-4.3.3.ebuild 1872 RMD160 bc8a6cbfe573a1de8cdc297daa24b4b3c251e83e
 EBUILD kde-env-4.3.4-r1.ebuild 1945 RMD160 66625ec19511b8df6775221959e7371b368a9c5b SHA1 a5a765a12937a9ddfc3776eb26b51f5e08ed741d SHA256 ba9284390dcbcafdf99ce07c52b7e0eb906a251807fcc543880902127c304bb5
 EBUILD kde-env-4.3.5-r1.ebuild 1837 RMD160 92d1aa0d917e439d1cbb7ddca04d952882f96c14 SHA1 c867034893fa559e13fc6570a12c8dee92890477 SHA256 0620e03de897737bfc6942fc3d5b433cb6db144ce728c3607fecdce8ecddb613
 EBUILD kde-env-4.4.0.ebuild 1879 RMD160 81769bfea76e9140fb66c89af3210a3af53b59c8 SHA1 ac0b336198aaf60b4079ca54117808b8e98d2675 SHA256 9774f078ebf631c7374b190b158f01c89d3842b46b26f17aac27942cd1065172
-EBUILD kde-env-4.4.1-r1.ebuild 2247 RMD160 1e3e809548553b9692c2ddcd5dd9f6afd1662683 SHA1 993c9f300efad4ba57895d0c28a2e06aeb720246 SHA256 1388e9bc5043c117fd42a9b257a910912fb3a98ad215240594f6211334931ba3
-MISC ChangeLog 4802 RMD160 74d2de3b6640e0b626a7dd7eec28dc9de9813cb4 SHA1 15a5723eaad5eb2700206e72033d83e1e6662ab7 SHA256 8193f7dd02d75925653dcbb1dd0d35fbb7abdffc34b3f85b77a56cd253b8f03d
+EBUILD kde-env-4.4.1-r2.ebuild 2248 RMD160 6af3b409999810cecf77ccdcb7bf3ca006aa9eac SHA1 f57cf7f10145d7e4b13ae11354d0dade59743a23 SHA256 a458bd2166135368d4f6e48a36318d7bae4a6505f48313a80a14701940f665ed
+MISC ChangeLog 5013 RMD160 950a864ea5b254065a69beb66f737e8c6d6a0931 SHA1 28b2a191c4e94039d282717cd0ff5a0ffef22f80 SHA256 9c556e47598ab132f57cf1d7d06f1b3c9e82d4f9d002cdac2499aebcdb8d8184
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a

diff --git a/kde-base/kde-env/kde-env-4.4.1-r1.ebuild b/kde-base/kde-env/kde-env-4.4.1-r2.ebuild
similarity index 94%
rename from kde-base/kde-env/kde-env-4.4.1-r1.ebuild
rename to kde-base/kde-env/kde-env-4.4.1-r2.ebuild
index c978057e74d484f575f96edf83183d135783a613..ae4bc755bafe074cb35dd4f14321152e103efcee 100644 (file)
--- a/kde-base/kde-env/kde-env-4.4.1-r1.ebuild
+++ b/kde-base/kde-env/kde-env-4.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.4.1-r1.ebuild,v 1.1 2010/03/02 16:25:17 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-4.4.1-r2.ebuild,v 1.1 2010/03/26 23:19:57 reavertm Exp $
 
 EAPI="3"
 
@@ -80,7 +80,7 @@ EOF
        cat <<EOF > 11-xdg-menu-${KDE_X}
 #!/bin/sh
 
-if [ -z \${XDG_MENU_PREFIX} ] && [ \${DESKTOP_SESSION} = "${KDE_X}" ]; then
+if [ -z \${XDG_MENU_PREFIX} ] && [ "\${DESKTOP_SESSION}" = "${KDE_X}" ]; then
        export XDG_MENU_PREFIX="kde-${SLOT}-"
 fi
 EOF