Update to 1.6.0 final.

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

5 files changed, 21 insertions, 213 deletions

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-*
-}