diff options
| author | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2009-01-07 10:26:57 -0100 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org> | 2009-01-07 10:26:57 -0100 |
| commit | b5442482045e6a167b463d7d17d2961c2daa9a28 (patch) | |
| tree | 65be3295364931488d934f44df56378b6de14e3d | |
| parent | e3857d5fe9c08b4e8b13359c8299a5531ab6f9ff (diff) | |
| download | kde-b5442482045e6a167b463d7d17d2961c2daa9a28.tar.gz kde-b5442482045e6a167b463d7d17d2961c2daa9a28.tar.bz2 kde-b5442482045e6a167b463d7d17d2961c2daa9a28.zip | |
Restrict the block and add comment explaining it.
| -rw-r--r-- | kde-base/kdebase-data/ChangeLog | 4 | ||||
| -rw-r--r-- | kde-base/kdebase-data/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/kdebase-data/kdebase-data-4.1.87.ebuild | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog index e97b8005feb..71a6b3cec92 100644 --- a/kde-base/kdebase-data/ChangeLog +++ b/kde-base/kdebase-data/ChangeLog @@ -4,6 +4,10 @@ 07 Jan 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> kdebase-data-4.1.87.ebuild: + Restrict the block and add comment explaining it. + + 07 Jan 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> + kdebase-data-4.1.87.ebuild: Fixed the dolphin block. *kdebase-data-4.1.87 (01 Jan 2009) diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest index 4e04cfc8840..235f81b508f 100644 --- a/kde-base/kdebase-data/Manifest +++ b/kde-base/kdebase-data/Manifest @@ -1,6 +1,6 @@ DIST kdebase-runtime-4.1.85.tar.bz2 68538709 RMD160 362f7fa3c1297a6a6cb123e1a774d65a21dce854 SHA1 e5e6741249405787bcab080addec44df731f0033 SHA256 18d99c7d924b5b5e786c87cbd6576fd48f7f76bd8573dca1030f923f0ed4823e DIST kdebase-runtime-4.1.87.tar.bz2 69777715 RMD160 c80702e9c4a389f6bb3165f7bbacfb52e26b0612 SHA1 463e9e62be20979d3a162934a415fad45e7aa693 SHA256 b89cb2683d1a2ee6da46ae22b78231af8596ec59f97b7cbc0ca0d4b1a5bb1dca EBUILD kdebase-data-4.1.85.ebuild 738 RMD160 8fb2eba0299013ca58d96a6bde62b516c2ac008c SHA1 1c71ce8a7e477ed64883606e9ef65b47c316abb1 SHA256 9c7da421bf2a818cc4eaa58d1ee5a848010bbac01d20e5db05ee51cd309630e9 -EBUILD kdebase-data-4.1.87.ebuild 870 RMD160 832485decef85f0425b0684d5ea5328c2bac7dcc SHA1 5a4a8e346b696f362118598bc220885e89432afe SHA256 fa5d68265d88ccd9e11d343d96ea4fe132151d52c25de4a376a9d307b3cb722d -MISC ChangeLog 4044 RMD160 09ef2defea53a30c54ace17fec1da42937c745c3 SHA1 39dae0f1a642491dba6caaed8ad193d9d3462842 SHA256 5761f4b5a1016376a57829080cc41f8b6798af6b3c0392b6b0872e94682ff767 +EBUILD kdebase-data-4.1.87.ebuild 1045 RMD160 6246bca273d344be9aed4c1fa55036de35c31bfc SHA1 17f5bbddc8f87c90635c00bc78ee17c6f1118ddf SHA256 1ff9bcd678a4f017d36a209a8ca20ca4e7cb4b322ebfdc139b1b8e166a836d0c +MISC ChangeLog 4194 RMD160 1891ee390cf94b0169747c97b64c534c0d3b6c5b SHA1 cbeea55d1291863549857fe18c3ea6b81beb0ae0 SHA256 3bf597223ce0bde9d1669435edb3af4397f2bc607ba3d9297ccd3c1aaf179d6a MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdebase-data/kdebase-data-4.1.87.ebuild b/kde-base/kdebase-data/kdebase-data-4.1.87.ebuild index 390d05cc336..baefe54c7b1 100644 --- a/kde-base/kdebase-data/kdebase-data-4.1.87.ebuild +++ b/kde-base/kdebase-data/kdebase-data-4.1.87.ebuild @@ -13,9 +13,11 @@ IUSE="" KEYWORDS="~amd64 ~x86" DEPEND="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. RDEPEND=" - !<kde-base/dolphin-${PV}:${SLOT}[kdeprefix=] - !kdeprefix? ( !<kde-base/dolphin-${PV}[-kdeprefix] ) + !<kde-base/dolphin-4.1.87:4.1[kdeprefix=] + !kdeprefix? ( !<kde-base/dolphin-4.1.87[-kdeprefix] ) ${DEPEND} " # second block is for kde4.1 |