Re-apply fixes for modular X setups, libxslt dependency and ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre7-r4

5 files changed, 131 insertions, 8 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index a181fda0084c..3b81c21e037d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.314 2006/04/03 23:38:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.315 2006/04/05 13:08:54 flameeyes Exp $
+
+*kdelibs-3.5.2-r2 (05 Apr 2006)
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdelibs-3.5.2-r1.ebuild, +kdelibs-3.5.2-r2.ebuild:
+  Re-apply fixes for modular X setups, libxslt dependency and ~x86-fbsd keyword.
 
 *kdelibs-3.5.2-r1 (03 Apr 2006)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index cdff8ad07a79..d780b48666f1 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,48 +1,154 @@
-MD5 7ea97bd510e50d0ba037d9f3e1cd366a ChangeLog 50369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 732cb568e34bac42c77fb39005760118 ChangeLog 50595
+RMD160 442162f96fb835e12ff2ee6ca52db2b5d3cc01bc ChangeLog 50595
+SHA256 f0955d6ede40023f5683c8f5a4ed629d84b5b0b8035d8c777c914763cd73143f ChangeLog 50595
 MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
+RMD160 02fa5c01bcd3d1ca4d7197e6278e524ef3f3ed57 files/digest-kdelibs-3.3.2-r10 517
+SHA256 1de0e42937ee68816eabf4f32d6a445a2eb4fddbbe88ff524f466c57b4ba5d17 files/digest-kdelibs-3.3.2-r10 517
 MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
+RMD160 ab733bc1102f57a113e946f52588d01977ea22c7 files/digest-kdelibs-3.4.1-r1 68
+SHA256 977c66e32d01c7fe8937e0cb70edda4ccd82b15191a644d06fc749f136603c00 files/digest-kdelibs-3.4.1-r1 68
 MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
+RMD160 ab733bc1102f57a113e946f52588d01977ea22c7 files/digest-kdelibs-3.4.1-r2 68
+SHA256 977c66e32d01c7fe8937e0cb70edda4ccd82b15191a644d06fc749f136603c00 files/digest-kdelibs-3.4.1-r2 68
 MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2 68
+RMD160 35b4b5cd961783f698f9571d192d651a55b11c16 files/digest-kdelibs-3.4.2 68
+SHA256 4a9d071579695c2aa2c1007ae216694c93da77532fc8b860c3e1943d5a117674 files/digest-kdelibs-3.4.2 68
 MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2-r1 68
+RMD160 35b4b5cd961783f698f9571d192d651a55b11c16 files/digest-kdelibs-3.4.2-r1 68
+SHA256 4a9d071579695c2aa2c1007ae216694c93da77532fc8b860c3e1943d5a117674 files/digest-kdelibs-3.4.2-r1 68
 MD5 e7fe23c3618de82d63dfdc90fb483a86 files/digest-kdelibs-3.4.3 68
+RMD160 e797fa494c2558ef314a455adad009ddfba8937d files/digest-kdelibs-3.4.3 68
+SHA256 0955ab88a478ca0674c741794f05c54ec25663013e73c381360d524b60df7c74 files/digest-kdelibs-3.4.3 68
 MD5 e7fe23c3618de82d63dfdc90fb483a86 files/digest-kdelibs-3.4.3-r1 68
+RMD160 e797fa494c2558ef314a455adad009ddfba8937d files/digest-kdelibs-3.4.3-r1 68
+SHA256 0955ab88a478ca0674c741794f05c54ec25663013e73c381360d524b60df7c74 files/digest-kdelibs-3.4.3-r1 68
 MD5 3e56d0cc58ec7854ae2f9c23bb729028 files/digest-kdelibs-3.5.0 68
+RMD160 3317c5b777eb06a7e33f9bda5e3402a01fa02eab files/digest-kdelibs-3.5.0 68
+SHA256 eb92c0feadb4f57e7364e550381101985eeb66ca667711326a6b23cd0cf3535d files/digest-kdelibs-3.5.0 68
 MD5 3e56d0cc58ec7854ae2f9c23bb729028 files/digest-kdelibs-3.5.0-r1 68
+RMD160 3317c5b777eb06a7e33f9bda5e3402a01fa02eab files/digest-kdelibs-3.5.0-r1 68
+SHA256 eb92c0feadb4f57e7364e550381101985eeb66ca667711326a6b23cd0cf3535d files/digest-kdelibs-3.5.0-r1 68
 MD5 3e56d0cc58ec7854ae2f9c23bb729028 files/digest-kdelibs-3.5.0-r2 68
+RMD160 3317c5b777eb06a7e33f9bda5e3402a01fa02eab files/digest-kdelibs-3.5.0-r2 68
+SHA256 eb92c0feadb4f57e7364e550381101985eeb66ca667711326a6b23cd0cf3535d files/digest-kdelibs-3.5.0-r2 68
 MD5 6508f7c84d8b68a6977113b719de2ff2 files/digest-kdelibs-3.5.1 68
+RMD160 e3950ddb609ebba9312a6402983df9c3b90ace55 files/digest-kdelibs-3.5.1 68
+SHA256 c8871d11879eb9ca72d5b8d20edebc9e97d68d4fde576f6ee06603696b184044 files/digest-kdelibs-3.5.1 68
 MD5 af68605e7f8cfd7d50461c32fc00d072 files/digest-kdelibs-3.5.1-r1 250
+RMD160 d90fc43b4479c8e2c8da7793a3dcfb463916c630 files/digest-kdelibs-3.5.1-r1 250
+SHA256 4e62cda1cc268ca4be7318a16dfe9df2bc779219eedf0f2e8d64e44eff0f2a4a files/digest-kdelibs-3.5.1-r1 250
 MD5 4c4f49895caa9f8976a6dced47216f21 files/digest-kdelibs-3.5.2 250
-MD5 380d0beea866646a3702d083896cff80 files/digest-kdelibs-3.5.2-r1 68
+RMD160 350f7a5f0dcebef5284f69bf12fd63fda5d4b554 files/digest-kdelibs-3.5.2 250
+SHA256 0f76ea6e9b50e50652b39e7372552cab0d8578b6ac2f9c76d2e9efcbf3e5bc97 files/digest-kdelibs-3.5.2 250
+MD5 4c4f49895caa9f8976a6dced47216f21 files/digest-kdelibs-3.5.2-r2 250
+RMD160 350f7a5f0dcebef5284f69bf12fd63fda5d4b554 files/digest-kdelibs-3.5.2-r2 250
+SHA256 0f76ea6e9b50e50652b39e7372552cab0d8578b6ac2f9c76d2e9efcbf3e5bc97 files/digest-kdelibs-3.5.2-r2 250
 MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681
+SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe files/kde3-dcopidlng.patch 681
 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
+RMD160 9bfa0b6a09aa60a7c52b3f2897b8f9d2e7479c70 files/kdelibs-3.3.2-anchor-fix.patch 5947
+SHA256 581d8dbb36681b9455e9479f3b5b1c2df13442a84ce0469b709148edd7ced770 files/kdelibs-3.3.2-anchor-fix.patch 5947
 MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+RMD160 955e64a9c0e01926fcc842338496f718e3bcaa8d files/kdelibs-3.3.2-aspell-dir.patch 467
+SHA256 c35e1706ad5687921de1f7d38f9729df4cc812c470e9cde26348fdc5d1a15f63 files/kdelibs-3.3.2-aspell-dir.patch 467
 MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+RMD160 c362fecc45636d7a2d25f79c0d2225bf98543677 files/kdelibs-3.3.2-ppc64.patch 957
+SHA256 c2492a503e41b8b652c91ee0bdbe36cb81401aa5c2aee899d3596fce873e2e02 files/kdelibs-3.3.2-ppc64.patch 957
 MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
+RMD160 37ae02ce1da2b281b6a7a65b72b5749a5f599ed3 files/kdelibs-3.4.1-configure.patch 4558
+SHA256 0a8baf8c4467ca1234b94c6a9a423519a980cc505d6bd8b5e19dd7ef672d5eec files/kdelibs-3.4.1-configure.patch 4558
 MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
+RMD160 003e35c9ddadc2fa102532b582b4301700b4fa9e files/kdelibs-3.4.1-kntlm.patch 1323
+SHA256 7da50f14bcff27a50fb0a1685e3d5622b6915c7b18dd19466b30e523c52af07b files/kdelibs-3.4.1-kntlm.patch 1323
 MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+RMD160 ac90500b2cc8a28e7380b92ec36e299bda73344d files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+SHA256 54449f95e2e1ce26d76541fa591dd99e5a7542a97f7feaee2ab3cda8170c2a6b files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
 MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
+RMD160 c5a35a17acc2a7b9644f10641e6a6791f7ad5942 files/kdelibs-3.4.2-gmail-fix.patch 724
+SHA256 d148b59cfdcbbd0596adb5d35030b3446694b4b00ff268e58694b2edc7176a08 files/kdelibs-3.4.2-gmail-fix.patch 724
 MD5 b0a18256a9bb33e81f45573f07a341e1 files/kdelibs-3.4.3-inttypes.patch 365
+RMD160 168a3826787553cb018ea8f282eedaa203563690 files/kdelibs-3.4.3-inttypes.patch 365
+SHA256 8ad8265109186cc5fa10a85f8006f3147517c102e2129d5a7b4b690f3a77d103 files/kdelibs-3.4.3-inttypes.patch 365
 MD5 15d3d3042e0bb2c9b640e8993aa234b1 files/kdelibs-3.5.0-bindnow.patch 1363
+RMD160 e0c25c7ac4bb4d0be389a529aded621499a844cc files/kdelibs-3.5.0-bindnow.patch 1363
+SHA256 243fc766daf2e324ccc7984843c9fe27aa463acacedb35e848eec645f1a232a4 files/kdelibs-3.5.0-bindnow.patch 1363
 MD5 091d05a08330372ddbaf5ef9d426be53 files/kdelibs-3.5.0-kicker-crash.patch 1298
+RMD160 d21a8d865fb3dc94dd597221ef14e43b878864b4 files/kdelibs-3.5.0-kicker-crash.patch 1298
+SHA256 55c03dec7736a84e0ef217bef71491a223c0d4d7f9315f2f05cb935ad96b3bd8 files/kdelibs-3.5.0-kicker-crash.patch 1298
 MD5 ff8c8a3637ab8276606dfba0bf33c05b files/kdelibs-3.5.1-kurllabel.patch 1991
+RMD160 59cb8c9ce5b3da7dd87adc119bc08a6d4bf661e7 files/kdelibs-3.5.1-kurllabel.patch 1991
+SHA256 f20969493685d0890f048d3d146ab81b7a7cd3433bc95fe1a75381a3dcc62d16 files/kdelibs-3.5.1-kurllabel.patch 1991
 MD5 b90114903755198fb136b739697819eb files/kdelibs-3.5.2-kate-fixes.diff 14651
+RMD160 a6598ddd9c1c27ab97cc7d90cbb5f185c615c103 files/kdelibs-3.5.2-kate-fixes.diff 14651
+SHA256 f9942c9454a5ec0864afc02efe1b0d55ba5b9412fed7e0b944763ff4673a0473 files/kdelibs-3.5.2-kate-fixes.diff 14651
 MD5 f80013d47f75d05b7d79c2a8aa93f19c files/kdelibs-3.5.2-kio-errror-handling.diff 3919
+RMD160 116461122bf41acde461ff76cdf0b63b356b10bd files/kdelibs-3.5.2-kio-errror-handling.diff 3919
+SHA256 33293320f31258d7a402808e44d052eb6f9d1774feb9bdce35952ee78e71bbbf files/kdelibs-3.5.2-kio-errror-handling.diff 3919
 MD5 073d3bf868dd8f07df2029d692308cb4 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633
+RMD160 778c7cbf959ec1ed49ced9c1883d77c178f5c7b5 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633
+SHA256 a16796bcda093dcbb51fb62c7e7bd0db1d174cc7b691a6bdbd863fd803d4ed25 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633
 MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+RMD160 0667bec1d6c4f77d34693f33770a3d7e5db9e67b files/post-3.3.2-kdelibs-htmlframes2.patch 989
+SHA256 101f230e3e760c68323e9392ba666123a495b3885000e570c0b484370f134561 files/post-3.3.2-kdelibs-htmlframes2.patch 989
 MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
+RMD160 78afa73da3f39e123a4d24aa216a5260f2484372 files/post-3.3.2-kdelibs-kate.diff 2212
+SHA256 7f02119f028936033afe7e7e49aa661c73a1b7af6801a281c832544d76b37ea1 files/post-3.3.2-kdelibs-kate.diff 2212
 MD5 ecc0ec13ce3b06e94e35aa8e937e02bf files/post-3.4.3-kdelibs-kjs.diff 1570
+RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d files/post-3.4.3-kdelibs-kjs.diff 1570
+SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724 files/post-3.4.3-kdelibs-kjs.diff 1570
 MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
+RMD160 e6323e26050b02ff98f888659fa6c1017b7cf9e1 kdelibs-3.3.2-r10.ebuild 4318
+SHA256 a1f09717ba0e7b34c4aa6b0f3ff0b26ab63dfdf2e19f67dcc276f78a7a0e40e5 kdelibs-3.3.2-r10.ebuild 4318
 MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
+RMD160 399a993c72c61f1bb76ac0fd3e03b5da11426a67 kdelibs-3.4.1-r1.ebuild 3363
+SHA256 4b105fc726fd5f1c778d1432409e232f041e8f188a7c57b1d477a3b8b4f109a3 kdelibs-3.4.1-r1.ebuild 3363
 MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364
+RMD160 1bd31964a458676182791cb933861389c2b86836 kdelibs-3.4.1-r2.ebuild 3364
+SHA256 3e61422a0866d26116de0ef1fba2ae83e46f50c6f830059fb0067e1c2c4648bd kdelibs-3.4.1-r2.ebuild 3364
 MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341
+RMD160 ebc4ccdbcb8cdc48b7eea50a5c6589b9862d93f0 kdelibs-3.4.2-r1.ebuild 3341
+SHA256 e7d7b2920bd0a0e8ffc6693bb8ea5f3b92fb639dea1314378e488d15aaad07a3 kdelibs-3.4.2-r1.ebuild 3341
 MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
+RMD160 37e4dcb010637218385ca342d28088c1fd4da319 kdelibs-3.4.2.ebuild 3346
+SHA256 76d4639b702bb8ba29ed795b3ce5d0eba2bee5ca275a2c97c8b527a53a8907c0 kdelibs-3.4.2.ebuild 3346
 MD5 2c50f5fde5dce4194f6b3dd5e21dfe4a kdelibs-3.4.3-r1.ebuild 3481
+RMD160 9d807e8decea2fe8b2193bec5557d8d788ec689c kdelibs-3.4.3-r1.ebuild 3481
+SHA256 6157936a48799baf75da7264fe1bf3fbff5a6009c94af65c896303230d26f247 kdelibs-3.4.3-r1.ebuild 3481
 MD5 8118ed2fe88987c7ed81197599658246 kdelibs-3.4.3.ebuild 3383
+RMD160 870e0416082a16fdb32316a46c3984738b50cbd5 kdelibs-3.4.3.ebuild 3383
+SHA256 b3d115570db1abe9d8582b39824cfa31a263a6cc889fcfc280960cf3330842d7 kdelibs-3.4.3.ebuild 3383
 MD5 c3c0ce25b29f40aa21a5cfbf711d63f5 kdelibs-3.5.0-r1.ebuild 3755
+RMD160 0d4d0931a54e77528d3011134edecadcdbed70e2 kdelibs-3.5.0-r1.ebuild 3755
+SHA256 10e64963cbcc97f9cd0e248d2a13334622299b1e5eece06c8fc7e08a94bf8e6c kdelibs-3.5.0-r1.ebuild 3755
 MD5 e95c1bad80bff99264f066c641a2ad17 kdelibs-3.5.0-r2.ebuild 3796
+RMD160 33be8ae1614ca147a05ce5d06fa785c3eea7a37f kdelibs-3.5.0-r2.ebuild 3796
+SHA256 6658105addb6b107bc651d80273056aff210f2f5d299c2fa9698aac459f91c65 kdelibs-3.5.0-r2.ebuild 3796
 MD5 f0e4dcbb7b8e88eeecf66511befbc047 kdelibs-3.5.0.ebuild 3718
+RMD160 3827ca40bd0ce02f36900bf385030218a7e351fa kdelibs-3.5.0.ebuild 3718
+SHA256 8644f4572b02c6a7bc9e1614ff6e33512e325778859fdef934f07b0d4890fe3d kdelibs-3.5.0.ebuild 3718
 MD5 3e314940cee355ba08804999d32fde46 kdelibs-3.5.1-r1.ebuild 3946
+RMD160 04ebf2757675588c37fe29cfc87e645f6ea6fee4 kdelibs-3.5.1-r1.ebuild 3946
+SHA256 9f928a38f3a6c5962333a85be82a4205cc72891e337314167d518d6dbafa3ba8 kdelibs-3.5.1-r1.ebuild 3946
 MD5 9ff9d154ab7cbc0932c29eb82b398ef3 kdelibs-3.5.1.ebuild 3766
-MD5 bd01229fc2a1df35f95602eb11b14875 kdelibs-3.5.2-r1.ebuild 3900
+RMD160 ccbb0de5c64de324a209d6ecfd5b4d7500eeff8f kdelibs-3.5.1.ebuild 3766
+SHA256 4fc1cb704755ee4142ddd3625671fd301473834976175ffa566a4a1719181a1f kdelibs-3.5.1.ebuild 3766
+MD5 a16c66fff6c663988a028192d97a00db kdelibs-3.5.2-r2.ebuild 4092
+RMD160 a128ed65e8f7aae482b4ea30229a572c7d9bfff1 kdelibs-3.5.2-r2.ebuild 4092
+SHA256 3174528bf98032617ec1917f57ae4fd7e4d0812b6fb2d4fce049dec5a5c11c9f kdelibs-3.5.2-r2.ebuild 4092
 MD5 3b1e9e05a496be6c74c8d13bfa99cc69 kdelibs-3.5.2.ebuild 3994
+RMD160 0ca68f67ef913dd6a60419c60740de98aee0d6fd kdelibs-3.5.2.ebuild 3994
+SHA256 432f3c66f50e6238bb40a4ca8da477c7a57c6573969465dfdd395d70208d847b kdelibs-3.5.2.ebuild 3994
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEM8D3AiZjviIA2XgRAsqqAJ0UxphLzWiiX15Grxh5uteI7B9XngCeLEZC
+MF1k5SJZgPxw5tR3kcCdm5E=
+=MEXZ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r1
deleted file mode 100644
index 7399e31d3824..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2
new file mode 100644
index 000000000000..e777d868963f
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2
@@ -0,0 +1,3 @@
+MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103
+RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103
+SHA256 fb9e1f2d2cb1f88e47dccda151fe701140e888894eae98c7a7c017349411ca57 kdelibs-3.5.2.tar.bz2 15442103
diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild
index 3fc3222c8bc5..217d613fa739 100644
--- a/kde-base/kdelibs/kdelibs-3.5.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.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/kdelibs/kdelibs-3.5.2-r1.ebuild,v 1.1 2006/04/03 23:38:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild,v 1.1 2006/04/05 13:08:55 flameeyes Exp $
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
@@ -21,7 +21,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=media-libs/freetype-2
 	media-libs/fontconfig
-	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxslt-1.1.15
 	>=dev-libs/libxml2-2.6.6
 	>=dev-libs/libpcre-4.2
 	media-libs/libart_lgpl
@@ -46,6 +46,9 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
+RDEPEND="${RDEPEND}
+	|| ( x11-apps/rgb virtual/x11 )"
+
 PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/${PN}-3.5.0-kicker-crash.patch
 	${FILESDIR}/${P}-xorg7-rgbtxt.patch
@@ -53,6 +56,8 @@ PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch
 	${FILESDIR}/kdelibs-3.5.2-kate-fixes.diff"
 
 src_compile() {
+	rm -f ${S}/configure
+
 	# hspell is disabled because it requires version 0.9 of hspell that
 	# is not in portage yet; leaving it to autodetection tries to use it
 	# and then fails because of missing required functions
@@ -73,6 +78,10 @@ src_compile() {
 		myconf="${myconf} --without-aspell"
 	fi
 
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
 	myconf="${myconf} --disable-fast-malloc"
 
 	# fix bug 58179, bug 85593