diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-04 20:39:10 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-04 20:39:10 +0000 |
commit | d90441df28e45f19270ffa51b988fcd992895c6c (patch) | |
tree | 1cf85a9e003a58b8569a0ba78da45cc7dc398840 /kde-base/kdelibs | |
parent | Uncompress patches #120693 by Simon Stelling and just drop the ping related p... (diff) | |
download | historical-d90441df28e45f19270ffa51b988fcd992895c6c.tar.gz historical-d90441df28e45f19270ffa51b988fcd992895c6c.tar.bz2 historical-d90441df28e45f19270ffa51b988fcd992895c6c.zip |
Add patch to restore previous behavior with kurllabel as per bug #121571 (upstream bug #120291).
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r-- | kde-base/kdelibs/ChangeLog | 9 | ||||
-rw-r--r-- | kde-base/kdelibs/Manifest | 97 | ||||
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.5.1-r1 | 3 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch | 62 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.5.1-r1.ebuild | 132 |
5 files changed, 301 insertions, 2 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index 40b48fccdcad..7f471debf9fd 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,13 @@ # 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.305 2006/02/01 12:02:30 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.306 2006/02/04 20:39:10 flameeyes Exp $ + +*kdelibs-3.5.1-r1 (04 Feb 2006) + + 04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/kdelibs-3.5.1-kurllabel.patch, +kdelibs-3.5.1-r1.ebuild: + Add patch to restore previous behavior with kurllabel as per bug #121571 + (upstream bug #120291). 01 Feb 2006; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.5.1.ebuild: Correct SRC_URI. diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 704a7a83210e..039aa390fbbd 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,38 +1,133 @@ -MD5 0b3536e209b57907d3f8d49dd8c5c351 ChangeLog 48715 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 ed884ed0382d45d1358df22ead8e5fd6 ChangeLog 48973 +RMD160 278924bf01126f9b973c71c27cca42b6fa2c17d8 ChangeLog 48973 +SHA256 69e195fa95cdd3c06af4e3d9f314faf4b0134be646ccefc9a14fdcfccb15af3b ChangeLog 48973 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 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 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 164d14643073731884968190e92185f5 kdelibs-3.4.3-r1.ebuild 3481 +RMD160 f8cceeb88d630ba4f839a367b59fae8f6d66ca9c kdelibs-3.4.3-r1.ebuild 3481 +SHA256 b6c7bd2c7762c091bba83faddaf9401e12581b16372b3c6a2429f2be8929d835 kdelibs-3.4.3-r1.ebuild 3481 MD5 a63c94e0dd87823f669a385d1e3a4b01 kdelibs-3.4.3.ebuild 3383 +RMD160 c3b083231b7937c6565f977414fe756db279cbb9 kdelibs-3.4.3.ebuild 3383 +SHA256 f2d68d17c46d352cf11fc632e1a709b8b9f7061c9be24ffe885e1219031661d8 kdelibs-3.4.3.ebuild 3383 MD5 d4581e4fb36f23fdb3d871207f79bb94 kdelibs-3.5.0-r1.ebuild 3758 +RMD160 1ab9618942e244fb7e03a57f83476155054a6594 kdelibs-3.5.0-r1.ebuild 3758 +SHA256 f9407e881026d7cf244e3e5551eaca42f83058a195be7835c791da69c8f2725b kdelibs-3.5.0-r1.ebuild 3758 MD5 359c57fe1577ee4141ffedbffab53628 kdelibs-3.5.0-r2.ebuild 3795 +RMD160 3a3b7dd12f9181bb02588d115045d860d3730ea5 kdelibs-3.5.0-r2.ebuild 3795 +SHA256 a916c467833188745e4b72fc48d5429a52e873dd4cc7a2f18929797dc4404ec4 kdelibs-3.5.0-r2.ebuild 3795 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 644cd9c940eb15a814cb5023f1555dcc kdelibs-3.5.1-r1.ebuild 3806 +RMD160 5cefcfbdad4abb261fe2867c221376d9b85f568c kdelibs-3.5.1-r1.ebuild 3806 +SHA256 c489bf82a364c1d49406fdbcf07bbf8d043518942e03a523ac01bfa207b5be7c kdelibs-3.5.1-r1.ebuild 3806 MD5 581f35cf760be4d1fd9facbf8756cc8b kdelibs-3.5.1.ebuild 3765 +RMD160 297d1058366d7cc1af9be25561ab0765d02f2d46 kdelibs-3.5.1.ebuild 3765 +SHA256 7facc559341e174ad36d28683f1402687e15cdb710b41b32a73e4ce99d739fa7 kdelibs-3.5.1.ebuild 3765 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) + +iD8DBQFD5REIAiZjviIA2XgRAnXvAJ4i2eyn4dSosWpluMAABUTgpvPJZgCghAg3 +HheiEoO73CIkEiYYY8eGvoI= +=ahz3 +-----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.1-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.1-r1 new file mode 100644 index 000000000000..9b36b26a0f40 --- /dev/null +++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.1-r1 @@ -0,0 +1,3 @@ +MD5 2a22193ae7c23f3759b02723dab02d30 kdelibs-3.5.1.tar.bz2 15459894 +RMD160 db974aa14ff8f8d5a9d279ba8cabb5dcdc3ecc1c kdelibs-3.5.1.tar.bz2 15459894 +SHA256 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981 kdelibs-3.5.1.tar.bz2 15459894 diff --git a/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch b/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch new file mode 100644 index 000000000000..d78cc7c8efb4 --- /dev/null +++ b/kde-base/kdelibs/files/kdelibs-3.5.1-kurllabel.patch @@ -0,0 +1,62 @@ +Index: kdeui/kurllabel.cpp +=================================================================== +--- kdeui/kurllabel.cpp (revision 504600) ++++ kdeui/kurllabel.cpp (revision 504601) +@@ -405,6 +405,8 @@ + QRect KURLLabel::activeRect() const + { + QRect r( contentsRect() ); ++ if (text().isEmpty() || (!d->MarginAltered && sizePolicy() == QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed))) ++ return r; //fixed size is sometimes used with pixmap + int hAlign = QApplication::horizontalAlignment( alignment() ); + int indentX = (hAlign && indent()>0) ? indent() : 0; + QFontMetrics fm(font()); +@@ -422,18 +424,26 @@ + + void KURLLabel::setMargin( int margin ) + { +- QLabel::setMargin(margin); +- d->MarginAltered = true; ++ QLabel::setMargin(margin); ++ d->MarginAltered = true; + } + + void KURLLabel::setFocusPolicy( FocusPolicy policy ) + { +- QLabel::setFocusPolicy(policy); +- if (!d->MarginAltered) { +- QLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused +- } ++ QLabel::setFocusPolicy(policy); ++ if (!d->MarginAltered) { ++ QLabel::setMargin(policy == NoFocus ? 0 : 3); //better default : better look when focused ++ } + } + ++void KURLLabel::setSizePolicy ( QSizePolicy policy ) ++{ ++ QLabel::setSizePolicy(policy); ++ if (!d->MarginAltered && policy.horData()==QSizePolicy::Fixed && policy.verData()==QSizePolicy::Fixed) { ++ QLabel::setMargin(0); //better default : better look when fixed size ++ } ++} ++ + void KURLLabel::virtual_hook( int, void* ) + { /*BASE::virtual_hook( id, data );*/ } + +Index: kdeui/kurllabel.h +=================================================================== +--- kdeui/kurllabel.h (revision 504600) ++++ kdeui/kurllabel.h (revision 504601) +@@ -163,6 +163,11 @@ + */ + virtual void setFocusPolicy ( FocusPolicy policy ); + ++ /** ++ * Reimplemented for internal reasons, the API is not affected. ++ */ ++ virtual void setSizePolicy ( QSizePolicy ); ++ + public slots: + /** + * Turns on or off the underlining. diff --git a/kde-base/kdelibs/kdelibs-3.5.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.1-r1.ebuild new file mode 100644 index 000000000000..3748f20bdce9 --- /dev/null +++ b/kde-base/kdelibs/kdelibs-3.5.1-r1.ebuild @@ -0,0 +1,132 @@ +# 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.1-r1.ebuild,v 1.1 2006/02/04 20:39:10 flameeyes Exp $ +inherit kde flag-o-matic eutils multilib +set-kdedir 3.5 + +DESCRIPTION="KDE libraries needed by all kde programs" +HOMEPAGE="http://www.kde.org/" +SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" +#SRC_URI="mirror://kde/stable/3.5/src/${P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2" +SLOT="3.5" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +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. +# so we recreate the entire DEPEND from scratch. +RDEPEND="$(qt_min_version 3.3.3) + arts? ( ~kde-base/arts-${PV} ) + app-arch/bzip2 + >=media-libs/freetype-2 + media-libs/fontconfig + >=dev-libs/libxslt-1.1.4 + >=dev-libs/libxml2-2.6.6 + >=dev-libs/libpcre-4.2 + media-libs/libart_lgpl + net-dns/libidn + virtual/utempter + acl? ( kernel_linux? ( sys-apps/acl ) ) + ssl? ( >=dev-libs/openssl-0.9.7d ) + alsa? ( media-libs/alsa-lib ) + cups? ( >=net-print/cups-1.1.19 ) + tiff? ( media-libs/tiff ) + kerberos? ( virtual/krb5 ) + jpeg2k? ( media-libs/jasper ) + openexr? ( >=media-libs/openexr-1.2 ) + spell? ( || ( app-text/aspell + app-text/ispell ) ) + zeroconf? ( net-misc/mDNSResponder ) + virtual/fam + virtual/ghostscript" + +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + sys-devel/gettext + dev-util/pkgconfig" + +PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch + ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch + ${FILESDIR}/${P}-kurllabel.patch" + +src_compile() { + # 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 + + myconf="--with-distribution=Gentoo + --enable-libfam $(use_enable kernel_linux dnotify) + --with-libart --with-libidn --with-utempter + $(use_with acl) $(use_with ssl) + $(use_with alsa) $(use_with arts) + $(use_with kerberos gssapi) $(use_with tiff) + $(use_with jpeg2k jasper) $(use_with openexr) + $(use_enable cups) $(use_enable zeroconf dnssd) + --without-hspell" + + if use spell && has_version app-text/aspell; then + myconf="${myconf} --with-aspell" + else + myconf="${myconf} --without-aspell" + fi + + myconf="${myconf} --disable-fast-malloc" + + # fix bug 58179, bug 85593 + # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a + # closer look... - corsair + use ppc64 && append-flags "-mminimal-toc" + + export BINDNOW_FLAGS="$(bindnow-flags)" + + kde_src_compile + + if use doc; then + make apidox || die + fi +} + +src_install() { + kde_src_install + + if use doc; then + make DESTDIR="${D}" install-apidox || die + fi + + # Needed to create lib -> lib64 symlink for amd64 2005.0 profile + if [ "${SYMLINK_LIB}" = "yes" ]; then + dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib + fi + + if ! use arts ; then + dodir /etc/env.d + + # List all the multilib libdirs + local libdirs + for libdir in $(get_all_libdirs); do + libdirs="${libdirs}:${PREFIX}/${libdir}" + done + + cat <<EOF > ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade +PATH=${PREFIX}/bin +ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin +LDPATH=${libdirs:1} +CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" +EOF + fi + +} + +pkg_postinst() { + if use zeroconf; then + echo + einfo "To make zeroconf support available in KDE" + einfo "make sure that the 'mdnsd' daemon is running." + einfo "Make sure also that multicast dns lookups are" + einfo "enabled by editing the 'hosts:' line in" + einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" + einfo "hosts: files mdns dns" + echo + fi +} |