Update to 1.6.0 final.

(Portage version: 2.1.2_pre3-r5)
 (Signed Manifest commit)

5 files changed, 22 insertions, 172 deletions

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