Add blocker on kscd to avoid collision on +handbook install.

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 31 insertions, 5 deletions

diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 1638e96bd744..afe32112f98c 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.224 2012/09/02 21:54:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.225 2012/09/03 08:11:17 scarabeus Exp $
+
+  03 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  kdemultimedia-kioslaves-4.8.5.ebuild:
+  Add blocker on kscd to avoid collision on +handbook install.
 
   02 Sep 2012; Agostino Sarubbo <ago@gentoo.org>
   kdemultimedia-kioslaves-4.8.5.ebuild:
@@ -1060,4 +1064,3 @@
   +kdemultimedia-kioslaves-3.4.0_beta1.ebuild:
   Adding the split ebuilds to portage. For KDE 3.4, we've created separate
   ebuilds for all the KDE apps.
-
diff --git a/kde-base/kdemultimedia-kioslaves/Manifest b/kde-base/kdemultimedia-kioslaves/Manifest
index 12a6ed1ddfeb..d7135ff888d3 100644
--- a/kde-base/kdemultimedia-kioslaves/Manifest
+++ b/kde-base/kdemultimedia-kioslaves/Manifest
@@ -1,8 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST kdemultimedia-4.7.4.tar.bz2 1644450 SHA256 c1236ed17f575ff793869e5ade024f892ae36aba27a00edafb3495806fb81b28 SHA512 646a446859e96104c1e721b1fb4d573c957b704fe222998d3b43fbf7637892367026a131c96bf15c51f3cafb73147c35a85267a5137695da7d77d2cf9d9d0724 WHIRLPOOL 0a3be46fb27ee7770012f1e6376ebe8411254a9391872de273198b3f15e9828f56478c242f7205a9dfa16c92bf10ba52972ddcc8e6e726e7696595d763941eb9
 DIST kdemultimedia-4.8.3.tar.xz 1501996 SHA256 9dbad22a853cfc3042305218035ad097b9cb1da287591ace410f9fe430e1b4c8 SHA512 34dcbb98387d6a16ed9f6abe9070246bad9c92f6d6de2cd02a9e7b34e3272c80acb18c5d6c091f096aa62aa94e7c23d549b5fa8c805dc194270817875e619476 WHIRLPOOL 456bfb738c001ae434a868e6f90a4805a23d7272a799af63d591bc166367c27ed2b5e6ecf9de326d648b4b67f6a8ece945ac36e88604a81ebf1a899b06ea4258
 DIST kdemultimedia-4.8.5.tar.xz 1499072 SHA256 47332668dd12d9c3c12e4821ddd6ee331b624a78eb50252b721aa597f80c5de6 SHA512 d73cbc0c9820a7d71b244f2c680ddb0c2c985c8fc9fea9785816a429a2452bbe49bac599a77bbe83ef0fccdf2bc7f80ff3be75f33e92d914c4a4bf31802b479e WHIRLPOOL 665781956c32fc194ea5b0f3b94575d4e4708833c22c0a1e3d5b08e5a53c8bf6dc0c631e5edf364398cfab34d4cdbb726c4a582cf3d0240ea0361b38f0f198c9
 EBUILD kdemultimedia-kioslaves-4.7.4.ebuild 1075 SHA256 2bb236bb8f182b0367b21c5dd1297ae138c6f2b4ec8dbec0e7ab3997dae04d77 SHA512 bbe2d1a8be1bfef3b7a8e7ff45bf38aa1c8409e1903bedf1ec9149fa78836b180c4a064625bd2d54032e54923585dc33a586fb656d53247a05f0d96135175a95 WHIRLPOOL 36706a400bfd613682f822f67242bdf07c82046f50bdf610a7ce44995c9a0ba8c1390729bf34b6bba1a947bf29bd0217adb03416ade40747a2567b402455cf25
 EBUILD kdemultimedia-kioslaves-4.8.3.ebuild 1073 SHA256 249cf760ad911ee4667c4ff8511fb71bfa081fed2358f697743c76c12bbadef2 SHA512 95b6d885f6839f06a5ec3ee18ee76aa582195af6ff6ec60f2c8da7261f492642ad0000dac705210c1373c2e7505205698a6490bb0658844381a293c285f66f82 WHIRLPOOL 06c0ed701da81693a4475018b54ae1580d707354d9f2e9304faa7d1a0988bab017e7b210d19c022434ca488b999e099555f584d54bf83bb9c49f54e07c7a4f2c
-EBUILD kdemultimedia-kioslaves-4.8.5.ebuild 1073 SHA256 e99b3e1b154dff4e9fde29d252d1d43e6e914fae386f7bdeb2648cf5e2fbe7aa SHA512 5a0b8275f1bca687c96307a51e4b65b6852efcaa3ee3b6921b9f9d1121d6a5b86e33c3d823340af7a4b439ca944d9a08d3e12c62b827b0001248fe69b928d52b WHIRLPOOL 15ad3b62661882b427741cd73291cc0e8c8db87383a7ee4c9225656692a1ae99d000c313b1363730724fa9743468ece063f27a53974c16ed09820ac03f80410c
-MISC ChangeLog 32660 SHA256 3cf1784a5429db0bda71d103c77d7f1a18fc38695c32515ae2d9dc9bbb5bbdcd SHA512 dccf34ec40cb36d4cfb4a9f6b7b20133684d20e8df2532484f7d288959fdfc9d46f291c501fa752b317999e08f8a0860aa9656e5b212e84e31024a178ffe2a40 WHIRLPOOL a1c83f3f18284981d8b5a170c5db4949d0afc146e3e92f42af93d1e511b1bdee303bcb180270c6e83fd14350c8d87aeb6fdbfdf033fca4b684a357708944c9dc
+EBUILD kdemultimedia-kioslaves-4.8.5.ebuild 1169 SHA256 61e0232b0605e01aecd20b4ebdd96c39182a8b854bf8f274873da71d2754158d SHA512 aa7b5228443b3c0e496597cfa35ac74b0b884c266864d67e2afe1280f83e3ab315b872ecbf0707091718ba749c1e565b03da264c89087e630199caec72816c74 WHIRLPOOL 2ff8ad15bfa28a8c2c16d3cdf732309ad2a6c605890221f46a67b4c917a8575f8e17ff3011c8fbd26a9e903787ad2f315f59b9ba543fca438583a9e2891ef60b
+MISC ChangeLog 32824 SHA256 64df9da1ef237d02f89920b93e0cb5bf8e80906ff4f2e568bb5b18239fb0656e SHA512 b4f91b4cab0af2c9e279066086238aa7785a6587692536b8568f400444c03538805b2af323c667e4d7474baee873dfa54d3c450b3181808a884baf0b822a1873 WHIRLPOOL e8a08d0e7d803146075ca95b7aac4d3489fa94a94c9d014422ea2b20a94b7b1862ac12f850e296137c2b79f086ea3e17449bdf7646952e76f6c09e9fc3843593
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQRGYoAAoJEOSiRoyO7jvoII0P/1fYZHpF7tIUlRrhpv58Tjsu
+KDwuIC33cXFrrp5BcAIN0YY4aaw/4M4tLZkGrC28xcncs9jzODrlnvC/NvEgLnyB
+sk7AznuKAYcoXrfZvsI9GzRs3qNbAA1cTXkMqKr4+Fe6Ic1wxA7MlONIPyo/jaQi
+BNz+fN5ccWGazsvqzU8dISyqosVTgceHvmn1iEvv7A0+vpKB1VTM2+FjUnVhF9nM
+wWpxodin8x7U0QDdL+0TNbkZIO+S4Xb0KEXQPmlsoWHx+BooNyTtPW4HMS0QhJzl
+zQFnnFKpDQBGuTvA0AibSj/BKQvPjIyoNYQynRCXMWYbtNpEagOMJLJ2j1IULUkK
+jpcRCf3y4midbzPuSCWlskU3Uz7n394C03uYrcmqc3We3ZrxszktdYJxWZGc5XbH
+a6VOon8NHuzUoOaywAWP33n43QY/1TorBxHHhtY3sndBwEN+GI3/ozHalsYszPit
+9J4QrjzT9uQ6AEAWL8TMMOvOKuxNgjXJWV5K+B2REr2T7D6fYchkY8hPnDl87cFj
+k9dhUmQvycw9l5cQLLC85dO926lfrgzGuCxkK3755w6flU9gU5dS5FOXMDL77/sh
+R5ubZcZKI1Feh1SLVzr8tXnJi6n8+5wjdlN1y6eSL8ITjDyR4X4fysCKjKlJeT/I
+kC0hQFErAPO/+pUZzg4Y
+=bRu/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild
index 9593c6393e08..f3412f17f775 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild,v 1.3 2012/09/02 21:54:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-4.8.5.ebuild,v 1.4 2012/09/03 08:11:17 scarabeus Exp $
 
 EAPI=4
 
@@ -27,6 +27,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# handbook collision, it was delivered by kscd prior this release
+add_blocker kscd 4.8.4
+
 KMEXTRACTONLY="
 	libkcompactdisc/
 "