Cleanup; add blocker for >=qt-4.7 (does not build)

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

4 files changed, 24 insertions, 43 deletions

diff --git a/app-office/kpresenter/ChangeLog b/app-office/kpresenter/ChangeLog
index a19861abb5e2..b57406a185dc 100644
--- a/app-office/kpresenter/ChangeLog
+++ b/app-office/kpresenter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kpresenter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.101 2010/10/15 21:48:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/ChangeLog,v 1.102 2010/10/20 20:32:35 dilfridge Exp $
+
+  20 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kpresenter-2.1.1.ebuild, kpresenter-2.1.2.ebuild:
+  Cleanup; add blocker for >=qt-4.7 (does not build)
 
   15 Oct 2010; Andreas K. Huettel <dilfridge@gentoo.org>
   kpresenter-2.2.2.ebuild:
diff --git a/app-office/kpresenter/kpresenter-2.1.1.ebuild b/app-office/kpresenter/kpresenter-2.1.1.ebuild
deleted file mode 100644
index 71376aa32f41..000000000000
--- a/app-office/kpresenter/kpresenter-2.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.1.ebuild,v 1.2 2010/06/21 13:56:13 ssuominen Exp $
-
-EAPI="2"
-
-KMNAME="koffice"
-KMMODULE="${PN}"
-inherit kde4-meta
-
-DESCRIPTION="KOffice presentation program."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.35.0"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="libs/"
-KMEXTRA="filters/${KMMODULE}/"
-
-KMLOADLIBS="koffice-libs"
diff --git a/app-office/kpresenter/kpresenter-2.1.2.ebuild b/app-office/kpresenter/kpresenter-2.1.2.ebuild
index 86f13d417663..a8b65c36b769 100644
--- a/app-office/kpresenter/kpresenter-2.1.2.ebuild
+++ b/app-office/kpresenter/kpresenter-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.2.ebuild,v 1.2 2010/06/21 13:56:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-2.1.2.ebuild,v 1.3 2010/10/20 20:32:35 dilfridge Exp $
 
 EAPI="2"
 
@@ -10,10 +10,11 @@ inherit kde4-meta
 
 DESCRIPTION="KOffice presentation program."
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~ppc ~ppc64"
 IUSE=""
 
-DEPEND=">=dev-libs/boost-1.35.0"
+DEPEND=">=dev-libs/boost-1.35.0
+	!>=x11-libs/qt-core-4.7.0"
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="libs/"
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index e9962feb03c6..2b70e8a880d9 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -5,29 +5,27 @@ AUX krita-2.1.0-opengl.patch 425 RMD160 957b1df959402314f5e5b2167d2c16ed8e32c960
 AUX krita-2.1.1-libpng14.patch 327 RMD160 9ec9c492d456d388b8d944b4a40e360693dd8605 SHA1 941850dc8485729edf3296cfd7bace6c1b56414c SHA256 93ef65c7da0e8f5d480ec90424e16e44c82068e7db5218ff4910f8e9a3b19b46
 AUX krita-2.1.2-gcc45.patch 3664 RMD160 f9e0766045b53102a6531b4aeec4f4a5be3a252d SHA1 b70b997572d5ff01e87b244c5f112e402794d72e SHA256 a054443342b5001f62f17fa5f1b705d160fb5cfca4f21b0265bad5ac9f1e067b
 DIST koffice-2.1.0.tar.bz2 76150485 RMD160 9703bdf4d70d0556c5c101f4cf4baecb17b66a10 SHA1 0fd0bf64e6d166d41bae41730b17d5194e7f5adf SHA256 96ea36d1e7e2495f0076805eacf29a84607dc597f58b129a310df7227716acc9
-DIST koffice-2.1.1.tar.bz2 50332433 RMD160 9c7123bf31370d406a6e5272d7e752c39b3596d5 SHA1 72a82cfaaca8fbdcd0ba4622f80d4cf27aff74d2 SHA256 ff928c2698ef37a5cc808faddf758ee0c44603ec19194c973f8e4d8fcc6aac01
 DIST koffice-2.1.2.tar.bz2 50359739 RMD160 20f3b162d49cbd70492c597aec2d79cb3de5a2d7 SHA1 29f5b5e611408ac2a2e68352cb64299b78d83094 SHA256 64233bb7b5b18813a9da46ab0c347170904611b59480b91297db4c3deb14b7da
 DIST koffice-2.2.2.tar.bz2 56470974 RMD160 bdd75cb056e2fa96b799eeec0ecb5ed6b6aef4c2 SHA1 ab6405e0efae0d8e895879183f1369facae410e0 SHA256 e5b060f640dd7ecd13b5d17f7e9ace7c0d1c0621e5fb83529f6e6db2d5c1edcb
 EBUILD krita-2.1.0.ebuild 1325 RMD160 6ba64d73a0699bb9e7bb989ae7834dc9ebd0abf2 SHA1 365cf457ce475aa49a8b9db6997696010b4b75b8 SHA256 8c6474fdc98b64a6349f82d0db09e9f3e61d1eea903d344e4286ae4da87c785a
-EBUILD krita-2.1.1.ebuild 1326 RMD160 8d75f732607bc44d673382462b46e2938163273b SHA1 593e75c14f61225f1367c6f44f0114c2c8cca290 SHA256 e816bd1670866b2014ac65cc25eb5daa8099ab53b9d34f6b68716aea244e9ba6
-EBUILD krita-2.1.2.ebuild 1365 RMD160 1724a68ff64ed27b2b7e0c5a478168bf4ee31791 SHA1 4edb816e0f2ad199854237088b4759937f76e558 SHA256 9463a4d008ff0c9adc02f6ef8013f67eb5181bb83fccdd61c2af87b2136a29f9
+EBUILD krita-2.1.2.ebuild 1353 RMD160 fba15179190639df777983d4b5b0a886615bac2c SHA1 19ec0bb7da1ca38955844e0bfbb169428b849fe7 SHA256 8362e4290772bf323eb2d29cc35ec5d319c8a86de6b119c8fe8307b17eca3a8c
 EBUILD krita-2.2.2.ebuild 1290 RMD160 2e57a3ca71f08264b3112d4efaf77481dbafe4df SHA1 27fe0feafebeb7d5443fc00744f87a5ba52b927f SHA256 9276f45cb2d4c3a92ba630eaf46650a4869f198a3311f3edaef92624042929dc
-MISC ChangeLog 14283 RMD160 fedd7329d0be41de724588fa7a98e73100aa1def SHA1 2aa8e6e41c132ddfd26da2d7874835d58a3cc6ab SHA256 a2996b61381fafcafd2ad3a5d8e8578e24fdc953fe36d54f6fe6ba71826dc337
+MISC ChangeLog 14394 RMD160 487ca1125a1e396512ba7a42183a7afe72f1e912 SHA1 dda47717e313b286ce8d5d3fbb55d50fc121917d SHA256 fd4dea3f806c59ae2a139a50a2f01cf0d5a4d41c938e2fa1019f79d6b5e46a0e
 MISC metadata.xml 318 RMD160 2341b49b24f95cc26f19933f8a785c5550970e3f SHA1 7264bf7bba1b5e206e47b8e85b783d3f5292ecc9 SHA256 41a628ecdd9b2fcd3405c2a146b1780eb75d282b956da88120963e441a1135d4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMuMyAAAoJENwGBM22xfferikQAJ2b+vTxySwWrOHqb56ock3r
-876Wn5im0Ac/3eLvmvJh8BG0qyZvhF7kcsy5xV4VS3IiVm7vo5jkdurZRe3WoGw9
-p0uELycFkvNkjGhG4w92tEovDn4757HrSGNQ7uDs/ri9cnfEnZy3sJnl08updVKu
-16YrTjo0pSc2ce98Zg2AfOquAQvR6zYpT7QeecZRf9X4+/21G31lRkjHt1TqiGjp
-DI0un6UcvJDTpKgzK8MNGw9CqhUFvQn3DJe8TX1wzs1SypU76UZMUNm96KUW/qAG
-EIF9jfqzuW4GhBuhgMTURIbkC/XcJ2STVia/LtKhUiXtqJbRTEP6IcrE228PZtUj
-JcAdL+UQfvNGn5eigKDDLxQ/5YCibUdhmORPKATlnN+KZq4Qcj0Dqjn9PDW0LBdj
-lJK4nGRrkOiX8qinMUMTnW9PScxUh+gGcNZl9zA69OpwzTUNih7fAGeBsh74xeJb
-0pXZ6T+TWA6afvghh8aO1Cq4u+cGzL6pl/n0aJK4JMuizwteWHDcMdQSf2bpw+9q
-V4+mrlMmoXt49QRy1Djvi/NN0aFHX4ADRxKppBVecTH7amsWpx3pnYi/z93HUCDH
-Hi2UgSk2rvJfFryettbjaY37wpIQPJZFWUN1fisy79dPXGyktsE4dqE1l/JFFZ4l
-0aqBGRfmJSmOhyssXUHv
-=MxQP
+iQIcBAEBAgAGBQJMv1JsAAoJENwGBM22xffeSk0P/2nyIk5GN3vtQEEw3J30j6Bw
+7YRD2FiI/5OyeOh94GaLF1mV8c+SkZSKpol7+mXCt6+imJU3C6a6jb35dLTifrbY
+clfhoTJo0iLG5tscBx+eMvMXwzKb7GeGw4oylVE6nORwYNBoFKzD/LRCWXdeI1k7
+PLYlcHBlcpBNNuiGgAhDa7xhjT7DCzt9SHzjTknHb5r4EXsUtqybrc+1irRUNx7u
+jl2KbKxTfS8/n/J+guo/rgikwRJ2O/Ae3Dz5grith5sRtcpR95ABcneMQAaxKMn5
+NJja0uyc7Beh/O9q1i8Xrz+ij3N6hC9xzJD56r8uCfG7z6MqaBwLME0IF47NnkoP
+jwG0qo52ndaBjtZx3BmPuVnk55tCBAWE40lYjlO2d2UP/hd+syIbYlADkdzKTAXN
+tE8qIlB1hH1plYP4Lwi9IOt7QVBL6hiWvY6ruuoAaWzcwo5z1J1UtqTd+VKQd8kq
+KEOM4IV2pIJZF6U4nPkBuuTh+oZyZjVCCb6hgaA7K+Xi7Nf71tnoL4nE9gdx3FEg
+nN5UNlBxPOQ0uXdJ4GNQA+4sjUlfLb4q4TUTQZN9SRF5QLHHCJqwqpeeZ216Pk1w
+PG0IybvSHeth0SCYsLdxM997LG9DbXyns3L7+ltyX0I43JIQgxU0Rp4NEwrMjeBK
+6oTtf/4WE5pJLxeHwwjm
+=6bi7
 -----END PGP SIGNATURE-----