Add missing patch, bug 371115

Package-Manager: portage-2.1.10.1/cvs/Linux x86_64

3 files changed, 33 insertions, 22 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 9116e0e650f3..060f7a0fee15 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.235 2011/06/10 21:24:38 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.236 2011/06/11 06:46:53 dilfridge Exp $
+
+  11 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/gentoo-startkde4-4.patch:
+  Add missing patch, bug 371115
 
   10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> Manifest:
   Remanifest as tarball was changed
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index c78fd8c9a2c9..9fdcdac09f0b 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX agent-shutdown.sh 323 RMD160 9a0451c1e58e688c022ecd2b37f08cac433b187d SHA1 1abb7a1503a80d95e4db34fa7fe58accce6e8109 SHA256 6a2d645ef38d3db9d36166fac699848d07eb166f71a646d7f1466efeb394eb11
 AUX agent-startup.sh 955 RMD160 bbe8abb4734bb7364edc45265b10ae2a2887db66 SHA1 f7dfd044b6f09e5ad0f04842e51c7f9e62fad718 SHA256 c63fd6233b1711ede4fbb5b30460c5b1ddee840f0f5123db953ee3ab298da8f9
 AUX gentoo-startkde4-2.patch 2604 RMD160 7493f93872ca5fc494e209197ff16776c7e8322e SHA1 f5c995624a1653d073d33e5022f5f31a9621a8d1 SHA256 5f495b2bdfe35768262eceeb37da4a74e5083177006f1a986689f3d806188bb3
 AUX gentoo-startkde4-3.patch 2589 RMD160 777b2cb0918493242023ed248be01d50ac0e526a SHA1 af57698fe5f6bdd13e7defa935a93618153c4de1 SHA256 796b516105aff26ff139b21f4472ba5dbd41599652c35ad5ca191a9d9ff6e5ef
+AUX gentoo-startkde4-4.patch 710 RMD160 a4d43cfb45ea64c07228dc5c4d3a505dee6acdba SHA1 4215728600f89933e5c290159712f5329bbb7f36 SHA256 130fe14ed9e6e115634cc6a4352bc33bc0ec9cc901db314a973c7a0e9cc6b0b3
 AUX sessionfile 1956 RMD160 2ca096f3cee11cf4414e74ec1551ded57b18961c SHA1 eeb45f382a1a4d68110175ccf24c7bf60682b498 SHA256 ff65678fec6b660c499aa900699471c2aea4af4629c5f28985e571aa0f7e94c2
 DIST kdebase-workspace-4.6.2.tar.bz2 69356153 RMD160 23856ab63e17e3971071f2ccd02bd78d546c71e0 SHA1 63efb68733f347d0b7d24a7a061c5a0e3f84dee7 SHA256 6a55a53282a0ec7dd61f16f87fb8d0097d945891504982eb5122c96238b711e1
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
@@ -12,22 +10,5 @@ DIST kdebase-workspace-4.6.4.tar.bz2 69240482 RMD160 a528bee8b8b36e30708f5efea08
 EBUILD kdebase-startkde-4.6.2.ebuild 3014 RMD160 380b302679ccaca642c187d408a7efb8af7a5ea6 SHA1 abe1282859ca9da25467a99e984353984020fd42 SHA256 47f0ed65402b4b3ae2df6d40b05de6f48a82dada1c80cb664b9fb11b09b21ae1
 EBUILD kdebase-startkde-4.6.3.ebuild 2876 RMD160 42b4cb268c266ee87a6ed64badd1ac9a59a6e8bf SHA1 4f39b2bfec2369c0e6c88626abc89ce50baab55e SHA256 9c332468f56ebbebb3942fe48776088be947de89d7af27afc0a8ef4fd3983782
 EBUILD kdebase-startkde-4.6.4.ebuild 2408 RMD160 26aeec9649147e408fd80698657a88a58ec31f36 SHA1 a5855030df5d1d2e2fe1701059e18a760e157bbe SHA256 ea5d31fb36cd2bf61f61fb0cc8dbd4c8a8cca904e6c104bf50605bcaa2f78e21
-MISC ChangeLog 35503 RMD160 7402a0ae6efb061fa83b949384fd0cb59d6233cb SHA1 1ee3012b10a37148d4d9dd42ca3bde178f3eef05 SHA256 3e10d2483eaa058039c6d68c504c61f500b4595b4c618a5ed43cd8201b24f260
+MISC ChangeLog 35628 RMD160 b6f197aa4c0c1614c5acafd53f9ceff38af2de03 SHA1 f70002a8b54cded64d38aa077db299fe179866ff SHA256 9941d173a25dfc66dec453c74c354e5839dacfee93da88a86101fd386374f70e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN8oubAAoJENwGBM22xffei2UQAI3/ujd/UlNke+dguoW72Ack
-Ury6xUaHMHUj0SxU2+9hwEIn0NuVsiN50ZYQklGKbMDUOaVeqJkj/E2vke7NmRpA
-UF8sgd5ykLX0h3W1g9v7pzrMAMFM5SM7LZFLqCPisbx5O3fABFFqUKstraK0SEWL
-lHpyK0ymCHnD5UkgyOoAToI+jf1bA3wVglklntN0LYO9YKPdrFTuAzcmiH5ctqmU
-CBQIFLYd7oER5ZkfRQXOUdxEVWndESMPedo6qGSJuG1BulqA/Z7huIym+27Pl0dE
-f7bbKOu57c3yrWrD/TPu0wXsQWYh+LtkPecjyXuCKs5IrJT6E5fpqU7wNpc9j5Hw
-+CMFoB8v2eutCSm0VWhxvcng5TW0dEK0akaxqrEESVoFL+CuchOwVLjRwlnkbotq
-yzjCSNsW4dxExtp6SQirtGHs+Nm5d+9ADXTp7N7Mt0OSQY5E2XfOkwg6DLYcpAd+
-W6476Cr1OIzHaQ0C1hwXHHnQdUVgaHYIaUfG41Fs26GzVRzz/TEkzLwNVdd+PNEK
-4pcfCnts9wx8Y7HRlJsOOPb3nMkkYKeulhoNH6TrHDYcxPWpLI8dmpc/ga5bxOL2
-JgrHklKFvUzEzUtzGPpAwjGXUvzz90hf7Zurru9tNndsiSMUhU6IJdV+fGxQoZw7
-Pr0T029ymEfYVZTd4HuN
-=hfU3
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
new file mode 100644
index 000000000000..4d5177507700
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/gentoo-startkde4-4.patch
@@ -0,0 +1,26 @@
+--- startkde.cmake.old	2011-03-24 13:07:04.919889148 +0100
++++ startkde.cmake	2011-03-24 13:14:42.033174445 +0100
+@@ -187,6 +187,11 @@
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Set the path for Qt plugins provided by KDE
+ if test -n "$QT_PLUGIN_PATH"; then
+   QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
+@@ -400,6 +405,11 @@
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/kde/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION