clean up

19 files changed, 8 insertions, 384 deletions

diff --git a/app-office/koffice/ChangeLog b/app-office/koffice/ChangeLog
index 530002c578f0..cd9b2d040734 100644
--- a/app-office/koffice/ChangeLog
+++ b/app-office/koffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/koffice
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.72 2004/11/02 21:27:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/ChangeLog,v 1.73 2004/11/03 18:12:26 carlo Exp $
+
+  03 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/koffice-1.2.1-kword-crashes.diff, -files/koffice-1.3.1-gcc34.patch,
+  -koffice-1.2.1-r1.ebuild, -koffice-1.3.1-r1.ebuild, -koffice-1.3.1.ebuild,
+  -koffice-1.3.2.ebuild, -koffice-1.3.3-r1.ebuild, -koffice-1.3.3.ebuild,
+  -koffice-1.3.4.ebuild, -koffice-1.3.ebuild:
+  clean up
 
   02 Nov 2004; Markus Rothe <corsair@gentoo.org> koffice-1.3.4-r1.ebuild:
   Stable on ppc64, bug #69624
diff --git a/app-office/koffice/files/digest-koffice-1.2.1-r1 b/app-office/koffice/files/digest-koffice-1.2.1-r1
deleted file mode 100644
index 107814748a96..000000000000
--- a/app-office/koffice/files/digest-koffice-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6a73aa72b094ca7b7377f74a508e804e koffice-1.2.1.tar.bz2 9275595
diff --git a/app-office/koffice/files/digest-koffice-1.3 b/app-office/koffice/files/digest-koffice-1.3
deleted file mode 100644
index cd52697306a6..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e4c9db57f701d42f21d61651f0b03bd koffice-1.3.tar.bz2 10622005
diff --git a/app-office/koffice/files/digest-koffice-1.3.1 b/app-office/koffice/files/digest-koffice-1.3.1
deleted file mode 100644
index 8a5acfd21fc5..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad68bab5753cf8d2e32a1d9e0c19495a koffice-1.3.1.tar.bz2 10615570
diff --git a/app-office/koffice/files/digest-koffice-1.3.1-r1 b/app-office/koffice/files/digest-koffice-1.3.1-r1
deleted file mode 100644
index 8a5acfd21fc5..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad68bab5753cf8d2e32a1d9e0c19495a koffice-1.3.1.tar.bz2 10615570
diff --git a/app-office/koffice/files/digest-koffice-1.3.2 b/app-office/koffice/files/digest-koffice-1.3.2
deleted file mode 100644
index cca0fc4e98d4..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 078a371f6768bea53b84ea342ac0b34b koffice-1.3.2.tar.bz2 10736662
diff --git a/app-office/koffice/files/digest-koffice-1.3.3 b/app-office/koffice/files/digest-koffice-1.3.3
deleted file mode 100644
index 8c8f121cb5f5..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c3b745c6218a9dc9b3f60edea2dca2b koffice-1.3.3.tar.bz2 10739168
diff --git a/app-office/koffice/files/digest-koffice-1.3.3-r1 b/app-office/koffice/files/digest-koffice-1.3.3-r1
deleted file mode 100644
index 8c8f121cb5f5..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c3b745c6218a9dc9b3f60edea2dca2b koffice-1.3.3.tar.bz2 10739168
diff --git a/app-office/koffice/files/digest-koffice-1.3.4 b/app-office/koffice/files/digest-koffice-1.3.4
deleted file mode 100644
index 27aee10e0979..000000000000
--- a/app-office/koffice/files/digest-koffice-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79896426542b0cf07e2e15f84946905a koffice-1.3.4.tar.bz2 10765924
diff --git a/app-office/koffice/files/koffice-1.2.1-kword-crashes.diff b/app-office/koffice/files/koffice-1.2.1-kword-crashes.diff
deleted file mode 100644
index ee7f53c9138f..000000000000
--- a/app-office/koffice/files/koffice-1.2.1-kword-crashes.diff
+++ /dev/null
@@ -1,110 +0,0 @@
-Index: contents.cc
-===================================================================
-RCS file: /home/kde/koffice/kword/contents.cc,v
-retrieving revision 1.49.2.1
-retrieving revision 1.49.2.2
-diff -u -p -r1.49.2.1 -r1.49.2.2
---- kword/contents.cc	18 Oct 2002 16:59:42 -0000	1.49.2.1
-+++ kword/contents.cc	20 Dec 2002 12:01:36 -0000	1.49.2.2
-@@ -134,7 +134,7 @@ KoTextCursor * KWInsertTOCCommand::remov
-     // We start from the end, to avoid the parag shifting problem
-     KoTextParag *p = textdoc->lastParag();
-     KoTextCursor *posOfTable=0L;
--    KWTextParag *posOfToc=0L;
-+    KoTextParag *posOfToc=0L;
- 
-     while ( p )
-     {
-@@ -142,8 +142,6 @@ KoTextCursor * KWInsertTOCCommand::remov
-         if ( parag->style() && ( parag->style()->name().startsWith( "Contents Head" ) ||
-             parag->style()->name() == "Contents Title" ) )
-         {
--            posOfToc=parag;
--
-             kdDebug() << "KWContents::createContents Deleting paragraph " << p << " " << p->paragId() << endl;
-             // This paragraph is part of the TOC -> remove
- 
-@@ -172,6 +170,7 @@ KoTextCursor * KWInsertTOCCommand::remov
-             delete p;
-             kdDebug() << "KWInsertTOCCommand::removeTOC " << p << " deleted" << endl;
-             p = next;
-+            posOfToc = p;
-             kdDebug() << "KWInsertTOCCommand::removeTOC prev=" << prev << " p=" << p << endl;
-             // Fix parag chain
-             if ( prev )
-@@ -179,6 +178,8 @@ KoTextCursor * KWInsertTOCCommand::remov
-                 prev->setNext( p );
-                 if ( p )
-                     p->setParagId( prev->paragId() + 1 );
-+                else
-+                    posOfToc = prev;
-             }
-             else
-             {
-@@ -190,6 +191,7 @@ KoTextCursor * KWInsertTOCCommand::remov
-                 {
-                     textdoc->clear( true ); // recreate empty parag.
-                     cursor->setParag( textdoc->firstParag() );
-+                    posOfToc = textdoc->firstParag();
-                     break;
-                 }
-             }
-@@ -198,12 +200,12 @@ KoTextCursor * KWInsertTOCCommand::remov
-         p = p->prev();
-     }
-     textdoc->invalidate();
--     if(posOfToc)
--     {
-+    if(posOfToc)
-+    {
-          posOfTable=new KoTextCursor( textdoc );
-          posOfTable->setParag(posOfToc  );
-          posOfTable->setIndex( 0 );//start of parag
--     }
-+    }
-     // ### TODO propagate parag ID changes.
-     return posOfTable;
- }
-Index: kwview.cc
-===================================================================
-RCS file: /home/kde/koffice/kword/kwview.cc,v
-retrieving revision 1.822.2.5
-retrieving revision 1.822.2.6
-diff -u -p -r1.822.2.5 -r1.822.2.6
---- kword/kwview.cc	12 Nov 2002 15:38:17 -0000	1.822.2.5
-+++ kword/kwview.cc	24 Dec 2002 15:16:50 -0000	1.822.2.6
-@@ -251,12 +251,6 @@ KWView::KWView( KWViewMode* viewMode, QW
- KWView::~KWView()
- {
-     clearSelection();
--    //delete special char dlg when we close view
--    if ( m_specialCharDlg )
--    {
--        m_specialCharDlg->closeDialog();
--    }
--
-     if ( m_findReplace )
-     {
-         // Abort any find/replace
-@@ -322,8 +316,11 @@ void KWView::clearSelection()
-         delete m_spell.kspell;
-     }
-     delete m_searchEntry;
-+    m_searchEntry = 0L;
-     delete m_replaceEntry;
--    delete m_specialCharDlg;
-+    m_replaceEntry = 0L;
-+    if ( m_specialCharDlg )
-+        m_specialCharDlg->closeDialog(); // will call slotSpecialCharDlgClosed
- }
- 
- 
-@@ -3079,7 +3076,7 @@ void KWView::slotSpecialCharDlgClosed()
-                     this, SLOT(slotSpecialChar(QChar,const QString &)));
-         disconnect( m_specialCharDlg, SIGNAL( finished() ),
-                     this, SLOT( slotSpecialCharDlgClosed() ) );
--        delete m_specialCharDlg;
-+        m_specialCharDlg->deleteLater();
-         m_specialCharDlg = 0L;
-     }
- }
diff --git a/app-office/koffice/files/koffice-1.3.1-gcc34.patch b/app-office/koffice/files/koffice-1.3.1-gcc34.patch
deleted file mode 100644
index 2236c0b079a6..000000000000
--- a/app-office/koffice/files/koffice-1.3.1-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- koffice-1.3.1/karbon/widgets/vcanvas.cc.orig	2004-04-12 11:18:46.000000000 +0200
-+++ koffice-1.3.1/karbon/widgets/vcanvas.cc	2004-05-09 19:13:47.832815696 +0200
-@@ -311,7 +311,7 @@
- 	//if( m_view->layersDocker() )
- //		m_view->layersDocker()->updatePreviews();
- 	VPainter *p = m_view->painterFactory()->painter();
--	KoRect rect( rect().x(), rect().y(), rect().width(), rect().height() );
-+	KoRect rect = KoRect::fromQRect( this->rect() );
- 	p->blit( rect );
- 
- 	// draw handle:
diff --git a/app-office/koffice/koffice-1.2.1-r1.ebuild b/app-office/koffice/koffice-1.2.1-r1.ebuild
deleted file mode 100644
index 0529fb40bd26..000000000000
--- a/app-office/koffice/koffice-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.2.1-r1.ebuild,v 1.15 2004/06/29 11:42:09 carlo Exp $
-inherit kde flag-o-matic
-
-filter-flags "-fomit-frame-pointer"
-
-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/stable/$P/src/$P.tar.bz2"
-
-KEYWORDS="x86 ppc sparc alpha"
-
-IUSE=""
-SLOT="0"
-
-DEPEND=">=dev-lang/python-2.2.1
-	>=media-libs/libart_lgpl-2.3.9
-	>=media-gfx/imagemagick-5.4.5"
-need-kde 3
-
-PATCHES="$FILESDIR/${P}-kword-crashes.diff"
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	export LIBPYTHON="${LIBPYTHON//-L \/usr\/lib\/python2.2\/config}"
-	kde_src_compile
-}
-export WANT_AUTOCONF=2.5
-export WANT_AUTOMAKE=1.5
-
diff --git a/app-office/koffice/koffice-1.3.1-r1.ebuild b/app-office/koffice/koffice-1.3.1-r1.ebuild
deleted file mode 100644
index f89114e23865..000000000000
--- a/app-office/koffice/koffice-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1-r1.ebuild,v 1.5 2004/10/05 14:04:06 pvdabeel Exp $
-
-inherit kde eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 amd64 ppc ~sparc ~alpha"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-gcc34.patch
-}
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.1.ebuild b/app-office/koffice/koffice-1.3.1.ebuild
deleted file mode 100644
index 02fe60a53889..000000000000
--- a/app-office/koffice/koffice-1.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.1.ebuild,v 1.6 2004/10/17 10:07:37 absinthe Exp $
-inherit kde
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-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/stable/${P}/src/${P}.tar.bz2"
-
-KEYWORDS="~x86 amd64 ppc ~sparc ~alpha"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.2.ebuild b/app-office/koffice/koffice-1.3.2.ebuild
deleted file mode 100644
index bccca9c2f8f9..000000000000
--- a/app-office/koffice/koffice-1.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.2.ebuild,v 1.7 2004/10/17 10:07:37 absinthe Exp $
-
-inherit kde eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha ppc64"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.3-r1.ebuild b/app-office/koffice/koffice-1.3.3-r1.ebuild
deleted file mode 100644
index 805296076237..000000000000
--- a/app-office/koffice/koffice-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.3-r1.ebuild,v 1.6 2004/10/27 16:14:05 kugelfang Exp $
-
-inherit kde eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha ~ppc64"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
-}
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	use arts || DO_NOT_COMPILE="$DO_NOT_COMPILE kpresenter"
-	export DO_NOT_COMPILE="$DO_NOT_COMPILE"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.3.ebuild b/app-office/koffice/koffice-1.3.3.ebuild
deleted file mode 100644
index df53bd85db0d..000000000000
--- a/app-office/koffice/koffice-1.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.3.ebuild,v 1.4 2004/11/02 20:37:34 eradicator Exp $
-
-inherit kde eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 amd64 ppc ~sparc ~alpha ppc64"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	use arts || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpresenter"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.4.ebuild b/app-office/koffice/koffice-1.3.4.ebuild
deleted file mode 100644
index 2c9a849412be..000000000000
--- a/app-office/koffice/koffice-1.3.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.4.ebuild,v 1.1 2004/10/26 15:19:42 carlo Exp $
-
-inherit kde eutils
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-DESCRIPTION="A free, integrated office suite for KDE, the K Desktop Environment."
-HOMEPAGE="http://www.koffice.org/"
-SRC_URI="mirror://kde/stable/${P}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~ppc64"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}
diff --git a/app-office/koffice/koffice-1.3.ebuild b/app-office/koffice/koffice-1.3.ebuild
deleted file mode 100644
index f86064f26913..000000000000
--- a/app-office/koffice/koffice-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-1.3.ebuild,v 1.11 2004/06/29 11:42:09 carlo Exp $
-
-inherit kde
-
-# TODO : mysql support
-# other refs from configure: jasper, qt-docs, doxygen, libxml2, libxslt, freetype, fontconfig, qt being built with sql support (???)
-
-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/stable/${P}/src/${P}.tar.bz2"
-
-KEYWORDS="x86 amd64 ppc sparc"
-
-IUSE=""
-SLOT="0"
-
-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"
-need-kde 3.1
-
-src_compile() {
-	export LIBPYTHON="`python-config --libs`"
-	kde_src_compile
-}