new version, removed old ones

8 files changed, 31 insertions, 223 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index af41097a07c0..c6cc5b63aaa0 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.5 2002/05/27 20:34:51 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.6 2002/06/27 15:37:51 verwilst Exp $
+
+*koffice-1.2_beta2 (27 June 2002) Bart Verwilst <verwilst@gentoo.org>
 
 *koffice-1.2_beta1-r2 (27 May 2002)
 
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1-r1 b/app-office/koffice/files/digest-koffice-1.2_beta1-r1
deleted file mode 100644
index b3231873b7fc..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5df9c55daabcc5df4327724d40f436cf koffice-1.2-beta1.tar.bz2 7901619
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta1-r2 b/app-office/koffice/files/digest-koffice-1.2_beta1-r2
deleted file mode 100644
index b3231873b7fc..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2_beta1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5df9c55daabcc5df4327724d40f436cf koffice-1.2-beta1.tar.bz2 7901619
diff --git a/app-office/koffice/files/digest-koffice-1.2_beta2 b/app-office/koffice/files/digest-koffice-1.2_beta2
new file mode 100644
index 000000000000..3f85f2f64b93
--- /dev/null
+++ b/app-office/koffice/files/digest-koffice-1.2_beta2
@@ -0,0 +1 @@
+MD5 46f27fe4ecc09e96db55b56b43840a1b koffice-1.2-beta2.tar.bz2 9018258
diff --git a/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch b/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch
deleted file mode 100644
index 6363d2f7f2b4..000000000000
--- a/app-office/koffice/files/koffice-1.2-beta1-gcc31-gentoo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur koffice-1.2-beta1.original/karbon/tools/vmtool_rotate.cc koffice-1.2-beta1/karbon/tools/vmtool_rotate.cc
---- koffice-1.2-beta1.original/karbon/tools/vmtool_rotate.cc	Tue Apr  2 07:07:04 2002
-+++ koffice-1.2-beta1/karbon/tools/vmtool_rotate.cc	Mon May 27 01:35:56 2002
-@@ -79,7 +79,7 @@
- 		KoRect rect = part()->selection().boundingBox( 1 / view->zoomFactor() );
- 		m_sp = QPoint( rect.left() + rect.width() / 2, rect.top() + rect.height() / 2 );
- 		QPoint sp = QPoint( m_sp.x() - view->canvasWidget()->contentsX(), m_sp.y() - view->canvasWidget()->contentsY() );
--		m_angle = atan2( lp.y() - m_sp.y(), lp.x() - m_sp.x() );
-+		m_angle = atan2( double(lp.y() - m_sp.y()), double(lp.x() - m_sp.x()) );
- 		if( VMToolHandle::instance( m_part )->activeNode() == NODE_LT )
- 			m_angle -= atan2( rect.top() - m_sp.y(), rect.left() - m_sp.x() );
- 		else if( VMToolHandle::instance( m_part )->activeNode() == NODE_MT )
-diff -ur koffice-1.2-beta1.original/karbon/tools/vshapetool.h koffice-1.2-beta1/karbon/tools/vshapetool.h
---- koffice-1.2-beta1.original/karbon/tools/vshapetool.h	Thu Mar 14 12:50:49 2002
-+++ koffice-1.2-beta1/karbon/tools/vshapetool.h	Mon May 27 01:33:58 2002
-@@ -61,12 +61,12 @@
- 	if( m_calcPolar )
- 	{
- 		// radius:
--		m_d1 = sqrt(
-+	  m_d1 = sqrt( double(
- 			( m_lp.x() - m_fp.x() ) * ( m_lp.x() - m_fp.x() ) +
--			( m_lp.y() - m_fp.y() ) * ( m_lp.y() - m_fp.y() ) );
-+			( m_lp.y() - m_fp.y() ) * ( m_lp.y() - m_fp.y() ) ));
- 
- 		// angle:
--		m_d2 = atan2( ( m_lp.y() - m_fp.y() ), ( m_lp.x() - m_fp.x() ) );
-+		m_d2 = atan2( double( m_lp.y() - m_fp.y() ), double( m_lp.x() - m_fp.x() ) );
- 
- 		// define pi/2 as "0.0":
- 		m_d2 -= VGlobal::pi_2;
diff --git a/app-office/koffice/koffice-1.2_beta1-r1.ebuild b/app-office/koffice/koffice-1.2_beta1-r1.ebuild
deleted file mode 100644
index 4c5752d0294a..000000000000
--- a/app-office/koffice/koffice-1.2_beta1-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1-r1.ebuild,v 1.3 2002/05/21 18:14:07 danarmak Exp $
-
-inherit kde-base || die
-
-need-kde 3
-
-S="${WORKDIR}/koffice-1.2-beta1"
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-
-SRC_URI="ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2-beta1/src/koffice-1.2-beta1.tar.bz2"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2-r7"
-
-
-src_unpack() {
-
-	unpack koffice-1.2-beta1.tar.bz2
-	cd ${S}/kword
-	
-	# This fixes the doc compilation error.. Seems kinda ugly, but beta2 will fix this#
-	cd ${S}/doc/kformula
-	mv index.docbook index.docbook.orig
-        sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/koffice
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kontour
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/koshell
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kpresenter
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kspread
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kugar
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kword
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/thesaurus
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-
-}
-
-src_compile() {
-
-    export LIBPYTHON="`python-config --libs`"
-    export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-    myconf="$myconf --enable-all"
-    kde_src_compile myconf
-
-    #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
-    CFLAGS2="$CFLAGS"
-    CXXFLAGS2="$CXXFLAGS"
-
-    CFLAGS=${CFLAGS/-fomit-frame-pointer}
-    CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
-
-    cd ${S}
-    kde_src_compile configure
-    cd kchart/kdchart
-    emake || die
-
-    cd ${S}
-    CFLAGS="$CFLAGS2"
-    CXXFLAGS="$CXXFLAGS2"
-    kde_src_compile configure
-    emake || die
-
-}
-
-
diff --git a/app-office/koffice/koffice-1.2_beta1-r2.ebuild b/app-office/koffice/koffice-1.2_beta1-r2.ebuild
deleted file mode 100644
index 1766c3860771..000000000000
--- a/app-office/koffice/koffice-1.2_beta1-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2_beta1-r2.ebuild,v 1.1 2002/05/27 20:34:51 mkennedy Exp $
-
-inherit kde-base || die
-
-need-kde 3
-
-S="${WORKDIR}/koffice-1.2-beta1"
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-
-SRC_URI="ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2-beta1/src/koffice-1.2-beta1.tar.bz2"
-
-DEPEND="$DEPEND
-	>=dev-lang/python-2.2-r7"
-
-
-src_unpack() {
-	unpack koffice-1.2-beta1.tar.bz2
-	cd ${S}
-	# patch for gcc3.1 support (will be sent upstream too if necessary)
-	patch -p1 <${FILESDIR}/koffice-1.2-beta1-gcc31-gentoo.patch || die
-
-	cd ${S}/kword
-	
-	# This fixes the doc compilation error.. Seems kinda ugly, but beta2 will fix this#
-	cd ${S}/doc/kformula
-	mv index.docbook index.docbook.orig
-        sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/koffice
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kontour
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/koshell
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kpresenter
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kspread
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kugar
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/kword
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-	cd ${S}/doc/thesaurus
-        mv index.docbook index.docbook.orig
-	sed 's:XML V4.1.2-Based Variant V1.1:XML V4.1-Based Variant V1.0:' index.docbook.orig > index.docbook
-        rm -f index.docbook.orig
-
-}
-
-src_compile() {
-
-    export LIBPYTHON="`python-config --libs`"
-    export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-
-    myconf="$myconf --enable-all"
-    kde_src_compile myconf
-
-    #the dir kchar/kdchart cannot be compiled with the -fomit-frame-pointer flag present
-    CFLAGS2="$CFLAGS"
-    CXXFLAGS2="$CXXFLAGS"
-
-    CFLAGS=${CFLAGS/-fomit-frame-pointer}
-    CXXFLAGS=${CXXFLAGS/-fomit-frame-pointer}
-
-    cd ${S}
-    kde_src_compile configure
-    cd kchart/kdchart
-    emake || die
-
-    cd ${S}
-    CFLAGS="$CFLAGS2"
-    CXXFLAGS="$CXXFLAGS2"
-    kde_src_compile configure
-    emake || die
-
-}
-
-
diff --git a/app-office/koffice/koffice-1.2_beta2.ebuild b/app-office/koffice/koffice-1.2_beta2.ebuild
new file mode 100644
index 000000000000..5f5df3118baa
--- /dev/null
+++ b/app-office/koffice/koffice-1.2_beta2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2002 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_beta2.ebuild,v 1.1 2002/06/27 15:37:51 verwilst Exp $
+
+inherit kde-base || die
+
+need-kde 3
+
+S="${WORKDIR}/koffice-1.2-beta2"
+DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
+HOMEPAGE="http://www.koffice.org/"
+
+SRC_URI="ftp://ftp.kde.org/pub/kde/unstable/koffice-1.2-beta2/src/koffice-1.2-beta2.tar.bz2"
+
+DEPEND="$DEPEND
+	>=dev-lang/python-2.2.1
+	>=media-libs/libart_lgpl-2.3.9
+	>=media-gfx/imagemagick-5.4.5"
+
+export LIBPYTHON="`python-config --libs`"
+export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
+
+need-automake 1.5
+need-autoconf 2.5
+
+
+