diff options
| author | Robert Förster <Dessa@gmake.de> | 2010-12-08 18:11:40 +0100 |
|---|---|---|
| committer | Robert Förster <Dessa@gmake.de> | 2010-12-08 18:11:40 +0100 |
| commit | 44fe70930ffc2a63a981643e851bc998404f2fb7 (patch) | |
| tree | b44391a582178694fdad5e5f2bdf3f0643bd17da | |
| parent | f57ca8fa0519c18149296bd7b8fe7ff7f53393e3 (diff) | |
| download | kde-44fe70930ffc2a63a981643e851bc998404f2fb7.tar.gz kde-44fe70930ffc2a63a981643e851bc998404f2fb7.tar.bz2 kde-44fe70930ffc2a63a981643e851bc998404f2fb7.zip | |
[kde-base/kdelibs] add a kcontrol blocker due to file collisions
(Portage version: 2.2.0_alpha7/git/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | kde-base/kdelibs/Manifest | 4 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.5.85.ebuild | 1 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 8cd404d1748..ce7ffe68224 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -20,7 +20,7 @@ AUX kdelibs-4.5.0-kfilemetadatawidget.patch 1604 RMD160 a6ce10ad49190a779aabff86 AUX kdelibs-4.5.73-module-suffix.patch 4098 RMD160 e003fcb8a496bcbc1c77f16a1e4ab81d735e9567 SHA1 1e15b7e24cbe41bc3f492b8e862fbd7da7f03212 SHA256 7e4116bf0f475b9ec4a6000830f28e0dcded039f58c2cb73c49c295ef276afd9 AUX kdelibs-4.5.74-klauncher_mac.patch 952 RMD160 666491525d51ca24c9b4228d97aa368ebd9b2eb8 SHA1 6a0ccd169f910842d27d1cc16f4f0f3e7c671de6 SHA256 8477a100f6c73ced8a8be06ac9025d83434fa6396daea8f86df85d7a3fb6fe84 DIST kdelibs-4.5.85.tar.bz2 14081810 RMD160 3daffd01a6dd849fbb75df7bb1a278bd89bc2eb5 SHA1 d48591373e3d9a3de9ee2bd7940eaf111c04eb98 SHA256 f25a27f97f76f7dc15017d170adc616d8476300282d58c38efff260179edb2ee -EBUILD kdelibs-4.5.85.ebuild 9365 RMD160 9ea58e3c4e9132bc4939ca6c0792217a519546c1 SHA1 49bfbd4e35a615761c3f4c0d14ac8a2cb2f511d7 SHA256 10183cb78afef68e25cb9994daff49f0a7d54a5607b6e236d533b77fcf9e3104 +EBUILD kdelibs-4.5.85.ebuild 9396 RMD160 980df5ce31019794bc50a182610392231c61d05f SHA1 9f4227d0a39f968b39b27199dcc5084f340b483c SHA256 ed20591c3fe68663c88e35ebca47cf6dad389f8e3c24c9ddd135b81d59938789 EBUILD kdelibs-4.5.9999.ebuild 9192 RMD160 aea9f8a496a66d9bcb169aff45a79f834cb42039 SHA1 140b699b0f526df9f86fe11ac36299aa4d98eae6 SHA256 513782145bb5267debf06d363c29b263e3db056b6ef573ff1f9f8242f0b00ac4 -EBUILD kdelibs-9999.ebuild 9338 RMD160 ef63fec63e5d0e3264ea73091fcc69034af73688 SHA1 231203f6420a30dadf86adf53e96ef3f94a1bd4f SHA256 2b6d49d90c4a065df6fcbeab395cffb9bb0398c2053ebead8ce87dc54b1d816a +EBUILD kdelibs-9999.ebuild 9369 RMD160 7b254b78f35501974c9f2979871424374bd19268 SHA1 4ab041d0c60f6264c6fc176020479e9351e5a6c2 SHA256 661fdb3fff830af2b9abc843e412632312b22e11f763fc98f76fba8697ee599a MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7 diff --git a/kde-base/kdelibs/kdelibs-4.5.85.ebuild b/kde-base/kdelibs/kdelibs-4.5.85.ebuild index 598c0cbf608..9bc256c6728 100644 --- a/kde-base/kdelibs/kdelibs-4.5.85.ebuild +++ b/kde-base/kdelibs/kdelibs-4.5.85.ebuild @@ -115,6 +115,7 @@ PDEPEND=" # as well as for file collisions add_blocker libknotificationitem add_blocker libkworkspace '<4.3.66' +add_blocker kcontrol '<4.5.80' # @since 4.4 - kpilot is gone (blocker added to help upgrades) add_blocker kpilot # Block some old versions of KDE-3.5 packages that don't work well with KDE-4 diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index a443870798a..e2fdc2ec3d0 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -115,6 +115,7 @@ PDEPEND=" # as well as for file collisions add_blocker libknotificationitem add_blocker libkworkspace '<4.3.66' +add_blocker kcontrol '<4.5.80' # @since 4.4 - kpilot is gone (blocker added to help upgrades) add_blocker kpilot # Block some old versions of KDE-3.5 packages that don't work well with KDE-4 |