Fixed gentoo-startkde4.patch to make it POSIX compliant by replacing == with = in the tests. Thanks to Davide Pesavento <davidepesa@gmail.com> for the report. Fixes bug #263426.

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

3 files changed, 12 insertions, 16 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 678e4963b55b..95f4be6fda9d 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.148 2009/03/08 19:20:50 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.149 2009/03/23 03:09:23 jmbsvicetto Exp $
+
+  23 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/gentoo-startkde4.patch:
+  Fixed gentoo-startkde4.patch to make it POSIX compliant by replacing ==
+  with = in the tests. Thanks to Davide Pesavento <davidepesa@gmail.com> for
+  the report. Fixes bug #263426.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org>
   -kdebase-startkde-4.2.0-r2.ebuild:
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index cf3eaf0cf68a..f9dc9248aff8 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde.patch 2117 RMD160 5905ab727f2d7e66733b459da2997707ff269396 SHA1 b425a63453116c1a68060548b4fab1fde29dad4e SHA256 0609638a4c1a67e2406b1a0d23a032e80791182e4bd4b632ee3949c19f516a97
-AUX gentoo-startkde4.patch 2367 RMD160 1a7641dbb6436841214c7acd303120be3272de8e SHA1 6d2415d6db4d31e02aae8936dc66b7d83131022f SHA256 1bae11d9b4e746d65df540676651f9330158165690bc500b72f85f584a29a2ff
+AUX gentoo-startkde4.patch 2364 RMD160 8e3ea8664ca71afb0e550e80c757d4c1d38b94a9 SHA1 26f6f137d127ebe2ff7e4be68a34834d147842eb SHA256 4b028874d093de69a3765d9913dfd19be85acd90197ee6131795e1dfc63f9f8f
 AUX kdebase-startkde-3.5-gentoo.patch 2016 RMD160 54c6fb0270747b82ec4eeba0f44b6b6f9dc422a6 SHA1 cf6dc0c158618620fcf79e63706abe7c04d5388c SHA256 2b7ddff127a7b41cf363cfda2609b3874e6e11cd9239ca9af1d4769553ed67f9
 DIST kdebase-3.5-patchset-08.tar.bz2 23090 RMD160 c78298981aa5d0a6295b40160860e10e9ade1ff8 SHA1 22715c39a1769a7cbdf3e0ff73425459eadab01d SHA256 2dc4cd3842f07644769555c821445f945262db62b51f92ba55610146d16c499a
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
@@ -13,12 +10,5 @@ DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f670990
 EBUILD kdebase-startkde-3.5.10-r5.ebuild 2652 RMD160 3ce015a75594ca8ce4f9caf626daa91a59a4c50e SHA1 990243f9d996f6506669da80f66cfa40ed85a67a SHA256 23deaed26146ed1b18dd1bd723637e19df85372b70ddece5b0739819ba9d9269
 EBUILD kdebase-startkde-3.5.9.ebuild 2655 RMD160 b94be06d7482e08542c16ff2809a8fdc4bf4a5a1 SHA1 400376a3fc0fc9456e01519beda9b257e8a3aa85 SHA256 3eda0945a65f82c11cb58c7d1231bdbdea8d4a63dfb86abe2dd7b6942a9b598a
 EBUILD kdebase-startkde-4.2.1.ebuild 4302 RMD160 2925672d95f4c8b7c156f1e9ce4324b51e083c8c SHA1 98b7f004e915b10f090c15d3227c643ea89aa0d6 SHA256 f5888e8b6cfdcce691a63085bd7541b8c910d4b314cb6faf7f80ac0cf2b15759
-MISC ChangeLog 23477 RMD160 31a9c1450744fe668759fe0ba151cf7cb74c702e SHA1 d9fbde87f4345d344da95d7fb732a63ea70204a6 SHA256 533cad763d20a7409ebc88e1ee778ea0f7d52044ce34367c13b2c37d19f30265
+MISC ChangeLog 23766 RMD160 e5ef73e9356f54de9b03970f0948aeb385cd06c5 SHA1 0fc8a17f78cf515c25709c8ae243392300c536bf SHA256 31b2be8e441425f244be8041afe2f7e34e792671db9442e138a15efef9856fe9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm0GpkACgkQ5BmOA85PVLg76wCgn7/0g4tfbNFaIyKN3HJNeAYn
-0b8An19s9Q7HYzHYMbdu3mfhCvsc6Jel
-=JJLL
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
index 2503b643a60c..5028cf100808 100644
--- a/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4.patch
@@ -22,7 +22,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
 +# Gentoo: handle the possible home directory layout for config directory
 +# Note that we change the default KDEHOME in kdelibs to .kde4 or .kde${SLOT}
 +# for -kdeprefix and +kdeprefix respectively.
-+if [ "${_KDEDIR}" == "/usr" ]; then
++if [ "${_KDEDIR}" = "/usr" ]; then
 +	# If the directory doesn't exist make it
 +	[ -e "${HOME}/.kde4" ] || mkdir "$HOME/.kde4"
 +else
@@ -42,7 +42,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  done
  
 +# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" == "/usr" ]; then
++if [ "${_KDEDIR}" = "/usr" ]; then
 +  for file in "/etc/kde/startup/"*.sh; do
 +    test -r "${file}" && . "${file}"
 +  done
@@ -56,7 +56,7 @@ diff -Naur kdebase-startkde-4.2.0-orig/startkde.cmake kdebase-startkde-4.2.0/sta
  done
  
 +# Gentoo part for FHS installs
-+if [ "${_KDEDIR}" == "/usr" ]; then
++if [ "${_KDEDIR}" = "/usr" ]; then
 +  for file in "/etc/kde/shutdown/"*.sh; do
 +    test -r "${file}" && . "${file}"
 +  done