Add explicit blockers for all koffice apps, bug 380613

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index d947117f3400b0bddc300a74a7deb54659e38d6d..3d20dd19c6c4d11999dbb74521684d03e5461401 100644 (file)
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.5 2011/08/22 21:48:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.6 2011/08/26 19:53:41 dilfridge Exp $
+
+  26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.3.74.ebuild:
+  Add explicit blockers for all koffice apps, bug 380613
 
   22 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   calligra-2.3.74.ebuild:

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 491ca8a3fd1befe2cf8518df0ce1258a02de4629..e6bc041c37729b90bde3f93cc1af4586afd76222 100644 (file)
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2
 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
-EBUILD calligra-2.3.74.ebuild 5327 RMD160 db6c79a7081f87330c44b947a1325eeca0c44a50 SHA1 10bfb8c2149bbc0dc03365924dc290de2b9aec94 SHA256 56ea60249819be57af98482eedb2331011f1d6d06b07bd4bee99f1235270097a
-MISC ChangeLog 1030 RMD160 abffeaffa9fc3eeec8e6dfbd31996214e659d8b6 SHA1 df2bac129edc3d9589e2b17c5bad13181a3a4f79 SHA256 69c0b29bfa7e4c9c626a3c197d8ce7e9a871779f08ae124b81388f720583d7de
+EBUILD calligra-2.3.74.ebuild 5528 RMD160 775ce140786c7cc3fdd0b8f1ff45d66bcf0fd652 SHA1 78e0df0875542692bfdce3f65730fc0b3d9cb433 SHA256 b446871cf7d063b9ef55ac4eaa35a95eeb7152fb66ffa520c5b9850aa6ab06e6
+MISC ChangeLog 1171 RMD160 34875dbc6ba2635b1cb8f73fa2bfc7c627bfaf6d SHA1 f2006c6dba7c9ee48f783a49db2efb5c15b27436 SHA256 f8cb2ee2e3cba141a10c4028d27a9eeae8f60a712f6cbf0b8c90fbd271f099cd
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOUs6pAAoJENwGBM22xffeC2AP/2+U7D2Ws+cxpsHCQr3E8eYs
-uX6mtL73goAcrHNnTXJRgV2ep+ykADDMnVLTumdZM9QXrKfJKHsvSgI0OJfGN/+W
-5VkY6yinUsnnx1C6LKOuhRNmABJi1bngwWvLBaXfTphlPrQ7rPa9Ey7Fci9nX0On
-KpRF7X5tlVhGbuoYmjm/wio+VU/pLoInXtWV4I4g8vH3AljIUYsipZlubkYYzfpf
-ikomPfh4iw/csn/+3muK1p0hFIOwTfUdegfsILSoMhM0Bo8ICLGr9i8RM2tk+/7a
-QWkr5vNlfNOBGq1xqsxDkv4RV3mO27hwoVZggwKv80A85ErIZjoi4n+i2zLQ65jQ
-LN0W+X4oYNHCL5orGhjkhFmo4B87KSgIT+RNX4gZZSsoy0QJozVxmjnPVvcTAx0S
-yupALVOOLsBsQdyQizQ2NW+L0fFbtyiipexUt1AGGlh0gN2O6VErdjkqi7AjpG9k
-zJ09+WkVKeEc1S+s4vp2PRcWvKca+LSZotV1H8dvsFkMYn0/0L+NTDi2sQX6HMQX
-HzkAqW0kZ7LGXX5vQnrAHWY2uZBInApat9HqnQm82+TJ93xaGnfiD0+NYBN5BCK5
-Cj8YK6Gu5B3CQNrsGyAjZfghjhnfpOR0/o1pBXG+UMJk2vrqvYgRuZQqkRnj4gjq
-vOBPUF9zr9W6KcX9YKCh
-=WLpj
+iQIcBAEBCgAGBQJOV/nbAAoJENwGBM22xffe6ZEQAKFdIAkMLmaglrYRK9k1R9Be
+6FLNvDclO8WrB5ag76N49TRLZhRHtPXObH/8HpGbH/FQrXpzpWjGA2A+axV7zTXs
+Tc3gOBCEJrXq7JqAyIAG1mjmFr29GLcG+WrqmO5oDhxan0fyMR7vFmhvKp0ahq8P
+ClzAsbflhfY4p/HCKOMPPBZrN9vCTQ7pvqFIfp5GhrA6LePXJ89duL2kUb2bKUX3
+kaKgZdKO0BdxwKGboLgygK0VsddOPSSowm/78ViYcuRw7S8vvQkrnjVODktvpxue
+81Hf9AJPnIzUYR8QVg/GkwDz/dn4hQtgwMnznSMHeYByNKeHDDcX6zA1C35sRfrQ
+527a8k6eDyx7X4AwOv9EjckVzypc1/043/Ge9z+joYLOvhseBMgb9v9ZrAcj5/jZ
+lSi9CkKRJogMJh6avDleP/yhtN+hMQB71DCBTfE4jh8E5QzaLoAkoCNYreYfCzJP
+PtZAzWkPZajhz2FbdcL4eoBPQ0OqkwOum58Ka0bsNweitzMwx4mYTRE4A38iGjzx
+EJgYMHohuG5UQeMhFABuAdzamgPUiNihDuLYR5bfr0UdgbO2/JSuGGMFi4yQxD8L
+KQLuYIMwU4S8HYrWSHfinltJAd5WZgL0hb/hfJjyT48Ri6MvRvH67OQ1ijiaZFS5
+k7x3qho26aQFfqKfV4VN
+=lcg4
 -----END PGP SIGNATURE-----

diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
index a9cd97a80f5db332cd23f177020a40a2b6e72363..e5dbded67bd3b7aa415fabc2f77c51cc596ff194 100644 (file)
--- a/app-office/calligra/calligra-2.3.74.ebuild
+++ b/app-office/calligra/calligra-2.3.74.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.3 2011/08/22 21:48:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.4 2011/08/26 19:53:41 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -42,7 +42,16 @@ REQUIRED_USE="
 "
 
 RDEPEND="
+       !app-office/karbon
+       !app-office/koffice-data
+       !app-office/koffice-l10n
        !app-office/koffice-libs
+       !app-office/koffice-meta
+       !app-office/krita
+       !app-office/kplato
+       !app-office/kpresenter
+       !app-office/kspread
+       !app-office/kword
        dev-db/sqlite:3
        dev-lang/perl
        dev-libs/boost