Revision bump to fix the tarball used. Thanks to Rene Gass for reporting.

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

3 files changed, 15 insertions, 112 deletions

diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index f56b3a6d9d4e..5b30cf808d4f 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -28,7 +28,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.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-1.4.2-r6.ebuild 1637 RMD160 683e30c0915e34ea9e88a93e74a49617432144ce SHA1 b9fbe431e9af984ef74219cf1d19c6d2bd0b1f62 SHA256 c0543d8c958de6dff352ba59de9d9cb094bec73a5a8530713c2361b4a4cb65e8
 MD5 2d6e382b8045fa0fb5e68af45c289781 koffice-1.4.2-r6.ebuild 1637
 RMD160 683e30c0915e34ea9e88a93e74a49617432144ce koffice-1.4.2-r6.ebuild 1637
@@ -49,14 +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.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
+EBUILD koffice-1.6.0-r1.ebuild 2288 RMD160 80dbaf95a7ddccca39194ba4a2dc1557b9511919 SHA1 f764cecd5b4b4740700d869608dc491d73e3fe8d SHA256 9d7bc59a1197899b8aad154b371cf6696254bb535a6fb19ed68c3f53cb63d94d
+MD5 083c4b5dff74ce98d4960ba31d4b1fb6 koffice-1.6.0-r1.ebuild 2288
+RMD160 80dbaf95a7ddccca39194ba4a2dc1557b9511919 koffice-1.6.0-r1.ebuild 2288
+SHA256 9d7bc59a1197899b8aad154b371cf6696254bb535a6fb19ed68c3f53cb63d94d koffice-1.6.0-r1.ebuild 2288
+MISC ChangeLog 26136 RMD160 f566717bd42c80088f77c842f6f7002fdd714ff1 SHA1 a6c40e8a966739344785194345d3cfc54632b65b SHA256 8f77451fab8e234f391c402d9a842188149cd4bf1c0e798e97027c09e4191d1d
+MD5 79ee42c4e570fc8b3b09f620776c888b ChangeLog 26136
+RMD160 f566717bd42c80088f77c842f6f7002fdd714ff1 ChangeLog 26136
+SHA256 8f77451fab8e234f391c402d9a842188149cd4bf1c0e798e97027c09e4191d1d ChangeLog 26136
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
@@ -76,13 +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 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
+MD5 3df311d51b7d32b34a55e2b3a9f375d2 files/digest-koffice-1.6.0-r1 250
+RMD160 089f72ec1cf3c245bb967622bf7acbba8c773ce9 files/digest-koffice-1.6.0-r1 250
+SHA256 94cfa2bebe4c165ca1e455a9773050546661c01f896551db89c6cbbd1556e3cb files/digest-koffice-1.6.0-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFN6iwAiZjviIA2XgRAgWhAJ97N1LaHVqVj5mXaSksndOC6SVizwCfXLOi
-iPyZJZox1AwrB0MXpATxZZ4=
-=Rb/G
+iD8DBQFFOA7rAiZjviIA2XgRAh8mAJ9UXU5bQi1isEwnrw+nK6fSY+kIbgCeN/qM
+foGWD70B2241F9ocLLjFZNs=
+=QaRn
 -----END PGP SIGNATURE-----
diff --git a/app-office/koffice/files/digest-koffice-1.6.0 b/app-office/koffice/files/digest-koffice-1.6.0
deleted file mode 100644
index 22dfd6c9ed05..000000000000
--- a/app-office/koffice/files/digest-koffice-1.6.0
+++ /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.0.ebuild b/app-office/koffice/koffice-1.6.0.ebuild
deleted file mode 100644
index 8ac24a8d3a7e..000000000000
--- a/app-office/koffice/koffice-1.6.0.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.0.ebuild,v 1.1 2006/10/19 16:32:40 flameeyes 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-*
-}