Update to 1.6.0 final.

Package-Manager: portage-2.1.2_pre3-r5
author: Diego Elio Pettenò <flameeyes@gentoo.org> 2006-10-19 16:44:27 +0000
committer: Diego Elio Pettenò <flameeyes@gentoo.org> 2006-10-19 16:44:27 +0000
commit: 8752c86bb0e1b1f96876746eb646e0eebf5d0983 (patch)
tree: d600de2f3b029fb7024ed07ada968c5c3db296a6 /app-office
parent: Update to 1.6.0 final. (diff)
download: historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.tar.gz
historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.tar.bz2
historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.zip
61 files changed, 278 insertions, 1533 deletions
diff --git a/app-office/kformula/Manifest b/app-office/kformula/Manifest
index 97bbb2a9159d..504c7a631f62 100644
--- a/app-office/kformula/Manifest
+++ b/app-office/kformula/Manifest
@@ -21,10 +21,10 @@ EBUILD kformula-1.6.0.ebuild 847 RMD160 fa25073f668c868f83eb3031ac0350a06238e823
 MD5 f4499617a262012ebcc571158ac7b27c kformula-1.6.0.ebuild 847
 RMD160 fa25073f668c868f83eb3031ac0350a06238e823 kformula-1.6.0.ebuild 847
 SHA256 32323b30a0ab4647e54ff6838bced1e5a78a392e5fd8be5a03a197c8f06cbb48 kformula-1.6.0.ebuild 847
-MISC ChangeLog 6223 RMD160 323777c3e4aefa352b1e8c133adc1d3df8eddee9 SHA1 533ca4c3fd208fafff1a2e017f35de63b7e80112 SHA256 ee715bdadb604c29f71ba737bd0cac19298c0c1e4df0d80b25375fb05fcb318a
-MD5 74374b28587be800fb0b1ebbdb346698 ChangeLog 6223
-RMD160 323777c3e4aefa352b1e8c133adc1d3df8eddee9 ChangeLog 6223
-SHA256 ee715bdadb604c29f71ba737bd0cac19298c0c1e4df0d80b25375fb05fcb318a ChangeLog 6223
+MISC ChangeLog 6313 RMD160 4cd7c7f6aa3baa62d0241948a9cf19cd7e6cdd38 SHA1 eb2d11a8f2f9aa116ab295a8e38f572ec696f477 SHA256 8e5959f36bc5cb9b6ee395b2687b80d01c5bcaca9bd8ff735b2686f9ba336ef1
+MD5 9942158bcfdab19de6aabe052113ec8c ChangeLog 6313
+RMD160 4cd7c7f6aa3baa62d0241948a9cf19cd7e6cdd38 ChangeLog 6313
+SHA256 8e5959f36bc5cb9b6ee395b2687b80d01c5bcaca9bd8ff735b2686f9ba336ef1 ChangeLog 6313
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -44,7 +44,7 @@ SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFN6dTAiZjviIA2XgRAldiAJ96dNDAhAv4utZnPhygQ4ShPA28AACeKlkv
-02wBMjki8L4f2yyc51Lp2TQ=
-=8ZY1
+iD8DBQFFN6eTAiZjviIA2XgRAtIsAJwO8rRMSWli85yHvHTStSK9C+74gACg8zIY
+DcJtOELCTI/hwE5/A2bc2KU=
+=n6wy
 -----END PGP SIGNATURE-----
diff --git a/app-office/kivio/Manifest b/app-office/kivio/Manifest
index 18a19cbe6d3a..1000bc320946 100644
--- a/app-office/kivio/Manifest
+++ b/app-office/kivio/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kivio-1.4.2.ebuild 848 RMD160 bce4d23db086532bde9e3f5e384edf03d4df67b4 SHA1 f1a5a32ac3114de753c1afaffdca3f9b91b8ef8b SHA256 0da80e8b85452fa085436dcb87aeb9065018225ba00a652b2d46074614871804
 MD5 4867a32ce0cc078f06aa6042bc0aefd9 kivio-1.4.2.ebuild 848
 RMD160 bce4d23db086532bde9e3f5e384edf03d4df67b4 kivio-1.4.2.ebuild 848
@@ -15,18 +17,14 @@ EBUILD kivio-1.5.2.ebuild 884 RMD160 0be524f33aa85946e1a5fc6b274a28a8c95ed32c SH
 MD5 209c25e27387e07b4b983e7a33f25747 kivio-1.5.2.ebuild 884
 RMD160 0be524f33aa85946e1a5fc6b274a28a8c95ed32c kivio-1.5.2.ebuild 884
 SHA256 65ae806ddbd9a7af3458d4c4188273fffef492374f513b8d67aa8ee1f18b3b65 kivio-1.5.2.ebuild 884
-EBUILD kivio-1.6_beta1.ebuild 893 RMD160 31a2061d668698699bd51bafc549501fd5ebf763 SHA1 5cb658baf43caa140f231f9833c3756c5ed01fbd SHA256 073c5e95cef7e7b4d7af12eb6a1d9641851f8192f01806375e58e738b3ea6ef9
-MD5 48074e15f6b765f40c583bd116a97018 kivio-1.6_beta1.ebuild 893
-RMD160 31a2061d668698699bd51bafc549501fd5ebf763 kivio-1.6_beta1.ebuild 893
-SHA256 073c5e95cef7e7b4d7af12eb6a1d9641851f8192f01806375e58e738b3ea6ef9 kivio-1.6_beta1.ebuild 893
-EBUILD kivio-1.6_rc1.ebuild 897 RMD160 11d6a74e423d21147675039439eeb3e97b73c0f8 SHA1 d8b8c16b0389967dd4deff707020fc11df4b3a78 SHA256 eb63558f3d9c43fefaa4d9eab9836295f43f1c859590e617e560755e187c9904
-MD5 a793c210311b26ce725feab586ece4a7 kivio-1.6_rc1.ebuild 897
-RMD160 11d6a74e423d21147675039439eeb3e97b73c0f8 kivio-1.6_rc1.ebuild 897
-SHA256 eb63558f3d9c43fefaa4d9eab9836295f43f1c859590e617e560755e187c9904 kivio-1.6_rc1.ebuild 897
-MISC ChangeLog 5753 RMD160 6e5133be5604d137d5b018b6b21fdd4a84bccbc8 SHA1 ba64a4eb349df16db25ed9708bcf18de7ab27624 SHA256 e6831de5f4367ba9501597a148318f5f0ce0afe46d42167c26bf86b6e9a50551
-MD5 8f62dc73fd77a6fd9861331fcb8362c0 ChangeLog 5753
-RMD160 6e5133be5604d137d5b018b6b21fdd4a84bccbc8 ChangeLog 5753
-SHA256 e6831de5f4367ba9501597a148318f5f0ce0afe46d42167c26bf86b6e9a50551 ChangeLog 5753
+EBUILD kivio-1.6.0.ebuild 893 RMD160 cd444dc70f8d841fe5d7284a5153556a40a9df49 SHA1 81828a8abe8b0399d7520621ee53cd6f54653223 SHA256 33238aac65e2bf58970244dc026879406cf19a13a446b4f52db8b02733182e1e
+MD5 3fd14adcd0f11bfb3f14ac73288cd332 kivio-1.6.0.ebuild 893
+RMD160 cd444dc70f8d841fe5d7284a5153556a40a9df49 kivio-1.6.0.ebuild 893
+SHA256 33238aac65e2bf58970244dc026879406cf19a13a446b4f52db8b02733182e1e kivio-1.6.0.ebuild 893
+MISC ChangeLog 5934 RMD160 58adf695eadebc19a91da30aa427c817ffd351fa SHA1 caeda62358460b268a0785823d31ae8352908aae SHA256 a27938e0749193a6e5d804841bf72c607fb2c5e0d4d66b2021ec75b3c64ab073
+MD5 2fe3c752eea76d9db337965d116aa04e ChangeLog 5934
+RMD160 58adf695eadebc19a91da30aa427c817ffd351fa ChangeLog 5934
+SHA256 a27938e0749193a6e5d804841bf72c607fb2c5e0d4d66b2021ec75b3c64ab073 ChangeLog 5934
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -40,9 +38,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kivio-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kivio-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kivio-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kivio-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kivio-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kivio-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kivio-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kivio-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kivio-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kivio-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kivio-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kivio-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6hWAiZjviIA2XgRAuYIAJ4xxZzCjkdkAp3/vVc4jOEVfWuIHgCggPkc
+Gt06Vhfe5ktHZW4/Rew1bGI=
+=BxRx
+-----END PGP SIGNATURE-----
diff --git a/app-office/kivio/files/digest-kivio-1.6_beta1 b/app-office/kivio/files/digest-kivio-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kivio/files/digest-kivio-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kivio/files/digest-kivio-1.6_rc1 b/app-office/kivio/files/digest-kivio-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kivio/files/digest-kivio-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kivio/kivio-1.6_beta1.ebuild b/app-office/kivio/kivio-1.6_beta1.ebuild
deleted file mode 100644
index 6f76db4ec462..000000000000
--- a/app-office/kivio/kivio-1.6_beta1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.6_beta1.ebuild,v 1.1 2006/09/15 18:53:16 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice flowchart and diagram tool."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	dev-lang/python"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kivio"
-
-need-kde 3.4
diff --git a/app-office/kivio/kivio-1.6_rc1.ebuild b/app-office/kivio/kivio-1.6_rc1.ebuild
deleted file mode 100644
index 5819f3706e68..000000000000
--- a/app-office/kivio/kivio-1.6_rc1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kivio/kivio-1.6_rc1.ebuild,v 1.1 2006/09/28 13:26:37 deathwing00 Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice flowchart and diagram tool."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	dev-lang/python"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kivio"
-
-need-kde 3.4
diff --git a/app-office/koffice-data/Manifest b/app-office/koffice-data/Manifest
index 37c4eb87e894..5200ecf759dd 100644
--- a/app-office/koffice-data/Manifest
+++ b/app-office/koffice-data/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD koffice-data-1.4.2.ebuild 596 RMD160 a12d0d42b562c67beb2943d4f87cbba8d71d326c SHA1 49599103eda01641bb7fdee355730f4ec6584bd0 SHA256 6b12af8e8b2704c054f7d644b02581b56dc16fecfdf530ae1820fe8f900ba1c7
 MD5 52b09cd1ad4578b0a65a0abcd7e8eebc koffice-data-1.4.2.ebuild 596
 RMD160 a12d0d42b562c67beb2943d4f87cbba8d71d326c koffice-data-1.4.2.ebuild 596
@@ -15,18 +17,14 @@ EBUILD koffice-data-1.5.2.ebuild 605 RMD160 dbd124f17dae1a318dff3a1150bf93b763af
 MD5 e770032732debea6b2af04da3c266727 koffice-data-1.5.2.ebuild 605
 RMD160 dbd124f17dae1a318dff3a1150bf93b763afbf6d koffice-data-1.5.2.ebuild 605
 SHA256 a1984e14037dc0f052dd441119b79851ac2b211ce63ff7d0c500516bc5d600b2 koffice-data-1.5.2.ebuild 605
-EBUILD koffice-data-1.6_beta1.ebuild 614 RMD160 c78d159cd3c397df0cf720d70a54a9b788cf5066 SHA1 1ab2eec2470809b3099ae85b6d7592ae98e2cf00 SHA256 18c600ca39a16fdbfba1113d035c4a7d62e2ac7e9cf846b4ba71cb42b9184bf3
-MD5 2384ce3a17295af3588ec3de6bc3314f koffice-data-1.6_beta1.ebuild 614
-RMD160 c78d159cd3c397df0cf720d70a54a9b788cf5066 koffice-data-1.6_beta1.ebuild 614
-SHA256 18c600ca39a16fdbfba1113d035c4a7d62e2ac7e9cf846b4ba71cb42b9184bf3 koffice-data-1.6_beta1.ebuild 614
-EBUILD koffice-data-1.6_rc1.ebuild 612 RMD160 57a28a1eded2f0306e4152d033ef800185f29fd4 SHA1 e8c716aa9056f2309f266dc3bebe782ab811874c SHA256 eb1ffbecff1b87717312d1ce1a6fd24615fe028931216c688714a0b228b4a64b
-MD5 847892f98b7130e1ee5c52cc1f36d947 koffice-data-1.6_rc1.ebuild 612
-RMD160 57a28a1eded2f0306e4152d033ef800185f29fd4 koffice-data-1.6_rc1.ebuild 612
-SHA256 eb1ffbecff1b87717312d1ce1a6fd24615fe028931216c688714a0b228b4a64b koffice-data-1.6_rc1.ebuild 612
-MISC ChangeLog 6273 RMD160 e5f504788f4a5116ea2621ae5fa3791ba0efde19 SHA1 cb03c48742532a46372e6c85344169552c07d865 SHA256 a3adddfa75c93a6a5b82fcbe71012e2dac5b9c69bd6fd00a2fe61bbfdf024433
-MD5 e83413b4e31af3d8b215bcf1debb6db6 ChangeLog 6273
-RMD160 e5f504788f4a5116ea2621ae5fa3791ba0efde19 ChangeLog 6273
-SHA256 a3adddfa75c93a6a5b82fcbe71012e2dac5b9c69bd6fd00a2fe61bbfdf024433 ChangeLog 6273
+EBUILD koffice-data-1.6.0.ebuild 614 RMD160 a0fcc3b5af0d23d1c08fee7677eaffeb761711d1 SHA1 66d4cdcfdef6c350351291f7b408e51a9774dcb3 SHA256 652fb333294ccf206416271434fc1cd315c68c02257b1ab462d9cbfe4260b149
+MD5 43f548a7100f023d01ab3cb2bd1a7318 koffice-data-1.6.0.ebuild 614
+RMD160 a0fcc3b5af0d23d1c08fee7677eaffeb761711d1 koffice-data-1.6.0.ebuild 614
+SHA256 652fb333294ccf206416271434fc1cd315c68c02257b1ab462d9cbfe4260b149 koffice-data-1.6.0.ebuild 614
+MISC ChangeLog 6484 RMD160 a21465845c3d05dc2b7a0f5cd226dde04f7bb273 SHA1 bdecffbf02674c1be637635098f4c73d5b32a5a2 SHA256 8605ee676a9ed7b816d6685e69ded9e68ce05f66cf50642206539cb1895b837b
+MD5 dcc8cacdd22acec86261443f66f8f229 ChangeLog 6484
+RMD160 a21465845c3d05dc2b7a0f5cd226dde04f7bb273 ChangeLog 6484
+SHA256 8605ee676a9ed7b816d6685e69ded9e68ce05f66cf50642206539cb1895b837b ChangeLog 6484
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -40,9 +38,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-data-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-data-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-data-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-koffice-data-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-koffice-data-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-koffice-data-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-koffice-data-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-koffice-data-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-koffice-data-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-koffice-data-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-koffice-data-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-koffice-data-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6j4AiZjviIA2XgRArzdAKDKYwYEPzeBU/h0gKw9AQeTbexORQCeN9LZ
+YAiir4k2Gltg0ZtiV5L8hhk=
+=35CG
+-----END PGP SIGNATURE-----
diff --git a/app-office/koffice-data/files/digest-koffice-data-1.6_beta1 b/app-office/koffice-data/files/digest-koffice-data-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/koffice-data/files/digest-koffice-data-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/koffice-data/files/digest-koffice-data-1.6_rc1 b/app-office/koffice-data/files/digest-koffice-data-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/koffice-data/files/digest-koffice-data-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/koffice-data/koffice-data-1.6_beta1.ebuild b/app-office/koffice-data/koffice-data-1.6_beta1.ebuild
deleted file mode 100644
index 7f684c615cf2..000000000000
--- a/app-office/koffice-data/koffice-data-1.6_beta1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6_beta1.ebuild,v 1.1 2006/09/15 18:37:03 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice data files."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="dev-util/pkgconfig"
-
-KMEXTRA="
-	mimetypes/
-	servicetypes/
-	pics/
-	templates/
-	autocorrect/"
-
-need-kde 3.4
diff --git a/app-office/koffice-data/koffice-data-1.6_rc1.ebuild b/app-office/koffice-data/koffice-data-1.6_rc1.ebuild
deleted file mode 100644
index 533fa30cc87d..000000000000
--- a/app-office/koffice-data/koffice-data-1.6_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-data/koffice-data-1.6_rc1.ebuild,v 1.1 2006/09/27 23:35:43 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice data files."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="dev-util/pkgconfig"
-
-KMEXTRA="
-	mimetypes/
-	servicetypes/
-	pics/
-	templates/
-	autocorrect/"
-
-need-kde 3.4
diff --git a/app-office/koffice-libs/Manifest b/app-office/koffice-libs/Manifest
index 204c24cba20b..e252e341bd94 100644
--- a/app-office/koffice-libs/Manifest
+++ b/app-office/koffice-libs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX koffice-libs-1.5_rc1-kspell2.patch 825 RMD160 94a09d0f4477ec15f76322afa3d38f428fd0874e SHA1 2d836ae0f46371b4dd191c6f940f6c8e380c7c39 SHA256 b75a139ff25c1a9583c03ad47a8742fe8bfb526741dde01f1e4d9b80ff8b59d4
 MD5 0c477f65102c24f2d150d7cd310e396c files/koffice-libs-1.5_rc1-kspell2.patch 825
 RMD160 94a09d0f4477ec15f76322afa3d38f428fd0874e files/koffice-libs-1.5_rc1-kspell2.patch 825
@@ -5,8 +8,7 @@ SHA256 b75a139ff25c1a9583c03ad47a8742fe8bfb526741dde01f1e4d9b80ff8b59d4 files/ko
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD koffice-libs-1.4.2.ebuild 1187 RMD160 755214f7afac626b36b754a609efe0e4a4218c82 SHA1 d32cf37a720063aa4f5498e7c320579ac521d0ca SHA256 ea50193c01da181228a75e88b46877fbcb0e1e835908b4521468679d3ac8dce4
 MD5 8519285df64019854a727a5b9e7b64bb koffice-libs-1.4.2.ebuild 1187
 RMD160 755214f7afac626b36b754a609efe0e4a4218c82 koffice-libs-1.4.2.ebuild 1187
@@ -19,18 +21,14 @@ EBUILD koffice-libs-1.5.2.ebuild 1332 RMD160 eff3ab2114bb642ce8d43062a8acbf9b814
 MD5 c8eeb4732918946e3ad066f650c1f4d4 koffice-libs-1.5.2.ebuild 1332
 RMD160 eff3ab2114bb642ce8d43062a8acbf9b8147f373 koffice-libs-1.5.2.ebuild 1332
 SHA256 605cc397959e2136f7a7f2526f6457c9bae52cc8c91b4867dfc0652217247b78 koffice-libs-1.5.2.ebuild 1332
-EBUILD koffice-libs-1.6_beta1.ebuild 1341 RMD160 ced273bcad3f3a0f6fdc56f92a00fe43dad67acc SHA1 7bfd3d700c28eaebc358bf16a6a5d46e0c7f49f8 SHA256 0b3c1994190247f5fd5e9dfd769874b904ea4ffa33b8e3541d0c28cb192c2bf4
-MD5 8e4cab379867ceef196591eeabaa771f koffice-libs-1.6_beta1.ebuild 1341
-RMD160 ced273bcad3f3a0f6fdc56f92a00fe43dad67acc koffice-libs-1.6_beta1.ebuild 1341
-SHA256 0b3c1994190247f5fd5e9dfd769874b904ea4ffa33b8e3541d0c28cb192c2bf4 koffice-libs-1.6_beta1.ebuild 1341
-EBUILD koffice-libs-1.6_rc1.ebuild 1339 RMD160 3016a236ba7f941891abb5525d2412cf2ef42086 SHA1 a6703884f0b665ca110da59acd3c7f09d3d0304c SHA256 34ebd367cb2999faa0179a88b0af5a5361d9b68b64503c10d1196c983cee6cdc
-MD5 0ea6af249601fb1524f076d9b50d5d3f koffice-libs-1.6_rc1.ebuild 1339
-RMD160 3016a236ba7f941891abb5525d2412cf2ef42086 koffice-libs-1.6_rc1.ebuild 1339
-SHA256 34ebd367cb2999faa0179a88b0af5a5361d9b68b64503c10d1196c983cee6cdc koffice-libs-1.6_rc1.ebuild 1339
-MISC ChangeLog 7025 RMD160 36f7ed1b8cdfe6474cad709d16d01ae463a11371 SHA1 8d4f725ea81a5fea6c70fc5e90a08e22fe5ed238 SHA256 2b9558dd7bb0c348fad7e061541ac8844d4ff32eba3be69ec2610e29a9d373ae
-MD5 db201dc295bbc12faa8135e3a6a77448 ChangeLog 7025
-RMD160 36f7ed1b8cdfe6474cad709d16d01ae463a11371 ChangeLog 7025
-SHA256 2b9558dd7bb0c348fad7e061541ac8844d4ff32eba3be69ec2610e29a9d373ae ChangeLog 7025
+EBUILD koffice-libs-1.6.0.ebuild 1341 RMD160 a5d3ca1bafcb3847bfe67ba9c5725585a722e65e SHA1 44420fa597f02f923af6a1c0302df2e4865f649f SHA256 f821111d3b9a8fcfe74847167e21903bfe6327c6b41d7855f75efaf510bcbeb0
+MD5 0f7f291ced10c1f79d77a66142d46204 koffice-libs-1.6.0.ebuild 1341
+RMD160 a5d3ca1bafcb3847bfe67ba9c5725585a722e65e koffice-libs-1.6.0.ebuild 1341
+SHA256 f821111d3b9a8fcfe74847167e21903bfe6327c6b41d7855f75efaf510bcbeb0 koffice-libs-1.6.0.ebuild 1341
+MISC ChangeLog 7236 RMD160 b223549a924ecdfbcdae2cf759c52d64a9de59df SHA1 fb1d284ed97698a981c9cab411870362238bdf27 SHA256 e7244dfae7cb671fa0dde65334081b2a45c9c7c46477b7868fbe66961a3dfb9d
+MD5 fe8e53049e9e9f44ab95f39e3d67fe80 ChangeLog 7236
+RMD160 b223549a924ecdfbcdae2cf759c52d64a9de59df ChangeLog 7236
+SHA256 e7244dfae7cb671fa0dde65334081b2a45c9c7c46477b7868fbe66961a3dfb9d ChangeLog 7236
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -44,9 +42,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-libs-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-libs-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-libs-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-koffice-libs-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-koffice-libs-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-koffice-libs-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-koffice-libs-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-koffice-libs-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-koffice-libs-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-koffice-libs-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-koffice-libs-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-koffice-libs-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6lAAiZjviIA2XgRAkvZAKDiUbuYmngEajrNMHNX+3a28jJ/3ACeNcM1
+lbLDJXbEsRmePBjm6SWyoxQ=
+=nVm0
+-----END PGP SIGNATURE-----
diff --git a/app-office/koffice-libs/files/digest-koffice-libs-1.6_beta1 b/app-office/koffice-libs/files/digest-koffice-libs-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/koffice-libs/files/digest-koffice-libs-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/koffice-libs/files/digest-koffice-libs-1.6_rc1 b/app-office/koffice-libs/files/digest-koffice-libs-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/koffice-libs/files/digest-koffice-libs-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/koffice-libs/koffice-libs-1.6_beta1.ebuild b/app-office/koffice-libs/koffice-libs-1.6_beta1.ebuild
deleted file mode 100644
index fc7b5f752485..000000000000
--- a/app-office/koffice-libs/koffice-libs-1.6_beta1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6_beta1.ebuild,v 1.1 2006/09/15 18:38:14 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=lib
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice libraries."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	virtual/python
-	dev-lang/ruby"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-KMEXTRA="interfaces/
-	plugins/
-	tools/
-	filters/olefilters/
-	filters/xsltfilter/
-	filters/generic_wrapper/
-	kounavail/
-	doc/api/
-	doc/koffice/
-	doc/thesaurus/"
-
-KMEXTRACTONLY="
-	kchart/kdchart/"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# Force the compilation of libkopainter.
-	sed -i 's:$(KOPAINTERDIR):kopainter:' $S/lib/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
-
-src_compile() {
-	local myconf="--enable-scripting --with-pythonfir=${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages"
-	kde-meta_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde-meta_src_install
-	if use doc; then
-		make DESTDIR=${D} install-apidox || die
-	fi
-}
diff --git a/app-office/koffice-libs/koffice-libs-1.6_rc1.ebuild b/app-office/koffice-libs/koffice-libs-1.6_rc1.ebuild
deleted file mode 100644
index 01ba067513ae..000000000000
--- a/app-office/koffice-libs/koffice-libs-1.6_rc1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-1.6_rc1.ebuild,v 1.1 2006/09/27 23:37:01 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-KMMODULE=lib
-inherit kde-meta eutils
-
-DESCRIPTION="Shared KOffice libraries."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	virtual/python
-	dev-lang/ruby"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig"
-
-KMEXTRA="interfaces/
-	plugins/
-	tools/
-	filters/olefilters/
-	filters/xsltfilter/
-	filters/generic_wrapper/
-	kounavail/
-	doc/api/
-	doc/koffice/
-	doc/thesaurus/"
-
-KMEXTRACTONLY="
-	kchart/kdchart/"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# Force the compilation of libkopainter.
-	sed -i 's:$(KOPAINTERDIR):kopainter:' $S/lib/Makefile.am
-
-	kde-meta_src_unpack makefiles
-}
-
-src_compile() {
-	local myconf="--enable-scripting --with-pythonfir=${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages"
-	kde-meta_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde-meta_src_install
-	if use doc; then
-		make DESTDIR=${D} install-apidox || die
-	fi
-}
diff --git a/app-office/koffice-meta/Manifest b/app-office/koffice-meta/Manifest
index f6e313f5399e..75048f781b7c 100644
--- a/app-office/koffice-meta/Manifest
+++ b/app-office/koffice-meta/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 EBUILD koffice-meta-1.4.2.ebuild 1144 RMD160 3b5c5cd4bfcd1f095d48d28f85e69b32affa33e2 SHA1 4edb1e7a2c551255501708c3954d310b1b77c3a1 SHA256 1e977d70647c34002f5065afcf1c35f3d8a3edafcd4d3228ba261c1863387268
 MD5 ce70c764a24d97876befe4715202f25e koffice-meta-1.4.2.ebuild 1144
 RMD160 3b5c5cd4bfcd1f095d48d28f85e69b32affa33e2 koffice-meta-1.4.2.ebuild 1144
@@ -10,34 +13,34 @@ EBUILD koffice-meta-1.5.2.ebuild 1203 RMD160 c2b8c545aecceca6f99ae625db4e6377175
 MD5 9c0702736a3ae5498c848c68374ae121 koffice-meta-1.5.2.ebuild 1203
 RMD160 c2b8c545aecceca6f99ae625db4e6377175338c2 koffice-meta-1.5.2.ebuild 1203
 SHA256 4dcf2486470021926a5bd34e5751aa65a537d44a12c76e0c8b61e3cbc48f0385 koffice-meta-1.5.2.ebuild 1203
-EBUILD koffice-meta-1.6_beta1.ebuild 1212 RMD160 8dbbb553e2bb4fd4042f49f6d43fc0d94f7a4119 SHA1 dd96066b7c87e0c94257be6f2926c64ce1a9e179 SHA256 6da41418c86b7a442b26adaaeda10847d39d53b5e4c100d962759cae9f602b27
-MD5 76f9c245321d7dcc42fbeb22d7bf0e85 koffice-meta-1.6_beta1.ebuild 1212
-RMD160 8dbbb553e2bb4fd4042f49f6d43fc0d94f7a4119 koffice-meta-1.6_beta1.ebuild 1212
-SHA256 6da41418c86b7a442b26adaaeda10847d39d53b5e4c100d962759cae9f602b27 koffice-meta-1.6_beta1.ebuild 1212
-EBUILD koffice-meta-1.6_rc1.ebuild 1210 RMD160 da01354dbf2e708399443315aeec62df1f46b82e SHA1 f7c37d335c238a9c5de7b3dc9e7f2e8d3aad43f6 SHA256 0b5242e363483a9266b53959b7b25fc26eeee736f0c77794563f90afdb31f4a6
-MD5 163e9f8df5181bfd5792e811da015362 koffice-meta-1.6_rc1.ebuild 1210
-RMD160 da01354dbf2e708399443315aeec62df1f46b82e koffice-meta-1.6_rc1.ebuild 1210
-SHA256 0b5242e363483a9266b53959b7b25fc26eeee736f0c77794563f90afdb31f4a6 koffice-meta-1.6_rc1.ebuild 1210
-MISC ChangeLog 6397 RMD160 86212bf90b1c794aa3de3e96e127d863b8e87a7b SHA1 2266c03b4b9051f9cc8ab075b0d4fca03ea46b61 SHA256 bd23c889ee381e8b7371ec98cc6af0f40415f02e8918c2b7e9e104435e1d1504
-MD5 8cbc326c0070379bac7273807bc5808d ChangeLog 6397
-RMD160 86212bf90b1c794aa3de3e96e127d863b8e87a7b ChangeLog 6397
-SHA256 bd23c889ee381e8b7371ec98cc6af0f40415f02e8918c2b7e9e104435e1d1504 ChangeLog 6397
+EBUILD koffice-meta-1.6.0.ebuild 1212 RMD160 109924db54a037c8ddb113b02a3c7ad1b4836ae7 SHA1 e404d8f2bc4f00ff34d3625f1340e31ba61e1c20 SHA256 5e5105a90514e0bf6fe243f5e7af6d51c19b750be835a8b949f2224ec7c6dcfd
+MD5 5f5d26e7faf5db826223b53b48088f1a koffice-meta-1.6.0.ebuild 1212
+RMD160 109924db54a037c8ddb113b02a3c7ad1b4836ae7 koffice-meta-1.6.0.ebuild 1212
+SHA256 5e5105a90514e0bf6fe243f5e7af6d51c19b750be835a8b949f2224ec7c6dcfd koffice-meta-1.6.0.ebuild 1212
+MISC ChangeLog 6608 RMD160 89ba29aa8361e6add3aeb983131c9290578da821 SHA1 84dd819a876d5bfecceb5f11a77e9671a2932558 SHA256 ccfd03be56de333c6681b7cbdf7cfa3f5260505c3eb0223df2c9897935a3922c
+MD5 a2addf53099c2dfc69bd7c2786d04030 ChangeLog 6608
+RMD160 89ba29aa8361e6add3aeb983131c9290578da821 ChangeLog 6608
+SHA256 ccfd03be56de333c6681b7cbdf7cfa3f5260505c3eb0223df2c9897935a3922c ChangeLog 6608
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-koffice-meta-1.4.2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-koffice-meta-1.4.2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-koffice-meta-1.4.2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-koffice-meta-1.5.1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-koffice-meta-1.5.1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-koffice-meta-1.5.1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-koffice-meta-1.5.2 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-koffice-meta-1.5.2 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-koffice-meta-1.5.2 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-koffice-meta-1.6_beta1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-koffice-meta-1.6_beta1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-koffice-meta-1.6_beta1 1
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-koffice-meta-1.6_rc1 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-koffice-meta-1.6_rc1 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-koffice-meta-1.6_rc1 1
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.4.2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-koffice-meta-1.4.2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-koffice-meta-1.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.5.1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-koffice-meta-1.5.1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-koffice-meta-1.5.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.5.2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-koffice-meta-1.5.2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-koffice-meta-1.5.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-koffice-meta-1.6.0 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-koffice-meta-1.6.0 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-koffice-meta-1.6.0 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6lzAiZjviIA2XgRApg5AJ9TUpdTB8wMKSp7RPaveMHZdRDc1QCgx9Up
+fLhEzB90ENwT7qNAwYHWwhk=
+=mrcZ
+-----END PGP SIGNATURE-----
diff --git a/app-office/koffice-meta/files/digest-koffice-meta-1.6_beta1 b/app-office/koffice-meta/files/digest-koffice-meta-1.6_beta1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-office/koffice-meta/files/digest-koffice-meta-1.6_beta1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-office/koffice-meta/files/digest-koffice-meta-1.6_rc1 b/app-office/koffice-meta/files/digest-koffice-meta-1.6_rc1
deleted file mode 100644
index 8b137891791f..000000000000
--- a/app-office/koffice-meta/files/digest-koffice-meta-1.6_rc1
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app-office/koffice-meta/koffice-meta-1.6_beta1.ebuild b/app-office/koffice-meta/koffice-meta-1.6_beta1.ebuild
deleted file mode 100644
index 78ca743505aa..000000000000
--- a/app-office/koffice-meta/koffice-meta-1.6_beta1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6_beta1.ebuild,v 1.1 2006/09/15 18:54:11 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-inherit kde-functions
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)
-	$(deprange $PV $MAXKOFFICEVER app-office/kformula)
-	$(deprange $PV $MAXKOFFICEVER app-office/kivio)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/koshell)
-	$(deprange $PV $MAXKOFFICEVER app-office/kplato)
-	$(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
-	$(deprange $PV $MAXKOFFICEVER app-office/krita)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	$(deprange $PV $MAXKOFFICEVER app-office/kugar)
-	$(deprange $PV $MAXKOFFICEVER app-office/kword)"
diff --git a/app-office/koffice-meta/koffice-meta-1.6_rc1.ebuild b/app-office/koffice-meta/koffice-meta-1.6_rc1.ebuild
deleted file mode 100644
index 542c4b60bd0b..000000000000
--- a/app-office/koffice-meta/koffice-meta-1.6_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-meta/koffice-meta-1.6_rc1.ebuild,v 1.1 2006/09/27 23:38:07 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-inherit kde-functions
-
-DESCRIPTION="KOffice - merge this to pull in all KOffice-derived packages."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/karbon)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)
-	$(deprange $PV $MAXKOFFICEVER app-office/kformula)
-	$(deprange $PV $MAXKOFFICEVER app-office/kivio)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-data)
-	$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/koshell)
-	$(deprange $PV $MAXKOFFICEVER app-office/kplato)
-	$(deprange $PV $MAXKOFFICEVER app-office/kpresenter)
-	$(deprange $PV $MAXKOFFICEVER app-office/krita)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	$(deprange $PV $MAXKOFFICEVER app-office/kugar)
-	$(deprange $PV $MAXKOFFICEVER app-office/kword)"
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index b3cf7279dd60..f56b3a6d9d4e 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kexi-1.4.2-gcc41.patch 1094 RMD160 ffc028b187ec7437aab156f3e575b945b390845c SHA1 2c5944a2e705d05abcb65674639b1b85ec22f6c9 SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 RMD160 ffc028b187ec7437aab156f3e575b945b390845c files/kexi-1.4.2-gcc41.patch 1094
@@ -25,7 +28,6 @@ SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/po
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
 DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
 EBUILD koffice-1.4.2-r6.ebuild 1637 RMD160 683e30c0915e34ea9e88a93e74a49617432144ce SHA1 b9fbe431e9af984ef74219cf1d19c6d2bd0b1f62 SHA256 c0543d8c958de6dff352ba59de9d9cb094bec73a5a8530713c2361b4a4cb65e8
 MD5 2d6e382b8045fa0fb5e68af45c289781 koffice-1.4.2-r6.ebuild 1637
@@ -47,18 +49,14 @@ EBUILD koffice-1.5.2.ebuild 1728 RMD160 8ad681b23ca1656577dc4358282adced39b0dc0d
 MD5 835623bf06d6695e508c524efc26cf18 koffice-1.5.2.ebuild 1728
 RMD160 8ad681b23ca1656577dc4358282adced39b0dc0d koffice-1.5.2.ebuild 1728
 SHA256 464f16f49bfdc7e31406fe6d689e373aeef93ef9866d1bcfe1591307975b5a2e koffice-1.5.2.ebuild 1728
-EBUILD koffice-1.6_beta1.ebuild 2282 RMD160 0907344e2ce1c56bd88c2ca414dd6bdcfcbd7f91 SHA1 4923dae579ce22336c609f31a1769fd818cafba8 SHA256 a963b1441816587dd7a2a38471130c1a2f4ab37e8e0d53caa29a5a95d43bd206
-MD5 b13377a3411d99e0edac3b13fe70b609 koffice-1.6_beta1.ebuild 2282
-RMD160 0907344e2ce1c56bd88c2ca414dd6bdcfcbd7f91 koffice-1.6_beta1.ebuild 2282
-SHA256 a963b1441816587dd7a2a38471130c1a2f4ab37e8e0d53caa29a5a95d43bd206 koffice-1.6_beta1.ebuild 2282
-EBUILD koffice-1.6_rc1.ebuild 2284 RMD160 7dc66eff38f8256e6f8aaf013d3dc48b02b436bf SHA1 86d244b4798a792614b316397134c80f17be994e SHA256 9af29a8fcbe8e461629ce8bee3ae0f2ea20a0643602cc8ac5aafa7c755ed8c51
-MD5 0afcca5f930f48af4a678043c9165025 koffice-1.6_rc1.ebuild 2284
-RMD160 7dc66eff38f8256e6f8aaf013d3dc48b02b436bf koffice-1.6_rc1.ebuild 2284
-SHA256 9af29a8fcbe8e461629ce8bee3ae0f2ea20a0643602cc8ac5aafa7c755ed8c51 koffice-1.6_rc1.ebuild 2284
-MISC ChangeLog 25733 RMD160 40aaa2dc0adce7eff8505ce5a655f7889b16956b SHA1 837145be1145679a5de5449e5dc0e901080dc8d2 SHA256 3138ebff162cb87605abd90aefffc102dce3aab4715071bd095c245b76ba988a
-MD5 493d682d42932af9d9a470e801010b23 ChangeLog 25733
-RMD160 40aaa2dc0adce7eff8505ce5a655f7889b16956b ChangeLog 25733
-SHA256 3138ebff162cb87605abd90aefffc102dce3aab4715071bd095c245b76ba988a ChangeLog 25733
+EBUILD koffice-1.6.0.ebuild 2286 RMD160 2fbdeba4e9dfe581f8f5b4e91210b9917e0e86a1 SHA1 19965bf99cc15cd7026c7f6f49e0a38544ef7166 SHA256 1dfd594e005179cea6711b4dece552b025ea70b7a777803ac98daf72a7e288c7
+MD5 e493bc87fe0afd7a472f56221d821229 koffice-1.6.0.ebuild 2286
+RMD160 2fbdeba4e9dfe581f8f5b4e91210b9917e0e86a1 koffice-1.6.0.ebuild 2286
+SHA256 1dfd594e005179cea6711b4dece552b025ea70b7a777803ac98daf72a7e288c7 koffice-1.6.0.ebuild 2286
+MISC ChangeLog 25922 RMD160 3498c159dda4a5f5fcd19ac71d488db20b1e1127 SHA1 6d407f4b98122a9ddb204b1aeed09c730fd72387 SHA256 6d3d008f451936e768d60c15e312a8082e7b78847ccd888710edfd1db14ba3bd
+MD5 38c6c20f4ece911dd989afb44c25a33d ChangeLog 25922
+RMD160 3498c159dda4a5f5fcd19ac71d488db20b1e1127 ChangeLog 25922
+SHA256 6d3d008f451936e768d60c15e312a8082e7b78847ccd888710edfd1db14ba3bd ChangeLog 25922
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -78,9 +76,13 @@ SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koffice-1.5.2-r1 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koffice-1.5.2-r1 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koffice-1.5.2-r1 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-koffice-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-koffice-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-koffice-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-koffice-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-koffice-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-koffice-1.6_rc1 253
+MD5 1555d685ff9b8710211d747da7d7e729 files/digest-koffice-1.6.0 253
+RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-koffice-1.6.0 253
+SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-koffice-1.6.0 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6iwAiZjviIA2XgRAgWhAJ97N1LaHVqVj5mXaSksndOC6SVizwCfXLOi
+iPyZJZox1AwrB0MXpATxZZ4=
+=Rb/G
+-----END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.6_beta1 b/app-office/koffice/files/digest-koffice-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/koffice/files/digest-koffice-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/koffice/files/digest-koffice-1.6_rc1 b/app-office/koffice/files/digest-koffice-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/koffice/files/digest-koffice-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/koffice/koffice-1.6_beta1.ebuild b/app-office/koffice/koffice-1.6_beta1.ebuild
deleted file mode 100644
index b114e7afe17c..000000000000
--- a/app-office/koffice/koffice-1.6_beta1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6_beta1.ebuild,v 1.1 2006/09/15 18:35:43 carlo Exp $
-
-inherit kde
-
-RV="1.5.91"
-MY_P="koffice-${RV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-#SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# See bug #130442.
-#IUSE="doc mysql opengl postgres"
-IUSE="doc mysql postgres"
-
-RDEPEND=">=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	virtual/python
-	dev-lang/ruby
-	>=app-text/wv2-0.1.9
-	>=app-text/libwpd-0.8.2
-	>=media-gfx/imagemagick-6.2.5.5
-	>=media-libs/lcms-1.14-r1
-	media-libs/tiff
-	media-libs/jpeg
-	>=media-libs/openexr-1.2.2-r2
-	media-libs/libpng
-	>=media-libs/libexif-0.6.13-r1
-	virtual/opengl
-	virtual/glu"
-#	opengl? ( virtual/opengl virtual/glu )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.4
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-pkg_setup() {
-	# use opengl &&
-		if ! built_with_use =x11-libs/qt-3* opengl ; then
-			eerror "You need to build x11-libs/qt with opengl use flag enabled."
-			die
-		fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	# FIXME - disable broken tests for now
-	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \
-		`ls ${S}/krita/colorspaces/*/Makefile.am`
-}
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-	# $(use_enable opengl gl)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}
diff --git a/app-office/koffice/koffice-1.6_rc1.ebuild b/app-office/koffice/koffice-1.6_rc1.ebuild
deleted file mode 100644
index 8079495f1552..000000000000
--- a/app-office/koffice/koffice-1.6_rc1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.6_rc1.ebuild,v 1.1 2006/09/27 23:31:50 carlo Exp $
-
-inherit kde
-
-RV="1.5.92"
-MY_P="koffice-${RV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="KOffice is an integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-#SRC_URI="mirror://kde/stable/koffice-${PV}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/unstable/koffice-${PV/_/-}/src/${MY_P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# See bug #130442.
-#IUSE="doc mysql opengl postgres"
-IUSE="doc mysql postgres"
-
-RDEPEND=">=media-libs/freetype-2
-	media-libs/fontconfig
-	media-libs/libart_lgpl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	sys-libs/readline
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-libs/libpqxx )
-	virtual/python
-	dev-lang/ruby
-	>=app-text/wv2-0.1.9
-	>=app-text/libwpd-0.8.2
-	>=media-gfx/imagemagick-6.2.5.5
-	>=media-libs/lcms-1.14-r1
-	media-libs/tiff
-	media-libs/jpeg
-	>=media-libs/openexr-1.2.2-r2
-	media-libs/libpng
-	>=media-libs/libexif-0.6.13-r1
-	virtual/opengl
-	virtual/glu"
-#	opengl? ( virtual/opengl virtual/glu )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-# add blockers on split packages derived from this one
-for x in $(get-child-packages ${CATEGORY}/${PN}); do
-	DEPEND="${DEPEND} !${x}"
-	RDEPEND="${RDEPEND} !${x}"
-done
-
-need-kde 3.4
-
-# TODO: kword sql plugin needs Qt compiled with sql support
-# the dependency on python is needed for scripting support in kexi
-# and for kivio/kiviopart/kiviosdk.
-
-pkg_setup() {
-	# use opengl &&
-		if ! built_with_use =x11-libs/qt-3* opengl ; then
-			eerror "You need to build x11-libs/qt with opengl use flag enabled."
-			die
-		fi
-}
-
-src_unpack() {
-	kde_src_unpack
-	# FIXME - disable broken tests for now
-	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \
-		`ls ${S}/krita/colorspaces/*/Makefile.am`
-}
-
-src_compile() {
-	local myconf="$(use_enable mysql) $(use_enable postgres pgsql)"
-	# $(use_enable opengl gl)"
-
-	kde_src_compile
-	if use doc; then
-		make apidox || die
-	fi
-}
-
-src_install() {
-	kde_src_install
-	if use doc; then
-		make DESTDIR="${D}" install-apidox || die
-	fi
-
-	dodoc changes-*
-}
diff --git a/app-office/koshell/Manifest b/app-office/koshell/Manifest
index 19fdc44d3654..10deff75a3d1 100644
--- a/app-office/koshell/Manifest
+++ b/app-office/koshell/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD koshell-1.4.2.ebuild 818 RMD160 3014ab68b027f758c2f0734a119dd77c178e4418 SHA1 11d80e8e370a81084847678a5a8f19c2949f5b21 SHA256 0e31776e40d769821a9a4ac37b53d1e662461f300a892fbce3bfe149560b713e
 MD5 46e5b89e805b6905c235eb8a840ed7a3 koshell-1.4.2.ebuild 818
 RMD160 3014ab68b027f758c2f0734a119dd77c178e4418 koshell-1.4.2.ebuild 818
@@ -15,18 +17,14 @@ EBUILD koshell-1.5.2.ebuild 801 RMD160 e32e808800d094416d4cf17972f6b60f8c392e4a
 MD5 5ae059c458b39cc26e207442936783d0 koshell-1.5.2.ebuild 801
 RMD160 e32e808800d094416d4cf17972f6b60f8c392e4a koshell-1.5.2.ebuild 801
 SHA256 0488ea4838ebe8406e1957c765e84b0e0e85685c952362ea30fb2d08351a3687 koshell-1.5.2.ebuild 801
-EBUILD koshell-1.6_beta1.ebuild 810 RMD160 d84d2b470f5900df9db6fb2f108bca481b486aa9 SHA1 1afd29208d5150e69169afffbaa08ad4bd284db3 SHA256 c1cbcac09bdda47f8d796dfef8c7daa75faee30bd8a1a9fd7f0cee23fab30df5
-MD5 b5fd3c9b224dce06eac8ed6599fa0739 koshell-1.6_beta1.ebuild 810
-RMD160 d84d2b470f5900df9db6fb2f108bca481b486aa9 koshell-1.6_beta1.ebuild 810
-SHA256 c1cbcac09bdda47f8d796dfef8c7daa75faee30bd8a1a9fd7f0cee23fab30df5 koshell-1.6_beta1.ebuild 810
-EBUILD koshell-1.6_rc1.ebuild 808 RMD160 7a511fa7e996097a724d1e59964fa267aacb7d41 SHA1 451906b4e3647ec1d75930249ecb5816f55c92b8 SHA256 8fe0a5fe657b41a8903d85181244081a78bd7596695f3410127b0bf53ea3e0bc
-MD5 b8b34cdeec130a7d2d004f9f9f75715f koshell-1.6_rc1.ebuild 808
-RMD160 7a511fa7e996097a724d1e59964fa267aacb7d41 koshell-1.6_rc1.ebuild 808
-SHA256 8fe0a5fe657b41a8903d85181244081a78bd7596695f3410127b0bf53ea3e0bc koshell-1.6_rc1.ebuild 808
-MISC ChangeLog 5592 RMD160 1afc3cf6ed32894b9660762c9b12f2b570233f33 SHA1 bacd5c4395181684681f985933fc5f3f0991e581 SHA256 01a22e015743ce70d6d8acf0fcc3b91ce081d0f51daddb630832c7b2b9dd2204
-MD5 8e777d1f79e5dc3f29782d3d57107217 ChangeLog 5592
-RMD160 1afc3cf6ed32894b9660762c9b12f2b570233f33 ChangeLog 5592
-SHA256 01a22e015743ce70d6d8acf0fcc3b91ce081d0f51daddb630832c7b2b9dd2204 ChangeLog 5592
+EBUILD koshell-1.6.0.ebuild 810 RMD160 41d245311061ac150fd82ddc0ad97186e6dd331c SHA1 67983f0348d2ee36c430c9b0c2a1b6688f7a1c8e SHA256 6b1a6f139820afe2bc3fb3a6ed76597612f255fee6368654f92d250b54efc1bb
+MD5 5b0d8de01626bdb2a9b7255e01328156 koshell-1.6.0.ebuild 810
+RMD160 41d245311061ac150fd82ddc0ad97186e6dd331c koshell-1.6.0.ebuild 810
+SHA256 6b1a6f139820afe2bc3fb3a6ed76597612f255fee6368654f92d250b54efc1bb koshell-1.6.0.ebuild 810
+MISC ChangeLog 5781 RMD160 e904ca6780bc105c479c70285ad9a8c57084e3e9 SHA1 9d4a88a7176215cfa21e96b5ff3e8be2e10fa93d SHA256 0f8a9f5b744a1e84a0af624b558b1705f06468cbeca6fbd2e4e572997874ea48
+MD5 7067b22083a6a5c7d95d7b71c0920a94 ChangeLog 5781
+RMD160 e904ca6780bc105c479c70285ad9a8c57084e3e9 ChangeLog 5781
+SHA256 0f8a9f5b744a1e84a0af624b558b1705f06468cbeca6fbd2e4e572997874ea48 ChangeLog 5781
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -40,9 +38,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-koshell-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-koshell-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-koshell-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-koshell-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-koshell-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-koshell-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-koshell-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-koshell-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-koshell-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-koshell-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-koshell-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-koshell-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6m5AiZjviIA2XgRAueDAJ9ISIFrF1Qwcm/yfvu3kKx2w7LORwCglvSc
+cYgSe6TGFNTB24xZBuPj0rY=
+=b914
+-----END PGP SIGNATURE-----
diff --git a/app-office/koshell/files/digest-koshell-1.6_beta1 b/app-office/koshell/files/digest-koshell-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/koshell/files/digest-koshell-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/koshell/files/digest-koshell-1.6_rc1 b/app-office/koshell/files/digest-koshell-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/koshell/files/digest-koshell-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/koshell/koshell-1.6_beta1.ebuild b/app-office/koshell/koshell-1.6_beta1.ebuild
deleted file mode 100644
index f21e57380537..000000000000
--- a/app-office/koshell/koshell-1.6_beta1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.6_beta1.ebuild,v 1.1 2006/09/15 18:40:29 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice workspace."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-need-kde 3.4
diff --git a/app-office/koshell/koshell-1.6_rc1.ebuild b/app-office/koshell/koshell-1.6_rc1.ebuild
deleted file mode 100644
index 714574d4b19d..000000000000
--- a/app-office/koshell/koshell-1.6_rc1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koshell/koshell-1.6_rc1.ebuild,v 1.1 2006/09/27 23:33:10 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice workspace."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-need-kde 3.4
diff --git a/app-office/kplato/Manifest b/app-office/kplato/Manifest
index 1a4ae75f9fe0..2848f42c0483 100644
--- a/app-office/kplato/Manifest
+++ b/app-office/kplato/Manifest
@@ -1,7 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kplato-1.5.1.ebuild 772 RMD160 f89280026fc1a255cba9700500f55dd6a811f336 SHA1 60ed5d7e6057cdbedf76ac7b3365717f5ce0ba1f SHA256 509d598da85153e1d71aa661c9b91c346c165b8c4dd117186139a8e1669e85cc
 MD5 53dbc942dc86254904cb3d08b03155f0 kplato-1.5.1.ebuild 772
 RMD160 f89280026fc1a255cba9700500f55dd6a811f336 kplato-1.5.1.ebuild 772
@@ -10,18 +12,14 @@ EBUILD kplato-1.5.2.ebuild 783 RMD160 68f784f7205a1b9b773e506d6de50e7ddeff18b9 S
 MD5 dc7b49ebef34a71b3a2372348d715d49 kplato-1.5.2.ebuild 783
 RMD160 68f784f7205a1b9b773e506d6de50e7ddeff18b9 kplato-1.5.2.ebuild 783
 SHA256 29512aa8cf98fa850008fdd607429495f84d3445121c3c7d60cd1ec7bc1ea9bd kplato-1.5.2.ebuild 783
-EBUILD kplato-1.6_beta1.ebuild 792 RMD160 8749d8a9d44fc177866c9ab630bde8fa1a259357 SHA1 78a01f159e2d71fe6b2f610d71cb70e0630e1d0c SHA256 e4a8ee175c0365cdd1b767c9e4770552a08ca60a16320b86172addedce28084a
-MD5 0e57ca00a3fe2bc960ec9138fd668432 kplato-1.6_beta1.ebuild 792
-RMD160 8749d8a9d44fc177866c9ab630bde8fa1a259357 kplato-1.6_beta1.ebuild 792
-SHA256 e4a8ee175c0365cdd1b767c9e4770552a08ca60a16320b86172addedce28084a kplato-1.6_beta1.ebuild 792
-EBUILD kplato-1.6_rc1.ebuild 790 RMD160 f6b8cf8be790e45b32863657c9970d5a84f00527 SHA1 1717ea3cacfb3467a06a998eef6e82ce53eafaff SHA256 0172e6fc6f62c858607a06eef6cbb3103b96626e3efc6126c41a3d6ed3e3f631
-MD5 0cb2c4c2ab2f4da678ad3a6faf082a0d kplato-1.6_rc1.ebuild 790
-RMD160 f6b8cf8be790e45b32863657c9970d5a84f00527 kplato-1.6_rc1.ebuild 790
-SHA256 0172e6fc6f62c858607a06eef6cbb3103b96626e3efc6126c41a3d6ed3e3f631 kplato-1.6_rc1.ebuild 790
-MISC ChangeLog 3241 RMD160 219fd809b1d8617551f962c0b5a7ff3d9d79aeea SHA1 c48fe8dbe29c6bbd61c0c48aca77942d38bec0a9 SHA256 3a5ecf61c47ce81b1d899638bb90283c9335ebf9d9a1927db842f747eb8a1dec
-MD5 41a728beca74eff47bfd04fa13280755 ChangeLog 3241
-RMD160 219fd809b1d8617551f962c0b5a7ff3d9d79aeea ChangeLog 3241
-SHA256 3a5ecf61c47ce81b1d899638bb90283c9335ebf9d9a1927db842f747eb8a1dec ChangeLog 3241
+EBUILD kplato-1.6.0.ebuild 792 RMD160 4cde7c6be605f721cb2baa1d77a85448e5f12e4c SHA1 e32aa9d50973f5b20c80a97a969cf58881b07144 SHA256 c76ff56586eb3aa5556e740adad917cc8fc90bd3c89e9fe44e1fbe32f432f187
+MD5 35301becfa1e48b4d8b2794123657134 kplato-1.6.0.ebuild 792
+RMD160 4cde7c6be605f721cb2baa1d77a85448e5f12e4c kplato-1.6.0.ebuild 792
+SHA256 c76ff56586eb3aa5556e740adad917cc8fc90bd3c89e9fe44e1fbe32f432f187 kplato-1.6.0.ebuild 792
+MISC ChangeLog 3426 RMD160 ef46f9ecc921c0e9d76cb0a238cf6b02d5d5361c SHA1 407531d272084116be17d27672d252cc2d4b2649 SHA256 6315d9ad5556e33c4a6051200277713899300eafcb588446de16bbf5032274b1
+MD5 37628036287f0d5493d6abba215d7e98 ChangeLog 3426
+RMD160 ef46f9ecc921c0e9d76cb0a238cf6b02d5d5361c ChangeLog 3426
+SHA256 6315d9ad5556e33c4a6051200277713899300eafcb588446de16bbf5032274b1 ChangeLog 3426
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -32,9 +30,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kplato-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kplato-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kplato-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kplato-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kplato-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kplato-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kplato-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kplato-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kplato-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kplato-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kplato-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kplato-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6n5AiZjviIA2XgRAviBAKDdS5+6ETa7Mt1AZPFXbb2oYXEn/QCgmPdY
+PcYcuWMYdJzC7YixrAyKRiI=
+=pX6r
+-----END PGP SIGNATURE-----
diff --git a/app-office/kplato/files/digest-kplato-1.6_beta1 b/app-office/kplato/files/digest-kplato-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kplato/files/digest-kplato-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kplato/files/digest-kplato-1.6_rc1 b/app-office/kplato/files/digest-kplato-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kplato/files/digest-kplato-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kplato/kplato-1.6_beta1.ebuild b/app-office/kplato/kplato-1.6_beta1.ebuild
deleted file mode 100644
index 77e0489d1d29..000000000000
--- a/app-office/kplato/kplato-1.6_beta1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.6_beta1.ebuild,v 1.1 2006/09/15 18:46:56 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KPlato is a project management application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/
-	kugar/"
-
-KMCOMPILEONLY=""
-
-KMEXTRA="kdgantt"
-
-need-kde 3.4
diff --git a/app-office/kplato/kplato-1.6_rc1.ebuild b/app-office/kplato/kplato-1.6_rc1.ebuild
deleted file mode 100644
index 3e0a056334c6..000000000000
--- a/app-office/kplato/kplato-1.6_rc1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kplato/kplato-1.6_rc1.ebuild,v 1.1 2006/09/27 23:43:22 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KPlato is a project management application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/
-	kugar/"
-
-KMCOMPILEONLY=""
-
-KMEXTRA="kdgantt"
-
-need-kde 3.4
diff --git a/app-office/kpresenter/Manifest b/app-office/kpresenter/Manifest
index d6e5251b3b4f..f153db47ffce 100644
--- a/app-office/kpresenter/Manifest
+++ b/app-office/kpresenter/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kpresenter-1.4.2.ebuild 1087 RMD160 21d74a7f0ddcba536487364e93ec22b3abc39b4c SHA1 039d737515920f1291220cdce8469d783d6f1fc4 SHA256 753101ee013c1ff41c66e8cef3804f85e5441b15297419ec1557008076e1b8ec
 MD5 51b7bbc480bdd8687058bfa6aa393ebb kpresenter-1.4.2.ebuild 1087
 RMD160 21d74a7f0ddcba536487364e93ec22b3abc39b4c kpresenter-1.4.2.ebuild 1087
@@ -15,18 +17,14 @@ EBUILD kpresenter-1.5.2.ebuild 1198 RMD160 a91fda378a0c14eea8e7a14d683499f43fb05
 MD5 92ff6c1864e72699aebd7d131652d93b kpresenter-1.5.2.ebuild 1198
 RMD160 a91fda378a0c14eea8e7a14d683499f43fb05fd3 kpresenter-1.5.2.ebuild 1198
 SHA256 d69dca6ac355cf7d918ff8046ce9d6febf4b4650f85b2d5ef584f9658cbff268 kpresenter-1.5.2.ebuild 1198
-EBUILD kpresenter-1.6_beta1.ebuild 1207 RMD160 718ab2fb646ad2e59e643c7cdcd94b590cc33c9a SHA1 cba29011c4aad0e284313c7bf9525cfa7e131608 SHA256 0eefe5655e80cdafd4f9376b4ed8d05202a2e815059a4127e597208c5f81a15f
-MD5 6d069cdde5a8b497616710613f43c9d0 kpresenter-1.6_beta1.ebuild 1207
-RMD160 718ab2fb646ad2e59e643c7cdcd94b590cc33c9a kpresenter-1.6_beta1.ebuild 1207
-SHA256 0eefe5655e80cdafd4f9376b4ed8d05202a2e815059a4127e597208c5f81a15f kpresenter-1.6_beta1.ebuild 1207
-EBUILD kpresenter-1.6_rc1.ebuild 1205 RMD160 ef02ee47293cade704cdcc3969d05119cb49a206 SHA1 6281bb9df943043303595aea2635411e6efa029d SHA256 d6e6a91fa13d4070d983fbc5dfe3ae01f9460f033bc75012f63f5f67e76bcad6
-MD5 9057ef8390423a8db6da2802947e52c8 kpresenter-1.6_rc1.ebuild 1205
-RMD160 ef02ee47293cade704cdcc3969d05119cb49a206 kpresenter-1.6_rc1.ebuild 1205
-SHA256 d6e6a91fa13d4070d983fbc5dfe3ae01f9460f033bc75012f63f5f67e76bcad6 kpresenter-1.6_rc1.ebuild 1205
-MISC ChangeLog 5913 RMD160 ea45483ce6f99ff3502d28fba1446859fe0f4329 SHA1 9a1af36922e98f8a79139cfb85e02438fa1a6b48 SHA256 7a55e6b14f518c24e5d44c4cebc742ca11393d81f7264a8cce4992bd658f3275
-MD5 966349fa089c6b985be63efcfdfa3886 ChangeLog 5913
-RMD160 ea45483ce6f99ff3502d28fba1446859fe0f4329 ChangeLog 5913
-SHA256 7a55e6b14f518c24e5d44c4cebc742ca11393d81f7264a8cce4992bd658f3275 ChangeLog 5913
+EBUILD kpresenter-1.6.0.ebuild 1207 RMD160 e39fbab357f215e48b37d78cda50e1bcbfdc84c7 SHA1 9ce15f85474df081a72b9f5d124f9cf2374fa136 SHA256 2b2894beb22110f2dad43235192d20251fb6442794a4234a5d08f17726cad707
+MD5 9b191fd8440bfb53f1d03872ec74ba9b kpresenter-1.6.0.ebuild 1207
+RMD160 e39fbab357f215e48b37d78cda50e1bcbfdc84c7 kpresenter-1.6.0.ebuild 1207
+SHA256 2b2894beb22110f2dad43235192d20251fb6442794a4234a5d08f17726cad707 kpresenter-1.6.0.ebuild 1207
+MISC ChangeLog 6116 RMD160 6269c83e18238f4c171fb906b18601296b5e82dc SHA1 dc324f69f0d8f70672a6b70a550f3422e7af7be5 SHA256 417c17de8bba80b3d818bb7fa8542e5da5ba31aa0b279dd518613d4eb87f1a98
+MD5 c6718f327e4b3b729aca452311e1463d ChangeLog 6116
+RMD160 6269c83e18238f4c171fb906b18601296b5e82dc ChangeLog 6116
+SHA256 417c17de8bba80b3d818bb7fa8542e5da5ba31aa0b279dd518613d4eb87f1a98 ChangeLog 6116
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -40,9 +38,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kpresenter-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kpresenter-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kpresenter-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kpresenter-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kpresenter-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kpresenter-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kpresenter-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kpresenter-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kpresenter-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kpresenter-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kpresenter-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kpresenter-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6pEAiZjviIA2XgRAj1sAKCKAyi1pk4rHZT+Tfmy0iJC4MHn9wCgmmVn
+DgwbrsxvfXdseqW8YDALQAY=
+=yg1M
+-----END PGP SIGNATURE-----
diff --git a/app-office/kpresenter/files/digest-kpresenter-1.6_beta1 b/app-office/kpresenter/files/digest-kpresenter-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kpresenter/files/digest-kpresenter-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kpresenter/files/digest-kpresenter-1.6_rc1 b/app-office/kpresenter/files/digest-kpresenter-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kpresenter/files/digest-kpresenter-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kpresenter/kpresenter-1.6_beta1.ebuild b/app-office/kpresenter/kpresenter-1.6_beta1.ebuild
deleted file mode 100644
index aca63f5d637c..000000000000
--- a/app-office/kpresenter/kpresenter-1.6_beta1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.6_beta1.ebuild,v 1.1 2006/09/15 18:45:40 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice presentation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kpresenter
-	filters/libdialogfilter"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile filters first.
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kpresenter/kpresenter-1.6_rc1.ebuild b/app-office/kpresenter/kpresenter-1.6_rc1.ebuild
deleted file mode 100644
index 3daca16dcd71..000000000000
--- a/app-office/kpresenter/kpresenter-1.6_rc1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kpresenter/kpresenter-1.6_rc1.ebuild,v 1.1 2006/09/27 23:42:01 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice presentation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kpresenter
-	filters/libdialogfilter"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile filters first.
-	echo "SUBDIRS = liboofilter libdialogfilter kpresenter" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 36c0e21459a1..beab186146a9 100644
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX krita-1.4.2-gcc41.patch 656 RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a SHA1 1fbccf29a08de0524590d408577ea1999b7bc53e SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108
 MD5 7d57f921f9a3827f925a3457413914b8 files/krita-1.4.2-gcc41.patch 656
 RMD160 38a6dddfb244c2b65525edd8bd219854397eff8a files/krita-1.4.2-gcc41.patch 656
@@ -5,8 +8,7 @@ SHA256 4f7fdc791cc6f811ed375741d1e1cc97eec7fbc72f0b23a22e0520afdf37f108 files/kr
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD krita-1.4.2.ebuild 1036 RMD160 ee759126f8d70930464fbbd095ef397bd3238660 SHA1 49c6aee29fface00f5398646515c764b745cfe0b SHA256 c558da84f5c82600889e39d47f97297b1f3b839ecb4e7146ca467cfe5d1a17b6
 MD5 f534726b9fa909dc8202c064574ad1b7 krita-1.4.2.ebuild 1036
 RMD160 ee759126f8d70930464fbbd095ef397bd3238660 krita-1.4.2.ebuild 1036
@@ -23,18 +25,14 @@ EBUILD krita-1.5.2.ebuild 1292 RMD160 07900b4fc8e0b7e61013e165cdecfde72ce843fb S
 MD5 1d8802cfb162a65ac03b5b76a7fc2f4d krita-1.5.2.ebuild 1292
 RMD160 07900b4fc8e0b7e61013e165cdecfde72ce843fb krita-1.5.2.ebuild 1292
 SHA256 51ea0c0d42c9be8d42a31b5502056d236c88b72c8aa6ee77d558025ddd6febe7 krita-1.5.2.ebuild 1292
-EBUILD krita-1.6_beta1.ebuild 1700 RMD160 722fd0c5417c215057bbc4ca8c5d2285adbcd8bd SHA1 e3c2a8cadfbb35f24b81f8857f27bdb30b1b7d39 SHA256 626470c7164ecbef39b376b9af1d42e8a71079a9e86db4e5485f21e0d77e34a6
-MD5 ec8b735339242bcb6cdb95db2fde86b0 krita-1.6_beta1.ebuild 1700
-RMD160 722fd0c5417c215057bbc4ca8c5d2285adbcd8bd krita-1.6_beta1.ebuild 1700
-SHA256 626470c7164ecbef39b376b9af1d42e8a71079a9e86db4e5485f21e0d77e34a6 krita-1.6_beta1.ebuild 1700
-EBUILD krita-1.6_rc1.ebuild 1698 RMD160 81d986a1256d6634f224d5da7438dad91a675066 SHA1 b7da0d8d59485f264b7e394afb615373edff9fdb SHA256 bc62d9bfc55a3aa502d2e12effbe57462b9de2a5631f51661ccc2e82f77902e5
-MD5 39702da29ed8697310cc948857a4a902 krita-1.6_rc1.ebuild 1698
-RMD160 81d986a1256d6634f224d5da7438dad91a675066 krita-1.6_rc1.ebuild 1698
-SHA256 bc62d9bfc55a3aa502d2e12effbe57462b9de2a5631f51661ccc2e82f77902e5 krita-1.6_rc1.ebuild 1698
-MISC ChangeLog 6700 RMD160 7d93999247508470ec1a18d25226449f1f5da7b4 SHA1 22ee0859358459ac8c67f426043418eb148f3ecc SHA256 79faf4966005a1d8b4646f1bc92890410ea629b182d3f229b15e65dbc786929f
-MD5 4f90878742909dbb53c640e0a7793917 ChangeLog 6700
-RMD160 7d93999247508470ec1a18d25226449f1f5da7b4 ChangeLog 6700
-SHA256 79faf4966005a1d8b4646f1bc92890410ea629b182d3f229b15e65dbc786929f ChangeLog 6700
+EBUILD krita-1.6.0.ebuild 1700 RMD160 c25431eccbb6443722f5145f1bcaef73babf4940 SHA1 bdb8893890bbb821c100102b1ead31b9116610ca SHA256 7438a351181a6c8e521ae90a41a4f65bb3db728bc308ca042de323c1be97549d
+MD5 0f1f6a7b30b480c8cfaff7342bcbe7a5 krita-1.6.0.ebuild 1700
+RMD160 c25431eccbb6443722f5145f1bcaef73babf4940 krita-1.6.0.ebuild 1700
+SHA256 7438a351181a6c8e521ae90a41a4f65bb3db728bc308ca042de323c1be97549d krita-1.6.0.ebuild 1700
+MISC ChangeLog 6881 RMD160 bea68b0aaa7f7ea5a6950b851934068d347b3fa3 SHA1 1404c4be771ef6ed5d300894eceaaffb866f7ff9 SHA256 df60ca1bde4ee162145eb4b21251d902a7609661ffedb08b6613da3ebf45e5f9
+MD5 b2e4d50441a35340d57945d56a7eb1c8 ChangeLog 6881
+RMD160 bea68b0aaa7f7ea5a6950b851934068d347b3fa3 ChangeLog 6881
+SHA256 df60ca1bde4ee162145eb4b21251d902a7609661ffedb08b6613da3ebf45e5f9 ChangeLog 6881
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -51,9 +49,13 @@ SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-krita-1.5.2-r1 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-krita-1.5.2-r1 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-krita-1.5.2-r1 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-krita-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-krita-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-krita-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-krita-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-krita-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-krita-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-krita-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-krita-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-krita-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6qPAiZjviIA2XgRAibMAJ0bjjyY2DF6zgHoTbPIYqjg8NhUTACg7Ojf
+qyJFf4I69MDKtSwQNjnMCrs=
+=CfHS
+-----END PGP SIGNATURE-----
diff --git a/app-office/krita/files/digest-krita-1.6_beta1 b/app-office/krita/files/digest-krita-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/krita/files/digest-krita-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/krita/files/digest-krita-1.6_rc1 b/app-office/krita/files/digest-krita-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/krita/files/digest-krita-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/krita/krita-1.6_beta1.ebuild b/app-office/krita/krita-1.6_beta1.ebuild
deleted file mode 100644
index 3ac3aa649047..000000000000
--- a/app-office/krita/krita-1.6_beta1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6_beta1.ebuild,v 1.2 2006/09/17 21:27:39 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice image manipulation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-# See bug #130442.
-#IUSE="opengl"
-IUSE=""
-
-DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	>=media-gfx/imagemagick-6.2.5.5
-	>=media-libs/lcms-1.15
-	media-libs/tiff
-	media-libs/jpeg
-	>=media-libs/openexr-1.2.2-r2
-	media-libs/libpng
-	>=media-libs/libexif-0.6.13-r1
-	virtual/opengl
-	virtual/glu"
-
-#opengl? ( virtual/opengl virtual/glu )"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkrossapi lib/kross/api/
-	libkrossmain lib/kross/main/"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/krita"
-
-need-kde 3.4
-
-pkg_setup() {
-	# use opengl &&
-		if ! built_with_use =x11-libs/qt-3* opengl ; then
-			eerror "You need to build x11-libs/qt with opengl use flag enabled."
-			die
-		fi
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-	# FIXME - disable broken tests for now
-	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \
-		`ls ${S}/krita/colorspaces/*/Makefile.am`
-}
-
-src_compile() {
-#	local myconf="$(use_with opengl gl)"
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_compile
-}
-\ No newline at end of file
diff --git a/app-office/krita/krita-1.6_rc1.ebuild b/app-office/krita/krita-1.6_rc1.ebuild
deleted file mode 100644
index f1f26f8ce81e..000000000000
--- a/app-office/krita/krita-1.6_rc1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-1.6_rc1.ebuild,v 1.1 2006/09/27 23:26:53 carlo Exp $
-
-MAXKOFFICEVER=${PV}
-KMNAME=koffice
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice image manipulation program."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-# See bug #130442.
-#IUSE="opengl"
-IUSE=""
-
-DEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	>=media-gfx/imagemagick-6.2.5.5
-	>=media-libs/lcms-1.15
-	media-libs/tiff
-	media-libs/jpeg
-	>=media-libs/openexr-1.2.2-r2
-	media-libs/libpng
-	>=media-libs/libexif-0.6.13-r1
-	virtual/opengl
-	virtual/glu"
-
-#opengl? ( virtual/opengl virtual/glu )"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkopalette lib/kopalette
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkrossapi lib/kross/api/
-	libkrossmain lib/kross/main/"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/krita"
-
-need-kde 3.4
-
-pkg_setup() {
-	# use opengl &&
-		if ! built_with_use =x11-libs/qt-3* opengl ; then
-			eerror "You need to build x11-libs/qt with opengl use flag enabled."
-			die
-		fi
-}
-
-src_unpack() {
-	kde-meta_src_unpack
-	# FIXME - disable broken tests for now
-	sed -i -e "s:TESTSDIR =.*:TESTSDIR=:" ${S}/krita/core/Makefile.am \
-		`ls ${S}/krita/colorspaces/*/Makefile.am`
-}
-
-src_compile() {
-#	local myconf="$(use_with opengl gl)"
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_compile
-}
-\ No newline at end of file
diff --git a/app-office/kspread/Manifest b/app-office/kspread/Manifest
index 4722a3fd6c41..afaf1d8ce7fb 100644
--- a/app-office/kspread/Manifest
+++ b/app-office/kspread/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kspread-1.4.2-gcc41.patch 451 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 SHA1 4864b69746b56c2b8e75a7e3d06097a133804b5f SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
@@ -9,8 +12,7 @@ SHA256 866b92a617bbf6883b396e1d652974f6b5f268eebb5620e244775b03fa7521bf files/ks
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kspread-1.4.2-r1.ebuild 1217 RMD160 500ca4f539772a7f0bee176f71e980dd250efdaf SHA1 0d35605f3fe78e47640de94dc1153650d08fff8a SHA256 d7c81286799da2f5f27c435374d2e0ce586b9b6f5b8ceec9099065d2813980de
 MD5 bb5e26afa725b08557c4a341bfcf2346 kspread-1.4.2-r1.ebuild 1217
 RMD160 500ca4f539772a7f0bee176f71e980dd250efdaf kspread-1.4.2-r1.ebuild 1217
@@ -27,18 +29,14 @@ EBUILD kspread-1.5.2.ebuild 1147 RMD160 c42591b752cf069c3408e1922723fd193eddeccf
 MD5 0320d36dec64b5ae6e241ee124c3f296 kspread-1.5.2.ebuild 1147
 RMD160 c42591b752cf069c3408e1922723fd193eddeccf kspread-1.5.2.ebuild 1147
 SHA256 6ed46919f223fdaaac76ed3b6e895343a1d651cd6bce74bf8560de47a3eff383 kspread-1.5.2.ebuild 1147
-EBUILD kspread-1.6_beta1.ebuild 1588 RMD160 c643bc0c8eae0d3689392e234364aff21eb363d2 SHA1 34530d2382c05799d9da074c8f5f43d7cc499d7f SHA256 f86b7b36c0a19bebdf0e0240ed2a6c460c2ad02e7851202bc616194695337cd7
-MD5 151835f6223a0bf5cd82bb3bebfea182 kspread-1.6_beta1.ebuild 1588
-RMD160 c643bc0c8eae0d3689392e234364aff21eb363d2 kspread-1.6_beta1.ebuild 1588
-SHA256 f86b7b36c0a19bebdf0e0240ed2a6c460c2ad02e7851202bc616194695337cd7 kspread-1.6_beta1.ebuild 1588
-EBUILD kspread-1.6_rc1.ebuild 1586 RMD160 ff884a43bf24df8e7644b70438260eb9df2df115 SHA1 9dd8c1a9fa755dd1981958fa32193a7dce3781c4 SHA256 d11ff0aeede8674142a45f5d6429b6360bc202d220731858f36aab03b83517e0
-MD5 432ed07c47ccd4a298ac4a1d4e25fb4f kspread-1.6_rc1.ebuild 1586
-RMD160 ff884a43bf24df8e7644b70438260eb9df2df115 kspread-1.6_rc1.ebuild 1586
-SHA256 d11ff0aeede8674142a45f5d6429b6360bc202d220731858f36aab03b83517e0 kspread-1.6_rc1.ebuild 1586
-MISC ChangeLog 6858 RMD160 aa7b545e5fc1c25a3d9b8936c07c940377b7af8f SHA1 626252a5e0d5fec546564a9ec03bded0c0480ed6 SHA256 463488e84a88f6469565d85e81deafb68d1bb7f96a29bb8bd4bc1c7d11d94144
-MD5 f54c02e84a8a6a58810139cc4fd7e826 ChangeLog 6858
-RMD160 aa7b545e5fc1c25a3d9b8936c07c940377b7af8f ChangeLog 6858
-SHA256 463488e84a88f6469565d85e81deafb68d1bb7f96a29bb8bd4bc1c7d11d94144 ChangeLog 6858
+EBUILD kspread-1.6.0.ebuild 1588 RMD160 8c681aa97616c90392d20422f233906716fd74d3 SHA1 f67bf9a7c15b446eba0f3e96e9769109678ed3d5 SHA256 fdbecc392557c76b428d9650feb7f06322f8469f160c1b21a38a9333bd34c9f4
+MD5 903eb75473e0cfac6739d7caadfa187a kspread-1.6.0.ebuild 1588
+RMD160 8c681aa97616c90392d20422f233906716fd74d3 kspread-1.6.0.ebuild 1588
+SHA256 fdbecc392557c76b428d9650feb7f06322f8469f160c1b21a38a9333bd34c9f4 kspread-1.6.0.ebuild 1588
+MISC ChangeLog 7047 RMD160 163cd9eef743750bf372af5fb0c765fc291b57c3 SHA1 5eac01e87b7c0d7f752e602a49173b69e5c63ab2 SHA256 24d43e61ff8050657224f2e7f1b207fcec05dd2c842d5a434e84f936297d0863
+MD5 17301496da7e2c83dfcf08b7612d718c ChangeLog 7047
+RMD160 163cd9eef743750bf372af5fb0c765fc291b57c3 ChangeLog 7047
+SHA256 24d43e61ff8050657224f2e7f1b207fcec05dd2c842d5a434e84f936297d0863 ChangeLog 7047
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -55,9 +53,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kspread-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kspread-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kspread-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kspread-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kspread-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kspread-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kspread-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kspread-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kspread-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kspread-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kspread-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kspread-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6rfAiZjviIA2XgRAr0TAJ0ftjcMQcRc9RUFI5tZRHDjDhAmmgCguYLa
+T1kLjAq2R+Ik6e/DpBE4tQE=
+=azUH
+-----END PGP SIGNATURE-----
diff --git a/app-office/kspread/files/digest-kspread-1.6_beta1 b/app-office/kspread/files/digest-kspread-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kspread/files/digest-kspread-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kspread/files/digest-kspread-1.6_rc1 b/app-office/kspread/files/digest-kspread-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kspread/files/digest-kspread-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kspread/kspread-1.6_beta1.ebuild b/app-office/kspread/kspread-1.6_beta1.ebuild
deleted file mode 100644
index 9125ab246207..000000000000
--- a/app-office/kspread/kspread-1.6_beta1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6_beta1.ebuild,v 1.1 2006/09/15 18:49:34 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice spreadsheet application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkochart interfaces
-	libkrossmain lib/kross/main
-	libkrossapi lib/kross/api
-	libkexidb kexi/kexidb
-	libkexidbparser kexi/kexidb/parser"
-
-KMEXTRACTONLY="lib/
-	interfaces/
-	filters/kexi
-	kexi/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kspread"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-
-	# Work around broken conditional
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kspread/kspread-1.6_rc1.ebuild b/app-office/kspread/kspread-1.6_rc1.ebuild
deleted file mode 100644
index 300dbd339c40..000000000000
--- a/app-office/kspread/kspread-1.6_rc1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kspread/kspread-1.6_rc1.ebuild,v 1.1 2006/09/27 23:34:28 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice spreadsheet application."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kchart)
-	$(deprange $PV $MAXKOFFICEVER app-office/kexi)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkochart interfaces
-	libkrossmain lib/kross/main
-	libkrossapi lib/kross/api
-	libkexidb kexi/kexidb
-	libkexidbparser kexi/kexidb/parser"
-
-KMEXTRACTONLY="lib/
-	interfaces/
-	filters/kexi
-	kexi/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kspread"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile liboofilter first
-	echo "SUBDIRS = liboofilter kspread" > ${S}/filters/Makefile.am
-
-	# Work around broken conditional
-	echo "SUBDIRS = applixspread csv dbase gnumeric latex opencalc html qpro excel kexi" > ${S}/filters/kspread/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kugar/Manifest b/app-office/kugar/Manifest
index 50ca5c590869..b194899ab1ef 100644
--- a/app-office/kugar/Manifest
+++ b/app-office/kugar/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kugar-1.4.2.ebuild 857 RMD160 fb55ef41b593659742f77fcc2124ad5fc84434b0 SHA1 65d137d6ff90a50e3920ebfeee136627707f7b98 SHA256 3477c9e8fdf9ec7c1402e2a00186a8a6dff87bb77eb6841373d1aa4571fdd52f
 MD5 ee48955eae30f71e2331f2b92438a578 kugar-1.4.2.ebuild 857
 RMD160 fb55ef41b593659742f77fcc2124ad5fc84434b0 kugar-1.4.2.ebuild 857
@@ -15,18 +17,14 @@ EBUILD kugar-1.5.2.ebuild 870 RMD160 ce4a2ad84f0ea474c2239c2777cbb00233c3990b SH
 MD5 5feac8310d977b1776941d2e368d938b kugar-1.5.2.ebuild 870
 RMD160 ce4a2ad84f0ea474c2239c2777cbb00233c3990b kugar-1.5.2.ebuild 870
 SHA256 a42d187ab22ca44d7646742377e28e635a4174c6130f4d04bf5ad676000fbb14 kugar-1.5.2.ebuild 870
-EBUILD kugar-1.6_beta1.ebuild 879 RMD160 d0fc128e74cf4288eda818c09d9b8dbe9d16df56 SHA1 954bd13cfc8df9df09071e03635d545f642d40c1 SHA256 de76148464b6b4b26e63b63e101d3abffb9dd4af7af325c385298c489dea3036
-MD5 420392198c8b0d6479387f69cd924b3d kugar-1.6_beta1.ebuild 879
-RMD160 d0fc128e74cf4288eda818c09d9b8dbe9d16df56 kugar-1.6_beta1.ebuild 879
-SHA256 de76148464b6b4b26e63b63e101d3abffb9dd4af7af325c385298c489dea3036 kugar-1.6_beta1.ebuild 879
-EBUILD kugar-1.6_rc1.ebuild 877 RMD160 c9fecda3f3ce400923dcc6e7bb5157d27f0fe84d SHA1 83a46eb77213283d08c2198319b72b3c9757190e SHA256 04ae11263546a3e102fa20ceba09b22cce6a2ac4c2f25ddc8668be350e3d4c62
-MD5 228865c1eeac92371ee34fa637b9edc4 kugar-1.6_rc1.ebuild 877
-RMD160 c9fecda3f3ce400923dcc6e7bb5157d27f0fe84d kugar-1.6_rc1.ebuild 877
-SHA256 04ae11263546a3e102fa20ceba09b22cce6a2ac4c2f25ddc8668be350e3d4c62 kugar-1.6_rc1.ebuild 877
-MISC ChangeLog 5618 RMD160 71e8896d2c6fde85744002c108cfefebe133511e SHA1 d7504a49fa10b156fc45a768101ca59cd20178de SHA256 e12141c75af994d97580e794a757284818e6bd698826c7562ae13b083acdb3cb
-MD5 1f00d1fb8a18ec96510ca0c2fc7d189b ChangeLog 5618
-RMD160 71e8896d2c6fde85744002c108cfefebe133511e ChangeLog 5618
-SHA256 e12141c75af994d97580e794a757284818e6bd698826c7562ae13b083acdb3cb ChangeLog 5618
+EBUILD kugar-1.6.0.ebuild 879 RMD160 8cfbd27046eed81decb9b3e38fa5c8e7e45ca0f7 SHA1 a8f7a37fb565c262a2648536d8f9d664ec11a840 SHA256 0834050c2163e6b194efcabf56aa5ab62845ff4c206b0d3d7ba5a15f8f86b006
+MD5 10b687638d3302dc7e3e2110501fca69 kugar-1.6.0.ebuild 879
+RMD160 8cfbd27046eed81decb9b3e38fa5c8e7e45ca0f7 kugar-1.6.0.ebuild 879
+SHA256 0834050c2163e6b194efcabf56aa5ab62845ff4c206b0d3d7ba5a15f8f86b006 kugar-1.6.0.ebuild 879
+MISC ChangeLog 5799 RMD160 babec2236070eecd560b28ef7ed41dc251528a92 SHA1 a7a6402f9e93e01d58794d17fa36b612cfaeff49 SHA256 2962230e0ed6f712787aa858fe3a2eaf457dc753a0c0f7001e02f1f9fb5d5666
+MD5 c4d3ca841cacab8a67148bfd1f32521a ChangeLog 5799
+RMD160 babec2236070eecd560b28ef7ed41dc251528a92 ChangeLog 5799
+SHA256 2962230e0ed6f712787aa858fe3a2eaf457dc753a0c0f7001e02f1f9fb5d5666 ChangeLog 5799
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -40,9 +38,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kugar-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kugar-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kugar-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kugar-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kugar-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kugar-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kugar-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kugar-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kugar-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kugar-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kugar-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kugar-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6soAiZjviIA2XgRAv6BAJ9AC8tO4zz6iJitpAxmqNfi8cHmcwCgwkV8
+84AyXCKJaAwEhJ+tERphwVM=
+=OeE4
+-----END PGP SIGNATURE-----
diff --git a/app-office/kugar/files/digest-kugar-1.6_beta1 b/app-office/kugar/files/digest-kugar-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kugar/files/digest-kugar-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kugar/files/digest-kugar-1.6_rc1 b/app-office/kugar/files/digest-kugar-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kugar/files/digest-kugar-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kugar/kugar-1.6_beta1.ebuild b/app-office/kugar/kugar-1.6_beta1.ebuild
deleted file mode 100644
index 822cde18941d..000000000000
--- a/app-office/kugar/kugar-1.6_beta1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6_beta1.ebuild,v 1.1 2006/09/15 18:44:28 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice report viewer and generator."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoproperty lib/koproperty
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kugar"
-
-need-kde 3.4
diff --git a/app-office/kugar/kugar-1.6_rc1.ebuild b/app-office/kugar/kugar-1.6_rc1.ebuild
deleted file mode 100644
index fa251e557538..000000000000
--- a/app-office/kugar/kugar-1.6_rc1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kugar/kugar-1.6_rc1.ebuild,v 1.1 2006/09/27 23:28:19 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice report viewer and generator."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="
-	libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkoproperty lib/koproperty
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store"
-
-KMEXTRACTONLY="lib/"
-
-KMEXTRA="filters/kugar"
-
-need-kde 3.4
diff --git a/app-office/kword/Manifest b/app-office/kword/Manifest
index 6bece4ea634d..748cc6ae9aa3 100644
--- a/app-office/kword/Manifest
+++ b/app-office/kword/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kspread-1.4.2-gcc41.patch 451 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 SHA1 4864b69746b56c2b8e75a7e3d06097a133804b5f SHA256 67d8e5722ad1aadab5811397c68aacd1d8a1d9d5363f95488231f00bb1fd047a
 MD5 f1f58cce115f40fcba31a4976b61d260 files/kspread-1.4.2-gcc41.patch 451
 RMD160 c0d17048a7b1dcb14cd00910a400287652c2b2f1 files/kspread-1.4.2-gcc41.patch 451
@@ -9,8 +12,7 @@ SHA256 efd30eca9230905c884925bd6f6264e885ab2610d7f56a7a65db8f7ab48f548a files/po
 DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
-DIST koffice-1.5.91.tar.bz2 54138646 RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 SHA1 5334bce411fa230f831488a0a0bb3a5742e0a82a SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa
-DIST koffice-1.5.92.tar.bz2 54676447 RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd SHA1 128b4468dcb800d9cc5c448ccac38d8a3154417d SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5
+DIST koffice-1.6.0.tar.bz2 56718478 RMD160 be09c18005eb33f6dc35ab0359cc97a8a658ce7c SHA1 e34d57d0941884496bd3f99b85787697fb55692e SHA256 9eddaae640ada9bd184f001e2489854daf7094b73e5f15b0b8deffb4cc654ae2
 EBUILD kword-1.4.2-r6.ebuild 1265 RMD160 a317b6af5557928904c4176209f8e20af4776999 SHA1 ff537bcc608693d1af99acce9fe8bc77cff6ea81 SHA256 b61db02be96fb8518829429e4b77dd27b01e6cf62ae4f3f60c9e800558c1d090
 MD5 3d8c253c535cf2140989fbe5587542c2 kword-1.4.2-r6.ebuild 1265
 RMD160 a317b6af5557928904c4176209f8e20af4776999 kword-1.4.2-r6.ebuild 1265
@@ -27,18 +29,14 @@ EBUILD kword-1.5.2.ebuild 1292 RMD160 4eeeba7c49ffd0fae6e60a01a4d8c8e43dec7cbb S
 MD5 8f2da75afe39631879b3c76f4dc52d32 kword-1.5.2.ebuild 1292
 RMD160 4eeeba7c49ffd0fae6e60a01a4d8c8e43dec7cbb kword-1.5.2.ebuild 1292
 SHA256 15ac032266394f1bdcf39ba2611f887b5dc41514b1979619b65485c799b57b4b kword-1.5.2.ebuild 1292
-EBUILD kword-1.6_beta1.ebuild 1301 RMD160 f7680e7923fa92ef0d4ee9712864dff1874d8cb6 SHA1 34756a8bf32b044e0ac297aaa76e6e9d004f4f36 SHA256 0d7e4faf8e21e5cdb8ded641c82c1817dee84207e7cfb1bfa072a97967c9ea2f
-MD5 1777bc18117c87a073b49391206c00fe kword-1.6_beta1.ebuild 1301
-RMD160 f7680e7923fa92ef0d4ee9712864dff1874d8cb6 kword-1.6_beta1.ebuild 1301
-SHA256 0d7e4faf8e21e5cdb8ded641c82c1817dee84207e7cfb1bfa072a97967c9ea2f kword-1.6_beta1.ebuild 1301
-EBUILD kword-1.6_rc1.ebuild 1299 RMD160 900c10a6dd1a4c0815346d503547e0de5669c75a SHA1 eff1c1fbd8388ec628523217729288567882c720 SHA256 4676ffef0dd10a01c9f29ce067c42699889a650c53ac419e7d782a79a2d3f5de
-MD5 47f5456d73808f72c2e052d180c92474 kword-1.6_rc1.ebuild 1299
-RMD160 900c10a6dd1a4c0815346d503547e0de5669c75a kword-1.6_rc1.ebuild 1299
-SHA256 4676ffef0dd10a01c9f29ce067c42699889a650c53ac419e7d782a79a2d3f5de kword-1.6_rc1.ebuild 1299
-MISC ChangeLog 9044 RMD160 a7e174423067145e03aa95b7d41b975455a3d5b1 SHA1 bbb165e24a2c37ca17ff250e1eabe9e8b9040a27 SHA256 96e5ab230082a8bf4d5e2eaaa047e0c5f2dc39310a2e8506a5ecc17637112c8d
-MD5 f0266ce5c3b584a9c36d8497f13a105c ChangeLog 9044
-RMD160 a7e174423067145e03aa95b7d41b975455a3d5b1 ChangeLog 9044
-SHA256 96e5ab230082a8bf4d5e2eaaa047e0c5f2dc39310a2e8506a5ecc17637112c8d ChangeLog 9044
+EBUILD kword-1.6.0.ebuild 1301 RMD160 8f18a33d0081ea606dec0cf17aa0af75b0ad84fb SHA1 5163b35848e4caa219cf59429c25813989f211ae SHA256 c0260297eca626a4e771eb8fe4c00c99c2529180d928cf33d659164efd6c8a51
+MD5 a74215a557e51e54ca0b95b0be1736e8 kword-1.6.0.ebuild 1301
+RMD160 8f18a33d0081ea606dec0cf17aa0af75b0ad84fb kword-1.6.0.ebuild 1301
+SHA256 c0260297eca626a4e771eb8fe4c00c99c2529180d928cf33d659164efd6c8a51 kword-1.6.0.ebuild 1301
+MISC ChangeLog 9225 RMD160 c3f057a6b02a64a78f61f4603309d9aec911bcf1 SHA1 3eb780ffe4443f1833f26cebf374e18bad6d484b SHA256 624be37df868d40ee3a9d1f2d7ffd12844e32bf0efc1275a83e7042f7973a51b
+MD5 7fdfcdd113cb1332b279cc4b0acb7fe8 ChangeLog 9225
+RMD160 c3f057a6b02a64a78f61f4603309d9aec911bcf1 ChangeLog 9225
+SHA256 624be37df868d40ee3a9d1f2d7ffd12844e32bf0efc1275a83e7042f7973a51b ChangeLog 9225
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -55,9 +53,13 @@ SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/di
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kword-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kword-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kword-1.5.2 250
-MD5 e11d022c2030096a26bafccd73da6859 files/digest-kword-1.6_beta1 253
-RMD160 bf1c16737c0dfb58564bf6ef2118622a61e0e8cc files/digest-kword-1.6_beta1 253
-SHA256 4002ad733065cf9ab288ea253cf2cddb7d054ec357ed348ff7990acc05270acb files/digest-kword-1.6_beta1 253
-MD5 1555d685ff9b8710211d747da7d7e729 files/digest-kword-1.6_rc1 253
-RMD160 668fc73efb54bd7aecac539b07feaae969becfb4 files/digest-kword-1.6_rc1 253
-SHA256 11aa61a79c8a6e0d52eed2b5483817a92ddf07f722df6d28d2e45c12d90187ca files/digest-kword-1.6_rc1 253
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-kword-1.6.0 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-kword-1.6.0 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-kword-1.6.0 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN6tmAiZjviIA2XgRAnodAJ9QjikZdX6uQLSBYuXxvpiv2a7n6ACfQ77k
+DNq1oceYqbv72aLVWqfRzHc=
+=ViFr
+-----END PGP SIGNATURE-----
diff --git a/app-office/kword/files/digest-kword-1.6_beta1 b/app-office/kword/files/digest-kword-1.6_beta1
deleted file mode 100644
index a68717744650..000000000000
--- a/app-office/kword/files/digest-kword-1.6_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7aeaf362210ff2e52d610bdbe2c91fd koffice-1.5.91.tar.bz2 54138646
-RMD160 8b412a4d6199cec32fd4a43660abb1352d675dd4 koffice-1.5.91.tar.bz2 54138646
-SHA256 2e1cbd20c8201a9d2d4c14fa4184b112d90a8f8bb089915f4d748eb9f8cef7aa koffice-1.5.91.tar.bz2 54138646
diff --git a/app-office/kword/files/digest-kword-1.6_rc1 b/app-office/kword/files/digest-kword-1.6_rc1
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/kword/files/digest-kword-1.6_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2134a0d09a3f98b91a062c7bafb57622 koffice-1.5.92.tar.bz2 54676447
-RMD160 4006772a542c24132ef7b7d16ad087beb6eb76cd koffice-1.5.92.tar.bz2 54676447
-SHA256 a4df08decea688dddfeec7b47e0fb4e96bf75e1c85b72b721d315d718bae11c5 koffice-1.5.92.tar.bz2 54676447
diff --git a/app-office/kword/kword-1.6_beta1.ebuild b/app-office/kword/kword-1.6_beta1.ebuild
deleted file mode 100644
index 2c27b3783136..000000000000
--- a/app-office/kword/kword-1.6_beta1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6_beta1.ebuild,v 1.1 2006/09/15 18:50:49 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.5.2
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-	lib/
-	kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile libs first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
diff --git a/app-office/kword/kword-1.6_rc1.ebuild b/app-office/kword/kword-1.6_rc1.ebuild
deleted file mode 100644
index 7f5bdcc05feb..000000000000
--- a/app-office/kword/kword-1.6_rc1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kword/kword-1.6_rc1.ebuild,v 1.1 2006/09/27 23:29:50 carlo Exp $
-
-KMNAME=koffice
-MAXKOFFICEVER=${PV}
-inherit kde-meta eutils
-
-DESCRIPTION="KOffice word processor."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="$(deprange $PV $MAXKOFFICEVER app-office/koffice-libs)
-	$(deprange $PV $MAXKOFFICEVER app-office/kspread)
-	>=app-text/wv2-0.1.8
-	>=media-gfx/imagemagick-5.5.2
-	>=app-text/libwpd-0.8.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-KMCOPYLIB="libkformula lib/kformula
-	libkofficecore lib/kofficecore
-	libkofficeui lib/kofficeui
-	libkopainter lib/kopainter
-	libkotext lib/kotext
-	libkwmf lib/kwmf
-	libkowmf lib/kwmf
-	libkstore lib/store
-	libkspreadcommon kspread"
-
-KMEXTRACTONLY="
-	lib/
-	kspread/"
-
-KMCOMPILEONLY="filters/liboofilter"
-
-KMEXTRA="filters/kword"
-
-need-kde 3.4
-
-src_unpack() {
-	kde-meta_src_unpack unpack
-
-	# We need to compile libs first
-	echo "SUBDIRS = liboofilter kword" > $S/filters/Makefile.am
-
-	for i in $(find ${S}/lib -iname "*\.ui"); do
-		${QTDIR}/bin/uic ${i} > ${i%.ui}.h
-	done
-
-	kde-meta_src_unpack makefiles
-}
author	Diego Elio Pettenò <flameeyes@gentoo.org>	2006-10-19 16:44:27 +0000
committer	Diego Elio Pettenò <flameeyes@gentoo.org>	2006-10-19 16:44:27 +0000
commit	8752c86bb0e1b1f96876746eb646e0eebf5d0983 (patch)
tree	d600de2f3b029fb7024ed07ada968c5c3db296a6 /app-office
parent	Update to 1.6.0 final. (diff)
download	historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.tar.gz historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.tar.bz2 historical-8752c86bb0e1b1f96876746eb646e0eebf5d0983.zip