Change xkbdata dep to || with xkeyboard-config, reported by Jure Repinc <jlp@holodeck1.com>.

Package-Manager: portage-2.1_pre4-r1

13 files changed, 140 insertions, 36 deletions

diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 54f61f0dbddf..943abbe32c64 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,52 +1,156 @@
 MD5 b3bfa178815633a3cc42b63752899133 ChangeLog 44815
+RMD160 aa73b3dfe000ed2243a2f7b3216cbf233492ff5f ChangeLog 44815
+SHA256 9636524d770a189ab3c9a24d7bbfcc652d6dd523c0aba8fa89ffee3d46db2984 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
+RMD160 8fcd5454724efcf07804b2296a098343733bc198 files/digest-kdebase-3.5.1-r1 142
+SHA256 55dfdfa182c6a8f9b39a15a5d897313cef65aa4369630e588f8410aab6970627 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
+RMD160 a9cafa82745979b6cc544f149023de9e2ed75ad5 files/kdebase-3.5.1-kicker.patch 1322
+SHA256 f2f9adca33d71f4b27763a07251cf6f2e0be75613e92449a816b7efc9ef3e734 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
+RMD160 9c0f77dd658e01795ad4ec0fa7ed11fcb2218af1 files/kxkb3.5.1.xx_XX_layouts.patch 806
+SHA256 fd3010f128ad54327558857135d0ab8f814b2e88cb4fb99086b4ac831c7dc83d files/kxkb3.5.1.xx_XX_layouts.patch 806
 MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
-MD5 4b6c7be574669a87540dceb67b7bb2c4 kdebase-3.3.2-r1.ebuild 4013
-MD5 a7c76a427186b4838e262cdc4b3194bc kdebase-3.3.2-r2.ebuild 3798
-MD5 af8292fa18d6323dd06c87994032cf60 kdebase-3.3.2-r3.ebuild 3921
-MD5 74c98765d1be677dda62670f1e1ff9d1 kdebase-3.4.1-r1.ebuild 4052
-MD5 173c4971290adc27708316e718aaff8c kdebase-3.4.2-r1.ebuild 4394
-MD5 7458e9d43c935c429d33907094cc2ae2 kdebase-3.4.2-r2.ebuild 4698
-MD5 bef97920556f498a65abdf7fe0712682 kdebase-3.4.2.ebuild 4255
-MD5 ee64fc183f47a6b5366a0bff52955125 kdebase-3.4.3-r1.ebuild 4663
-MD5 84fbf5ffb4d97619f345862b690af502 kdebase-3.4.3.ebuild 4434
-MD5 3ee4ab274fd461f29c11f95278d0e821 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 12a1f6236c84300452b8375abd838fd9ccc45ff8 files/post-3.3.2-kdebase-htmlframes2.patch 1342
+SHA256 55142fe08c664b69a3fe184ef263230094bb3924aeec013873884bc8f954fa1e files/post-3.3.2-kdebase-htmlframes2.patch 1342
+MD5 95a977df4bb3b97a1d37d837a5825235 kdebase-3.3.2-r1.ebuild 4046
+RMD160 83422d2edc21de6d80210e7f8bce87164cf910f9 kdebase-3.3.2-r1.ebuild 4046
+SHA256 b864b57d0e9544442c1dffb557938d879b19ccd9974b3c1285bded3347441d8f kdebase-3.3.2-r1.ebuild 4046
+MD5 a3f4693590461443562b7616687d59b6 kdebase-3.3.2-r2.ebuild 3831
+RMD160 ebe96878b94571135f2fb43f2d8b0753c353a3d1 kdebase-3.3.2-r2.ebuild 3831
+SHA256 63193a1d28f7eb6aafc4f11638811b1f740c3ee5c94145f398dffdbcfaf2a92b kdebase-3.3.2-r2.ebuild 3831
+MD5 6f8365fb6472abbc67213ac7bac8ac36 kdebase-3.3.2-r3.ebuild 3954
+RMD160 e206dab842b4f8f532b2b9367e9e91dd9414011c kdebase-3.3.2-r3.ebuild 3954
+SHA256 1d5a6d9e3fc1d23bcedbd8165de1a32755348e8f3885aa3e9610e50bf16b3714 kdebase-3.3.2-r3.ebuild 3954
+MD5 b9bcbc48f52e49818375a91656b8d821 kdebase-3.4.1-r1.ebuild 4085
+RMD160 a074281c1ef72705f94ed32d933b9f252d537693 kdebase-3.4.1-r1.ebuild 4085
+SHA256 081ff043fe72b2a5c1e7ece72e99d5a9d7e02b2a9596dfb7b08e4a410604aa72 kdebase-3.4.1-r1.ebuild 4085
+MD5 19683c36ae1f9f880eaf93203f0c5b02 kdebase-3.4.2-r1.ebuild 4427
+RMD160 0d7508dfad56e92db244a1b75776f390cea98340 kdebase-3.4.2-r1.ebuild 4427
+SHA256 94f4d6d37a77f0c99b8c5a9f9680454b86f071d1932aa2e9202cfad838234467 kdebase-3.4.2-r1.ebuild 4427
+MD5 2460a9a5d5f1376ef48a27eac374ec8d kdebase-3.4.2-r2.ebuild 4731
+RMD160 056eb316683c7e122164dbaf111d7af7cd27c13c kdebase-3.4.2-r2.ebuild 4731
+SHA256 900eaa0fb017e44301a370268480d514df168a7e94a5f62c787cbfe8c98c3636 kdebase-3.4.2-r2.ebuild 4731
+MD5 b55487abdc171cd67c3b95c3a17aeb4a kdebase-3.4.2.ebuild 4288
+RMD160 928e0ab42a6ee0c6b6492519767d8cdd2a4ab902 kdebase-3.4.2.ebuild 4288
+SHA256 c096ea6da5dc6b0c6be0c412f75c7894a73e73bbcf08ccf4906d64488beb639b kdebase-3.4.2.ebuild 4288
+MD5 28fdaa34273caaecf58f87499a9c662a kdebase-3.4.3-r1.ebuild 4696
+RMD160 3c2ba0fc57ae1ef7083eecdc59bba9f0d1fd4112 kdebase-3.4.3-r1.ebuild 4696
+SHA256 0f4aa20ad902cdd10952abbf962915b027e0970eb9068985d500e8a2dfc759ff kdebase-3.4.3-r1.ebuild 4696
+MD5 5a8b0e61c66d4067b0c55485d5d7468e kdebase-3.4.3.ebuild 4467
+RMD160 ae4d4ba058dadbd0f4d8550732a3fb5f223dfcf3 kdebase-3.4.3.ebuild 4467
+SHA256 f1ac302a79637d12336812cf94da66603532eaf107a0467304d5691cf3d0d1a8 kdebase-3.4.3.ebuild 4467
+MD5 a00a6ad253bf309d4de39d73be5ef333 kdebase-3.5.0-r1.ebuild 6249
+RMD160 bf622a873a7034bd253be9e5c3b0af749c46a2d5 kdebase-3.5.0-r1.ebuild 6249
+SHA256 95a4752cf7990a31a4ae3ba381b1d01840a7e526c875f3a45475d784bc910da1 kdebase-3.5.0-r1.ebuild 6249
+MD5 44c869f0a4cbebddf5726413985217d9 kdebase-3.5.1-r1.ebuild 5212
+RMD160 5bc39a5675a2499ef01c9a3b93d5af423be2ed69 kdebase-3.5.1-r1.ebuild 5212
+SHA256 86ac748dccd7b740709cb0cf1af1562f49eb7e1c35ce93a30a0d3c9a240c1c02 kdebase-3.5.1-r1.ebuild 5212
+MD5 e4b268e5fd737ffd4858993020e915ab kdebase-3.5.1.ebuild 5116
+RMD160 29a90af9ace387020879187c1dd7580661e4ea0d kdebase-3.5.1.ebuild 5116
+SHA256 18607df8898fa044582cca3d40cb94ba255991b3398183dbe9aaeda5f8eca714 kdebase-3.5.1.ebuild 5116
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
diff --git a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
index b616bc0bec63..93f215ca400f 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2-r1.ebuild,v 1.14 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
index 0ad7470db6c4..6b37bc8e9b51 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2-r2.ebuild,v 1.11 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r2.ebuild,v 1.12 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
index 7e954b8e9c0d..b63dde5b2b56 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.2-r3.ebuild,v 1.6 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r3.ebuild,v 1.7 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	sys-apps/eject"
diff --git a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild b/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
index a840c8eaa5de..c2353d3febba 100644
--- a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r1.ebuild,v 1.10 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.1-r1.ebuild,v 1.11 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	java? ( || ( virtual/jdk virtual/jre ) )
diff --git a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild b/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
index 895dec0c8552..3b1b8a5fac81 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2-r1.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r1.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
index c204636cbb01..9306b34912ae 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2-r2.ebuild,v 1.2 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r2.ebuild,v 1.3 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.2.ebuild b/kde-base/kdebase/kdebase-3.4.2.ebuild
index f1545642784f..792ad3cc6f93 100644
--- a/kde-base/kdebase/kdebase-3.4.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # 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.4.2.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -38,7 +38,7 @@ DEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	dev-util/pkgconfig"
diff --git a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
index 692802ffe862..b0bb7422b0fe 100644
--- a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.3-r1.ebuild,v 1.10 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3-r1.ebuild,v 1.11 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.4.3.ebuild b/kde-base/kdebase/kdebase-3.4.3.ebuild
index 3bc35d986fa2..5d044d69782f 100644
--- a/kde-base/kdebase/kdebase-3.4.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # 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.4.3.ebuild,v 1.3 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3.ebuild,v 1.4 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils
 
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	java? ( >=virtual/jre-1.4 )
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
index 65eb70d9a747..d97326f10286 100644
--- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.14 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	xcomposite? ( || ( (
diff --git a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
index e0122e482abe..5f23f4ee68e0 100644
--- a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r1.ebuild,v 1.2 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	xcomposite? ( || ( (
diff --git a/kde-base/kdebase/kdebase-3.5.1.ebuild b/kde-base/kdebase/kdebase-3.5.1.ebuild
index a3d1661b6c39..3c2f1e6b3927 100644
--- a/kde-base/kdebase/kdebase-3.5.1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.2 2006/01/30 01:01:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1.ebuild,v 1.3 2006/02/12 18:38:08 spyderous Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -43,7 +43,7 @@ RDEPEND="${DEPEND}
 			x11-apps/xset
 			x11-apps/xrandr
 			x11-apps/mkfontdir
-			x11-misc/xkbdata
+			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
 			x11-apps/setxkbmap
 		) virtual/x11 )
 	xcomposite? ( || ( (