New version, stable on x86.

12 files changed, 17 insertions, 157 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 581a5f5eb9cd..c327ce073155 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.34 2004/01/15 03:59:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.35 2004/01/29 14:59:41 caleb Exp $
+
+  29 Jan 2004; Caleb Tennis <caleb@gentoo.org> :
+  New stable version
 
   14 Jan 2004; Aron Griffis <agriffis@gentoo.org> koffice-1.2.1-r1.ebuild:
   add ~alpha
diff --git a/app-office/koffice/Manifest b/app-office/koffice/Manifest
index 95fd2e40aa2b..1e2c3e404728 100644
--- a/app-office/koffice/Manifest
+++ b/app-office/koffice/Manifest
@@ -1,17 +1,9 @@
-MD5 cd7530c334d300a44640540064734d7d koffice-1.2.1.ebuild 774
+MD5 b489e4042d7275a592958232dde25004 koffice-1.2.1.ebuild 771
 MD5 525ca4234ab7b33a17450c21463c11f9 koffice-1.2.1-r1.ebuild 835
-MD5 3d866e7a849cd70c3d2ff6b8281a638f koffice-1.3.ebuild 994
-MD5 65fe5c817c88a9e44be825cb742aa99a koffice-1.3_beta4.ebuild 1023
-MD5 48801fdc9969f48e5b156d36a07a240e koffice-1.3_rc2.ebuild 1042
-MD5 1fcab80603d3f703f5458975f4a46cf3 ChangeLog 5783
+MD5 5e8ffe3fbfdfcdbac14bf459692ce092 koffice-1.3.ebuild 964
+MD5 f27664e30d5ffa6eb3c01d1ec30bf7c4 ChangeLog 5851
 MD5 3567b0f5f53ad3a98e67fe21ecb23624 metadata.xml 225
-MD5 15c84093ed6cf28d37c5d9901eefff0c koffice-1.3_rc1.ebuild 1045
-MD5 362c1081c562d8405d25be71122ca125 files/koffice-1.2-connectortool.diff 493
-MD5 429b5b5cd44d002e65f789d548cfea19 files/digest-koffice-1.3_beta4 69
 MD5 bd89862f0c15396ad54e30a1c9f2f5d9 files/koffice-1.2.1-kword-crashes.diff 3840
 MD5 65a32b814eb23f48f2392f1ae13ac167 files/digest-koffice-1.3 66
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1 67
-MD5 5802216e6a21bb1221ef5b43571fed97 files/digest-koffice-1.3_rc1 69
-MD5 6865dfab81716509d08f843071b4892a files/digest-koffice-1.3_rc2 69
-MD5 5a23cf845584563e25579a8a2d6f3681 files/koffice-1.3_beta3-gcc33.diff 1224
 MD5 75c9f696b717a82bf663b4c545be66d2 files/digest-koffice-1.2.1-r1 67
diff --git a/app-office/koffice/files/digest-koffice-1.3 b/app-office/koffice/files/digest-koffice-1.3
new file mode 100644
index 000000000000..cd52697306a6
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.3
@@ -0,0 +1 @@
+MD5 8e4c9db57f701d42f21d61651f0b03bd koffice-1.3.tar.bz2 10622005
diff --git a/app-office/koffice/files/digest-koffice-1.3_beta4 b/app-office/koffice/files/digest-koffice-1.3_beta4
deleted file mode 100644
index 3ae1a0a26c53..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3_beta4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7635262fbbfb334c32f798233cfc91c koffice-1.2.93.tar.bz2 10503068
diff --git a/app-office/koffice/files/digest-koffice-1.3_rc1 b/app-office/koffice/files/digest-koffice-1.3_rc1
deleted file mode 100644
index 22d25ee0eba9..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 713d64d08f7635fbf5400e109d31653b koffice-1.2.94.tar.bz2 10534854
diff --git a/app-office/koffice/files/digest-koffice-1.3_rc2 b/app-office/koffice/files/digest-koffice-1.3_rc2
deleted file mode 100644
index 66f2c5d0aa45..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a738120fed3f68316700f5f05317ac7a koffice-1.2.95.tar.bz2 10704380
diff --git a/app-office/koffice/files/koffice-1.2-connectortool.diff b/app-office/koffice/files/koffice-1.2-connectortool.diff
deleted file mode 100644
index f64bce219526..000000000000
--- a/app-office/koffice/files/koffice-1.2-connectortool.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kivio/plugins/kivioconnectortool/straight_connector/Makefile.am	2002/05/25 16:08:19	1.8
-+++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.am	2002/09/13 08:30:39	1.8.2.1
-@@ -2,7 +2,7 @@
- ####   Makefile.am generated automatically by KDEStudio   ####
- #### WARNING! All changes made in this part will be lost! ####
- ##############################################################
--
-+libdir = $(kde_datadir)/kivio/autoloadStencils
- lib_LTLIBRARIES =libstraight_connector.la
- 
- 
diff --git a/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff b/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff
deleted file mode 100644
index 2e1c13703dd0..000000000000
--- a/app-office/koffice/files/koffice-1.3_beta3-gcc33.diff
+++ /dev/null
@@ -1,46 +0,0 @@
---- filters/kspread/latex/export/table.cc~	2003-08-19 13:38:51.000000000 -0700
-+++ filters/kspread/latex/export/table.cc	2003-08-19 15:01:47.000000000 -0700
-@@ -20,6 +20,7 @@
- */
- 
- #include <kdebug.h>		/* for kdDebug stream */
-+#include <qbitarray.h>
- #include "cell.h"
- #include "column.h"
- #include "row.h"
-@@ -269,7 +270,7 @@
- {
- 	
- 	Cell* cell = 0;
--	bool border[getMaxColumn()];
-+	QBitArray border(getMaxColumn());
- 	bool fullLine = true;
- 	for(int index = 1; index <= getMaxColumn(); index++)
- 	{
-@@ -302,7 +303,7 @@
- 				int begin = index;
- 				int end;
- 				index = index + 1;
--				while(border[index] == true && index < getMaxColumn())
-+				while(border[index] && index < getMaxColumn())
- 				{
- 					index = index + 1;
- 				}
-@@ -325,7 +326,7 @@
- void Table::generateBottomLineBorder(QTextStream& out, int row)
- {
- 	Cell* cell = 0;
--	bool border[getMaxColumn()];
-+	QBitArray border(getMaxColumn());
- 	bool fullLine = true;
- 
- 	for(int index = 1; index <= getMaxColumn(); index++)
-@@ -358,7 +359,7 @@
- 				int begin = index;
- 				int end;
- 				index = index + 1;
--				while(border[index] == true && index < getMaxColumn())
-+				while(border[index] && index < getMaxColumn())
- 				{
- 					index = index + 1;
- 				}
diff --git a/app-office/koffice/koffice-1.2.1.ebuild b/app-office/koffice/koffice-1.2.1.ebuild
index 70e3d12aa1d0..96bc2c4345bd 100644
--- a/app-office/koffice/koffice-1.2.1.ebuild
+++ b/app-office/koffice/koffice-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1.ebuild,v 1.3 2003/03/13 19:03:24 doctomoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1.ebuild,v 1.4 2004/01/29 14:59:41 caleb Exp $
 
 inherit kde-base flag-o-matic
 
diff --git a/app-office/koffice/koffice-1.3_rc2.ebuild b/app-office/koffice/koffice-1.3.ebuild
index 7cb2db5fe5b4..dd84fc20ffe3 100644
--- a/app-office/koffice/koffice-1.3_rc2.ebuild
+++ b/app-office/koffice/koffice-1.3.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_rc2.ebuild,v 1.1 2003/12/18 13:01:41 caleb Exp $
-inherit kde flag-o-matic
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.1 2004/01/29 14:59:41 caleb Exp $
+inherit kde
 
 # TODO : mysql support
 # other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
 
-filter-flags "-fomit-frame-pointer"
-
 need-kde 3
 
-MY_P=${PN}-1.2.95
-S="$WORKDIR/${MY_P}"
-
 DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
 HOMEPAGE="http://www.koffice.org/"
 LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/unstable/${MY_P}/src/${MY_P}.tar.bz2"
+SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 RESTRICT="nomirror"
 
 DEPEND="$DEPEND
+	>=kde-base/kdelibs-3.1
 	>=dev-lang/python-2.2.1
 	>=media-libs/libart_lgpl-2.3.9
 	>=media-gfx/imagemagick-5.4.5
@@ -29,7 +25,7 @@ DEPEND="$DEPEND
 	dev-util/pkgconfig"
 
 export LIBPYTHON="`python-config --libs`"
-export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
+#export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
 
 need-automake 1.5
 need-autoconf 2.5
diff --git a/app-office/koffice/koffice-1.3_beta4.ebuild b/app-office/koffice/koffice-1.3_beta4.ebuild
deleted file mode 100644
index 20b487da8abc..000000000000
--- a/app-office/koffice/koffice-1.3_beta4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_beta4.ebuild,v 1.1 2003/09/25 16:07:31 caleb Exp $
-inherit kde-base flag-o-matic
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-filter-flags "-fomit-frame-pointer"
-
-need-kde 3
-
-MY_P=${PN}-1.2.93
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/unstable/${MY_P}/src/${MY_P}.tar.bz2"
-
-S="$WORKDIR/${MY_P}"
-
-KEYWORDS="~x86"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/wv2-0.1.8
-	dev-util/pkgconfig"
-
-export LIBPYTHON="`python-config --libs`"
-export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-need-automake 1.5
-need-autoconf 2.5
-
diff --git a/app-office/koffice/koffice-1.3_rc1.ebuild b/app-office/koffice/koffice-1.3_rc1.ebuild
deleted file mode 100644
index 61326c538c7e..000000000000
--- a/app-office/koffice/koffice-1.3_rc1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3_rc1.ebuild,v 1.2 2003/11/29 20:10:24 brad_mssw Exp $
-inherit kde flag-o-matic
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-filter-flags "-fomit-frame-pointer"
-
-need-kde 3
-
-MY_P=${PN}-1.2.94
-S="$WORKDIR/${MY_P}"
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/unstable/${MY_P}/src/${MY_P}.tar.bz2"
-
-KEYWORDS="~x86 amd64"
-RESTRICT="nomirror"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5
-	>=app-text/wv2-0.1.8
-	dev-util/pkgconfig"
-
-export LIBPYTHON="`python-config --libs`"
-export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-need-automake 1.5
-need-autoconf 2.5
-