diff options
84 files changed, 169 insertions, 219 deletions
diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords index 3e08925af35..64f72148329 100644 --- a/Documentation/package.keywords/kde-3.5.keywords +++ b/Documentation/package.keywords/kde-3.5.keywords @@ -1,4 +1,4 @@ -# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Mar 2009) +# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Mar 2009) # Autogenerated by regenerate-files, DO NOT EDIT. # Combined KDE 3.5 package.keywords file. kde-base/ksayit:3.5 diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index 13bf5491e00..3158195f376 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -1,4 +1,4 @@ -# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (06 Mar 2009) +# Maciej Mrozowski (reavertm) <reavertm@poczta.fm> (07 Mar 2009) # Autogenerated by regenerate-files, DO NOT EDIT. # Live packages are masked by default. # Edit Documentation/package.unmask/kde-live.d/ files instead. @@ -242,7 +242,7 @@ kde-base/kmailcvt:live # kde-base/kmobiletools:live # missing ebuild kde-base/knode:live kde-base/knotes:live -kde-base/kode:live +# kde-base/kode:live # removed from 4.3 kde-base/kontact:live kde-base/kontact-specialdates:live kde-base/kontactinterfaces:live diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index dcfc0268284..07ad35b108d 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -58,20 +58,9 @@ case ${KMNAME} in dev-libs/boost >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] " - if [[ ${PN} != kode ]]; then - DEPEND="${DEPEND} - >=kde-base/kode-${PV}:${SLOT}[kdeprefix=] - " - RDEPEND="${RDEPEND} - >=kde-base/kode-${PV}:${SLOT}[kdeprefix=] - " - fi case ${PN} in akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker) IUSE="+kontact" - DEPEND="${DEPEND} - kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] ) - " RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] ) " @@ -389,9 +378,12 @@ kde4-meta_create_extractlists() { fi ;; kdepim) + if [[ ${PN} != libkdepim ]]; then + KMEXTRACTONLY="${KMEXTRACTONLY} + libkdepim" + fi KMEXTRACTONLY="${KMEXTRACTONLY} - kleopatra/ConfigureChecks.cmake - libkdepim/kdepim_export.h" + kleopatra/ConfigureChecks.cmake" if has kontact ${IUSE//+} && use kontact; then KMEXTRA="${KMEXTRA} kontact/plugins/${PLUGINNAME:-${PN}}" KMEXTRACTONLY="${KMEXTRACTONLY} kontactinterfaces/" diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest index 87c2e9a2d2b..aff70540ae8 100644 --- a/kde-base/akonadi/Manifest +++ b/kde-base/akonadi/Manifest @@ -1,6 +1,6 @@ DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c DIST kdepim-4.2.65.tar.lzma 12023020 RMD160 0b4ba6d8664d0f8424f3b4bd13e25f7be20c2b85 SHA1 e451c2f6f09fd6eef8a47828fd4d68f6b9a916a5 SHA256 30f490f8d168fd27e76111551e3ca0ec489dac4a3db9b33124d6c6991836bbae -EBUILD akonadi-4.2.1.ebuild 1906 RMD160 40033fe7d6421cff45c65e84b96fa93e41f6031e SHA1 3be070e1b11e2708e7710e43edfbb1d207466d29 SHA256 4dae935275d7addade4f5ef4461d6017b9df3b924365be9c3000107818d81d3b +EBUILD akonadi-4.2.1.ebuild 1894 RMD160 f32d54cd9f8b0a85bb76ae81df082fb88f2269c4 SHA1 ab46ebbdadbf19e71dd99c981bc08d0b33741a11 SHA256 89c904e79dee41145afb9d7ab9fb286e802ee1d256a61f5af36625f80ee61e10 EBUILD akonadi-4.2.65.ebuild 1962 RMD160 9e8c0b2514ddd4aefda5d3abbefdca8c3d42fa53 SHA1 0fe9a354536e65a159a72a3596354189ab735a9e SHA256 61fe944c7dcb39180c2817579c58fbf26f830f76d522c3c5948b07e57ea7f46f EBUILD akonadi-9999.ebuild 1951 RMD160 7d8b9487ad515c310ea95f2d618b5960b2ea033a SHA1 d13dcb59b798dfaaa6f0829f11446bf83bdb7843 SHA256 ee03799575293ab56d5b6e88e0408a405108f9a0b6981d575c5bdc366b174099 MISC ChangeLog 6162 RMD160 956aea80b9a3cbf2ca5255bb557dc7734b358703 SHA1 5e0d87de8ab4700063a0782ff69bc34bb8053133 SHA256 26a15715180e174abc917ce9b791e8e3f65194c166083cc10661f911eabc9f48 diff --git a/kde-base/akonadi/akonadi-4.2.1.ebuild b/kde-base/akonadi/akonadi-4.2.1.ebuild index 85c6ee198a3..219a64baf6e 100644 --- a/kde-base/akonadi/akonadi-4.2.1.ebuild +++ b/kde-base/akonadi/akonadi-4.2.1.ebuild @@ -32,7 +32,6 @@ RDEPEND="${DEPEND} " KMEXTRACTONLY=" - libkdepim/ maildir/ " diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest index b3ed1f1d18a..3569635a6aa 100644 --- a/kde-base/akregator/Manifest +++ b/kde-base/akregator/Manifest @@ -1,7 +1,7 @@ DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c DIST kdepim-4.2.65.tar.lzma 12023020 RMD160 0b4ba6d8664d0f8424f3b4bd13e25f7be20c2b85 SHA1 e451c2f6f09fd6eef8a47828fd4d68f6b9a916a5 SHA256 30f490f8d168fd27e76111551e3ca0ec489dac4a3db9b33124d6c6991836bbae -EBUILD akregator-4.2.1.ebuild 386 RMD160 f37c6a31efb1dc18d010adf819e8da455fa3b439 SHA1 edaa26b033d7ead16bb98d23498e4eadf5fcb422 SHA256 4dc6790204f25b78e4930d200c7fd9503fe349b05f886d88d047b6da2e9e2ec9 -EBUILD akregator-4.2.65.ebuild 374 RMD160 244ba380361f07c0dcc30d3dcda64fe3933b85e6 SHA1 24e84fc6af25c6a87106d412950acecbc291e212 SHA256 4ccfdade82efdedbe6ba6432f7e24c3b61a1e6b73103fb74a40867cec373a0ac -EBUILD akregator-9999.ebuild 363 RMD160 f4178103063e264ecc2d6d77cf341a4a52fff834 SHA1 fe0f38b4b736b770e0d7ccc30245a9a99ac6d7ef SHA256 a49ca3a2f3b2c7f641173f41927a375764b423684f92010ea803140280fce0d3 +EBUILD akregator-4.2.1.ebuild 358 RMD160 06122a3634d35abd294f74f31fa7724c73422def SHA1 dcd17f06dbfb45c6042fac60347f8b294a6e050e SHA256 36ec9cf514ec059aa8823b8ab950ba4d2c8fd3b879ed9804cc09e491a6d85222 +EBUILD akregator-4.2.65.ebuild 346 RMD160 e98136bdb00d4c2438eceaa509c1fc1f7e7f1d02 SHA1 b8de14b97a371facf1492e48566bd4d23b4115ef SHA256 60f53539fd9b6405319278bb722f8b336fc443a850af2caf2883c80bae1e81a5 +EBUILD akregator-9999.ebuild 335 RMD160 91f2a00a582399c06eb9ef6edcbbeb7ef5071dee SHA1 caa1306ac2fe2e64ed48983aeffa2e996ba3dae6 SHA256 c037a94d540c8ac2049991e2e6359787a3c220b7aec00b2c02b49482e22b6a1c MISC ChangeLog 4318 RMD160 c6235a9dd21ffd29e30d6c5446dfb49e17a2c61a SHA1 33a583d4739d55efb98e03499dbdc1ff536f74e8 SHA256 6d87f7ebfd3adb8135ea9d229a0dd5c925a65d42bb085f9d4350b7878045d7a7 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/akregator/akregator-4.2.1.ebuild b/kde-base/akregator/akregator-4.2.1.ebuild index ce42ee9b7e0..7d7eaa8aff3 100644 --- a/kde-base/akregator/akregator-4.2.1.ebuild +++ b/kde-base/akregator/akregator-4.2.1.ebuild @@ -17,5 +17,3 @@ DEPEND=" RDEPEND="${DEPEND}" KMLOADLIBS="libkdepim" - -KMEXTRACTONLY="libkdepim/" diff --git a/kde-base/akregator/akregator-4.2.65.ebuild b/kde-base/akregator/akregator-4.2.65.ebuild index 57083f785a4..26cdc1d7607 100644 --- a/kde-base/akregator/akregator-4.2.65.ebuild +++ b/kde-base/akregator/akregator-4.2.65.ebuild @@ -17,5 +17,3 @@ DEPEND=" RDEPEND="${DEPEND}" KMLOADLIBS="libkdepim" - -KMEXTRACTONLY="libkdepim/" diff --git a/kde-base/akregator/akregator-9999.ebuild b/kde-base/akregator/akregator-9999.ebuild index 39040bb8d4b..d06e0dbdbd8 100644 --- a/kde-base/akregator/akregator-9999.ebuild +++ b/kde-base/akregator/akregator-9999.ebuild @@ -17,5 +17,3 @@ DEPEND=" RDEPEND="${DEPEND}" KMLOADLIBS="libkdepim" - -KMEXTRACTONLY="libkdepim/" diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest index 20b6da863ce..adb84d73bdc 100644 --- a/kde-base/kaddressbook/Manifest +++ b/kde-base/kaddressbook/Manifest @@ -1,7 +1,7 @@ DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c DIST kdepim-4.2.65.tar.lzma 12023020 RMD160 0b4ba6d8664d0f8424f3b4bd13e25f7be20c2b85 SHA1 e451c2f6f09fd6eef8a47828fd4d68f6b9a916a5 SHA256 30f490f8d168fd27e76111551e3ca0ec489dac4a3db9b33124d6c6991836bbae -EBUILD kaddressbook-4.2.1.ebuild 938 RMD160 12784c780ec0794b098130b101dd09f73015e654 SHA1 da9e83514003adefe07b9bee887bc01c2ecbad3a SHA256 75dcc926d92d1f74366a6b98072c603243473e89ff1cc26104981b4dc3e22efa -EBUILD kaddressbook-4.2.65.ebuild 926 RMD160 d91282a02283c88ad806c30a22b272cb6de1cfcd SHA1 5520e54fa94ed0e5f9bf4e96571e3624e3318b2c SHA256 b6bceeb8e561c632ad41cb18cf0f54da535a5d44a545df28690c8622f013a6c3 -EBUILD kaddressbook-9999.ebuild 915 RMD160 0d9d90fbc9bf23b35c2efe19da29230730f58cac SHA1 c4a6722efef33a5b00c35dd573420d094df6340d SHA256 dc36b456c0c6446dc0a6fbbf9cf251d4fba2fd8b39585bd6e9804d0ffc8f9e5b +EBUILD kaddressbook-4.2.1.ebuild 926 RMD160 37e64ba09317269e910fc9bb8a9ae4c0443dfa99 SHA1 6946b3732468440a417ef8124e91b14f42fc1a49 SHA256 0ae1550d811031ac13992c96dbdc996f1197b3f8022270369cd4e4f7623e425d +EBUILD kaddressbook-4.2.65.ebuild 914 RMD160 eab3aec23ace91040a6175a0250ce84337d30cb8 SHA1 9f33936e5eddab9d609fd5fa83b4d7ba20dca01a SHA256 05c9729faffa2fc2c144714adc3e88cb239da0a854c537115f75f01e55efe8d7 +EBUILD kaddressbook-9999.ebuild 903 RMD160 4ad067d9eb92e29093d5c2b1df54865da2a2175f SHA1 4a960409785d949d44d50de19de647f7952c63b8 SHA256 bb47a3ef78dca54d6017344e9f606d302f49977b13aa8bdcb6cbd6021ce19d60 MISC ChangeLog 4703 RMD160 c4f28736c466b8e39fbdf212ec2e48f945c80c42 SHA1 fd4e158557306612a2520b5bc0a4b0d678a2c6b5 SHA256 caa8e66f6645974ba40b1da2a09599da26aa684b91dc789afadd0d5dcd7398d3 MISC metadata.xml 267 RMD160 d8062a20042efd5c1c8471fe72d395d5f233172a SHA1 7dc839167883c5f3dca58dd101f28d4e3d74f20c SHA256 767eee971926a02fe48e50c4d2373b94d993857d993026a537011b62d0ad4e49 diff --git a/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild index b02585976d0..90e731e047e 100644 --- a/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild +++ b/kde-base/kaddressbook/kaddressbook-4.2.1.ebuild @@ -21,7 +21,6 @@ RDEPEND="${DEPEND}" # xml targets from kmail are being uncommented by kde4-meta.eclass KMEXTRACTONLY=" kmail/ - libkdepim/ libkleo/ " KMLOADLIBS="libkdepim libkleo" diff --git a/kde-base/kaddressbook/kaddressbook-4.2.65.ebuild b/kde-base/kaddressbook/kaddressbook-4.2.65.ebuild index 16a08a2ffbc..7d4d387bd65 100644 --- a/kde-base/kaddressbook/kaddressbook-4.2.65.ebuild +++ b/kde-base/kaddressbook/kaddressbook-4.2.65.ebuild @@ -21,7 +21,6 @@ RDEPEND="${DEPEND}" # xml targets from kmail are being uncommented by kde4-meta.eclass KMEXTRACTONLY=" kmail/ - libkdepim/ libkleo/ " KMLOADLIBS="libkdepim libkleo" diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild index 6a436881290..e6c953e58bb 100644 --- a/kde-base/kaddressbook/kaddressbook-9999.ebuild +++ b/kde-base/kaddressbook/kaddressbook-9999.ebuild @@ -21,7 +21,6 @@ RDEPEND="${DEPEND}" # xml targets from kmail are being uncommented by kde4-meta.eclass KMEXTRACTONLY=" kmail/ - libkdepim/ libkleo/ " KMLOADLIBS="libkdepim libkleo" diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest index 18fece7cad6..583c8df7cd4 100644 --- a/kde-base/kalarm/Manifest +++ b/kde-base/kalarm/Manifest @@ -1,7 +1,7 @@ DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c DIST kdepim-4.2.65.tar.lzma 12023020 RMD160 0b4ba6d8664d0f8424f3b4bd13e25f7be20c2b85 SHA1 e451c2f6f09fd6eef8a47828fd4d68f6b9a916a5 SHA256 30f490f8d168fd27e76111551e3ca0ec489dac4a3db9b33124d6c6991836bbae -EBUILD kalarm-4.2.1-r1.ebuild 470 RMD160 308e9a23d4c132e1015bac8631ea0d6822b56187 SHA1 0edd2503947b628f6c17dae750c89c0cb43e2f9a SHA256 8aad4c7a97a18d52e2bd57f320a95d5baf0a36a84560d500443d5ad873dacbcb -EBUILD kalarm-4.2.65.ebuild 393 RMD160 7f474687f53d2a730362e9a8346570854141d7fd SHA1 18be0a91c8ef98d8435396de50853ded31917d80 SHA256 e46a0cf2538146c75437916cc41efbe7054dc508e04d1a14ca8a445722d5b542 -EBUILD kalarm-9999.ebuild 382 RMD160 f35551c33f597d4fd4112feac89a00d12a3c191d SHA1 633290700bd2dab52af9e44465d478ccee65454e SHA256 a46de1c5c55b7985b75ce71633053de992cfecf90dff360d338a44440bc8873c +EBUILD kalarm-4.2.1-r1.ebuild 459 RMD160 0c09b45e72c18129882a8dd9a0d54cf76ed80bfe SHA1 edd167be01ef8865861bee91996491ae2915f90c SHA256 13668cd253c0b2aa1585ebaf9eba7029895bd618e401c2d638d2fea996761c12 +EBUILD kalarm-4.2.65.ebuild 382 RMD160 d383a29658b6e2c6bcd6414f5ee206f9bbc52403 SHA1 d22f285b40b45a131e3c7ce68d830f7ed79bd9d6 SHA256 69377e6aa927b549f23495bbd091858913bcd70a4aea96b4701f3ffa236ab3e5 +EBUILD kalarm-9999.ebuild 371 RMD160 3a5a07d5999682eaf0397bc25a4f65503ee74cf3 SHA1 c28bc056d940dfb3516509ba54e420353a1a71d8 SHA256 76273666f10011f2e94d3f6a62857028158ba5a0d93ddafbe5918a2714a30450 MISC ChangeLog 4402 RMD160 26dc658d7145470392b90d44f4daa50dcc508342 SHA1 ff27069ca1ac366fd44c9033b30ea1832153bc1e SHA256 49f0c6419778d0f93588829a45cfd5053655c5328b0e2a3d928da11a705e8799 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kalarm/kalarm-4.2.1-r1.ebuild b/kde-base/kalarm/kalarm-4.2.1-r1.ebuild index d9eec7ca587..835e526c9e3 100644 --- a/kde-base/kalarm/kalarm-4.2.1-r1.ebuild +++ b/kde-base/kalarm/kalarm-4.2.1-r1.ebuild @@ -19,6 +19,5 @@ RDEPEND="${DEPEND}" KMEXTRACTONLY=" kmail - libkdepim libkholidays " diff --git a/kde-base/kalarm/kalarm-4.2.65.ebuild b/kde-base/kalarm/kalarm-4.2.65.ebuild index c092b6d15b9..536cb11a036 100644 --- a/kde-base/kalarm/kalarm-4.2.65.ebuild +++ b/kde-base/kalarm/kalarm-4.2.65.ebuild @@ -18,5 +18,4 @@ RDEPEND="${DEPEND}" KMEXTRACTONLY=" kmail - libkdepim " diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild index eeb2f946d70..dca904ab2db 100644 --- a/kde-base/kalarm/kalarm-9999.ebuild +++ b/kde-base/kalarm/kalarm-9999.ebuild @@ -18,5 +18,4 @@ RDEPEND="${DEPEND}" KMEXTRACTONLY=" kmail - libkdepim " diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest index d1578986138..2135d8a6667 100644 --- a/kde-base/kdepim-kresources/Manifest +++ b/kde-base/kdepim-kresources/Manifest @@ -1,7 +1,7 @@ DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c DIST kdepim-4.2.65.tar.lzma 12023020 RMD160 0b4ba6d8664d0f8424f3b4bd13e25f7be20c2b85 SHA1 e451c2f6f09fd6eef8a47828fd4d68f6b9a916a5 SHA256 30f490f8d168fd27e76111551e3ca0ec489dac4a3db9b33124d6c6991836bbae -EBUILD kdepim-kresources-4.2.1.ebuild 1397 RMD160 630a16a70df04a4134405ccbbdfa93b77d5e3a88 SHA1 2bb9841a0b4269df1be4feb8604992afc3995817 SHA256 6da3e08c3d764ba6d401898c768211b570515fedfbc745ca3af4743141fbbd61 -EBUILD kdepim-kresources-4.2.65.ebuild 1385 RMD160 5e8f3207c89f0707039a4d992ca656edd4600d67 SHA1 9df0b2e356e0758387483c548fa23444cff89f38 SHA256 d0f6c7fc24d9a61a486c3f7b275a5ff848b02668813fc769cd2f2a59bb8b803c -EBUILD kdepim-kresources-9999.ebuild 1374 RMD160 c7eeba38473db891e65aaf336197b470321a61b1 SHA1 702d30cf72c027ab39cf659b3f592ac38b2fa792 SHA256 00ee |