Patches to fix #121369 and #121444.

Package-Manager: portage-2.0.54

6 files changed, 248 insertions, 108 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 54bef52b36ce..f7c3a17a660d 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.257 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.258 2006/02/03 17:47:28 carlo Exp $
+
+*kdebase-3.5.1-r1 (03 Feb 2006)
+
+  03 Feb 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kxkb3.5.1.xx_XX_layouts.patch, +files/kdebase-3.5.1-kicker.patch,
+  +kdebase-3.5.1-r1.ebuild:
+  Patches to fix #121369 and #121444.
 
   30 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   kdebase-3.3.2-r1.ebuild, kdebase-3.3.2-r2.ebuild, kdebase-3.3.2-r3.ebuild,
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 4b11a80d7f3e..54f61f0dbddf 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,154 +1,52 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a311c5b2cf771a3eaebeaa71dad7d87d ChangeLog 44595
-RMD160 e28ab34a207797e25b8bc97d88a719f91dfbf598 ChangeLog 44595
-SHA256 9c84689fcf1613ec296d9f0bea970d702e9f1890005d604fbb8065a3c351e9ed ChangeLog 44595
+MD5 b3bfa178815633a3cc42b63752899133 ChangeLog 44815
 MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
-RMD160 4ecb5417a842a4fb309b975608cbe68484cef22b files/3.3.2-r1/Xsetup 758
-SHA256 8c56fca90a98025ecae2364197ad3e07d2b7f86cf7efe86d07ea518d5b63fac9 files/3.3.2-r1/Xsetup 758
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
-RMD160 8a11bb1af1983b271dcb37cce062c01ab13e020b files/3.3.2-r1/backgroundrc 342
-SHA256 605e29d5585734f9fc6b1207406a196d71acb998c20b266824269f02e219c551 files/3.3.2-r1/backgroundrc 342
 MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
-RMD160 e54c7f78297073084dcc9af06e1fa8961ac849d0 files/3.3.2-r1/kdmrc 19878
-SHA256 3cc854e92c3dea3cab044935d480c37c1ec3e53890cf687cfd9c30cc92c26845 files/3.3.2-r1/kdmrc 19878
 MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
-RMD160 da082e27fcb4c122a53fe1470436305c14e2d024 files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
-SHA256 76217bdb45ebb0d10ef525e3ee300fcf08bb6a45ae9344b6dabc172aac0b4e43 files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
-RMD160 8a11bb1af1983b271dcb37cce062c01ab13e020b files/3.3.2-r2/backgroundrc 342
-SHA256 605e29d5585734f9fc6b1207406a196d71acb998c20b266824269f02e219c551 files/3.3.2-r2/backgroundrc 342
 MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r2/kdmrc 19864
-RMD160 2cf31d76e17aa7bf6547a4443d1e25ae3ea75986 files/3.3.2-r2/kdmrc 19864
-SHA256 1e599051c143dab0ee3a9f1140fe0f059a403fc8c962422987f53488ce21ee07 files/3.3.2-r2/kdmrc 19864
 MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
-RMD160 14a852134e00b3633c8f9c701adddf707b5a77b8 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
-SHA256 9d209e1b6e45d1f302a66b64e152f77c6aadfcbbae9b507914dad2fe1213300e files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
-RMD160 8a11bb1af1983b271dcb37cce062c01ab13e020b files/3.3.2-r3/backgroundrc 342
-SHA256 605e29d5585734f9fc6b1207406a196d71acb998c20b266824269f02e219c551 files/3.3.2-r3/backgroundrc 342
 MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
-RMD160 2cf31d76e17aa7bf6547a4443d1e25ae3ea75986 files/3.3.2-r3/kdmrc 19864
-SHA256 1e599051c143dab0ee3a9f1140fe0f059a403fc8c962422987f53488ce21ee07 files/3.3.2-r3/kdmrc 19864
 MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
-RMD160 14a852134e00b3633c8f9c701adddf707b5a77b8 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
-SHA256 9d209e1b6e45d1f302a66b64e152f77c6aadfcbbae9b507914dad2fe1213300e files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
 MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
-RMD160 aca937be56a69b274c0756eca91456e00a91442b files/agent-shutdown.sh 320
-SHA256 1e53f9fc9155b38d8bb0ac36c8564898dbabc33f9ecaca933216a0ace4e30b33 files/agent-shutdown.sh 320
 MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
-RMD160 62b38cdc14970db4f8ae09c90d7bc2a388255301 files/agent-startup.sh 550
-SHA256 f43a591922dd5a2649cad7b3d42827ee56aa21c09564e5eebb0cf7fa2eeb5fc4 files/agent-startup.sh 550
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
-RMD160 279e1c383ca8e7e1d2f7ad3d0724de0333bf4da3 files/digest-kdebase-3.3.2-r1 68
-SHA256 f60d1178139da88f7351d52088e5d1d82bf55db81809b48db21ccdb6fcf316e5 files/digest-kdebase-3.3.2-r1 68
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
-RMD160 279e1c383ca8e7e1d2f7ad3d0724de0333bf4da3 files/digest-kdebase-3.3.2-r2 68
-SHA256 f60d1178139da88f7351d52088e5d1d82bf55db81809b48db21ccdb6fcf316e5 files/digest-kdebase-3.3.2-r2 68
 MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
-RMD160 279e1c383ca8e7e1d2f7ad3d0724de0333bf4da3 files/digest-kdebase-3.3.2-r3 68
-SHA256 f60d1178139da88f7351d52088e5d1d82bf55db81809b48db21ccdb6fcf316e5 files/digest-kdebase-3.3.2-r3 68
 MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1-r1 68
-RMD160 97f606d6b4927aba3a0f7938611ce36f739340f3 files/digest-kdebase-3.4.1-r1 68
-SHA256 ac935314ab67038aac48e2eeeed31265932c24af25cb077ca317ad8bad59bea0 files/digest-kdebase-3.4.1-r1 68
 MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2 68
-RMD160 2c76c722f5ee8051ca3c04f9918a7f4a8cd48bc1 files/digest-kdebase-3.4.2 68
-SHA256 a08b36e2da283323c394b9d85a1e0054a55b3d49c007a0987a9ec6c022ccb9b5 files/digest-kdebase-3.4.2 68
 MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2-r1 68
-RMD160 2c76c722f5ee8051ca3c04f9918a7f4a8cd48bc1 files/digest-kdebase-3.4.2-r1 68
-SHA256 a08b36e2da283323c394b9d85a1e0054a55b3d49c007a0987a9ec6c022ccb9b5 files/digest-kdebase-3.4.2-r1 68
 MD5 387a99610a8332cea995ed48d7e3339b files/digest-kdebase-3.4.2-r2 143
-RMD160 0bcbb2fb450fa1c27cf0f77146727845aaa35fd8 files/digest-kdebase-3.4.2-r2 143
-SHA256 3f87a7af466598e8ce7e4a07f5be35052768b4c5ca8b4cece77308847078bf2a files/digest-kdebase-3.4.2-r2 143
 MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-3.4.3 145
-RMD160 6b15d62234180bb1a6bdb93eaaf00b8e8c250831 files/digest-kdebase-3.4.3 145
-SHA256 17214120d785f9b7a57adde1d220b7b9cedd8d8ece850501b1695f2dd6db257f files/digest-kdebase-3.4.3 145
 MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-3.4.3-r1 145
-RMD160 6b15d62234180bb1a6bdb93eaaf00b8e8c250831 files/digest-kdebase-3.4.3-r1 145
-SHA256 17214120d785f9b7a57adde1d220b7b9cedd8d8ece850501b1695f2dd6db257f files/digest-kdebase-3.4.3-r1 145
 MD5 a2128e7c7d0adb0dd7af470def77f880 files/digest-kdebase-3.5.0-r1 142
-RMD160 5a25b9d5e731ecbb0238d4016eec7d640fd809ca files/digest-kdebase-3.5.0-r1 142
-SHA256 2aa9daeb1aa26a4ddbc37c210bcd1cde8dbaa15d45bfd5f58d45ac26f7d36aea files/digest-kdebase-3.5.0-r1 142
 MD5 340e546ce7b64129122115c8301d915e files/digest-kdebase-3.5.1 142
-RMD160 8fcd5454724efcf07804b2296a098343733bc198 files/digest-kdebase-3.5.1 142
-SHA256 55dfdfa182c6a8f9b39a15a5d897313cef65aa4369630e588f8410aab6970627 files/digest-kdebase-3.5.1 142
+MD5 340e546ce7b64129122115c8301d915e files/digest-kdebase-3.5.1-r1 142
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-RMD160 a7ce9d94fac98f513e0df2b59026c17e0999c33c files/kde-np.pam 379
-SHA256 e84fa10df5ec9b81b9a19d373fa60d4ebeaad4cd748a775f3dcc15921c7657e0 files/kde-np.pam 379
 MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
-RMD160 a66efb59c231330e211f4fd4d604caae3fe2aa6d files/kde.desktop 3910
-SHA256 416172223bf8fc23b26a48c2cda24810f939342fd48037717d0005f6217ce6b4 files/kde.desktop 3910
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-RMD160 f3f47a59375b02c2645af558a44e0ad94a203411 files/kde.pam 405
-SHA256 1864f6ba56e3d8352539aef94f75e507be4283e11d7e2347c013eba8fee6bd77 files/kde.pam 405
 MD5 c13bb6243f0c10dd3892ca00a9fce333 files/kdebase-3.4-configure.patch 7273
-RMD160 971dd8ee9199219cf7ae266120bb67e92aecb2ac files/kdebase-3.4-configure.patch 7273
-SHA256 2b7cb9084c06e4da53e906aa0d3bb7ff52ae1c6d0dcaa1e983d3d84534c56211 files/kdebase-3.4-configure.patch 7273
 MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
-RMD160 e48887385354d82ff3c9726006b3839a6da22524 files/kdebase-3.4.1-configure.patch 6497
-SHA256 cca11083fcb7ca6e1c3c22e89c476569f8c3ad8bd20448d56314879d42f30b90 files/kdebase-3.4.1-configure.patch 6497
 MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.1-startkde-gentoo.patch 1284
-RMD160 ed121f7b31d54262af7fd85995bb2a258c9e2590 files/kdebase-3.4.1-startkde-gentoo.patch 1284
-SHA256 047293bb0cdcaf19ec21fb8381c304306a4753023f8e7c82ede8fabab862cc48 files/kdebase-3.4.1-startkde-gentoo.patch 1284
 MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
-RMD160 6eda9169a469f4b403588266c359af960574be77 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
-SHA256 913a471769ed045badc10cec6d1788896b3c6a8b993e234ca74ebb7c415cb5c0 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
 MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
-RMD160 5161e8c9895372eef07a962d7f64adabb951313e files/kdebase-3.4.2-konqueror-filter.patch 899
-SHA256 0debb9cd5d8ac571924a135893c146d58aa5770e9fc60fd6363607432d6bab77 files/kdebase-3.4.2-konqueror-filter.patch 899
 MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
-RMD160 72eaff49bea56612492a88ddeaa3ad529001b251 files/kdebase-3.4.3-noimake.patch 2214
-SHA256 8cb4a0ed5f5c02bc9c1e1b9e1ba8f45f963bcbbe08210c02d8a9bb00434d143f files/kdebase-3.4.3-noimake.patch 2214
 MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
-RMD160 10d4bba34bb3c6bb398f68423a766ca27dab92e8 files/kdebase-3.4.3-xdmcp.patch 614
-SHA256 bedfb9a156f13f721f74e30ff525bbe982a27d7d8dc3a25787745a1380f8513f files/kdebase-3.4.3-xdmcp.patch 614
+MD5 33f94f4cf8b5b34dd04b50e159d07ae5 files/kdebase-3.5.1-kicker.patch 1322
 MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
-RMD160 b25eaa3561a402620413ba8a2be2db91e564461e files/konsole-3.3.2.patch 1201
-SHA256 bab26c70517b86d93423ea2c73e6ba85c14df1e317b0b91d5ed7aef4db736e78 files/konsole-3.3.2.patch 1201
+MD5 42226b3baf60c509e74036e7bb7a7b4e files/kxkb3.5.1.xx_XX_layouts.patch 806
 MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
-RMD160 12a1f6236c84300452b8375abd838fd9ccc45ff8 files/post-3.3.2-kdebase-htmlframes2.patch 1342
-SHA256 55142fe08c664b69a3fe184ef263230094bb3924aeec013873884bc8f954fa1e files/post-3.3.2-kdebase-htmlframes2.patch 1342
 MD5 4b6c7be574669a87540dceb67b7bb2c4 kdebase-3.3.2-r1.ebuild 4013
-RMD160 5a622331265df1da16c5d6aafd65402a4f93cd1e kdebase-3.3.2-r1.ebuild 4013
-SHA256 7b5e14bedeb55ad3e7c91235ac6fe8e6bd038b2fceb85c3bdc5265b4740718a7 kdebase-3.3.2-r1.ebuild 4013
 MD5 a7c76a427186b4838e262cdc4b3194bc kdebase-3.3.2-r2.ebuild 3798
-RMD160 0f86ccf407c81d5f1db8863568abf7f9efa64d4a kdebase-3.3.2-r2.ebuild 3798
-SHA256 c1f101646a696da0f8e4145cdbe8ef255fbf92b5700f456558ce0756f88076f6 kdebase-3.3.2-r2.ebuild 3798
 MD5 af8292fa18d6323dd06c87994032cf60 kdebase-3.3.2-r3.ebuild 3921
-RMD160 9f4e7b74ad90d65000239e4c158c7f1407d9c9dd kdebase-3.3.2-r3.ebuild 3921
-SHA256 dcdde0b6357e38ce605660cc0c19d130cc35cb3059b4567398d013b359f2e9f3 kdebase-3.3.2-r3.ebuild 3921
 MD5 74c98765d1be677dda62670f1e1ff9d1 kdebase-3.4.1-r1.ebuild 4052
-RMD160 f02e8bfb8e2e66979b4dda388cc361550238c41b kdebase-3.4.1-r1.ebuild 4052
-SHA256 aec8d33cf8c66f453881e4c4b5d950b3789a7c8fe4644792246433c515d9bcc0 kdebase-3.4.1-r1.ebuild 4052
 MD5 173c4971290adc27708316e718aaff8c kdebase-3.4.2-r1.ebuild 4394
-RMD160 ff2aed2b3259ea9295beee45268849fccba0a255 kdebase-3.4.2-r1.ebuild 4394
-SHA256 f9d7753c6a8d6148f06a95bfe6bc140fde19b0163f9adfbf885c7b4a9928f5ee kdebase-3.4.2-r1.ebuild 4394
 MD5 7458e9d43c935c429d33907094cc2ae2 kdebase-3.4.2-r2.ebuild 4698
-RMD160 0d9d7985c4a2087a94ba7f7bee5bb95821638f94 kdebase-3.4.2-r2.ebuild 4698
-SHA256 5e7a9873920e9e07c4fa089d2f428f1a53d003ed505cddd339652034d85648aa kdebase-3.4.2-r2.ebuild 4698
 MD5 bef97920556f498a65abdf7fe0712682 kdebase-3.4.2.ebuild 4255
-RMD160 a4098dfb9ed093aafbbfac898b825c83c3d87303 kdebase-3.4.2.ebuild 4255
-SHA256 c8f62a55276c535602999ebd606f550a95fecfcd928a42596c92d37cc5618930 kdebase-3.4.2.ebuild 4255
 MD5 ee64fc183f47a6b5366a0bff52955125 kdebase-3.4.3-r1.ebuild 4663
-RMD160 c6ed77b09394227fb938830d94050cb26334eee0 kdebase-3.4.3-r1.ebuild 4663
-SHA256 d3543a7c58dc4dc27f90212f2d8a50557d5bf9b2cf0799141e96bc53b28debf4 kdebase-3.4.3-r1.ebuild 4663
 MD5 84fbf5ffb4d97619f345862b690af502 kdebase-3.4.3.ebuild 4434
-RMD160 2f750730942d06ad194216c3d2b8766b3d0571dd kdebase-3.4.3.ebuild 4434
-SHA256 b6fd995594e563d292eaa7477ceed26143b5151d3263b0be593c18815073455a kdebase-3.4.3.ebuild 4434
 MD5 3ee4ab274fd461f29c11f95278d0e821 kdebase-3.5.0-r1.ebuild 6216
-RMD160 48675459453b6fbf6ca3f3ada28bed87b9e54387 kdebase-3.5.0-r1.ebuild 6216
-SHA256 7b2d7dd1e1b800c2cda0c63220d6e24025b006037c29bd2f6155ff59f4c6d973 kdebase-3.5.0-r1.ebuild 6216
+MD5 dffb667531113a048d5c099402edce71 kdebase-3.5.1-r1.ebuild 5175
 MD5 b1dcc2a2e4a9b309795b9be7378f3c68 kdebase-3.5.1.ebuild 5083
-RMD160 56e6d35a8f001c0891ffcf937f25b3eaf0865c03 kdebase-3.5.1.ebuild 5083
-SHA256 9a65d4671f100dec7a24cce66922ca243314d86c97a37b29ce3ab21e5c2042d4 kdebase-3.5.1.ebuild 5083
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD3WVdAiZjviIA2XgRAlAIAJ4w+UCAcmk8uCTI9/o7THR3H4UkeQCg50JH
-Zd3DJ3CAqURyViMGQ3HPRmI=
-=a8BJ
------END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.1-r1
new file mode 100644
index 000000000000..e7fa262ae41d
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.1-r1
@@ -0,0 +1,2 @@
+MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
+MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch b/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch
new file mode 100644
index 000000000000..6cf272391a96
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch
@@ -0,0 +1,40 @@
+--- branches/KDE/3.5/kdebase/kicker/taskmanager/taskmanager.cpp #505029:505030
+@@ -378,9 +378,8 @@
+     }
+ 
+     // check if any state we are interested in is marked dirty
+-    if (!(dirty & (NET::WMVisibleName | NET::WMVisibleIconName | NET::WMName |
+-                   NET::WMIconName | NET::WMState | NET::WMIcon |
+-                   NET::XAWMState | NET::WMDesktop) ||
++    if (!(dirty & (NET::WMVisibleName | NET::WMName | NET::WMIcon |
++                  NET::WMState | NET::XAWMState | NET::WMDesktop) ||
+           (m_trackGeometry && dirty & NET::WMGeometry)))
+     {
+         return;
+@@ -404,9 +403,12 @@
+     if (dirty & NET::WMIcon)
+     {
+         t->refreshIcon();
++
++        // we're done with the icon processing, don't pass this on anymore
++        dirty ^= NET::WMIcon;
+     }
+ 
+-    if (dirty != NET::WMIcon)
++    if (dirty)
+     {
+         // only refresh this stuff if we have other changes besides icons
+         t->refresh(dirty);
+@@ -725,10 +727,10 @@
+ 
+ void Task::refresh(unsigned int dirty)
+ {
+-    QString name = visibleIconicName();
++    QString name = visibleName();
+     _info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions);
+ 
+-    if (dirty != NET::WMName || name != visibleIconicName())
++    if (dirty != NET::WMName || name != visibleName())
+     {
+         emit changed();
+     } 
\ No newline at end of file
diff --git a/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch b/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch
new file mode 100644
index 000000000000..741c0d348ffa
--- /dev/null
+++ b/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch
@@ -0,0 +1,22 @@
+Index: rules.cpp
+===================================================================
+--- kxkb/rules.cpp	(revision 504758)
++++ kxkb/rules.cpp	(working copy)
+@@ -300,7 +300,7 @@
+  */
+ const QString KeyRules::getLayout(const QString &layvar) const
+ {
+-  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
++  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
+   QString varLine = layvar.stripWhiteSpace();
+   QRegExp rx(LAYOUT_PATTERN);
+   int pos = rx.search(varLine, 0);
+@@ -318,7 +318,7 @@
+  */
+ const QString KeyRules::getVariant(const QString &layvar) const
+ {
+-  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
++  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
+   QString varLine = layvar.stripWhiteSpace();
+   QRegExp rx(VARIANT_PATTERN);
+   int pos = rx.search(varLine, 0);
diff --git a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..e0122e482abe
--- /dev/null
+++ b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r1.ebuild,v 1.1 2006/02/03 17:47:28 carlo Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
+pam samba ssl zeroconf xcomposite xscreensaver xinerama"
+# hal: enables hal backend for 'media:' ioslave
+
+DEPEND="arts? ( ~kde-base/arts-${PV} )
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	pam? ( kde-base/kdebase-pam )
+	>=dev-libs/cyrus-sasl-2
+	ldap? ( >=net-nds/openldap-2 )
+	cups? ( net-print/cups )
+	ssl? ( dev-libs/openssl )
+	opengl? ( virtual/opengl )
+	openexr? ( >=media-libs/openexr-1.2 )
+	samba? ( >=net-fs/samba-3.0.4 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
+	ieee1394? ( sys-libs/libraw1394 )
+	hal? ( >=sys-apps/dbus-0.33
+	       =sys-apps/hal-0.5*
+		   sys-apps/pmount )
+	zeroconf? ( net-misc/mDNSResponder )"
+
+RDEPEND="${DEPEND}
+	sys-apps/usbutils
+	java? ( >=virtual/jre-1.4 )
+	virtual/eject
+	|| ( (
+			x11-apps/xmessage
+			x11-apps/xsetroot
+			x11-apps/xset
+			x11-apps/xrandr
+			x11-apps/mkfontdir
+			x11-misc/xkbdata
+			x11-apps/setxkbmap
+		) virtual/x11 )
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)
+	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+
+DEPEND="${DEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)
+	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch
+	${FILESDIR}/kdebase-3.5.1-kicker.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
+
+	# Avoid using imake (kde bug 114466).
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+
+	# For the noimake patch.
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	local myconf="--with-dpms
+	              $(use_with arts) $(use_with ldap)
+	              $(use_with opengl gl) $(use_with ssl)
+	              $(use_with samba) $(use_with openexr)
+	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
+	              $(use_with ieee1394 libraw1394) $(use_with hal)
+	              $(use_enable zeroconf dnssd)
+				  $(use_with xcomposite composite)
+				  $(use_with xscreensaver)
+				  $(use_with xinerama)
+				  --with-usbids=/usr/share/misc/usb.ids"
+
+	if use pam; then
+		myconf="${myconf} --with-pam=yes"
+	else
+		myconf="${myconf} --with-pam=no --with-shadow"
+	fi
+
+	# the java test is problematic (see kde bug 100729) and
+	# useless. All that's needed for java applets to work is
+	# to have the 'java' executable in PATH.
+	myconf="${myconf} --without-java"
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# startup and shutdown scripts
+	insinto ${KDEDIR}/env
+	doins ${FILESDIR}/agent-startup.sh
+
+	exeinto ${KDEDIR}/shutdown
+	doexe ${FILESDIR}/agent-shutdown.sh
+
+	# freedesktop environment variables
+	cat <<EOF > ${T}/xdg.sh
+export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+EOF
+	insinto ${KDEDIR}/env
+	doins ${T}/xdg.sh
+
+	# x11 session script
+	cat <<EOF > ${T}/kde-${SLOT}
+#!/bin/sh
+exec ${KDEDIR}/bin/startkde
+EOF
+	exeinto /etc/X11/Sessions
+	doexe ${T}/kde-${SLOT}
+
+	# freedesktop compliant session script
+	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
+		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
+	insinto /usr/share/xsessions
+	doins ${T}/kde-${SLOT}.desktop
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+
+	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	# set the default kdm face icon if it's not already set by the system admin
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	fi
+
+	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
+
+	echo
+	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
+	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+}