diff options
44 files changed, 87 insertions, 167 deletions
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest index a461b9f11f6..1f074c92386 100644 --- a/kde-base/akonadi/Manifest +++ b/kde-base/akonadi/Manifest @@ -1,5 +1,5 @@ DIST kdepim-runtime-4.3.69.tar.lzma 716769 RMD160 b65f35e7e7e753214e7a993f52184e8cc6763f11 SHA1 00133d678a94f129ab176f935a799f91ae24a7da SHA256 cc4b3e878c421fddb8244b1a9512a2bbdb28e0bad9891b4de49f523db33818b3 EBUILD akonadi-4.3.69.ebuild 2719 RMD160 443508a5db82ca7fd90b66a1685f39b921c040a9 SHA1 ca8585f5d222ca9fc8893d87f4845522ace9bff5 SHA256 c1aa89326e8d6b57a477e03cbdc54c5cd16d1443ab533750fd4075561f5858e8 EBUILD akonadi-4.3.9999.ebuild 2677 RMD160 54e1c595b13643a87e891b2bfde68caa8ce48cc0 SHA1 7033c4bf028840188458741d849848b4980e8f46 SHA256 77debfaf0ba7651d13f50aa41a5a3887f384dccb7006f482448dd6c378eefb62 -EBUILD akonadi-9999-r1.ebuild 2677 RMD160 54e1c595b13643a87e891b2bfde68caa8ce48cc0 SHA1 7033c4bf028840188458741d849848b4980e8f46 SHA256 77debfaf0ba7651d13f50aa41a5a3887f384dccb7006f482448dd6c378eefb62 +EBUILD akonadi-9999-r1.ebuild 2431 RMD160 c30cdd045a2d7b3991e921556035c3c5e38f3925 SHA1 86ff1499a6af445e7f8aeaac52729f3c46393d3c SHA256 163374ad35d1b672e3104c66dddf727d8866d4e3873d6646cc0957dfc85b3958 MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5 diff --git a/kde-base/akonadi/akonadi-9999-r1.ebuild b/kde-base/akonadi/akonadi-9999-r1.ebuild index b537fe28843..39ccd328770 100644 --- a/kde-base/akonadi/akonadi-9999-r1.ebuild +++ b/kde-base/akonadi/akonadi-9999-r1.ebuild @@ -29,21 +29,14 @@ DEPEND=" >=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] x11-misc/shared-mime-info " -# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now) RDEPEND="${DEPEND} - !kdeprefix? ( - !kde-base/kdemaildir[-kdeprefix] - !~kde-base/kdepim-kresources-4.2.3[-kdeprefix] - !~kde-base/kdepim-kresources-4.2.4[-kdeprefix] - !<kde-base/kdepim-kresources-4.2.95:4.3[-kdeprefix] - ) - kdeprefix? ( - !kde-base/kdemaildir:${SLOT} - !<kde-base/kdepim-kresources-4.2.95:${SLOT}[kdeprefix] - ) >=app-office/akonadi-server-1.2.1 " +# @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now) +add_blocker kdemaildir +add_blocker kdepim-kresources '<4.2.95' + [[ ${KMNAME} = "kdepim-runtime" ]] && S="${WORKDIR}/${KMNAME}-${PV}" src_prepare() { diff --git a/kde-base/drkonqi/Manifest b/kde-base/drkonqi/Manifest index 148fefa77eb..815ae9cb687 100644 --- a/kde-base/drkonqi/Manifest +++ b/kde-base/drkonqi/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD drkonqi-4.3.69.ebuild 450 RMD160 45d3444d9f628df2e036d269c919ba141ce47018 SHA1 d0bb7d8b04938ad8fbb60cfee9e8512e1b5b5422 SHA256 cb18671bb251f45cd52e51f0ce4cbee004910a8adf76506ba54100d3cc5684df EBUILD drkonqi-4.3.9999.ebuild 408 RMD160 cce5b16068f8e97322ac9b1e36485af17dc00d85 SHA1 ce1318cccdea45d47d00299b99b8ee68b821fd3d SHA256 507fda84dbb59ad7bd1ac038fc49b6676eea021d2dd80c5666af3b1c37000849 -EBUILD drkonqi-9999.ebuild 408 RMD160 cce5b16068f8e97322ac9b1e36485af17dc00d85 SHA1 ce1318cccdea45d47d00299b99b8ee68b821fd3d SHA256 507fda84dbb59ad7bd1ac038fc49b6676eea021d2dd80c5666af3b1c37000849 +EBUILD drkonqi-9999.ebuild 328 RMD160 f64114670979f203f804a77895896badd4ebec71 SHA1 0933e1b575996418cac1b07c9f8e8b89b0eb9653 SHA256 1112fabb1d080353c196dba088d02ab55d1dd76d4d44d5e5f21a6ffb5044d606 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/drkonqi/drkonqi-9999.ebuild b/kde-base/drkonqi/drkonqi-9999.ebuild index 6903035e677..197278bcbcb 100644 --- a/kde-base/drkonqi/drkonqi-9999.ebuild +++ b/kde-base/drkonqi/drkonqi-9999.ebuild @@ -12,7 +12,7 @@ KEYWORDS="" IUSE="debug" RDEPEND=" - !kdeprefix? ( !kde-base/drkonqi2[-kdeprefix] ) - kdeprefix? ( !kde-base/drkonqi2:${SLOT}[kdeprefix] ) sys-devel/gdb " + +add_blocker drkonqi2 diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest index 7174ed0672f..51dc6120331 100644 --- a/kde-base/kcontrol/Manifest +++ b/kde-base/kcontrol/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD kcontrol-4.3.69.ebuild 565 RMD160 2f1c0e204bd0852791a66b0f72f611dfc225b2a8 SHA1 7e9a247bc7729428a87038bfd986e22855f0cd7c SHA256 c2f7cb4492032be396b94c46fe727f70eab553c708e57b35987cb40a42c72a43 EBUILD kcontrol-4.3.9999.ebuild 523 RMD160 0885c5c50555f892829bcc2978fbdabba554b187 SHA1 c660f538ae9af0142784f0041b9d47cae65d3662 SHA256 378ac69083b4b0bea038438e8b942238c5b380cf267ca41f87722b95420c0a38 -EBUILD kcontrol-9999.ebuild 523 RMD160 0885c5c50555f892829bcc2978fbdabba554b187 SHA1 c660f538ae9af0142784f0041b9d47cae65d3662 SHA256 378ac69083b4b0bea038438e8b942238c5b380cf267ca41f87722b95420c0a38 +EBUILD kcontrol-9999.ebuild 419 RMD160 9157e64faa813dfd7dc73068352bff73c15320a6 SHA1 65f518ccf895c04d6555b9738ec57a8861a88384 SHA256 22d06ce6772f8fb2c0810eac307c219ac6c76ae3c290eeabf99e0b42892fa596 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-9999.ebuild index df2e0f41ed5..71c6d51b021 100644 --- a/kde-base/kcontrol/kcontrol-9999.ebuild +++ b/kde-base/kcontrol/kcontrol-9999.ebuild @@ -12,11 +12,9 @@ KEYWORDS="" IUSE="debug +handbook" RDEPEND=" - !kdeprefix? ( - !kde-base/ksmserver:4.1[-kdeprefix] - !<kde-base/systemsettings-4.2.91[-kdeprefix] - ) - kdeprefix? ( !<kde-base/systemsettings-4.2.91:${SLOT}[kdeprefix] ) >=kde-base/kdnssd-${PV}:${SLOT}[kdeprefix=] >=kde-base/khotkeys-${PV}:${SLOT}[kdeprefix=] " + +add_blocker ksmserver 4.1.50 +add_blocker systemsettings '<4.2.91' diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest index c57429040b0..4286892a8df 100644 --- a/kde-base/kde-env/Manifest +++ b/kde-base/kde-env/Manifest @@ -1,4 +1,4 @@ EBUILD kde-env-4.3.69.ebuild 1916 RMD160 89f958421353ad1668997ad1b499508e9565c8ee SHA1 b1293bd5d465d77009a0c3e4041ab0cbb3ef7274 SHA256 068ff75c32a7b416aff53877cb1d6717f91384b928c4e1235303842b598a0a6f EBUILD kde-env-4.3.9999.ebuild 1874 RMD160 c74b6deac0b510e3acdc3a6cb7a31b1aea099b1e SHA1 8e7cb63b0d4f49c859d88c6596a9f049ec7d5d3f SHA256 91667acc56d573c814fba3c72652f08bcba5c3ee49e2b79e0eeae8785b00a88f -EBUILD kde-env-9999.ebuild 1874 RMD160 c74b6deac0b510e3acdc3a6cb7a31b1aea099b1e SHA1 8e7cb63b0d4f49c859d88c6596a9f049ec7d5d3f SHA256 91667acc56d573c814fba3c72652f08bcba5c3ee49e2b79e0eeae8785b00a88f +EBUILD kde-env-9999.ebuild 1732 RMD160 cdbaec4159f432f43b1d0b690ba0c1d6dcb1ddcb SHA1 dbf61e75535de687de34edd38f19b2e9cf351c78 SHA256 02ce9cd322d4f95f6c90466a4adc9b3b5aa332285d5cbcee3f27b8ad0cac239a MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kde-env/kde-env-9999.ebuild b/kde-base/kde-env/kde-env-9999.ebuild index 50c4adbe8ae..764d5684989 100644 --- a/kde-base/kde-env/kde-env-9999.ebuild +++ b/kde-base/kde-env/kde-env-9999.ebuild @@ -14,15 +14,7 @@ KEYWORDS="" LICENSE="as-is" IUSE="" -RDEPEND=" - !<kde-base/kdelibs-3.5.10-r3 - !kdeprefix? ( - !kde-base/kdelibs:4.1 - !<=kde-base/kdelibs-4.2.2-r1:4.2 - !<=kde-base/kdelibs-4.2.70:4.3 - ) - kdeprefix? ( !<=kde-base/kdelibs-4.2.70:4.3 ) -" +add_blocker kdelibs 4.2.2-r1 '<3.5.10-r3:3.5' 4.2.70:4.3 src_unpack() { : diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest index c2d403a6c66..e952b1cfc92 100644 --- a/kde-base/kdebase-data/Manifest +++ b/kde-base/kdebase-data/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD kdebase-data-4.3.69.ebuild 1036 RMD160 dfbdf11e1ee8b5aac64f4758c2ba97ba0a307ee4 SHA1 e6e8823730497c09620d7fdf4963813dda832d55 SHA256 593957a3d54f2645c7059fc6c09a944bce361d4377fcd392187250d9a946a0f1 EBUILD kdebase-data-4.3.9999.ebuild 994 RMD160 517e8c063724780bcbd239fef1e51b12c56d80fb SHA1 61909bda2e7af0a1b0cf43cabea36571faca4087 SHA256 d414daa93669b96f9c3960ceedadd5b8a93568ea9318387f42c59d7001ecdbe9 -EBUILD kdebase-data-9999.ebuild 994 RMD160 517e8c063724780bcbd239fef1e51b12c56d80fb SHA1 61909bda2e7af0a1b0cf43cabea36571faca4087 SHA256 d414daa93669b96f9c3960ceedadd5b8a93568ea9318387f42c59d7001ecdbe9 +EBUILD kdebase-data-9999.ebuild 920 RMD160 5e33cbd6e466828737a770f3c781295c6310c229 SHA1 473042c3c3855b58e68581ef674d60f69b8bd37d SHA256 63c4ebf9693eb773ef6f90871981f45cfd01b377651d83410bca9f5f9f376d35 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-data/kdebase-data-9999.ebuild b/kde-base/kdebase-data/kdebase-data-9999.ebuild index 4a66bb92849..bf7040bdadb 100644 --- a/kde-base/kdebase-data/kdebase-data-9999.ebuild +++ b/kde-base/kdebase-data/kdebase-data-9999.ebuild @@ -12,15 +12,15 @@ DESCRIPTION="Icons, localization data and various .desktop files from kdebase." IUSE="" KEYWORDS="" -# Some files were moved from dolphin to kdebase-data between the 4.1.85 and the 4.1.87 -# releases. Thus we need to block older versions of dolphin, including the :4.1 versions. RDEPEND=" - !kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] ) - kdeprefix? ( !<kde-base/dolphin-4.1.87:${SLOT} ) >=kde-base/oxygen-icons-${PV}:${SLOT}[kdeprefix=] x11-themes/hicolor-icon-theme " +# Some files were moved from dolphin to kdebase-data between the 4.1.85 and the 4.1.87 +# releases. Thus we need to block older versions of dolphin, including the :4.1 versions. +add_blocker dolphin '<4.1.87' + KMEXTRA=" l10n/ pics/ diff --git a/kde-base/kdebase-menu-icons/Manifest b/kde-base/kdebase-menu-icons/Manifest index 1aa7cf02d52..136c5705778 100644 --- a/kde-base/kdebase-menu-icons/Manifest +++ b/kde-base/kdebase-menu-icons/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD kdebase-menu-icons-4.3.69.ebuild 386 RMD160 4bd428dcec30554724ea7c3b531846e604c96790 SHA1 c50acd01892513309f867a7e94c14e2f3823f4c5 SHA256 c1b910cbd190d050a0494a167db95e3cc7fa345619bf8f5f737ab1cb99bb728f EBUILD kdebase-menu-icons-4.3.9999.ebuild 356 RMD160 5780a4097d36527c6be61dbcc74cc05db22e9a7c SHA1 063d88587cebb6bd8a0ad4994eea4889fe891737 SHA256 e88f6f5546116bf98820939f6d7621e153764e2d838f2e3db684d833b95e8f5c -EBUILD kdebase-menu-icons-9999.ebuild 356 RMD160 5780a4097d36527c6be61dbcc74cc05db22e9a7c SHA1 063d88587cebb6bd8a0ad4994eea4889fe891737 SHA256 e88f6f5546116bf98820939f6d7621e153764e2d838f2e3db684d833b95e8f5c +EBUILD kdebase-menu-icons-9999.ebuild 268 RMD160 bfd0a02e21c08106190dc25ec8bdf75e2408156e SHA1 ba18309d1d8604f5bf59a33f9ddbc1263e8f7279 SHA256 905f46a0f0b34ca123534d03d20483d6a43d6ed1a06d5e9c6520973168fdb0da MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild index e98617abada..aa52671f3b5 100644 --- a/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild +++ b/kde-base/kdebase-menu-icons/kdebase-menu-icons-9999.ebuild @@ -12,7 +12,4 @@ DESCRIPTION="KDE menu icons" KEYWORDS="" IUSE="" -RDEPEND=" - !kdeprefix? ( !kde-base/kde-menu-icons[-kdeprefix] ) - kdeprefix? ( !kde-base/kde-menu-icons:${SLOT} ) -" +add_blocker kde-menu-icons diff --git a/kde-base/kdebase-menu/Manifest b/kde-base/kdebase-menu/Manifest index 9429204f809..45b21ad798a 100644 --- a/kde-base/kdebase-menu/Manifest +++ b/kde-base/kdebase-menu/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD kdebase-menu-4.3.69.ebuild 389 RMD160 6e515b0d9dfa79eed7fb77db36290021815e7540 SHA1 85b5739404d6b07e007caeddc382908c4afdf0a6 SHA256 b0fb63961ceb7eb2d278c687d65a9233688c95fdf95168286d542e1155b2bb8d EBUILD kdebase-menu-4.3.9999.ebuild 359 RMD160 943d9801e29c19c3f96521e5e16d8ec0037f53a6 SHA1 967dc2b2e30856943b78057383cbe0eb0099d924 SHA256 77fa1241ad8a26182a7edce518d791b576ac27094d6308d6264f8758ef66e8d3 -EBUILD kdebase-menu-9999.ebuild 359 RMD160 943d9801e29c19c3f96521e5e16d8ec0037f53a6 SHA1 967dc2b2e30856943b78057383cbe0eb0099d924 SHA256 77fa1241ad8a26182a7edce518d791b576ac27094d6308d6264f8758ef66e8d3 +EBUILD kdebase-menu-9999.ebuild 277 RMD160 1b8dcccc2aeec96f809d76678b590c6fb7ddbed5 SHA1 d9eae5dd5c1af8a0237bd4436bfadc980dd41900 SHA256 138ea5fced4ec57d69d2a4bc37f62bf07403eb4d7cd27523278b72f97e3fda7e MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild index e3b9c124366..215bad744f4 100644 --- a/kde-base/kdebase-menu/kdebase-menu-9999.ebuild +++ b/kde-base/kdebase-menu/kdebase-menu-9999.ebuild @@ -12,7 +12,4 @@ DESCRIPTION="KDE Menu query tool." KEYWORDS="" IUSE="debug" -RDEPEND=" - !kdeprefix? ( !kde-base/kde-menu[-kdeprefix] ) - kdeprefix? ( !kde-base/kde-menu:${SLOT} ) -" +add_blocker kde-menu diff --git a/kde-base/kdebase-wallpapers/Manifest b/kde-base/kdebase-wallpapers/Manifest index bf6ddd82b54..ab0394b0ca3 100644 --- a/kde-base/kdebase-wallpapers/Manifest +++ b/kde-base/kdebase-wallpapers/Manifest @@ -1,5 +1,5 @@ DIST kdebase-workspace-4.3.69.tar.lzma 61199155 RMD160 92a350dd39b34d07b62504a6d35d593147f669fb SHA1 47a8aca5c790bddf56057e2e31f636a7c73df70d SHA256 e2b69cd24de8b9ae887ab94d18f3785ae2ea9c6cd741281cfac69b7400268803 EBUILD kdebase-wallpapers-4.3.69.ebuild 394 RMD160 50bd51621cabf378580a9cb06201dd2154621a78 SHA1 72aa40b71b11cd4e35117ccacc35f29638c59990 SHA256 8ed9bcd52f20663a94908a51939eee8ad0b77d79eab492bbd1be956182fa44e3 EBUILD kdebase-wallpapers-4.3.9999.ebuild 364 RMD160 3cbac9fa9a5fa42cb13ee732dce0fa39162e1ad6 SHA1 5541f33f86cd447cf092854bf97d0cd7167a0bba SHA256 47c0efadcbb44d32d10fb09ac4b11408438f8ede5ecbc03a55e0c0bbf3851e44 -EBUILD kdebase-wallpapers-9999.ebuild 364 RMD160 3cbac9fa9a5fa42cb13ee732dce0fa39162e1ad6 SHA1 5541f33f86cd447cf092854bf97d0cd7167a0bba SHA256 47c0efadcbb44d32d10fb09ac4b11408438f8ede5ecbc03a55e0c0bbf3851e44 +EBUILD kdebase-wallpapers-9999.ebuild 276 RMD160 ec1c90f35f1547f68d736e2181b39d44eee5a24d SHA1 488340b4105a66b5d927517dea959e6b12ce569c SHA256 5c60f5e6750754ab26e45ab2608278d644e77d929213b5b4fbabbbecb45ed3cb MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild b/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild index 30601e063f4..ba6b2fc80ce 100644 --- a/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild +++ b/kde-base/kdebase-wallpapers/kdebase-wallpapers-9999.ebuild @@ -12,7 +12,4 @@ DESCRIPTION="KDE wallpapers" KEYWORDS="" IUSE="" -RDEPEND=" - !kdeprefix? ( !kde-base/kde-wallpapers[-kdeprefix] ) - kdeprefix? ( !kde-base/kde-wallpapers:${SLOT} ) -" +add_blocker kde-wallpapers diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index aa56bad36e4..eb23fd7ce26 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -9,5 +9,5 @@ DIST kdelibs-4.3.69.tar.lzma 10744122 RMD160 72bb5893800aa5c6e3f16f11e3632be7f8f EBUILD kdelibs-4.3.1-r2.ebuild 6450 RMD160 1d8eff25d147a52d90c0a21b80b2d71c4eb57885 SHA1 db79aab8b641d19c409b7df7e84baf8d9fea3938 SHA256 b45c54f8319a28d6b6a6d5a5aa488d3ec4e5b0bd05ec298931729dfcd7c6cf4d EBUILD kdelibs-4.3.69.ebuild 6563 RMD160 5c4cbe0965101e3d96a8ceedd8e000a13afa72e3 SHA1 b05c56611ea016042e504100689e8ff2d1a34dcb SHA256 b3e32008d88719cc1902e2d49c8faf6cb136a3a3ac276feec2662cb489895ef0 EBUILD kdelibs-4.3.9999.ebuild 6259 RMD160 d33e62653936fc55ea5bf9f99bb9ccf89f1d3b4f SHA1 24401e82bf378ab9672f70eca63e000a7e810f56 SHA256 be67b89dd69082ef9de034c1ad1ea67917f278c2975fd2267d58ef4f69503773 -EBUILD kdelibs-9999.ebuild 6521 RMD160 6db92d53c961dad9f0fa08ab012c3ddfd72fa6cd SHA1 8c296ab8ae6b00dc600c9fbac0400679e80d6f09 SHA256 847bd23b7409a5deaf9563b7e65cc8710f3662f906895766cfd51df1548fba33 +EBUILD kdelibs-9999.ebuild 6363 RMD160 bd4603c12d7067e612f810b71f86586537099292 SHA1 7061c16e8acaa6533183a86ad054fc410a29ae39 SHA256 2f4c494bd4b39dac82e1b176ced58f24a951c254c0649ac808450c47f61393a1 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index e741b5de037..e981a211ed7 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -86,29 +86,10 @@ DEPEND="${COMMONDEPEND} # kde-base/kpercentage # kde-base/ktnef RDEPEND="${COMMONDEPEND} + !dev-libs/conversion !dev-libs/kunitconversion - !<=kde-base/kdebase-3.5.9-r4 - !<=kde-base/kdebase-startkde-3.5.10 - !<kde-base/kdelibs-3.5.10 !x11-libs/qt-phonon !<=kde-misc/kdnssd-avahi-0.1.2:0 - !kdeprefix? ( - !kde-base/kitchensync:4.1[-kdeprefix] - !kde-base/knewsticker:4.1[-kdeprefix] - !kde-base/kpercentage:4.1[-kdeprefix] - !kde-base/ktnef:4.1[-kdeprefix] - !kde-base/libknotificationitem[-kdeprefix] - !kde-base/libkworkspace:4.2[-kdeprefix] - !kde-base/libkworkspace:4.3[-kdeprefix] - !<kde-base/libkworkspace-4.3.66:4.4[-kdeprefix] - !=kde-base/libkworkspace-9999:live[-kdeprefix] - !kde-base/libplasma[-kdeprefix] - ) - kdeprefix? ( - !kde-base/libknotificationitem:${SLOT}[kdeprefix] - !<kde-base/libkworkspace-4.3.66:${SLOT}[kdeprefix] - !=kde-base/libkworkspace-9999:${SLOT}[kdeprefix] - ) >=app-crypt/gnupg-2.0.11 x11-apps/iceauth x11-apps/rgb @@ -120,6 +101,20 @@ PDEPEND=" >=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=] " +# Blockers added due to packages from old versions, removed in the meanwhile +# as well as for file collisions +add_blocker kitchensync 4.1.50 +add_blocker knewsticker 4.1.50 +add_blocker kpercentage 4.1.50 +add_blocker ktnef 4.1.50 +add_blocker libknotificationitem +add_blocker libkworkspace '<4.3.66' 9999:live +add_blocker libplasma +# Block some old versions of KDE-3.5 packages that don't work well with KDE-4 +add_blocker kdebase 0 3.5.9-r4:3.5 +add_blocker kdebase-startkde 0 3.5.10:3.5 +add_blocker kdelibs 0 '<3.5.10:3.5' + PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch" diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest index b74e4054614..a85227ff91b 100644 --- a/kde-base/kdepimlibs/Manifest +++ b/kde-base/kdepimlibs/Manifest @@ -1,5 +1,5 @@ DIST kdepimlibs-4.3.69.tar.lzma 1687726 RMD160 edfb55d3680fefa7db8761b7f9a66db69865f664 SHA1 47a580e845529539cab5747e55869dbc6a5c1adc SHA256 2c3878fd4de535e6bd5c1d136cd04b62974c0488afcb2fd68f88f761c9a69ae0 EBUILD kdepimlibs-4.3.69.ebuild 1388 RMD160 00d55aba9a99bcc6bf6a01e1e6d5902ac1d6400e SHA1 8d06644636731fc08ae68d2074e9789182e8945b SHA256 a99f4f7bf28dd83ea990236fdcc51f2f7bab1a239e1e02063a9948be1698b0ab EBUILD kdepimlibs-4.3.9999.ebuild 949 RMD160 6f4de549d0b57b6e70189aea1fb3061941611061 SHA1 ac7ba763a831e73501d2e737f77be4e8a9244cca SHA256 7d5a7c6348ca7d74d9655fad76302fc6efe83c2c705838dddb54f6b38521dc15 -EBUILD kdepimlibs-9999.ebuild 1346 RMD160 a3937ff693d9fde000eb00b72b9c3db5499792e2 SHA1 e6d7bb100a964b34b9b0380681220bd4fb3d0300 SHA256 2e86823ed3742aa690f6c91ffec819f709b93059796167a7da20e4bf10410394 +EBUILD kdepimlibs-9999.ebuild 1029 RMD160 83bc9650f306f81da9aede309e2b54273a425ff3 SHA1 f89d98e0a3d01555f19218b1195ca0b68431fd34 SHA256 0569d79405ffad2c78defa6b7bddc3a2b630c1605ea465bf733bec292ba4ff04 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild index 340059e986f..0ff5a6f6244 100644 --- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild @@ -26,24 +26,14 @@ DEPEND=" dev-libs/cyrus-sasl ldap? ( net-nds/openldap ) " -# @since 4.3 - libkholidays is in kdepimlibs now +RDEPEND="${DEPEND}" + # libakonadi-contact moved here from akonadi in 4.3.66 +add_blocker akonadi 4.1.50 '<4.3.66:4.4' 9999:live +# @since 4.3 - libkholidays is in kdepimlibs now +add_blocker libkholidays # @since 4.4 - kontactinterfaces is in kdepimlibs now -RDEPEND="${DEPEND} - !kdeprefix? ( - !kde-base/akonadi:4.1[-kdeprefix] - !kde-base/libkholidays:4.1[-kdeprefix] - !kde-base/libkholidays:4.2[-kdeprefix] - !<kde-base/akonadi-4.3.66:4.4[-kdeprefix] - !=kde-base/akonadi-9999:live[-kdeprefix] - !kde-base/kontactinterfaces[-kdeprefix] - ) - kdeprefix? ( - !<kde-base/akonadi-4.3.66:${SLOT}[kdeprefix] - !=kde-base/akonadi-9999:${SLOT}[kdeprefix] - !kde-base/kontactinterfaces:${SLOT}[kdeprefix] - ) -" +add_blocker kontactinterfaces src_configure() { mycmakeargs="${mycmakeargs} diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest index 06ae20713e3..53e2393ecf0 100644 --- a/kde-base/kdeplasma-addons/Manifest +++ b/kde-base/kdeplasma-addons/Manifest @@ -1,5 +1,5 @@ DIST kdeplasma-addons-4.3.69.tar.lzma 1268629 RMD160 d6db8023eeeb9fbd237f8ad73de396dd759721ff SHA1 8004fec1266ef8e0254e5c812b7b431a9079da34 SHA256 c628eab487bfabd38a1caff98969ff533a5683dbbeeb2a84dc29f51659eed1e4 EBUILD kdeplasma-addons-4.3.69.ebuild 2176 RMD160 6653fffbaa469f4f1fbe70e91ad0d36692c4202c SHA1 a72b63a3a6e4b9a1e084925bc2a87bc788e18152 SHA256 22b9b0e0b5b4f31c03b706c33ed9ec30ad55e1f2e807a344473b95281dd76c81 EBUILD kdeplasma-addons-4.3.9999.ebuild 2062 RMD160 4f965846f9f3a014048e00b0ae50d780f622ac9e SHA1 602bc08d81aa28e745032c936ce4ad018e53f5c8 SHA256 0b70a9204b5d3f7096867af2193215e6516d31dd04735144b972534f68f5fbfc -EBUILD kdeplasma-addons-9999.ebuild 2134 RMD160 151b8244cc4af1fda4e0840cdf8fad9cbeeb7ece SHA1 b5af648d9f72847255437cee2167a151d3b8f105 SHA256 704cf68dedb28e4777f065aa0d7b15bed4cfdffdbf782a4164aa4d846a16ecfe +EBUILD kdeplasma-addons-9999.ebuild 2042 RMD160 2e03b903b2aeb712a85e52ca716cf44364848c76 SHA1 e40cbe4161cba6035f176069fa6f49b3f0c09b94 SHA256 99b51f46872e85d7a3f4c345e29a0b547c2d06c0b2e75074dfaee0664d918c48 MISC metadata.xml 365 RMD160 fd7d216c9dbb213b7cd9dd3f76b572a92a1eb043 SHA1 cb1f43ef914f1342c5aa1866fec98dacfba6b65e SHA256 d1bef9c8ebb216e5073c597e63e056e73412b2d348ca3a67c34412751ec9b5c0 diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild index 1db5f89adb5..344ec124731 100644 --- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild +++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild @@ -29,18 +29,15 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} dev-cpp/eigen:2 " -# BLOCKS: -# kdebase-data: some svg icons moved from data directly here. # kde-misc/plasmaboard: moved here in 4.3.65 RDEPEND="${COMMON_DEPEND} - !kdeprefix? ( - !<kde-base/kdebase-data-4.2.88:4.2[-kdeprefix] - !kde-misc/plasmaboard - ) - kdeprefix? ( !<kde-base/kdebase-data-4.2.88:${SLOT}[kdeprefix] ) + !kdeprefix? ( !kde-misc/plasmaboard ) semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] ) " +# kdebase-data: some svg icons moved from data directly here. +add_blocker kdebase-data '<4.2.88' + src_prepare() { sed -i -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \ -e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \ diff --git a/kde-base/keditfiletype/Manifest b/kde-base/keditfiletype/Manifest index ebf38c60738..c6fb76b9f64 100644 --- a/kde-base/keditfiletype/Manifest +++ b/kde-base/keditfiletype/Manifest @@ -1,5 +1,5 @@ DIST kdebase-runtime-4.3.69.tar.lzma 6925687 RMD160 cce9c6f70cd2ddc4efa4a7feffd8af64c19a8a3d SHA1 30f32c85b20f7ea9b212d6342206f516f38d7767 SHA256 9e7bf2adfee39bc75e35a0a9f81d3057db48dd69807c1964b68a7771d4b8a31b EBUILD keditfiletype-4.3.69.ebuild 499 RMD160 16f7b402656e829074ef46fb19fe4e16462f2ae9 SHA1 4e8e02b630b90b734e2a4b729bb606fcaf10964d SHA256 80e13f9fab686ee54c7bce880ead05c60cd471a1f228b96ee947b28b940f67c2 EBUILD keditfiletype-4.3.9999.ebuild 469 RMD160 28da435bb4c515b125f0c67d21c338f3332f25ad SHA1 061e2421efbde8baaa13584c07c83ca69f2798eb SHA256 2e61eac17072afef52230e4c597b18f9b21e772c55d5e8dcbc52d19e54fdcb11 -EBUILD keditfiletype-9999.ebuild 469 RMD160 28da435bb4c515b125f0c67d21c338f3332f25ad SHA1 061e2421efbde8baaa13584c07c83ca69f2798eb SHA256 2e61eac17072afef52230e4c597b18f9b21e772c55d5e8dcbc52d19e54fdcb11 +EBUILD keditfiletype-9999.ebuild 375 RMD160 dc04612f1064f6a281ee1b663fe535899889d15e SHA1 564e30cf1ae6071d3b181371b9164bfb967f5891 SHA256 1442676ed8b011436a416c583a64731345599d02442272c502eebbf7d37429d1 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/keditfiletype/keditfiletype-9999.ebuild b/kde-base/keditfiletype/keditfiletype-9999.ebuild index 79095600dd7..528bf0ea558 100644 --- a/kde-base/keditfiletype/keditfiletype-9999.ebuild +++ b/kde-base/keditfiletype/keditfiletype-9999.ebuild @@ -15,7 +15,4 @@ IUSE="debug" RESTRICT=test # @Since 4.2.68 - split from konqueror -RDEPEND=" - !kdeprefix? ( !<=kde-base/konqueror-4.2.67:4.2[-kdeprefix] ) - kdeprefix? ( !<=kde-base/konqueror-4.2.67:4.3 ) -" +add_blocker konqueror 4.2.67 diff --git a/kde-base/kfmclient/Manifest b/kde-base/kfmclient/Manifest index 7b28c0d8fa3..5d30f623ccf 100644 --- a/kde-base/kfmclient/Manifest +++ b/kde-base/kfmclient/Manifest @@ -3,5 +3,5 @@ DIST kdebase-4.3.69.tar.lzma 3856841 RMD160 3b44e44824ac3d70a3cc075d7439dd76a60b EBUILD kfmclient-4.3.0.ebuild 1348 RMD160 00aa86f8fcbed0e82612b0a8860e535560a2e125 SHA1 5e1cbb1dd63ef6af9dde2628fe0fa9058bba1614 SHA256 ec5a7f8229a2d055937dafae545ff402855f014fc2785881fbf572ed3676ef0f EBUILD kfmclient-4.3.69.ebuild 1435 RMD160 02798389959b168a99731b80ad31b3d1b525dd13 SHA1 86faad7512c9392a2d53d2d7521e7b8ae90d475a SHA256 bb7295cb093a6208c60020353e6c6f4d5779f5ff3a562eeb66b1be31145f6570 EBUILD kfmclient-4.3.9999.ebuild 1306 RMD160 24ab3600a14347af5f9a4410e3bb8f6b29434040 SHA1 82646ecd95ecc95b56282b8063dc1e907bceda44 SHA256 f0e35b03695df7d33c7c549ff9aa5402b9b767323d213b9ff44aba999cc21c70 -EBUILD kfmclient-9999.ebuild 1411 RMD160 2a8663cde514c2100c49ac32356d230ef6f94d4b SHA1 33fceebb04b4bbdca28bec549115494bc821de5a SHA256 a2b87391a076bd7e2fa8d9f05d2e16306f1ec6e00f50c1c4643622a66b87fb19 +EBUILD kfmclient-9999.ebuild 1000 RMD160 e9653213a3401b256eb87b1438c6d5a9ef2bb8bc SHA1 65d3a6ee157f7c2fa80aa111e0792ae767509dd5 SHA256 2a52c889f0972ca6216ec6015270a993be1bd24e4cece8dfb0ba232eb0bb23c0 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd598 |