Remove old ebuilds.

Package-Manager: portage-2.0.51-r15

97 files changed, 0 insertions, 2958 deletions

diff --git a/kde-base/kde/files/digest-kde-3.2.0 b/kde-base/kde/files/digest-kde-3.2.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.2.0
+++ /dev/null
diff --git a/kde-base/kde/files/digest-kde-3.2.2 b/kde-base/kde/files/digest-kde-3.2.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.2.2
+++ /dev/null
diff --git a/kde-base/kde/files/digest-kde-3.3.0 b/kde-base/kde/files/digest-kde-3.3.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.3.0
+++ /dev/null
diff --git a/kde-base/kde/kde-3.2.0.ebuild b/kde-base/kde/kde-3.2.0.ebuild
deleted file mode 100644
index 706f7b409662..000000000000
--- a/kde-base/kde/kde-3.2.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.2.0.ebuild,v 1.14 2005/01/23 20:16:49 corsair Exp $
-
-DESCRIPTION="KDE 3.2 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc hppa sparc amd64 alpha ia64"
-IUSE=""
-
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="`echo ~kde-base/kde{libs,base,addons,admin,artwork,edu,games,graphics,multimedia,network,pim,toys,utils,accessibility}-${PV}`"
diff --git a/kde-base/kde/kde-3.2.2.ebuild b/kde-base/kde/kde-3.2.2.ebuild
deleted file mode 100644
index 11cab1f80f1f..000000000000
--- a/kde-base/kde/kde-3.2.2.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.2.2.ebuild,v 1.10 2005/01/23 20:16:49 corsair Exp $
-
-DESCRIPTION="KDE 3.2 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="3.2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE=""
-
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="`echo ~kde-base/kde{libs,base,addons,admin,artwork,edu,games,graphics,multimedia,network,pim,toys,utils,accessibility}-${PV}`"
diff --git a/kde-base/kde/kde-3.3.0.ebuild b/kde-base/kde/kde-3.3.0.ebuild
deleted file mode 100644
index d74c77224e51..000000000000
--- a/kde-base/kde/kde-3.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.3.0.ebuild,v 1.11 2005/01/23 20:16:49 corsair Exp $
-
-DESCRIPTION="KDE 3.3 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-LICENSE="GPL-2"
-SLOT="3.3"
-KEYWORDS="x86 amd64 sparc ppc ~ppc64 hppa"
-IUSE=""
-
-# removed: kdebindings, kdesdk since these are developer-only packages
-RDEPEND="~kde-base/kdelibs-${PV}
-	~kde-base/kdebase-${PV}
-	~kde-base/kdeaddons-${PV}
-	~kde-base/kdeadmin-${PV}
-	~kde-base/kdeartwork-${PV}
-	~kde-base/kdeedu-${PV}
-	~kde-base/kdegames-${PV}
-	~kde-base/kdegraphics-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdepim-${PV}
-	~kde-base/kdetoys-${PV}
-	~kde-base/kdeutils-${PV}
-	~kde-base/kdeaccessibility-${PV}
-	~kde-base/kdewebdev-${PV}"
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.0 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.0
deleted file mode 100644
index 687fc69c0ca9..000000000000
--- a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97466b78dcee2d29505937c79919713d kdeaccessibility-3.2.0.tar.bz2 1247384
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.2 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.2
deleted file mode 100644
index 6666f00e29fd..000000000000
--- a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26179a0315123a72949a5981f5d4beb3 kdeaccessibility-3.2.2.tar.bz2 1261683
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.3.0 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.3.0
deleted file mode 100644
index 3b948263b85e..000000000000
--- a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 17dc4ae94d0307a00e2b676818f49d63 kdeaccessibility-3.3.0.tar.bz2 1239242
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.2.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.2.0.ebuild
deleted file mode 100644
index 7f23d4fcd0dd..000000000000
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.2.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.2.0.ebuild,v 1.12 2005/01/14 23:17:06 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE=""
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.2.2.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.2.2.ebuild
deleted file mode 100644
index 9e885cb6b23c..000000000000
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.2.2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.2.2.ebuild,v 1.10 2005/01/14 23:17:06 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE=""
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.3.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.3.0.ebuild
deleted file mode 100644
index 6792c7cbad91..000000000000
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.3.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.3.0.ebuild,v 1.9 2005/01/14 23:17:06 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE=""
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0
deleted file mode 100644
index 26d11f055345..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e61991c52aa6b76dec0790e76eb889bd kdeaddons-3.2.0.tar.bz2 1312305
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.2 b/kde-base/kdeaddons/files/digest-kdeaddons-3.2.2
deleted file mode 100644
index 63fce45c2af4..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 294edc0b59a23ae5a9e3a3664e677b2f kdeaddons-3.2.2.tar.bz2 1351925
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0 b/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0
deleted file mode 100644
index 154cc88f4481..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ba019d8b3ce0811ae2c861d6819aaab kdeaddons-3.3.0.tar.bz2 1554404
diff --git a/kde-base/kdeaddons/files/kdeaddons-3.2.2-gcc34.patch b/kde-base/kdeaddons/files/kdeaddons-3.2.2-gcc34.patch
deleted file mode 100644
index 75ab7123e372..000000000000
--- a/kde-base/kdeaddons/files/kdeaddons-3.2.2-gcc34.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -udBbr kdeaddons-3.2.2/work/kdeaddons-3.2.2/noatun-plugins/synaescope/polygon.h kdeaddons-3.2.2-fix1/work/kdeaddons-3.2.2/noatun-plugins/synaescope/polygon.h
---- noatun-plugins/synaescope/polygon.h	2001-04-17 03:20:34.000000000 +0400
-+++ noatun-plugins/synaescope/polygon.h	2004-04-24 09:51:48.355249296 +0400
-@@ -25,6 +25,10 @@
- template<class Pixel, class Combiner, int superSampleShift>
- struct PolygonEngine : public Bitmap<Pixel>
- {
-+    using Bitmap<Pixel>::width;
-+    using Bitmap<Pixel>::height;
-+    using Bitmap<Pixel>::data;
-+
- 	PolygonEngine() : Bitmap<Pixel>(1) { }
- 
- #define super (1<<superSampleShift)
-diff -udBbr kdeaddons-3.2.2/work/kdeaddons-3.2.2/noatun-plugins/tippercanoe/polygon.h kdeaddons-3.2.2-fix1/work/kdeaddons-3.2.2/noatun-plugins/tippercanoe/polygon.h
---- noatun-plugins/tippercanoe/polygon.h	2001-04-17 02:04:03.000000000 +0400
-+++ noatun-plugins/tippercanoe/polygon.h	2004-04-24 09:58:30.243153048 +0400
-@@ -23,6 +23,10 @@
- 
- template<class Pixel, class Combiner, int superSampleShift>
- struct PolygonEngine : public Bitmap<Pixel> {
-+    using Bitmap<Pixel>::width;
-+    using Bitmap<Pixel>::height;
-+    using Bitmap<Pixel>::data;
-+
-   PolygonEngine() : Bitmap<Pixel>(1) { }
-   
- #define super (1<<superSampleShift)
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild
deleted file mode 100644
index addd6417e028..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.0.ebuild,v 1.13 2005/01/23 20:05:22 corsair Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
diff --git a/kde-base/kdeaddons/kdeaddons-3.2.2.ebuild b/kde-base/kdeaddons/kdeaddons-3.2.2.ebuild
deleted file mode 100644
index 4d95f2975f4f..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.2.2.ebuild,v 1.10 2005/01/23 20:05:22 corsair Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
-# fix needed for compiling with gcc 3.4
-PATCHES="${PATCHES} ${FILESDIR}/${P}-gcc34.patch"
diff --git a/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild b/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild
deleted file mode 100644
index 0349dc9874b8..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.3.0.ebuild,v 1.9 2005/01/23 20:05:22 corsair Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="x86 amd64 sparc ppc ~ppc64 hppa"
-IUSE="arts sdl svga xmms esd"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	arts? ( ~kde-base/arts-${PV//3.3/1.3} )
-	esd? ( media-sound/esound )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	svga? ( media-libs/svgalib )
-	xmms? ( media-sound/xmms )"
-
-use sdl && myconf="$myconf --with-sdl --with-sdl-prefix=/usr" || myconf="$myconf --without-sdl --disable-sdltest"
-
-use xmms || export ac_cv_have_xmms=no
-
-# Make vimpart use /usr/bin/kvim -- fixes bug 33257.
-# This should continue to apply to upcoming versions since it's
-# Gentoo-specific and won't go upstream.
-PATCHES="$FILESDIR/${PN}-3.2.0-kvim.diff"
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0
deleted file mode 100644
index 7f2670661215..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b24ec2e71edcd0157d84821729cae2b2 kdeadmin-3.2.0.tar.bz2 1561532
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.2.2
deleted file mode 100644
index 46207a36364c..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a39ce0d9abdd2dccb4531466ee7f229 kdeadmin-3.2.2.tar.bz2 1559783
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0 b/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0
deleted file mode 100644
index 4aa8e6873ea4..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a4480c4e3b73206252397345d2055b2 kdeadmin-3.3.0.tar.bz2 1557283
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.0.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.0.ebuild
deleted file mode 100644
index db8ca873127b..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.0.ebuild,v 1.11 2005/01/23 20:08:57 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
-	pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# we only want to compile the lilo config module on x86, but there we want to make sure it's
-# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# so, we make configure build it by removing the configure.in.in file that checks for
-# lilo's presense
-src_unpack() {
-	kde_src_unpack
-	use x86 && echo > ${S}/lilo-config/configure.in.in
-}
-
-# TODO: add nis support
diff --git a/kde-base/kdeadmin/kdeadmin-3.2.2.ebuild b/kde-base/kdeadmin/kdeadmin-3.2.2.ebuild
deleted file mode 100644
index 8e23a77ce86a..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.2.2.ebuild,v 1.9 2005/01/23 20:08:57 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
-	pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# we only want to compile the lilo config module on x86, but there we want to make sure it's
-# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# so, we make configure build it by removing the configure.in.in file that checks for
-# lilo's presense
-src_unpack() {
-	kde_src_unpack
-	use x86 && echo > ${S}/lilo-config/configure.in.in
-}
-
-# TODO: add nis support
diff --git a/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild b/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild
deleted file mode 100644
index 02471321a705..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.3.0.ebuild,v 1.9 2005/01/23 20:08:57 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE="pam"
-
-DEPEND="~kde-base/kdebase-${PV}
-	pam? ( >=sys-libs/pam-0.72 )"
-
-myconf="$myconf --without-rpm"
-DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage ksysv"
-
-# we only want to compile the lilo config module on x86, but there we want to make sure it's
-# always compiled to ensure consistent behaviour of the package across both lilo and grub systems,
-# because configure when left to its own devices will build lilo-config or not basd on whether
-# lilo is present in the path.
-# so, we make configure build it by removing the configure.in.in file that checks for
-# lilo's presense
-src_unpack() {
-	kde_src_unpack
-	use x86 && echo > ${S}/lilo-config/configure.in.in
-}
-
-# TODO: add nis support
diff --git a/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch b/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch
deleted file mode 100644
index ab76a60672b4..000000000000
--- a/kde-base/kdeartwork/files/3.3.0-kfiresaver-Makefile.am.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kscreensaver/kdesavers/Makefile.am	2004-06-22 12:13:59.000000000 -0500
-+++ kscreensaver/kdesavers/Makefile.am	2004-08-12 15:53:33.366143312 -0500
-@@ -21,9 +21,14 @@
- endif
- LIBART_KSAVERS_LDADD = $(AM_LDADD) $(LIBART_LIBS)
- 
-+if COMPILE_ARTS_KSAVERS
-+ARTS_KSAVERS = kfiresaver.kss
-+ARTS_DESKTOP_FILES = KFiresaver.desktop
-+endif
-+
- if COMPILE_GL_KSAVERS
--GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss kfiresaver.kss
--GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop KFiresaver.desktop
-+GL_KSAVERS=kfountain.kss kwave.kss kgravity.kss kflux.kss keuphoria.kss ksolarwinds.kss krotation.kss kpendulum.kss $(ARTS_KSAVERS)
-+GL_DESKTOP_FILES=KGravity.desktop KWave.desktop KFountain.desktop KFlux.desktop KEuphoria.desktop KSolarWinds.desktop KRotation.desktop KPendulum.desktop $(ARTS_DESKTOP_FILES)
- endif
- GL_KSAVERS_LDADD = $(AM_LDADD) $(GLLIB)
- 
diff --git a/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch b/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch
deleted file mode 100644
index b2f59f32fb22..000000000000
--- a/kde-base/kdeartwork/files/3.3.0-kfiresaver-configure.in.in.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kscreensaver/configure.in.in.orig	2004-08-12 16:08:58.452508808 -0500
-+++ kscreensaver/configure.in.in	2004-08-12 16:10:38.628279776 -0500
-@@ -32,6 +32,7 @@
- AC_HAVE_GL( have_gl=yes, have_gl=no )
- 
- AM_CONDITIONAL(COMPILE_GL_XSAVERS, test x$have_gl = xyes)
-+AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$have_arts = xyes)
- AM_CONDITIONAL(COMPILE_GL_KSAVERS, test x$ac_cv_kde_qt_has_opengl = xyes)
- AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
- 
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.0 b/kde-base/kdeartwork/files/digest-kdeartwork-3.2.0
deleted file mode 100644
index 3a0f42c2a583..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 882a798e09e9529f102599d24bb7daee kdeartwork-3.2.0.tar.bz2 17155976
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.2 b/kde-base/kdeartwork/files/digest-kdeartwork-3.2.2
deleted file mode 100644
index 730bbeef9847..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc2b1f2116c998387ea4ea998720934a kdeartwork-3.2.2.tar.bz2 17186661
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0 b/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0
deleted file mode 100644
index 886606e74755..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e8ea5c980a770708ab639c49a8d5e0f kdeartwork-3.3.0.tar.bz2 17811533
diff --git a/kde-base/kdeartwork/kdeartwork-3.2.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.2.0.ebuild
deleted file mode 100644
index 98a0723f1e4e..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.0.ebuild,v 1.11 2005/01/23 20:07:41 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="opengl"
-
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}"
-
-src_compile() {
-	myconf="$myconf --with-dpms `use_with opengl gl`"
-	kde_src_compile
-}
diff --git a/kde-base/kdeartwork/kdeartwork-3.2.2.ebuild b/kde-base/kdeartwork/kdeartwork-3.2.2.ebuild
deleted file mode 100644
index 18141c71b482..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.2.2.ebuild,v 1.10 2005/01/23 20:07:41 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~mips"
-IUSE="opengl"
-
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}"
-
-src_compile() {
-	myconf="$myconf --with-dpms `use_with opengl gl`"
-	kde_src_compile
-}
diff --git a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
deleted file mode 100644
index 263500fe6c5d..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.0.ebuild,v 1.12 2005/01/23 20:07:41 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="x86 amd64 sparc ppc ppc64 hppa"
-IUSE="opengl xscreensaver"
-
-DEPEND="opengl? ( virtual/opengl )
-	~kde-base/kdebase-${PV}
-	!ppc64? ( xscreensaver? ( x11-misc/xscreensaver ) )"
-
-src_unpack() {
-	kde_src_unpack
-	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
-	if ! use arts; then
-		epatch ${FILESDIR}/3.3.0-kfiresaver-configure.in.in.patch
-		epatch ${FILESDIR}/3.3.0-kfiresaver-Makefile.am.patch
-		cd ${S}
-		make -f admin/Makefile.common
-	fi
-}
-
-src_compile() {
-	myconf="$myconf --with-dpms $(use_with opengl gl)"
-	kde_src_compile
-}
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.2.0 b/kde-base/kdeedu/files/digest-kdeedu-3.2.0
deleted file mode 100644
index e5167bdc8fcf..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0a59713a19fb01dd62b13b92f222d08 kdeedu-3.2.0.tar.bz2 22292776
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.2.2 b/kde-base/kdeedu/files/digest-kdeedu-3.2.2
deleted file mode 100644
index 6bb71e49ede4..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97174178360396ea50e69097979b8319 kdeedu-3.2.2.tar.bz2 22380094
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.3.0 b/kde-base/kdeedu/files/digest-kdeedu-3.3.0
deleted file mode 100644
index 3f973c2802a9..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da972b3d4090290b6852dd50a32a2eee kdeedu-3.3.0.tar.bz2 22010608
diff --git a/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch b/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch
deleted file mode 100644
index 22e3f90b7671..000000000000
--- a/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -udBbr kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h
---- kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h	2004-04-04 11:47:53.000000000 +0400
-+++ kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h	2004-04-24 09:04:04.812573952 +0400
-@@ -155,9 +155,9 @@
- /* function to set all property switches off */
- extern void IUResetSwitches(const ISwitchVectorProperty *svp);
- 
--extern int IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
-+extern int IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
- 
--extern int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n);
-+extern int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n);
- 
- /* function to reliably save new text in a IText */
- extern void IUSaveText (IText *tp, const char *newtext);
-diff -udBbr kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c
---- kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c	2004-04-04 11:47:53.000000000 +0400
-+++ kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c	2004-04-24 09:07:50.076328656 +0400
-@@ -46,11 +46,11 @@
- static void clientMsgCB(int fd, void *arg);
- static int dispatch (XMLEle *root, char msg[]);
- static int crackDN (XMLEle *root, char **dev, char **name, char msg[]);
--static char *pstateStr(IPState s);
--static char *sstateStr(ISState s);
--static char *ruleStr(ISRule r);
--static char *permStr(IPerm p);
--static char *timestamp (void);
-+static const char *pstateStr(IPState s);
-+static const char *sstateStr(ISState s);
-+static const char *ruleStr(ISRule r);
-+static const char *permStr(IPerm p);
-+static const char *timestamp (void);
- 
- static int verbose;			/* chatty */
- char *me;				/* a.out name */
-@@ -546,7 +546,7 @@
- 
- /* Update property switches in accord with states and names. */
- int 
--IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
-+IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
- {
-  int i=0;
-  
-@@ -571,7 +571,7 @@
- }
- 
- /* Update property numbers in accord with values and names */
--int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n)
-+int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n)
- {
-   int i=0;
-   
-@@ -724,7 +724,7 @@
- 	    static char **names;
- 	    static int maxn;
- 	    char *dev, *name;
--	    XMLEle *ep;
-+	    /* XMLEle *ep; */
- 
- 	    /* pull out device and name */
- 	    if (crackDN (root, &dev, &name, msg) < 0)
-@@ -856,7 +856,7 @@
- }
- 
- /* return static string corresponding to the given property or light state */
--static char *
-+static const char *
- pstateStr (IPState s)
- {
- 	switch (s) {
-@@ -871,7 +871,7 @@
- }
- 
- /* return static string corresponding to the given switch state */
--static char *
-+static const char *
- sstateStr (ISState s)
- {
- 	switch (s) {
-@@ -884,7 +884,7 @@
- }
- 
- /* return static string corresponding to the given Rule */
--static char *
-+static const char *
- ruleStr (ISRule r)
- {
- 	switch (r) {
-@@ -898,7 +898,7 @@
- }
- 
- /* return static string corresponding to the given IPerm */
--static char *
-+static const char *
- permStr (IPerm p)
- {
- 	switch (p) {
-@@ -912,7 +912,7 @@
- }
- 
- /* return current system time in message format */
--static char *
-+static const char *
- timestamp()
- {
- 	static char ts[32];
diff --git a/kde-base/kdeedu/files/kdeedu-3.3.0-sparc.patch b/kde-base/kdeedu/files/kdeedu-3.3.0-sparc.patch
deleted file mode 100644
index 3d7c0c5c5346..000000000000
--- a/kde-base/kdeedu/files/kdeedu-3.3.0-sparc.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeedu/kstars/kstars/indi/webcam/port.cpp,v
-retrieving revision 1.3
-retrieving revision 1.3.2.1
-diff -u -p -r1.3 -r1.3.2.1
---- kdeedu/kstars/kstars/indi/webcam/port.cpp	2004/07/06 21:19:01	1.3
-+++ kdeedu/kstars/kstars/indi/webcam/port.cpp	2004/08/27 19:33:34	1.3.2.1
-@@ -38,7 +38,7 @@
- #endif /* LOCKING */
- 
- #ifdef __linux__
--  #if defined(arm) || defined(__hppa__)
-+  #if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
-   #include <fcntl.h>
-   #else
-   #include <sys/io.h>
-@@ -74,7 +74,7 @@ port_t::port_t(int iport) {
- #endif /* LOCKING */
- 
- #ifdef LINUX
--#if defined(arm) || defined(__hppa__)
-+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
-   if ((devport = open("/dev/port", O_RDWR)) < 0) {
-     perror("open /dev/port");
-     return;
-@@ -118,7 +118,7 @@ port_t::~port_t(void) {
-   unlock(port);
- #endif /* LOCKING */
- #ifdef LINUX
--#if defined(arm) || defined(__hppa__)
-+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
-   if (devport >= 0)
-     close(devport);
- #else
-Use of tainted arguments in exec is deprecated at /var/www/cgi-bin/cvsweb.cgi line 2043.
-===================================================================
-RCS file: /home2/webcvs/mirror/kdeedu/kstars/kstars/indi/webcam/port.h,v
-retrieving revision 1.3
-retrieving revision 1.3.2.1
-diff -u -p -r1.3 -r1.3.2.1
---- kdeedu/kstars/kstars/indi/webcam/port.h	2004/07/06 21:19:01	1.3
-+++ kdeedu/kstars/kstars/indi/webcam/port.h	2004/08/27 19:33:34	1.3.2.1
-@@ -35,7 +35,7 @@
- #include <unistd.h>
- 
- #ifdef __linux__
--  #if !defined(arm) && !defined(__hppa__)
-+  #if !defined(arm) && !defined(__hppa__) && !defined(__sparc__) && !defined(__ppc__) && !defined(__powerpc__)
-   #include <sys/io.h>
-   #endif /* !arm */
- #elif defined(QNX)
-@@ -55,7 +55,7 @@
- #error Please define a platform in the Makefile
- #endif
- 
--#if defined(arm) || defined(__hppa__)
-+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__)
- static char ports_temp;
- 
- #ifdef inb
-@@ -114,7 +114,7 @@ private:
- #ifdef FREEBSD
-   FILE *devio;
- #endif
--#if defined(__linux__) && (defined(arm) || defined(__hppa__))
-+#if defined(__linux__) && (defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) || defined(__powerpc__))
-   int devport;
- #endif
- };
diff --git a/kde-base/kdeedu/kdeedu-3.2.0.ebuild b/kde-base/kdeedu/kdeedu-3.2.0.ebuild
deleted file mode 100644
index f0c70171279c..000000000000
--- a/kde-base/kdeedu/kdeedu-3.2.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.0.ebuild,v 1.12 2005/01/23 19:56:36 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE=""
diff --git a/kde-base/kdeedu/kdeedu-3.2.2.ebuild b/kde-base/kdeedu/kdeedu-3.2.2.ebuild
deleted file mode 100644
index 61386cb93eb3..000000000000
--- a/kde-base/kdeedu/kdeedu-3.2.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.2.ebuild,v 1.12 2005/01/23 19:56:36 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE=""
-
-src_unpack()
-{
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-gcc34-compile.patch
-}
diff --git a/kde-base/kdeedu/kdeedu-3.3.0.ebuild b/kde-base/kdeedu/kdeedu-3.3.0.ebuild
deleted file mode 100644
index 4f205c4ab9bf..000000000000
--- a/kde-base/kdeedu/kdeedu-3.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.0.ebuild,v 1.12 2005/01/23 19:56:36 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="x86 amd64 sparc ppc ppc64 hppa"
-IUSE=""
-
-src_unpack() {
-	#kde_src_unpack
-	# Workaround problem on JFS filesystems, see bug 62510
-	bzip2 -dc ${DISTDIR}/${A} | tar xf -
-	cd ${S}
-	# Fix for SPARC compilation issues, may also work for PPC, PPC64
-	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
-	use ppc64 && epatch ${FILESDIR}/${P}-sparc.patch
-	use ppc && epatch ${FILESDIR}/${P}-sparc.patch
-}
diff --git a/kde-base/kdegames/files/digest-kdegames-3.2.0 b/kde-base/kdegames/files/digest-kdegames-3.2.0
deleted file mode 100644
index b80bf355b294..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30af752fbe3547a30963bf0df0380c24 kdegames-3.2.0.tar.bz2 9079958
diff --git a/kde-base/kdegames/files/digest-kdegames-3.2.2 b/kde-base/kdegames/files/digest-kdegames-3.2.2
deleted file mode 100644
index 5059e24751ee..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 714f8a591964c11af5bdb228cee750e6 kdegames-3.2.2.tar.bz2 9115614
diff --git a/kde-base/kdegames/files/digest-kdegames-3.3.0 b/kde-base/kdegames/files/digest-kdegames-3.3.0
deleted file mode 100644
index faca3c64e325..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bac48b11e98f7722954ec7327d36b74f kdegames-3.3.0.tar.bz2 9304259
diff --git a/kde-base/kdegames/files/ktron.patch b/kde-base/kdegames/files/ktron.patch
deleted file mode 100644
index d7c9f7fad710..000000000000
--- a/kde-base/kdegames/files/ktron.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-diff -Naur ktron/player.cpp ktron_new/player.cpp
---- ktron/player.cpp	2003-03-12 13:30:12.000000000 +0100
-+++ ktron_new/player.cpp	2004-02-04 20:02:10.019832020 +0100
-@@ -26,8 +26,8 @@
-   computer=false;
-   score=0;
-   reset();
--  dir=Up;
--  last_dir=None;
-+  dir=Directions::Up;
-+  last_dir=Directions::None;
- }
- 
- 
-diff -Naur ktron/player.h ktron_new/player.h
---- ktron/player.h	2003-03-12 13:30:12.000000000 +0100
-+++ ktron_new/player.h	2004-02-04 21:19:10.554045768 +0100
-@@ -26,7 +26,10 @@
- #include <config.h>
- #endif
- 
--enum Direction{ None, Up, Down, Left, Right};
-+namespace Directions
-+{
-+  enum Direction{ None, Up, Down, Left, Right};
-+}
- 
- /**
- * @short This class represents a player with current position and several flags
-@@ -42,8 +45,8 @@
-   int xCoordinate,yCoordinate;
-   int score;
-   bool alive;
--  Direction dir;
--  Direction last_dir;
-+  Directions::Direction dir;
-+  Directions::Direction last_dir;
-   bool accelerated;
-   bool keyPressed;
-   bool computer;
-diff -Naur ktron/tron.cpp ktron_new/tron.cpp
---- ktron/tron.cpp	2003-11-30 10:45:42.000000000 +0100
-+++ ktron_new/tron.cpp	2004-02-04 20:01:46.758365324 +0100
-@@ -212,8 +212,8 @@
- {
-    timer->stop();
-    gameEnded=true;
--   players[0].last_dir = None;
--   players[1].last_dir = None;
-+   players[0].last_dir = Directions::None;
-+   players[1].last_dir = Directions::None;
- }
- 
- void Tron::togglePause() // pause or continue game
-@@ -490,7 +490,7 @@
-   return flag;
- }
- 
--void Tron::switchDir(int playerNr,Direction newDirection)
-+void Tron::switchDir(int playerNr,Directions::Direction newDirection)
- {
-   if(playerNr!=0 && playerNr != 1)
-   {
-@@ -500,13 +500,13 @@
- 
-   if (Settings::oppositeDirCrashes()==false)
-   {
--    if (newDirection==::Up && players[playerNr].last_dir==::Down)
-+    if (newDirection==Directions::Up && players[playerNr].last_dir==Directions::Down)
-       return;
--    if (newDirection==::Down && players[playerNr].last_dir==::Up)
-+    if (newDirection==Directions::Down && players[playerNr].last_dir==Directions::Up)
-       return;
--    if (newDirection==::Left && players[playerNr].last_dir==::Right)
-+    if (newDirection==Directions::Left && players[playerNr].last_dir==Directions::Right)
-       return;
--    if (newDirection==::Right && players[playerNr].last_dir==::Left)
-+    if (newDirection==Directions::Right && players[playerNr].last_dir==Directions::Left)
-       return;
-   }
- 
-@@ -524,18 +524,18 @@
-       switch(players[0].dir)
-       {
-          // unset drawing flags in the moving direction
--         case ::Up:
-+         case Directions::Up:
-          {
-             playfield[x][y] &= (~TOP);
-             break;
-          }
--         case ::Down:
-+         case Directions::Down:
-             playfield[x][y] &= (~BOTTOM);
-             break;
--         case ::Right:
-+         case Directions::Right:
-             playfield[x][y] &= (~RIGHT);
-             break;
--         case ::Left:
-+         case Directions::Left:
-             playfield[x][y] &= (~LEFT);
-             break;
-          default:
-@@ -553,18 +553,18 @@
-       switch(players[1].dir)
-       {
-           // unset drawing flags in the moving direction
--     	  case ::Up:
-+     	  case Directions::Up:
-      	  {
-              playfield[x][y] &= (~TOP);
-              break;
-        	  }
--          case ::Down:
-+          case Directions::Down:
-              playfield[x][y] &= (~BOTTOM);
-              break;
--          case ::Right:
-+          case Directions::Right:
-              playfield[x][y] &= (~RIGHT);
-              break;
--          case ::Left:
-+          case Directions::Left:
-              playfield[x][y] &= (~LEFT);
-              break;
-          default:
-@@ -642,22 +642,22 @@
-   {
-       if(actionCollection->action("Pl2Up")->shortcut().contains(key))
- 		{
--	  		switchDir(1,::Up);
-+	  		switchDir(1,Directions::Up);
- 	  		players[1].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl2Left")->shortcut().contains(key))
- 	   {
--	  		switchDir(1,::Left);
-+	  		switchDir(1,Directions::Left);
- 	  		players[1].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl2Right")->shortcut().contains(key))
- 		{
--	  		switchDir(1,::Right);
-+	  		switchDir(1,Directions::Right);
- 	  		players[1].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl2Down")->shortcut().contains(key))
- 		{
--	  		switchDir(1,::Down);
-+	  		switchDir(1,Directions::Down);
- 	  		players[1].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl2Ac")->shortcut().contains(key))
-@@ -672,22 +672,22 @@
-   {
-       if(actionCollection->action("Pl1Left")->shortcut().contains(key))
- 		{
--	  		switchDir(0,::Left);
-+	  		switchDir(0,Directions::Left);
- 	  		players[0].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl1Right")->shortcut().contains(key))
- 		{
--	  		switchDir(0,::Right);
-+	  		switchDir(0,Directions::Right);
- 	  		players[0].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl1Up")->shortcut().contains(key))
- 		{
--	  		switchDir(0,::Up);
-+	  		switchDir(0,Directions::Up);
- 	  		players[0].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl1Down")->shortcut().contains(key))
- 		{
--	 		switchDir(0,::Down);
-+	 		switchDir(0,Directions::Down);
- 	  		players[0].keyPressed=true;
- 		}
-       else if(actionCollection->action("Pl1Ac")->shortcut().contains(key))
-@@ -837,7 +837,7 @@
-          }
-          switch(players[i].dir)
-          {
--            case ::Up:
-+            case Directions::Up:
-                if(crashed(i,0,-1))
-                   players[i].alive=false;
-                else
-@@ -846,7 +846,7 @@
-                   newType|=(TOP | LEFT | RIGHT);
-                }
-             break;
--            case ::Down:
-+            case Directions::Down:
-                if(crashed(i,0,1))
-                   players[i].alive=false;
-                else
-@@ -855,7 +855,7 @@
-                   newType |= (BOTTOM | LEFT | RIGHT);
-                }
-             break;
--            case ::Left:
-+            case Directions::Left:
-                if(crashed(i,-1,0))
-                   players[i].alive=false;
-                else
-@@ -864,7 +864,7 @@
-                   newType |= (LEFT | TOP | BOTTOM);
-                }
-             break;
--            case ::Right:
-+            case Directions::Right:
-                if(crashed(i,1,0))
-                   players[i].alive=false;
-                else
-@@ -889,16 +889,16 @@
-          int xInc=0,yInc=0;
-          switch(players[1].dir)
-          {
--            case ::Left:
-+            case Directions::Left:
-               xInc = -1;
-             break;
--            case ::Right:
-+            case Directions::Right:
-                xInc = 1;
-             break;
--            case ::Up:
-+            case Directions::Up:
-                yInc = -1;
-             break;
--            case ::Down:
-+            case Directions::Down:
-                yInc = 1;
-             break;
-             default:
-@@ -963,7 +963,7 @@
- 
-       switch(players[i].dir)
-       {
--         case ::Up:
-+         case Directions::Up:
-             if(crashed(i,0,-1))
-                players[i].alive=false;
-             else
-@@ -972,7 +972,7 @@
-                newType |= (TOP | RIGHT | LEFT);
-             }
-          break;
--         case ::Down:
-+         case Directions::Down:
-             if(crashed(i,0,1))
-                players[i].alive=false;
-             else
-@@ -981,7 +981,7 @@
-                newType |= (BOTTOM | RIGHT | LEFT);
-             }
-          break;
--         case ::Left:
-+         case Directions::Left:
-             if(crashed(i,-1,0))
-                players[i].alive=false;
-             else
-@@ -990,7 +990,7 @@
-                newType |= (LEFT | TOP | BOTTOM);
-             }
-          break;
--         case ::Right:
-+         case Directions::Right:
-             if(crashed(i,1,0))
-                players[i].alive=false;
-             else
-@@ -1013,13 +1013,13 @@
-       int xInc=0,yInc=0;
-       switch(players[1].dir)
-       {
--         case ::Left:
-+         case Directions::Left:
-             xInc = -1; break;
--         case ::Right:
-+         case Directions::Right:
-             xInc = 1; break;
--         case ::Up:
-+         case Directions::Up:
-             yInc = -1; break;
--         case ::Down:
-+         case Directions::Down:
-             yInc = 1; break;
-          default:
-             break;
-@@ -1074,7 +1074,7 @@
-   int opponent=(playerNr==1)? 0 : 1;
- 
-   // determines left and right side
--  Direction sides[2];
-+  Directions::Direction sides[2];
-   // increments for moving to the different sides
-   int flags[6]={0,0,0,0,0,0};
-   int index[2];
-@@ -1086,7 +1086,7 @@
- 
-   	switch (players[playerNr].dir)
-    	{
--  			case ::Left:
-+  			case Directions::Left:
-     			//forward flags
-     			flags[0] = -1;
-     			flags[1] = 0;
-@@ -1100,38 +1100,38 @@
-     			flags[5] = -1;
- 
-     			//turns to either side
--    			sides[0] = ::Down;
--    			sides[1] = ::Up;
-+    			sides[0] = Directions::Down;
-+    			sides[1] = Directions::Up;
-     			break;
--  			case ::Right:
-+  			case Directions::Right:
-     			flags[0] = 1;
-     			flags[1] = 0;
-     			flags[2] = 0;
- 			   flags[3] = -1;
-     			flags[4] = 0;
-     			flags[5] = 1;
--    			sides[0] = ::Up;
--    			sides[1] = ::Down;
-+    			sides[0] = Directions::Up;
-+    			sides[1] = Directions::Down;
-     			break;
--  			case ::Up:
-+  			case Directions::Up:
-     			flags[0] = 0;
-     			flags[1] = -1;
-     			flags[2] = -1;
-     			flags[3] = 0;
-     			flags[4] = 1;
-     			flags[5] = 0;
--    			sides[0] = ::Left;
--    			sides[1] = ::Right;
-+    			sides[0] = Directions::Left;
-+    			sides[1] = Directions::Right;
-     			break;
--  			case ::Down:
-+  			case Directions::Down:
-     			flags[0] = 0;
-     			flags[1] = 1;
-     			flags[2] = 1;
-     			flags[3] = 0;
-     			flags[4] = -1;
-     			flags[5] = 0;
--    			sides[0] = ::Right;
--    			sides[1] = ::Left;
-+    			sides[0] = Directions::Right;
-+    			sides[1] = Directions::Left;
-     			break;
- 			default:
- 			break;
-@@ -1187,52 +1187,52 @@
- 
-   	switch(players[playerNr].dir)
-   	{
--  	   case ::Up:
-+  	   case Directions::Up:
-   	      opForwardDis=vert_dis;
-   	      opSideDis=-hor_dis;
--  	      if(players[opponent].dir==::Down)
-+  	      if(players[opponent].dir==Directions::Down)
-   	         opMovesOppositeDir=true;
--  	      else if(players[opponent].dir==::Up)
-+  	      else if(players[opponent].dir==Directions::Up)
-   	         opMovesSameDir=true;
--  	      else if(players[opponent].dir==::Left)
-+  	      else if(players[opponent].dir==Directions::Left)
-   	         opMovesLeft=true;
--  	      else if(players[opponent].dir==::Right)
-+  	      else if(players[opponent].dir==Directions::Right)
-   	         opMovesRight=true;
-   	      break;
--  	   case ::Down:
-+  	   case Directions::Down:
-   	      opForwardDis=-vert_dis;
-   	      opSideDis=hor_dis;
--  	      if(players[opponent].dir==::Up)
-+  	      if(players[opponent].dir==Directions::Up)
-   	         opMovesOppositeDir=true;
--  	      else if(players[opponent].dir==::Down)
-+  	      else if(players[opponent].dir==Directions::Down)
-   	         opMovesSameDir=true;
--  	      else if(players[opponent].dir==::Left)
-+  	      else if(players[opponent].dir==Directions::Left)
-   	         opMovesRight=true;
--  	      else if(players[opponent].dir==::Right)
-+  	      else if(players[opponent].dir==Directions::Right)
-   	         opMovesLeft=true;
-   	      break;
--  	   case ::Left:
-+  	   case Directions::Left:
-   	      opForwardDis=hor_dis;
-   	      opSideDis=vert_dis;
--  	      if(players[opponent].dir==::Right)
-+  	      if(players[opponent].dir==Directions::Right)
-   	         opMovesOppositeDir=true;
--  	      else if(players[opponent].dir==::Left)
-+  	      else if(players[opponent].dir==Directions::Left)
-   	         opMovesSameDir=true;
--  	      else if(players[opponent].dir==::Down)
-+  	      else if(players[opponent].dir==Directions::Down)
-   	         opMovesLeft=true;
--  	      else if(players[opponent].dir==::Up)
-+  	      else if(players[opponent].dir==Directions::Up)
-   	         opMovesRight=true;
-   	      break;
--  	   case ::Right:
-+  	   case Directions::Right:
-   	      opForwardDis=-hor_dis;
-   	      opSideDis=-vert_dis;
--  	      if(players[opponent].dir==::Left)
-+  	      if(players[opponent].dir==Directions::Left)
-   	         opMovesOppositeDir=true;
--  	      else if(players[opponent].dir==::Right)
-+  	      else if(players[opponent].dir==Directions::Right)
-   	         opMovesSameDir=true;
--  	      else if(players[opponent].dir==::Up)
-+  	      else if(players[opponent].dir==Directions::Up)
-   	         opMovesLeft=true;
--  	      else if(players[opponent].dir==::Down)
-+  	      else if(players[opponent].dir==Directions::Down)
-   	         opMovesRight=true;
-   	      break;
-   	    default:
-@@ -1475,7 +1475,7 @@
- // xtron-1.1 by Rhett D. Jacobs <rhett@hotel.canberra.edu.au>
- else // Settings::skill() == Settings::EnumSkill::Easy
- {
--  Direction sides[2];
-+  Directions::Direction sides[2];
-   int flags[6] = {0,0,0,0,0,0};
-   int index[2];
-   int dis_forward,  dis_left, dis_right;
-@@ -1483,7 +1483,7 @@
-   dis_forward = dis_left = dis_right = 1;
- 
-   switch (players[playerNr].dir) {
--  case ::Left:
-+  case Directions::Left:
- 
-     //forward flags
-     flags[0] = -1;
-@@ -1498,38 +1498,38 @@
-     flags[5] = -1;
- 
-     //turns to either side
--    sides[0] = ::Down;
--    sides[1] = ::Up;
-+    sides[0] = Directions::Down;
-+    sides[1] = Directions::Up;
-     break;
--  case ::Right:
-+  case Directions::Right:
-     flags[0] = 1;
-     flags[1] = 0;
-     flags[2] = 0;
-     flags[3] = -1;
-     flags[4] = 0;
-     flags[5] = 1;
--    sides[0] = ::Up;
--    sides[1] = ::Down;
-+    sides[0] = Directions::Up;
-+    sides[1] = Directions::Down;
-     break;
--  case ::Up:
-+  case Directions::Up:
-     flags[0] = 0;
-     flags[1] = -1;
-     flags[2] = -1;
-     flags[3] = 0;
-     flags[4] = 1;
-     flags[5] = 0;
--    sides[0] = ::Left;
--    sides[1] = ::Right;
-+    sides[0] = Directions::Left;
-+    sides[1] = Directions::Right;
-     break;
--  case ::Down:
-+  case Directions::Down:
-     flags[0] = 0;
-     flags[1] = 1;
-     flags[2] = 1;
-     flags[3] = 0;
-     flags[4] = -1;
-     flags[5] = 0;
--    sides[0] = ::Right;
--    sides[1] = ::Left;
-+    sides[0] = Directions::Right;
-+    sides[1] = Directions::Left;
-     break;
-   default:
-     break;
-@@ -1600,26 +1600,26 @@
- 
- void Tron::changeDirection(int playerNr,int dis_right,int dis_left)
- {
--   Direction currentDir=players[playerNr].dir;
--   Direction sides[2];
-+   Directions::Direction currentDir=players[playerNr].dir;
-+   Directions::Direction sides[2];
-    switch (currentDir)
-    {
--  		case ::Left:
-+  		case Directions::Left:
-     		//turns to either side
--    		sides[0] = ::Down;
--    		sides[1] = ::Up;
-+    		sides[0] = Directions::Down;
-+    		sides[1] = Directions::Up;
-     		break;
--  		case ::Right:
--    		sides[0] = ::Up;
--    		sides[1] = ::Down;
-+  		case Directions::Right:
-+    		sides[0] = Directions::Up;
-+    		sides[1] = Directions::Down;
-     		break;
--  		case ::Up:
--    		sides[0] = ::Left;
--    		sides[1] = ::Right;
-+  		case Directions::Up:
-+    		sides[0] = Directions::Left;
-+    		sides[1] = Directions::Right;
-     		break;
--  		case ::Down:
--    		sides[0] = ::Right;
--    		sides[1] = ::Left;
-+  		case Directions::Down:
-+    		sides[0] = Directions::Right;
-+    		sides[1] = Directions::Left;
-     		break;
- 		default:
- 		break;
-diff -Naur ktron/tron.h ktron_new/tron.h
---- ktron/tron.h	2003-10-26 11:51:47.000000000 +0100
-+++ ktron_new/tron.h	2004-02-04 19:59:00.491504299 +0100
-@@ -151,7 +151,7 @@
-   void changeDirection(int playerNr,int dis_right,int dis_left);
- 
-   /** sets the direction of player playerNr to newDirection */
--  void switchDir(int playerNr,Direction newDirection);
-+  void switchDir(int playerNr,Directions::Direction newDirection);
-   /**
-   * updates the the rect at current position to not draw a
-   * border in the direction of the next step.
diff --git a/kde-base/kdegames/files/libksirtet.patch b/kde-base/kdegames/files/libksirtet.patch
deleted file mode 100644
index b4964dc9e927..000000000000
--- a/kde-base/kdegames/files/libksirtet.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -Naur libksirtet/lib/meeting.cpp libksirtet_new/lib/meeting.cpp
---- libksirtet/lib/meeting.cpp	2003-07-21 09:40:28.000000000 +0200
-+++ libksirtet_new/lib/meeting.cpp	2004-02-04 23:04:56.433145441 +0100
-@@ -148,18 +148,18 @@
- void NetMeeting::readData(uint i)
- {
- 	// get message type
--	MeetingMsgFlag mt;
-+	MeetingMsgFlags::MeetingMsgFlag mt;
- 	sm[i]->readingStream() >> mt;
- 	CHECK_READ(i);
- 	switch (mt) {
--	 case End:      endFlag(i);     break;
--	 case New:      newFlag(i);     break;
--	 case Mod_Text: modTextFlag(i); break;
--	 case Mod_Type: modTypeFlag(i); break;
--	 case Id:       idFlag(i);      break;
--	 case Del:      delFlag(i);     break;
--	 case Mod_Opt:  modOptFlag(i);  break;
--	 case Play:     playFlag(i);    break;
-+	 case MeetingMsgFlags::End:      endFlag(i);     break;
-+	 case MeetingMsgFlags::New:      newFlag(i);     break;
-+	 case MeetingMsgFlags::Mod_Text: modTextFlag(i); break;
-+	 case MeetingMsgFlags::Mod_Type: modTypeFlag(i); break;
-+	 case MeetingMsgFlags::Id:       idFlag(i);      break;
-+	 case MeetingMsgFlags::Del:      delFlag(i);     break;
-+	 case MeetingMsgFlags::Mod_Opt:  modOptFlag(i);  break;
-+	 case MeetingMsgFlags::Play:     playFlag(i);    break;
- 	 default:       dataError(i);
- 	}
- 
-@@ -194,7 +194,7 @@
- void NetMeeting::reject()
- {
- 	// send an End flag
--	sm.commonWritingStream() << End;
-+	sm.commonWritingStream() << MeetingMsgFlags::End;
- 	writeToAll();
- 
- 	cleanReject();
-@@ -252,7 +252,7 @@
- 		removeLine(i-1);
- 
- 		// Send a Del message to all (other) clients
--		sm.commonWritingStream() << Del << i;
-+		sm.commonWritingStream() << MeetingMsgFlags::Del << i;
- 		writeToAll();
- 	}
- 	players.remove(players.at(i));
-@@ -291,7 +291,7 @@
- 
- 	// send result to client
- 	Stream &s = sm[i]->writingStream();
--	s << Id << id;
-+	s << MeetingMsgFlags::Id << id;
- 	WRITE(i);
- 
- 	// if not accepted : remove socket and player from list
-@@ -322,18 +322,18 @@
- 	// send to the new client already present lines including its own
- 	// (New flag + MeetingLineData struct)
- 	spl->data(pld.ed);
--	sm[i]->writingStream() << New << pld.ed;
-+	sm[i]->writingStream() << MeetingMsgFlags::New << pld.ed;
- 	for(uint k=1; k<sm.size(); k++) {
- 		wl->widget(k-1)->data(pld.ed);
- 		pld.own = ( k==i );
--		sm[i]->writingStream() << New << pld;
-+		sm[i]->writingStream() << MeetingMsgFlags::New << pld;
- 	}
- 	WRITE(i);
- 
- 	// send to all other clients the new line (New flag + MeetingLineData struct)
- 	wl->widget(i-1)->data(pld.ed);
- 	pld.own = FALSE;
--	sm.commonWritingStream() << New << pld;
-+	sm.commonWritingStream() << MeetingMsgFlags::New << pld;
- 	writeToAll(i);
- }
- 
-@@ -349,7 +349,7 @@
- 	setText(ti);
- 
- 	// send it to all other clients (Mod_Text flag + TextInfo struct)
--	sm.commonWritingStream() << Mod_Text << ti;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << ti;
- 	writeToAll(i);
- }
- 
-@@ -365,7 +365,7 @@
- 	setType(ti);
- 
- 	// send it to all other clients (Mod_Type flag + TypeInfo struct)
--	sm.commonWritingStream() << Mod_Type << ti;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << ti;
- 	writeToAll(i);
- }
- 
-@@ -373,7 +373,7 @@
- {
- 	// server line text changed : send to every clients (Mod_Text flag + TextInfo struct)
- 	TextInfo ti; ti.i = 0; ti.text = text;
--	sm.commonWritingStream() << Mod_Text << ti;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << ti;
- 	writeToAll();
- }
- 
-@@ -390,7 +390,7 @@
- 	ty.i++;
- 
- 	// TCB change : send to every clients (Mod_Type flag + TypeInfo struct)
--	sm.commonWritingStream() << Mod_Type << ty;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << ty;
- 	writeToAll();
- 	if (server) enableButtonOK(ready());
- }
-@@ -421,7 +421,7 @@
- 
- 			// send play message to client (Play flag
- 			// + bool [accepted/rejected])
--			sm[0]->writingStream() << Play << (Q_UINT8)willPlay;
-+			sm[0]->writingStream() << MeetingMsgFlags::Play << (Q_UINT8)willPlay;
- 			// if write failed and the client is not playing : silently
- 			// put it aside ...
- 			if ( !sm[0]->write() && willPlay ) {
-@@ -440,7 +440,7 @@
- 
- void ServerNetMeeting::optionsChanged()
- {
--	sm.commonWritingStream() << Mod_Opt;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Opt;
- 	ow->dataOut( sm.commonWritingStream() );
- 	writeToAll();
- }
-@@ -456,7 +456,7 @@
- 	players.append(NewPlayer); // server player
- 
- 	// Send id to server (Id flag + Id struct)
--	sm.commonWritingStream() << Id << id;
-+	sm.commonWritingStream() << MeetingMsgFlags::Id << id;
- 	writeToAll(); // what happens if there is a message box appearing before exec() call ??
- }
- 
-@@ -484,7 +484,7 @@
- 	if ( !serverId.accepted() ) cleanReject(serverId.errorMessage(id));
- 	else {
- 		// send client info (New flag + GameData struct)
--		sm.commonWritingStream() << New << bds;
-+		sm.commonWritingStream() << MeetingMsgFlags::New << bds;
- 		writeToAll();
- 	}
- }
-@@ -535,14 +535,14 @@
- void ClientNetMeeting::textChanged(const QString &text)
- {
- 	// text changed : send to server (Mod_Text flag + QString)
--	sm.commonWritingStream() << Mod_Text << text;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Text << text;
- 	writeToAll();
- }
- 
- void ClientNetMeeting::typeChanged(MeetingCheckBox::Type type)
- {
- 	// type changed : send to server (Mod_Type flag + TCB)
--	sm.commonWritingStream() << Mod_Type << type;
-+	sm.commonWritingStream() << MeetingMsgFlags::Mod_Type << type;
- 	writeToAll();
- }
- 
-diff -Naur libksirtet/lib/types.cpp libksirtet_new/lib/types.cpp
---- libksirtet/lib/types.cpp	2002-07-15 12:01:48.000000000 +0200
-+++ libksirtet_new/lib/types.cpp	2004-02-04 23:04:56.428146251 +0100
-@@ -50,16 +50,16 @@
- }
- 
- //-----------------------------------------------------------------------------
--QDataStream &operator << (QDataStream &s, const MeetingMsgFlag &f)
-+QDataStream &operator << (QDataStream &s, const MeetingMsgFlags::MeetingMsgFlag &f)
- {
- 	s << (Q_UINT8)f;
- 	return s;
- }
- 
--QDataStream &operator >> (QDataStream &s, MeetingMsgFlag &f)
-+QDataStream &operator >> (QDataStream &s, MeetingMsgFlags::MeetingMsgFlag &f)
- {
- 	Q_UINT8 i;
--	s >> i; f = (MeetingMsgFlag)i;
-+	s >> i; f = (MeetingMsgFlags::MeetingMsgFlag)i;
- 	return s;
- }
- 
-diff -Naur libksirtet/lib/types.h libksirtet_new/lib/types.h
---- libksirtet/lib/types.h	2001-09-01 13:52:21.000000000 +0200
-+++ libksirtet_new/lib/types.h	2004-02-04 23:04:56.430145927 +0100
-@@ -31,10 +31,13 @@
- QDataStream &operator >> (QDataStream &s, cId &id);
- 
- /** Flags used for the netmeeting. */
-+namespace MeetingMsgFlags
-+{
- enum MeetingMsgFlag
-     { Id = 0, End, New, Del, Mod_Text, Mod_Type, Mod_Opt, Play };
--QDataStream &operator << (QDataStream &s, const MeetingMsgFlag &f);
--QDataStream &operator >> (QDataStream &s, MeetingMsgFlag &f);
-+}
-+QDataStream &operator << (QDataStream &s, const MeetingMsgFlags::MeetingMsgFlag &f);
-+QDataStream &operator >> (QDataStream &s, MeetingMsgFlags::MeetingMsgFlag &f);
- 
- /** Internal class : used in netmeeting to transport text line. */
- class TextInfo
diff --git a/kde-base/kdegames/kdegames-3.2.0.ebuild b/kde-base/kdegames/kdegames-3.2.0.ebuild
deleted file mode 100644
index e66812b98d8b..000000000000
--- a/kde-base/kdegames/kdegames-3.2.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.0.ebuild,v 1.14 2005/01/23 19:55:21 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE=""
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/ktron.patch
-	epatch ${FILESDIR}/libksirtet.patch
-}
diff --git a/kde-base/kdegames/kdegames-3.2.2.ebuild b/kde-base/kdegames/kdegames-3.2.2.ebuild
deleted file mode 100644
index 8a8d3fcd32b9..000000000000
--- a/kde-base/kdegames/kdegames-3.2.2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.2.2.ebuild,v 1.10 2005/01/23 19:55:21 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE=""
diff --git a/kde-base/kdegames/kdegames-3.3.0.ebuild b/kde-base/kdegames/kdegames-3.3.0.ebuild
deleted file mode 100644
index cc4769dc37fb..000000000000
--- a/kde-base/kdegames/kdegames-3.3.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.3.0.ebuild,v 1.9 2005/01/23 19:55:21 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE=""
diff --git a/kde-base/kdemultimedia/files/3.3.0-Makefile-synth.am.diff b/kde-base/kdemultimedia/files/3.3.0-Makefile-synth.am.diff
deleted file mode 100644
index 2ded8a858f29..000000000000
--- a/kde-base/kdemultimedia/files/3.3.0-Makefile-synth.am.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- arts/modules/synth/Makefile.am	2003/08/26 08:43:25	1.8
-+++ arts/modules/synth/Makefile.am	2004/08/18 05:52:18	1.9
-@@ -25,6 +25,7 @@ libartsmodulessynth_la_SOURCES = artsmod
- 	synth_capture_wav_impl.cc \
- 	synth_midi_test_impl.cc synth_sequence_impl.cc synth_sequence_freq_impl.cc \
- 	synth_midi_debug_impl.cc objectcache_impl.cc synth_nil_impl.cc synth_debug_impl.cc synth_data_impl.cc
-+libartsmodulessynth_la_COMPILE_FIRST = artsmodulessynth.h
- 
- libartsmodulessynth_la_LIBADD = \
- 	$(top_builddir)/arts/runtime/libartsbuilder.la \
diff --git a/kde-base/kdemultimedia/files/3.3.0-Makefile.am.diff b/kde-base/kdemultimedia/files/3.3.0-Makefile.am.diff
deleted file mode 100644
index d140feefc7db..000000000000
--- a/kde-base/kdemultimedia/files/3.3.0-Makefile.am.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- arts/modules/common/Makefile.am	2003/08/26 08:43:25	1.7
-+++ arts/modules/common/Makefile.am	2004/08/18 05:54:54	1.7.4.1
-@@ -19,6 +19,7 @@ libartsmodulescommon_la_SOURCES = artsmo
- 	env_context_impl.cc env_effectrackitem_impl.cc \
- 	env_instrumentitem_impl.cc env_item_impl.cc \
- 	env_mixeritem_impl.cc
-+libartsmodulescommon_la_COMPILE_FIRST = artsmodulescommon.h
- 
- libartsmodulescommon_la_LIBADD = \
- 	$(top_builddir)/arts/gui/common/libartsgui_idl.la \
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0
deleted file mode 100644
index 4114182bb522..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 caa8578190d032acd3c8fa996cf9585a kdemultimedia-3.2.0.tar.bz2 4893608
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1
deleted file mode 100644
index 3e9ad457e1ea..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 062249563cbf66d77e61b41e5126f806 kdemultimedia-3.2.2.tar.bz2 4911246
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0
deleted file mode 100644
index 31a96a96ac22..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2579f41004b39168da25cb4db0043f00 kdemultimedia-3.3.0.tar.bz2 5356679
diff --git a/kde-base/kdemultimedia/files/flac-patch.diff b/kde-base/kdemultimedia/files/flac-patch.diff
deleted file mode 100644
index b3cbe3435a82..000000000000
--- a/kde-base/kdemultimedia/files/flac-patch.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- kfile-plugins/flac/configure.in.in	2003/10/16 10:52:00	1.1
-+++ kfile-plugins/flac/configure.in.in	2004/01/21 21:27:36	1.3
-@@ -6,7 +6,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
-   kde_has_flac_lib=no
-   AC_CHECK_HEADER(FLAC/metadata.h,
-   [ 
--     kde_has_flac_lib=yes
-+     AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
-+	          kde_has_flac_lib=yes)
-+		
-     ])
-   if test "x$kde_has_flac_lib" = "xyes"; then
-       LIBFLAC="-lFLAC"
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
deleted file mode 100644
index 650e3c2e8e5f..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.0.ebuild,v 1.19 2005/02/08 15:04:11 greg_g Exp $
-
-inherit kde-dist flag-o-matic eutils
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="nas encode esd motif slang tcltk oggvorbis gtk alsa gstreamer"
-
-DEPEND="~kde-base/kdebase-${PV}
-	sys-libs/ncurses
-	media-sound/cdparanoia
-	media-sound/mpg123
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	nas? ( media-libs/nas )
-	esd? ( media-sound/esound )
-	motif? ( x11-libs/openmotif )
-	slang? ( sys-libs/slang )
-	tcltk? ( dev-lang/tk dev-lang/tcl )
-	>=dev-libs/glib-2.2.1
-	>=media-libs/xine-lib-1_beta12
-	gtk? ( =x11-libs/gtk+-1.2* )
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
-	media-libs/id3lib media-libs/musicbrainz media-libs/taglib"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/flac-patch.diff
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-
-	myaudio="--enable-audio=oss"
-	myinterface="--enable-interface=xaw,ncurses"
-	myconf="$myconf --enable-xaw --enable-ncurses"
-	myconf="$myconf --with-xine-prefix=/usr"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" && myaudio="$myaudio,alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use nas		&& myaudio="$myaudio,nas --with-nas-library=/usr/X11R6/lib/libaudio.so --with-nas-includes=/usr/X11R6/include" || myconf="$myconf --disable-nas"
-	use esd		&& myaudio="$myaudio,esd"			|| myconf="$myconf --disable-esd"
-	use motif	&& myinterface="$myinterface,motif" && myconf="$myconf --enable-motif"
-	use slang	&& myinterface="$myinterface,slang" && myconf="$myconf --enable-slang"
-	use tcltk	&& myinterface="$myinterface,tcltk" && myconf="$myconf --enable-tcltk"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-
-	myconf="$myconf $myaudio $myinterface --with-cdda --disable-strict --disable-warnings"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild
deleted file mode 100644
index b007126d870e..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.2.2-r1.ebuild,v 1.11 2005/02/08 15:04:11 greg_g Exp $
-
-inherit kde-dist flag-o-matic
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="flac encode oggvorbis alsa gstreamer"
-
-DEPEND="~kde-base/kdebase-${PV}
-	media-sound/cdparanoia
-	flac? ( media-libs/flac )
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	>=media-libs/xine-lib-1_beta12
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( media-libs/gstreamer )
-	media-libs/musicbrainz
-	media-libs/taglib"
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	# Still persists with 3.2.1 - kaboodle
-	filter-flags "-fno-default-inline"
-
-	myconf="$myconf --with-xine-prefix=/usr"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
-
-	myconf="$myconf --disable-strict --disable-warnings"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
deleted file mode 100644
index f2aef7dd5942..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.0.ebuild,v 1.15 2005/02/08 15:04:11 greg_g Exp $
-
-inherit kde-dist flag-o-matic eutils
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-
-KEYWORDS="x86 amd64 sparc ppc ~ppc64 hppa"
-IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
-
-DEPEND="~kde-base/kdebase-${PV}
-	audiofile? ( media-libs/audiofile )
-	cdparanoia? ( media-sound/cdparanoia )
-	flac? ( media-libs/flac )
-	encode? ( media-sound/lame )
-	oggvorbis? ( media-sound/vorbis-tools )
-	xine? ( >=media-libs/xine-lib-1_beta12 )
-	alsa? ( media-libs/alsa-lib )
-	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
-	>=media-libs/taglib-1.2
-	media-libs/tunepimp"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/3.3.0-Makefile.am.diff
-	epatch ${FILESDIR}/3.3.0-Makefile-synth.am.diff
-	cd ${S} && make -f admin/Makefile.common
-}
-
-src_compile() {
-	replace-flags -O3 -O2
-	# Still persists with 3.2.1 - kaboodle
-	filter-flags "-fno-default-inline"
-
-	use xine && myconf="$myconf --with-xine-prefix=/usr"
-	use xine || DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
-
-	myconf="${myconf} `use_with cdparanoia`"
-
-	# make -j2 fails, at least on ppc
-	use ppc && export MAKEOPTS="$MAKEOPTS -j1"
-	use hppa && append-flags -ffunction-sections
-
-	# alsa 0.9 not supported
-	use alsa	&& myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
-	use oggvorbis	&& myconf="$myconf --with-vorbis=/usr"		|| myconf="$myconf --without-vorbis"
-	use encode	&& myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
-
-	myconf="$myconf --disable-strict --disable-warnings"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdenetwork/files/3.3.0-kget.diff b/kde-base/kdenetwork/files/3.3.0-kget.diff
deleted file mode 100644
index d72334ae598e..000000000000
--- a/kde-base/kdenetwork/files/3.3.0-kget.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- kdenetwork-3.3.0.old/kget/kmainwidget.cpp	2004-05-23 03:50:10.000000000 +0300
-+++ kdenetwork-3.3.0/kget/kmainwidget.cpp	2004-08-20 04:26:27.000000000 +0300
-@@ -130,6 +130,7 @@
- 
-     myTransferList = 0L;
-     kmain = this;
-+    kdock = NULL;
- 
-     // Set log time, needed for the name of log file
-     QDate date = QDateTime::currentDateTime().date();
-@@ -2056,12 +2057,14 @@
-     statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE);
-     statusBar()->changeItem(i18n(" Time: %1 ").arg(remTime.toString()), ID_TOTAL_TIME);
-     statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED);
--
--    tmpstr = i18n(" Transfers: %1 ").arg(myTransferList->childCount()) +
--    i18n(" Files: %1 ").arg(totalFiles)+
--    i18n(" Size: %1 ").arg(KIO::convertSize(totalSize))+
--    i18n(" Time: %1 %2/s").arg(remTime.toString()).arg(KIO::convertSize(totalSpeed));
--    kdock->updateToolTip( tmpstr );
-+    
-+    if (kdock) {
-+	tmpstr = i18n(" Transfers: %1 ").arg(myTransferList->childCount()) +
-+	i18n(" Files: %1 ").arg(totalFiles)+
-+	i18n(" Size: %1 ").arg(KIO::convertSize(totalSize))+
-+	i18n(" Time: %1 %2/s").arg(remTime.toString()).arg(KIO::convertSize(totalSpeed));
-+	kdock->updateToolTip( tmpstr );
-+    }
- 
- #ifdef _DEBUG
-     //sDebugOut << endl;
diff --git a/kde-base/kdenetwork/files/3.3.0-kopete.diff b/kde-base/kdenetwork/files/3.3.0-kopete.diff
deleted file mode 100644
index abc364830cb2..000000000000
--- a/kde-base/kdenetwork/files/3.3.0-kopete.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdenetwork-3.3.0/kopete/protocols/oscar/oscarsocket/rtf.cc	2004-07-17 21:10:33.000000000 +0200
-+++ rtf.cc	2004-08-23 12:17:00.405431600 +0200
-@@ -1790,7 +1790,7 @@
-         case TAG_FONT_COLOR:
-             {
-                // RTF colors are 1-based; colors[] is a 0-based array.
--               if (t.param > colors.size())
-+               if (t.param > colors.size() || t.param == 0)
-                    break;
-                QColor &c = colors[t.param-1];
-                PrintUnquoted("<span style=\"color:#%02X%02X%02X\">", c.red(), c.green(), c.blue());
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.2.0 b/kde-base/kdenetwork/files/digest-kdenetwork-3.2.0
deleted file mode 100644
index f2d25ec47b7a..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80d5a03ac950a7fac10bacbb122db11f kdenetwork-3.2.0.tar.bz2 6113134
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.2.2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.2.2
deleted file mode 100644
index 2dfd3fa6e7a0..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 405ade1938cd74e3e9643f25814ee81d kdenetwork-3.2.2.tar.bz2 6157487
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0 b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0
deleted file mode 100644
index eef87cc45ff8..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae7d989594ec2a7c073478e4535c284b kdenetwork-3.3.0.tar.bz2 6971120
diff --git a/kde-base/kdenetwork/files/linuxwirelesswidget.cpp.diff b/kde-base/kdenetwork/files/linuxwirelesswidget.cpp.diff
deleted file mode 100644
index fcb5dd044c69..000000000000
--- a/kde-base/kdenetwork/files/linuxwirelesswidget.cpp.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- wifi/kwireless/linuxwirelesswidget.cpp	2003/05/07 07:59:05	1.5
-+++ wifi/kwireless/linuxwirelesswidget.cpp	2004/01/30 15:12:57	1.5.2.1
-@@ -12,6 +12,7 @@
- #include <kdebug.h>
- #include <klocale.h>
- #include "linuxwirelesswidget.h"
-+#include "config.h"
- 
- extern "C" {
- #include <iwlib.h>
-@@ -124,7 +125,11 @@ void LinuxWireLessWidget::poll()
-             }
- 
-             // get the device statistics:
--            if(iw_get_stats(socketFD, device_c_str, &(info.stats)) >= 0)
-+#if HAVE_IW_27 
-+	    if(iw_get_stats(socketFD, device_c_str, &(info.stats), &(info.range), info.has_range)>= 0)
-+#else
-+	    if(iw_get_stats(socketFD, device_c_str, &(info.stats)) >= 0)
-+#endif
- 	    {
-                 info.has_stats = 1;
-                 bool isAbs; // true if values are relative tp a peak value,
diff --git a/kde-base/kdenetwork/kdenetwork-3.2.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.2.0.ebuild
deleted file mode 100644
index 0b91d0311c37..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.0.ebuild,v 1.14 2005/02/08 15:00:21 greg_g Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="slp samba"
-
-DEPEND="~kde-base/kdebase-${PV}
-	slp? ( net-libs/openslp )
-	samba? ( net-fs/samba )"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/linuxwirelesswidget.cpp.diff
-}
-
-src_compile() {
-	myconf="$myconf `use_enable slp`"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-	chmod +x ${D}/etc/init.d/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.2.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.2.2.ebuild
deleted file mode 100644
index 1aeefe450280..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.2.ebuild,v 1.11 2005/02/08 15:00:21 greg_g Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="slp samba wifi"
-
-DEPEND="~kde-base/kdebase-${PV}
-	slp? ( net-libs/openslp )
-	samba? ( net-fs/samba )"
-#	wifi? ( net-wireless/wireless-tools )"
-#
-# Need to add this dep above but only when other arches
-# support wireless-tools
-
-src_unpack() {
-	kde_src_unpack
-}
-
-src_compile() {
-	myconf="$myconf `use_enable slp`"
-	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-	chmod +x ${D}/etc/init.d/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild
deleted file mode 100644
index ce00981eff17..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild,v 1.14 2005/02/08 14:19:24 greg_g Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget..."
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE="slp samba wifi ssl"
-
-DEPEND="~kde-base/kdebase-${PV}
-	slp? ( net-libs/openslp )
-	samba? ( net-fs/samba )
-	ssl? ( app-crypt/qca-tls )
-	wifi? ( net-wireless/wireless-tools )"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/3.3.0-kget.diff
-	epatch ${FILESDIR}/3.3.0-kopete.diff
-}
-
-src_compile() {
-	myconf="$myconf `use_enable slp`"
-	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	dodir /etc/init.d
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
-	chmod +x ${D}/etc/init.d/*
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff b/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
deleted file mode 100644
index 893a2ff82acd..000000000000
--- a/kde-base/kdepim/files/KMail-inboxEater-BRANCH.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- kmail/kmfolderimap.cpp    14 Jan 2004 23:05:04 -0000      1.163
-+++ kmail/kmfolderimap.cpp    4 Feb 2004 08:53:56 -0000
-@@ -1207,7 +1207,16 @@ void KMFolderImap::deleteMessage(KMMessa
- {
-   KURL url = mAccount->getUrl();
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msg->parent());
--  url.setPath(msg_parent->imapPath() + ";UID=" + msg->headerField("X-UID"));
-+  QString uid = msg->headerField("X-UID");
-+  /* If the uid is empty the delete job below will nuke all mail in the
-+     folder, so we better safeguard against that. See ::expungeFolder, as
-+     to why. :( */
-+  if ( uid.isEmpty() ) {
-+     kdDebug( 5006 ) << "KMFolderImap::deleteMessage: Attempt to delete "
-+                        "an empty UID. Aborting."  << endl;
-+     return;
-+  }
-+  url.setPath(msg_parent->imapPath() + ";UID=" + uid );
-   if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-     return;
-   KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
-@@ -1228,7 +1237,11 @@ void KMFolderImap::deleteMessage(QPtrLis
-   KMFolderImap *msg_parent = static_cast<KMFolderImap*>(msgList.first()->parent());
-   for ( QStringList::Iterator it = sets.begin(); it != sets.end(); ++it )
-   {
--    url.setPath(msg_parent->imapPath() + ";UID=" + *it);
-+    QString uid = *it;
-+    // Don't delete with no uid, that nukes the folder. Should not happen, but
-+    // better safe than sorry.
-+    if ( uid.isEmpty() ) continue;
-+    url.setPath(msg_parent->imapPath() + ";UID=" + uid);
-     if ( mAccount->makeConnection() != ImapAccountBase::Connected )
-       return;
-     KIO::SimpleJob *job = KIO::file_delete(url, FALSE);
diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0-r2 b/kde-base/kdepim/files/digest-kdepim-3.2.0-r2
deleted file mode 100644
index 7f0b3ccf1635..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.2.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960
diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.2 b/kde-base/kdepim/files/digest-kdepim-3.2.2
deleted file mode 100644
index 90b1cb4baaee..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10249b56cbc4c67dc4093b9f968604b9 kdepim-3.2.2.tar.bz2 7721918
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0 b/kde-base/kdepim/files/digest-kdepim-3.3.0
deleted file mode 100644
index 55b963d55eeb..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94520aeae0db2fac5da7d1ece7b575a5 kdepim-3.3.0.tar.bz2 9951726
diff --git a/kde-base/kdepim/files/digest-kdepim-3.3.0-r1 b/kde-base/kdepim/files/digest-kdepim-3.3.0-r1
deleted file mode 100644
index 55b963d55eeb..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94520aeae0db2fac5da7d1ece7b575a5 kdepim-3.3.0.tar.bz2 9951726
diff --git a/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch b/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
deleted file mode 100644
index fa7df50f8d84..000000000000
--- a/kde-base/kdepim/files/kdepim-3.3.0-korganizer.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- korganizer/plugins/holidays/holidays.cpp.orig	2004-09-09 14:13:05.321243736 -0500
-+++ korganizer/plugins/holidays/holidays.cpp	2004-09-09 14:13:31.521260728 -0500
-@@ -91,7 +91,7 @@
-   //static int lastYear = 0;
-   int lastYear = 0;
- 
--  if (mHolidayFile.isEmpty()) return QString::null;
-+  if (mHolidayFile.isEmpty() || qd.isNull()) return QString::null;
- 
-   //if ((lastYear == 0) || (qd.year() != lastYear)) {
-   if ((yearLast == 0) || (qd.year() != yearLast)) {
diff --git a/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch b/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch
deleted file mode 100644
index 790b8da1b2bd..000000000000
--- a/kde-base/kdepim/files/kdepim-3.3.0-spam-assistant.patch
+++ /dev/null
@@ -1,791 +0,0 @@
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/antispamwizard.cpp ./kmail/antispamwizard.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/antispamwizard.cpp	2004-08-05 21:26:52.000000000 +0200
-+++ ./kmail/antispamwizard.cpp	2004-09-11 14:27:58.745702928 +0200
-@@ -141,6 +141,7 @@
-                     << mVirusRulesPage->selectedFolderName() << endl;
- 
-   KMFilterActionDict dict;
-+  QPtrList<KMFilter> filterList;
- 
-   // Let's start with virus detection and handling,
-   // so we can avoid spam checks for viral messages
-@@ -168,7 +169,7 @@
-         pipeFilter->setStopProcessingHere( FALSE );
-         pipeFilter->setConfigureShortcut( FALSE );
- 
--        KMKernel::self()->filterMgr()->appendFilter( pipeFilter );
-+        filterList.append( pipeFilter );
-       }
-     }
- 
-@@ -213,7 +214,7 @@
-       virusFilter->setStopProcessingHere( TRUE );
-       virusFilter->setConfigureShortcut( FALSE );
- 
--      KMKernel::self()->filterMgr()->appendFilter( virusFilter );
-+      filterList.append( virusFilter );
-     }
-   }
-   else { // AntiSpam mode
-@@ -240,7 +241,7 @@
-         pipeFilter->setStopProcessingHere( FALSE );
-         pipeFilter->setConfigureShortcut( FALSE );
- 
--        KMKernel::self()->filterMgr()->appendFilter( pipeFilter );
-+        filterList.append( pipeFilter );
-       }
-     }
- 
-@@ -288,7 +289,7 @@
-       spamFilter->setStopProcessingHere( TRUE );
-       spamFilter->setConfigureShortcut( FALSE );
- 
--      KMKernel::self()->filterMgr()->appendFilter( spamFilter );
-+      filterList.append( spamFilter );
-     }
- 
-     if ( mSpamRulesPage->classifyRulesSelected() )
-@@ -323,7 +324,8 @@
-       classSpamFilter->setApplyOnExplicit( FALSE );
-       classSpamFilter->setStopProcessingHere( TRUE );
-       classSpamFilter->setConfigureShortcut( TRUE );
--      KMKernel::self()->filterMgr()->appendFilter( classSpamFilter );
-+      classSpamFilter->setConfigureToolbar( TRUE );
-+      filterList.append( classSpamFilter );
- 
-       // Classify messages manually as not Spam / as Ham
-       KMFilter* classHamFilter = new KMFilter();
-@@ -350,92 +352,15 @@
-       classHamFilter->setApplyOnExplicit( FALSE );
-       classHamFilter->setStopProcessingHere( TRUE );
-       classHamFilter->setConfigureShortcut( TRUE );
--      KMKernel::self()->filterMgr()->appendFilter( classHamFilter );
-+      classHamFilter->setConfigureToolbar( TRUE );
-+      filterList.append( classHamFilter );
- 
--      // add the classification filter actions to the toolbar
--      QString filterNameSpam =
--          QString( "Filter %1" ).arg( classSpamFilterPattern->name() );
--      filterNameSpam = filterNameSpam.replace( " ", "_" );
--      QString filterNameHam =
--          QString( "Filter %1" ).arg( classHamFilterPattern->name() );
--      filterNameHam = filterNameHam.replace( " ", "_" );
--
--      // FIXME post KDE 3.2
--      // The following code manipulates the kmmainwin.rc file directly. Usuallay
--      // one would expect to let the toolbar write back it's change from above
--      // i.e. the new structure including the two added actions.
--      // In KDE 3.2 there is no API for that so I only fund the way to read in
--      // the XML file myself, to change it and write it out then.
--      // As soon as an API is available, the following part can certainly get
--      // replaced by one or two statements.
--      // (a.gungl@gmx.de)
--
--      // make the toolbar changes persistent - let's be very conservative here
--      QString config =
--          KXMLGUIFactory::readConfigFile( "kmmainwin.rc", KMKernel::self()->xmlGuiInstance() );
--#ifndef NDEBUG
--      kdDebug(5006) << "Read kmmainwin.rc contents (last 1000 chars printed):" << endl;
--      kdDebug(5006) << config.right( 1000 ) << endl;
--      kdDebug(5006) << "#####################################################" << endl;
--#endif
--      QDomDocument domDoc;
--      domDoc.setContent( config );
--      QDomNodeList domNodeList = domDoc.elementsByTagName( "ToolBar" );
--      if ( domNodeList.count() > 0 )
--        kdDebug(5006) << "ToolBar section found." << endl;
--      else
--        kdDebug(5006) << "No ToolBar section found." << endl;
--      for ( unsigned int i = 0; i < domNodeList.count(); i++ )
--      {
--        QDomNode domNode = domNodeList.item( i );
--        QDomNamedNodeMap nodeMap = domNode.attributes();
--        kdDebug(5006) << "name=" << nodeMap.namedItem( "name" ).nodeValue() << endl;
--        if ( nodeMap.namedItem( "name" ).nodeValue() == "mainToolBar" )
--        {
--          kdDebug(5006) << "mainToolBar section found." << endl;
--          bool spamActionFound = false;
--          bool hamActionFound = false;
--          QDomNodeList domNodeChildList = domNode.childNodes();
--          for ( unsigned int j = 0; j < domNodeChildList.count(); j++ )
--          {
--            QDomNode innerDomNode = domNodeChildList.item( j );
--            QDomNamedNodeMap innerNodeMap = innerDomNode.attributes();
--            if ( innerNodeMap.namedItem( "name" ).nodeValue() == filterNameSpam )
--              spamActionFound = true;
--            if ( innerNodeMap.namedItem( "name" ).nodeValue() == filterNameHam )
--              hamActionFound = true;
--          }
--
--          // append the new actions if not yet existing
--          if ( !spamActionFound )
--          {
--            QDomElement domElemSpam = domDoc.createElement( "Action" );
--            domElemSpam.setAttribute( "name", filterNameSpam );
--            domNode.appendChild( domElemSpam );
--            kdDebug(5006) << "Spam action added to toolbar." << endl;
--          }
--          if ( !hamActionFound )
--          {
--            QDomElement domElemHam = domDoc.createElement( "Action" );
--            domElemHam.setAttribute( "name", filterNameHam );
--            domNode.appendChild( domElemHam );
--            kdDebug(5006) << "Ham action added to toolbar." << endl;
--          }
--          if ( !spamActionFound || !hamActionFound )
--          {
--#ifndef NDEBUG
--            kdDebug(5006) << "New kmmainwin.rc structur (last 1000 chars printed):" << endl;
--            kdDebug(5006) << domDoc.toString().right( 1000 ) << endl;
--            kdDebug(5006) << "####################################################" << endl;
--#endif
--            // write back the modified resource file
--            KXMLGUIFactory::saveConfigFile( domDoc, "kmmainwin.rc",
--                KMKernel::self()->xmlGuiInstance() );
--          }
--        }
--        else
--          kdDebug(5006) << "No mainToolBar section found." << endl;
--      }
-+      /* Now that all the filters have been added to the list, tell
-+       * the filter manager about it. That will emit filterListUpdate
-+       * which will result in the filter list in kmmainwidget being 
-+       * initialized. This should happend only once. */
-+      KMKernel::self()->filterMgr()->appendFilters( filterList );
-+      
-     }
-   }
- 
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.cpp ./kmail/kmail_part.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.cpp	2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmail_part.cpp	2004-09-11 14:27:58.746702776 +0200
-@@ -49,6 +49,7 @@
- #include <dcopclient.h>
- #include <kiconloader.h>
- #include <kdebug.h>
-+#include <libkdepim/part.h>
- 
- #include <qlayout.h>
- 
-@@ -58,7 +59,7 @@
- 
- KMailPart::KMailPart(QWidget *parentWidget, const char *widgetName,
- 		     QObject *parent, const char *name, const QStringList &) :
--  DCOPObject("KMailIface"), KParts::ReadOnlyPart(parent, name),
-+  DCOPObject("KMailIface"), KPIM::Part(parent, name),
-   mParentWidget( parentWidget )
- {
-   kdDebug(5006) << "KMailPart()" << endl;
-@@ -94,6 +95,8 @@
-   kmsetSignalHandler(kmsignalHandler);
-   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
- 
-+  connect( kmailKernel, SIGNAL( showMailCalled() ), SIGNAL( raise() ) );
-+
-   // create a canvas to insert our widget
-   QWidget *canvas = new QWidget(parentWidget, widgetName);
-   canvas->setFocusPolicy(QWidget::ClickFocus);
-@@ -118,7 +121,8 @@
-   setXMLFile( "kmmainwin.rc" );
-   kmkernel->inboxFolder()->close();
- #else
--  mainWidget = new KMMainWidget( canvas, "mainWidget", actionCollection(), kapp->config());
-+  mainWidget = new KMMainWidget( canvas, "mainWidget", this, actionCollection(), 
-+                                 kapp->config());
-   QVBoxLayout *topLayout = new QVBoxLayout(canvas);
-   topLayout->addWidget(mainWidget);
-   mainWidget->setFocusPolicy(QWidget::ClickFocus);
-@@ -237,6 +241,7 @@
-   return mParentWidget;
- }
- 
-+
- KMailBrowserExtension::KMailBrowserExtension(KMailPart *parent) :
-   KParts::BrowserExtension(parent, "KMailBrowserExtension")
- {
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.h ./kmail/kmail_part.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmail_part.h	2004-06-25 10:57:47.000000000 +0200
-+++ ./kmail/kmail_part.h	2004-09-11 14:27:58.747702624 +0200
-@@ -33,6 +33,7 @@
- #include <kparts/factory.h>
- #include <kparts/event.h>
- #include <qwidget.h>
-+#include <libkdepim/part.h>
- 
- class KInstance;
- class KAboutData;
-@@ -47,7 +48,7 @@
- 
- class ActionManager;
- 
--class KMailPart: public KParts::ReadOnlyPart, virtual public KMailPartIface
-+class KMailPart: public KPIM::Part, virtual public KMailPartIface
- {
-     Q_OBJECT
-   public:
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.cpp ./kmail/kmfilter.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.cpp	2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfilter.cpp	2004-09-11 14:27:58.748702472 +0200
-@@ -180,6 +180,8 @@
- 
-     bStopProcessingHere = config->readBoolEntry("StopProcessingHere", true);
-     bConfigureShortcut = config->readBoolEntry("ConfigureShortcut", false);
-+    bConfigureToolbar = config->readBoolEntry("ConfigureToolbar", false);
-+    bConfigureToolbar = bConfigureToolbar && bConfigureShortcut;
-     mIcon = config->readEntry( "Icon", "gear" );
- 
-     int i, numActions;
-@@ -251,6 +253,7 @@
- 
-     config->writeEntry( "StopProcessingHere", bStopProcessingHere );
-     config->writeEntry( "ConfigureShortcut", bConfigureShortcut );
-+    config->writeEntry( "ConfigureToolbar", bConfigureToolbar );
-     config->writeEntry( "Icon", mIcon );
- 
-     QString key;
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.h ./kmail/kmfilter.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfilter.h	2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfilter.h	2004-09-11 14:27:58.749702320 +0200
-@@ -154,10 +154,42 @@
-   void setStopProcessingHere( bool aStop ) { bStopProcessingHere = aStop; }
-   bool stopProcessingHere() const { return bStopProcessingHere; }
- 
--  void setConfigureShortcut( bool aShort ) { bConfigureShortcut = aShort; }
-+  /** Set whether this filter should be plugged into the filter menu.
-+  */
-+  void setConfigureShortcut( bool aShort ) { 
-+    bConfigureShortcut = aShort; 
-+    bConfigureToolbar = bConfigureToolbar && bConfigureShortcut; 
-+  }
-+  
-+  /** @return TRUE if this filter should be plugged into the filter menu, 
-+      FALSE otherwise.
-+      @see setConfigureShortcut
-+  */
-   bool configureShortcut() const { return bConfigureShortcut; }
- 
-+  /** Set whether this filter should be plugged into the toolbar.
-+      This can be done only if a shortcut is defined.
-+      @see setConfigureShortcut
-+  */
-+  void setConfigureToolbar( bool aTool ) { 
-+    bConfigureToolbar = aTool && bConfigureShortcut; 
-+  }
-+  
-+  /** @return TRUE if this filter should be plugged into the toolbar, 
-+      FALSE otherwise.
-+      @see setConfigureToolbar
-+  */
-+  bool configureToolbar() const { return bConfigureToolbar; }
-+
-+  /** Set the icon to be used if plugged into the filter menu 
-+      or toolbar. Default is the gear icon.
-+      @see setConfigureShortcut setConfigureToolbar
-+  */
-   void setIcon( QString icon ) { mIcon = icon; }
-+  
-+  /** @return The name of the icon to be used. 
-+      @see setIcon
-+  */
-   QString icon() const { return mIcon; }
- 
-   /**
-@@ -191,6 +223,7 @@
-   bool bApplyOnExplicit : 1;
-   bool bStopProcessingHere : 1;
-   bool bConfigureShortcut : 1;
-+  bool bConfigureToolbar : 1;
- };
- 
- #endif /*kmfilter_h*/
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.cpp ./kmail/kmfiltermgr.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.cpp	2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfiltermgr.cpp	2004-09-11 14:27:58.750702168 +0200
-@@ -321,6 +321,15 @@
-   endUpdate();
- }
- 
-+void KMFilterMgr::appendFilters( const QPtrList <KMFilter> filters )
-+{
-+  beginUpdate();
-+  QPtrListIterator<KMFilter> it(filters);
-+  for ( it.toFirst(); it.current() ; ++it )
-+  	append( *it );
-+  writeConfig( TRUE );
-+  endUpdate();
-+}
- 
- //-----------------------------------------------------------------------------
- bool KMFilterMgr::folderRemoved(KMFolder* aFolder, KMFolder* aNewFolder)
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.h ./kmail/kmfiltermgr.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmfiltermgr.h	2004-05-22 22:58:05.000000000 +0200
-+++ ./kmail/kmfiltermgr.h	2004-09-11 14:27:58.751702016 +0200
-@@ -48,6 +48,8 @@
-       write everything back into the configuration.*/
-   void appendFilter( KMFilter* filter );
- 
-+  void appendFilters( const QPtrList <KMFilter> );
-+
-   /** Process given message by applying the filter rules one by
-       one. You can select which set of filters (incoming or outgoing)
-       should be used.
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.cpp ./kmail/kmmainwidget.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.cpp	2004-08-09 11:27:48.000000000 +0200
-+++ ./kmail/kmmainwidget.cpp	2004-09-11 14:27:58.754701560 +0200
-@@ -101,8 +101,9 @@
- static KStaticDeleter<QPtrList<KMMainWidget> > mwlsd;
- 
- //-----------------------------------------------------------------------------
--KMMainWidget::KMMainWidget(QWidget *parent, const char *name,
--			   KActionCollection *actionCollection, KConfig* config ) :
-+KMMainWidget::KMMainWidget(QWidget *parent, const char *name, 
-+                           KXMLGUIClient *aGUIClient,
-+                           KActionCollection *actionCollection, KConfig* config ) :
-     QWidget(parent, name),
-     mQuickSearchLine( 0 )
- {
-@@ -120,10 +121,15 @@
-   mDestructed = false;
-   mActionCollection = actionCollection;
-   mTopLayout = new QVBoxLayout(this);
--  mFilterActions.setAutoDelete(true);
-+  mFilterMenuActions.setAutoDelete(true);
-+  mFilterTBarActions.setAutoDelete(false);
-   mFilterCommands.setAutoDelete(true);
-   mJob = 0;
-   mConfig = config;
-+  mGUIClient = aGUIClient;
-+  // FIXME This should become a line separator as soon as the API
-+  // is extended in kdelibs.
-+  mToolbarActionSeparator = new KActionSeparator( actionCollection );
- 
-   if( !s_mainWidgetList )
-     mwlsd.setObject( s_mainWidgetList, new QPtrList<KMMainWidget>() );
-@@ -2086,12 +2092,11 @@
- 
-     menu->insertSeparator();
- 
--    // these two only make sense if there is a reader window.
--    // I guess. Not sure about view source ;). Till
-+    // this one only make sense if there is a reader window.
-     if (mMsgView) {
-       toggleFixFontAction()->plug(menu);
--      viewSourceAction()->plug(menu);
-     }
-+    viewSourceAction()->plug(menu);
- 
-     menu->insertSeparator();
-     mPrintAction->plug( menu );
-@@ -2715,6 +2720,9 @@
- 		     SLOT(slotCollapseAllThreads()),
- 		     actionCollection(), "collapse_all_threads" );
- 
-+  mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
-+                                   SLOT(slotShowMsgSrc()), actionCollection(),
-+                                   "view_source" );
- 
-   //----- Go Menu
-   new KAction( KGuiItem( i18n("&Next Message"), QString::null,
-@@ -2881,6 +2889,19 @@
-   mHeaders->slotExpandOrCollapseAllThreads( false ); // collapse
- }
- 
-+//-----------------------------------------------------------------------------
-+void KMMainWidget::slotShowMsgSrc()
-+{
-+  KMMessage *msg = mHeaders->currentMsg();
-+  if ( !msg )
-+    return;
-+  KMCommand *command = new KMShowMsgSrcCommand( this, msg,
-+                                                mMsgView
-+                                                ? mMsgView->isFixedFont()
-+                                                : false );
-+  command->start();
-+}
-+
- 
- //-----------------------------------------------------------------------------
- void KMMainWidget::moveSelectedToFolder( int menuId )
-@@ -3007,9 +3028,7 @@
-     replyListAction()->setEnabled( single_actions );
-     redirectAction()->setEnabled( single_actions );
-     printAction()->setEnabled( single_actions );
--    if (mMsgView) {
--      viewSourceAction()->setEnabled( single_actions );
--    }
-+    viewSourceAction()->setEnabled( single_actions );
- 
-     mSendAgainAction->setEnabled( single_actions &&
-              ( mHeaders->currentMsg() && mHeaders->currentMsg()->isSent() )
-@@ -3137,6 +3156,9 @@
-   connect( kmkernel->filterMgr(), SIGNAL( filterListUpdated() ),
- 	   this, SLOT( initializeFilterActions() ));
- 
-+  // plug shortcut filter actions now
-+  initializeFilterActions();
-+  
-   QString newFeaturesMD5 = KMReaderWin::newFeaturesMD5();
-   if ( kmkernel->firstStart() ||
-        GlobalSettings::previousNewFeaturesMD5() != newFeaturesMD5 ) {
-@@ -3153,7 +3175,7 @@
-   if ( !startup )
-     startup = kmkernel->inboxFolder();
- 
--  if ( mFolderTree ) 
-+  if ( mFolderTree )
-   {
-     mFolderTree->reload();
-     mFolderTree->showFolder( startup );
-@@ -3175,6 +3197,7 @@
- //-----------------------------------------------------------------------------
- void KMMainWidget::slotChangeCaption(QListViewItem * i)
- {
-+  if ( !i ) return;
-   // set the caption to the current full path
-   QStringList names;
-   for ( QListViewItem * item = i ; item ; item = item->parent() )
-@@ -3256,12 +3279,22 @@
- {
-   QString filterName, normalizedName;
-   KMMetaFilterActionCommand *filterCommand;
--  KAction *filterAction;
--  mApplyFilterActionsMenu->popupMenu()->clear();
--  mFilterActions.clear();
-+  KAction *filterAction = 0;
-+  
-+  if ( !mFilterTBarActions.isEmpty() ) {
-+    if ( mGUIClient->factory() )
-+      mGUIClient->unplugActionList( "toolbar_filter_actions" );
-+    mFilterTBarActions.clear();
-+  }
-+  if ( !mFilterMenuActions.isEmpty() ) {
-+    mApplyFilterActionsMenu->popupMenu()->clear();
-+    if ( mGUIClient->factory() )
-+      mGUIClient->unplugActionList( "menu_filter_actions" );
-+    mFilterMenuActions.clear();
-+  }
-   mFilterCommands.clear();
-   for ( QPtrListIterator<KMFilter> it(*kmkernel->filterMgr()) ;
--        it.current() ; ++it )
-+        it.current() ; ++it ) {
-     if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
-       filterName = QString("Filter %1").arg((*it)->name());
-       normalizedName = filterName.replace(" ", "_");
-@@ -3276,26 +3309,26 @@
-       filterAction = new KAction(as, icon, 0, filterCommand,
-                                  SLOT(start()), actionCollection(),
-                                  normalizedName.local8Bit());
--      mFilterActions.append(filterAction);
-+      filterAction->plug( mApplyFilterActionsMenu->popupMenu() );
-+      mFilterMenuActions.append(filterAction);
-+      // FIXME
-+      // uncomment the next if statement after the filter dialog supports
-+      // separate activation of filters for the toolbar - currently 
-+      // we better use the coupled way
-+      // if ( (*it)->configureToolbar() )
-+        mFilterTBarActions.append(filterAction);
-     }
--
--  plugFilterActions(mApplyFilterActionsMenu->popupMenu());
-+  }
-+  if ( !mFilterMenuActions.isEmpty() && mGUIClient->factory() )
-+    mGUIClient->plugActionList( "menu_filter_actions", mFilterMenuActions );
-+  if ( !mFilterTBarActions.isEmpty() && mGUIClient->factory() ) {
-+    mFilterTBarActions.prepend( mToolbarActionSeparator );
-+    mGUIClient->plugActionList( "toolbar_filter_actions", mFilterTBarActions );
-+  }
- }
- 
- 
- //-----------------------------------------------------------------------------
--void KMMainWidget::plugFilterActions(QPopupMenu *menu)
--{
--  for (QPtrListIterator<KMFilter> it(*kmkernel->filterMgr()); it.current(); ++it)
--      if (!(*it)->isEmpty() && (*it)->configureShortcut()) {
--	  QString filterName = QString("Filter %1").arg((*it)->name());
--	  filterName = filterName.replace(" ","_");
--	  KAction *filterAction = action(filterName.local8Bit());
--	  if (filterAction && menu)
--	      filterAction->plug(menu);
--      }
--}
--
- void KMMainWidget::slotSubscriptionDialog()
- {
-   if (!mFolder) return;
-@@ -3355,7 +3388,6 @@
-   AntiSpamWizard wiz( AntiSpamWizard::AntiSpam,
-                       this, folderTree(), actionCollection() );
-   wiz.exec();
--  emit modifiedToolBarConfig();
- }
- 
- //-----------------------------------------------------------------------------
-@@ -3364,7 +3396,6 @@
-   AntiSpamWizard wiz( AntiSpamWizard::AntiVirus,
-                       this, folderTree(), actionCollection() );
-   wiz.exec();
--  //emit modifiedToolBarConfig();
- }
- 
- //-----------------------------------------------------------------------------
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.h ./kmail/kmmainwidget.h
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwidget.h	2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmmainwidget.h	2004-09-11 14:27:58.756701256 +0200
-@@ -9,6 +9,7 @@
- #define __KMMAINWIDGET
- 
- #include <kurl.h>
-+#include <kxmlguiclient.h>
- #include <qlistview.h>
- #include <qvbox.h>
- 
-@@ -67,7 +68,8 @@
- 
- public:
-   KMMainWidget(QWidget *parent, const char *name,
--	       KActionCollection *actionCollection,
-+               KXMLGUIClient *aGUIClient,
-+               KActionCollection *actionCollection,
-          KConfig*config = KMKernel::config() );
-   virtual ~KMMainWidget();
-   void destruct();
-@@ -116,6 +118,7 @@
-   KAction *findInMessageAction() const { return mFindInMessageAction; }
-   KAction *saveAttachmentsAction() const { return mSaveAttachmentsAction; }
-   KAction *openAction() const { return mOpenAction; }
-+  KAction *viewSourceAction() { return mViewSourceAction; }
- 
-   KActionMenu *statusMenu()  const{ return mStatusMenu; }
-   KActionMenu *threadStatusMenu() const { return mThreadStatusMenu; }
-@@ -128,7 +131,6 @@
- 
-   // Forwarded to the reader window.
-   KToggleAction *toggleFixFontAction() { return mMsgView->toggleFixFontAction(); }
--  KAction *viewSourceAction() { return mMsgView->viewSourceAction(); }
- 
-   KMHeaders *headers() const { return mHeaders; }
-   void toggleSystemTray();
-@@ -186,7 +188,6 @@
- signals:
-   void messagesTransfered( bool );
-   void captionChangeRequest( const QString & caption );
--  void modifiedToolBarConfig( void );
- 
- protected:
-   void setupActions();
-@@ -257,6 +258,7 @@
-   void slotExpandAllThreads();
-   void slotCollapseThread();
-   void slotCollapseAllThreads();
-+  void slotShowMsgSrc();
-   void slotSetMsgStatusNew();
-   void slotSetMsgStatusUnread();
-   void slotSetMsgStatusRead();
-@@ -348,8 +350,6 @@
-   void removeDuplicates();
-   /** Create actions for marked filters */
-   void initializeFilterActions();
--  /** Plug filter actions into a popup menu */
--  void plugFilterActions(QPopupMenu*);
- 
-   /** Slot to reply to a message */
-   void slotReplyToMsg();
-@@ -373,7 +373,7 @@
-   // Message actions
-   KAction *mTrashAction, *mDeleteAction, *mSaveAsAction, *mEditAction,
-     *mSendAgainAction, *mApplyFiltersAction, *mFindInMessageAction,
--    *mSaveAttachmentsAction, *mOpenAction;
-+    *mSaveAttachmentsAction, *mOpenAction, *mViewSourceAction;
-   // Composition actions
-   KAction *mPrintAction, *mReplyAction, *mReplyAllAction, *mReplyAuthorAction,
-       *mReplyListAction,
-@@ -460,15 +460,18 @@
- 
-   QGuardedPtr<KMail::Vacation> mVacation;
-   KActionCollection *mActionCollection;
-+  KActionSeparator  *mToolbarActionSeparator;
-   QVBoxLayout *mTopLayout;
-   bool mDestructed, mForceJumpToUnread;
--  QPtrList<KAction> mFilterActions;
-+  QPtrList<KAction> mFilterMenuActions;
-+  QPtrList<KAction> mFilterTBarActions;
-   QPtrList<KMMetaFilterActionCommand> mFilterCommands;
-   QGuardedPtr <KMail::FolderJob> mJob;
- 
-   KMSystemTray  *mSystemTray;
-   KConfig *mConfig;
--
-+  KXMLGUIClient *mGUIClient;
-+  
-   static QPtrList<KMMainWidget>* s_mainWidgetList;
- };
- 
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.cpp ./kmail/kmmainwin.cpp
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.cpp	2004-08-05 21:26:53.000000000 +0200
-+++ ./kmail/kmmainwin.cpp	2004-09-11 14:27:58.757701104 +0200
-@@ -27,7 +27,7 @@
-       mReallyClose( false )
- {
-   kapp->ref();
--  mKMMainWidget = new KMMainWidget( this, "KMMainWidget", actionCollection() );
-+  mKMMainWidget = new KMMainWidget( this, "KMMainWidget", this, actionCollection() );
-   mKMMainWidget->resize( 450, 600 );
-   setCentralWidget(mKMMainWidget);
-   setupStatusBar();
-@@ -44,8 +44,9 @@
- 
-   KStdAction::quit( this, SLOT(slotQuit()), actionCollection());
-   createGUI( "kmmainwin.rc", false );
-+  // Don't use conserveMemory() because this renders dynamic plugging
-+  // of actions unusable!
- 
--  conserveMemory();
-   applyMainWindowSettings(KMKernel::config(), "Main Window");
- 
-   connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ),
-diff -uNr /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.rc ./kmail/kmmainwin.rc
---- /home/fiam/kdepim-3.3.0.orig/kmail/kmmainwin.rc	2004-07-17 21:16:37.000000000 +0200
-+++ ./kmail/kmmainwin.rc	2004-09-11 14:27:58.758700952 +0200
-@@ -1,5 +1,5 @@
- <!DOCTYPE kpartgui>
--<kpartgui version="77" name="kmmainwin" >
-+<kpartgui version="78" name="kmmainwin" >
-  <MenuBar>
-   <Menu noMerge="1" name="file" >
-    <text>&amp;File</text>
-@@ -110,7 +110,11 @@
-    <Action name="thread_ignored" />
-    <Separator/>
-    <Action name="apply_filters" />
--   <Action name="apply_filter_actions" />
-+   <Separator/>
-+   <Menu name="apply_filter_actions" >
-+     <text>A&amp;pply Filter</text>
-+     <ActionList name="menu_filter_actions" />
-+   </Menu>
-   </Menu>
-   <Menu noMerge="1" name="tools">
-    <text>&amp;Tools</text>
-@@ -163,5 +167,6 @@
-   <Action name="move_to_trash" />
-   <Separator/>
-   <Action name="search_messages" />
-+  <ActionList name="toolbar_filter_actions" />
-  </ToolBar>
- </kpartgui>
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/Makefile.am ./libkdepim/Makefile.am
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/Makefile.am	2004-08-05 21:27:05.000000000 +0200
-+++ ./libkdepim/Makefile.am	2004-09-11 14:28:18.001775560 +0200
-@@ -24,7 +24,7 @@
-   overlaywidget.cpp progressmanager.cpp progressdialog.cpp \
-   statusbarprogresswidget.cpp ssllabel.cpp completionordereditor.cpp \
-   resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp \
--  htmldiffalgodisplay.cpp broadcaststatus.cpp
-+  htmldiffalgodisplay.cpp broadcaststatus.cpp part.cpp
- 
- noinst_HEADERS = categoryselectdialog.h categoryeditdialog.h ktimeedit.h 
- $(srcdir)/categoryselectdialog.h: categoryselectdialog_base.h
-@@ -36,7 +36,7 @@
- AddressBookServiceIface_DIR = $(srcdir)/interfaces
- 
- libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
--libkdepim_la_LIBADD  = $(LIB_KIO) $(LIB_KABC) \
-+libkdepim_la_LIBADD  = $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) \
-   $(top_builddir)/libkcal/libkcal.la $(LIB_KDEUI) 
- #               $top_builddir)/libkdepim/resources/libkpimresources.la
- 
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/part.cpp ./libkdepim/part.cpp
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/part.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ ./libkdepim/part.cpp	2004-09-11 14:27:58.791695936 +0200
-@@ -0,0 +1,35 @@
-+/*
-+    This file is part of libkdepim.
-+
-+    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public License
-+    along with this library; see the file COPYING.LIB.  If not, write to
-+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+    Boston, MA 02111-1307, USA.
-+*/
-+
-+#include "part.h"
-+
-+using namespace KPIM;
-+
-+Part::Part( QObject *parent, const char *name )
-+  : KParts::ReadOnlyPart( parent, name )
-+{
-+}
-+
-+Part::~Part()
-+{
-+}
-+
-+#include "part.moc"
-diff -uNr /home/fiam/kdepim-3.3.0.orig/libkdepim/part.h ./libkdepim/part.h
---- /home/fiam/kdepim-3.3.0.orig/libkdepim/part.h	1970-01-01 01:00:00.000000000 +0100
-+++ ./libkdepim/part.h	2004-09-11 14:27:58.798694872 +0200
-@@ -0,0 +1,51 @@
-+/*
-+    This file is part of libkdepim.
-+
-+    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public License
-+    along with this library; see the file COPYING.LIB.  If not, write to
-+    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+    Boston, MA 02111-1307, USA.
-+*/
-+
-+#ifndef KPIM_PART_H
-+#define KPIM_PART_H
-+
-+#include <kparts/part.h>
-+
-+namespace KPIM {
-+
-+/**
-+  This special part should be used as base class for all applications
-+  which shall be integrated in Kontact.
-+ */
-+class Part : public KParts::ReadOnlyPart
-+{
-+  Q_OBJECT
-+
-+  public:
-+    Part( QObject *parent, const char *name );
-+    virtual ~Part();
-+
-+  signals:
-+    /**
-+      Emit this signal whenever the plugin with this part shall be
-+      raised inside Kontact.
-+     */
-+    void raise();
-+};
-+
-+}
-+
-+#endif
diff --git a/kde-base/kdepim/files/kmfilter.cpp.patch b/kde-base/kdepim/files/kmfilter.cpp.patch
deleted file mode 100644
index 8206264ecd2a..000000000000
--- a/kde-base/kdepim/files/kmfilter.cpp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: kmfilter.cpp
-===================================================================
-RCS file: /home/kde/kdepim/kmail/kmfilter.cpp,v
-retrieving revision 1.58
-diff -u -3 -p -r1.58 kmfilter.cpp
---- kmail/kmfilter.cpp	29 Nov 2003 15:46:43 -0000	1.58
-+++ kmail/kmfilter.cpp	4 Feb 2004 16:16:01 -0000
-@@ -147,9 +147,18 @@ void KMFilter::readConfig(KConfig* confi
-   // that the pattern is purified.
-   mPattern.readConfig(config);
- 
--  if (bPopFilter)
-+  if (bPopFilter) {
-     // get the action description...
--    mAction = (KMPopFilterAction) config->readNumEntry( "action" );
-+    QString action = config->readEntry( "action" );
-+    if ( action == "down" )
-+      mAction = Down;
-+    else if ( action == "later" )
-+      mAction = Later;
-+    else if ( action == "delete" )
-+      mAction = Delete;
-+    else
-+      mAction = NoAction;
-+  }
-   else {
-     QStringList sets = config->readListEntry("apply-on");
-     if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
-@@ -210,7 +219,19 @@ void KMFilter::writeConfig(KConfig* conf
-   mPattern.writeConfig(config);
- 
-   if (bPopFilter) {
--    config->writeEntry( "action", mAction );
-+    switch ( mAction ) {
-+    case Down:
-+      config->writeEntry( "action", "down" );
-+      break;
-+    case Later:
-+      config->writeEntry( "action", "later" );
-+      break;
-+    case Delete:
-+      config->writeEntry( "action", "delete" );
-+      break;
-+    default:
-+      config->writeEntry( "action", "" );
-+    }
-   } else {
-     QStringList sets;
-     if ( bApplyOnInbound )
diff --git a/kde-base/kdepim/files/kpilot-parallel-make-fix.patch b/kde-base/kdepim/files/kpilot-parallel-make-fix.patch
deleted file mode 100644
index c7a7c7bdf24d..000000000000
--- a/kde-base/kdepim/files/kpilot-parallel-make-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kpilot/conduits/vcalconduit/Makefile.am.orig	2004-03-09 17:14:39.000000000 -0500
-+++ kpilot/conduits/vcalconduit/Makefile.am	2004-03-09 17:16:32.000000000 -0500
-@@ -26,12 +26,14 @@
- conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
- 	../../../libkcal/libkcal.la \
- 	libvcalconduit_shared.la
-+conduit_vcal_la_COMPILE_FIRST = korganizerConduit.h
- 
- conduit_todo_la_SOURCES = todo-factory.cc todo-setup.cc todo-conduit.cc
- conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
- conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
- 	../../../libkcal/libkcal.la \
- 	libvcalconduit_shared.la
-+conduit_todo_la_COMPILE_FIRST = korganizerConduit.h
- 
- libvcalconduit_shared_la_SOURCES = korganizerConduit.ui \
- 	vcal-factorybase.cc \
diff --git a/kde-base/kdepim/kdepim-3.2.0-r2.ebuild b/kde-base/kdepim/kdepim-3.2.0-r2.ebuild
deleted file mode 100644
index 89abca9b0375..000000000000
--- a/kde-base/kdepim/kdepim-3.2.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0-r2.ebuild,v 1.13 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE="pda crypt ldap"
-
-DEPEND="~kde-base/kdenetwork-${PV}
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	ldap? ( net-nds/openldap )
-	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-PATCHES="${FILESDIR}/KMail-inboxEater-BRANCH.diff ${FILESDIR}/kmfilter.cpp.patch"
-
-src_compile() {
-	use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.2.2.ebuild b/kde-base/kdepim/kdepim-3.2.2.ebuild
deleted file mode 100644
index 5ea179274bfd..000000000000
--- a/kde-base/kdepim/kdepim-3.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.2.ebuild,v 1.10 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="pda crypt ldap cjk"
-
-DEPEND="~kde-base/kdenetwork-${PV}
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	ldap? ( net-nds/openldap )
-	crypt? ( app-crypt/cryptplug app-crypt/gnupg )"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-}
-
-src_compile() {
-	use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild b/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
deleted file mode 100644
index 7e2597b9f204..000000000000
--- a/kde-base/kdepim/kdepim-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0-r1.ebuild,v 1.11 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE="crypt gnokii pda cjk"
-
-DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( x86? ( net-dialup/gnokii ) )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
-	epatch ${FILESDIR}/kdepim-3.3.0-spam-assistant.patch
-	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-	make -f admin/Makefile.common
-}
diff --git a/kde-base/kdepim/kdepim-3.3.0.ebuild b/kde-base/kdepim/kdepim-3.3.0.ebuild
deleted file mode 100644
index 7bba6261dbc5..000000000000
--- a/kde-base/kdepim/kdepim-3.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.0.ebuild,v 1.13 2005/01/23 20:04:19 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="amd64"
-IUSE="pda crypt cjk"
-
-DEPEND="pda? ( app-pda/pilot-link dev-libs/libmal )
-		crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/kdepim-3.3.0-korganizer.patch
-	use cjk && epatch ${FILESDIR}/kdepim-3.2.3-cjk.diff
-}
-
-src_compile() {
-	kde_src_compile
-}
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.2.0 b/kde-base/kdetoys/files/digest-kdetoys-3.2.0
deleted file mode 100644
index 81a4de094579..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9fdd2b51a25501322e3dd3301760a41 kdetoys-3.2.0.tar.bz2 2354974
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.2.2 b/kde-base/kdetoys/files/digest-kdetoys-3.2.2
deleted file mode 100644
index 6ee92fa97a56..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8db947ef275b7eb255a4448baca419d9 kdetoys-3.2.2.tar.bz2 2401063
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.3.0 b/kde-base/kdetoys/files/digest-kdetoys-3.3.0
deleted file mode 100644
index f97bde921de4..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 935e3e2e6d84c9fedb2f8acb8e36cdc7 kdetoys-3.3.0.tar.bz2 2761629
diff --git a/kde-base/kdetoys/kdetoys-3.2.0.ebuild b/kde-base/kdetoys/kdetoys-3.2.0.ebuild
deleted file mode 100644
index 447a29f44c82..000000000000
--- a/kde-base/kdetoys/kdetoys-3.2.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.2.0.ebuild,v 1.12 2005/01/23 20:00:10 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.2.2.ebuild b/kde-base/kdetoys/kdetoys-3.2.2.ebuild
deleted file mode 100644
index 7090311d5518..000000000000
--- a/kde-base/kdetoys/kdetoys-3.2.2.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.2.2.ebuild,v 1.10 2005/01/23 20:00:10 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.3.0.ebuild b/kde-base/kdetoys/kdetoys-3.3.0.ebuild
deleted file mode 100644
index 2e004eac5db5..000000000000
--- a/kde-base/kdetoys/kdetoys-3.3.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.3.0.ebuild,v 1.9 2005/01/23 20:00:10 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE=""
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.2.0 b/kde-base/kdeutils/files/digest-kdeutils-3.2.0
deleted file mode 100644
index 46a13a538c39..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 988480b534c1fab9003f624edb87e7a7 kdeutils-3.2.0.tar.bz2 2517278
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.2.2 b/kde-base/kdeutils/files/digest-kdeutils-3.2.2
deleted file mode 100644
index 6975a5d37209..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94eee311b04f91aa083d1f8a8620faca kdeutils-3.2.2.tar.bz2 2549521
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.3.0 b/kde-base/kdeutils/files/digest-kdeutils-3.3.0
deleted file mode 100644
index b6fb5977e766..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a3788e7ee386080b66254e515fa6e49 kdeutils-3.3.0.tar.bz2 2206454
diff --git a/kde-base/kdeutils/kdeutils-3.2.0.ebuild b/kde-base/kdeutils/kdeutils-3.2.0.ebuild
deleted file mode 100644
index 8a577b0aa755..000000000000
--- a/kde-base/kdeutils/kdeutils-3.2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.0.ebuild,v 1.13 2005/02/08 14:53:40 greg_g Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ia64"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}
-	app-crypt/gnupg"
diff --git a/kde-base/kdeutils/kdeutils-3.2.2.ebuild b/kde-base/kdeutils/kdeutils-3.2.2.ebuild
deleted file mode 100644
index 458ea4e218a0..000000000000
--- a/kde-base/kdeutils/kdeutils-3.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.2.ebuild,v 1.14 2005/02/08 14:53:40 greg_g Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 ~mips"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}
-	app-crypt/gnupg"
-
-src_unpack()
-{
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-tarfix.patch
-	epatch ${FILESDIR}/${P}-gcc34-compile.patch
-}
diff --git a/kde-base/kdeutils/kdeutils-3.3.0.ebuild b/kde-base/kdeutils/kdeutils-3.3.0.ebuild
deleted file mode 100644
index 64b51f277e59..000000000000
--- a/kde-base/kdeutils/kdeutils-3.3.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.3.0.ebuild,v 1.9 2005/01/23 20:06:29 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="x86 amd64 ppc64 sparc ppc hppa"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}
-	app-crypt/gnupg"
diff --git a/kde-base/kdewebdev/files/3.3.0-kafka-configure.in.in.patch b/kde-base/kdewebdev/files/3.3.0-kafka-configure.in.in.patch
deleted file mode 100644
index 17432f2197c0..000000000000
--- a/kde-base/kdewebdev/files/3.3.0-kafka-configure.in.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- quanta/parts/kafka/configure.in.in.orig	2004-08-30 12:33:30.510517920 -0500
-+++ quanta/parts/kafka/configure.in.in	2004-08-30 12:34:10.569428040 -0500
-@@ -14,8 +14,10 @@
- AC_MSG_RESULT("$KDE_VERSION")
- if test "x`echo $KDE_VERSION | grep 3.1.9`" = "x"; then
-  if test "x`echo $KDE_VERSION | grep 3.2`" = "x"; then
-+   if test "x`echo $KDE_VERSION | grep 3.3`" = "x"; then
-     echo "The KDE version is too old, WYSIWYG mode disabled!"
-     build_wysiwyg="no"
-+   fi
-  fi    
- fi
- 
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0 b/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0
deleted file mode 100644
index 303f3867484d..000000000000
--- a/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29a344f426bb9875f6e731678bc159a kdewebdev-3.3.0.tar.bz2 4784455
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0-r1 b/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0-r1
deleted file mode 100644
index 303f3867484d..000000000000
--- a/kde-base/kdewebdev/files/digest-kdewebdev-3.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29a344f426bb9875f6e731678bc159a kdewebdev-3.3.0.tar.bz2 4784455
diff --git a/kde-base/kdewebdev/kdewebdev-3.3.0-r1.ebuild b/kde-base/kdewebdev/kdewebdev-3.3.0-r1.ebuild
deleted file mode 100644
index adc64a12b862..000000000000
--- a/kde-base/kdewebdev/kdewebdev-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.3.0-r1.ebuild,v 1.9 2005/01/14 23:09:01 danarmak Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE web development - Quanta"
-KEYWORDS="x86 amd64 sparc ppc ppc64 hppa"
-IUSE="doc"
-DEPEND="~kde-base/kdebase-${PV}
-	doc? ( app-doc/quanta-docs )
-	!media-gfx/kimagemapeditor"
-
-src_unpack()
-{
-	kde_src_unpack
-	epatch ${FILESDIR}/3.3.0-kafka-configure.in.in.patch
-	cd ${S} && make -f admin/Makefile.common
-}
diff --git a/kde-base/kdewebdev/kdewebdev-3.3.0.ebuild b/kde-base/kdewebdev/kdewebdev-3.3.0.ebuild
deleted file mode 100644
index 8af05da37da7..000000000000
--- a/kde-base/kdewebdev/kdewebdev-3.3.0.ebuild
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.3.0.ebuild,v 1.5 2005/01/14 23:09:01 danarmak Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE web development - Quanta"
-KEYWORDS="~x86 amd64 ~sparc ppc"
-IUSE="doc"
-DEPEND="~kde-base/kdebase-${PV}
-	doc? ( app-doc/quanta-docs )"