removing stale versions

140 files changed, 163 insertions, 6382 deletions

diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index 26e4e63456c0..7ede1fe32627 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.40 2003/09/26 17:37:46 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.41 2003/09/27 17:38:59 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-2.2.2-r1.ebuild,
+  kde-2.2.2-r1.ebuild, kde-3.1.1a.ebuild, kde-3.1.1a.ebuild, kde-3.1.3.ebuild,
+  kde-3.1.3.ebuild:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kde-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kde/Manifest b/kde-base/kde/Manifest
index a49542a34da4..9b0ba167902b 100644
--- a/kde-base/kde/Manifest
+++ b/kde-base/kde/Manifest
@@ -1,16 +1,10 @@
-MD5 5c0618a98961cce7a894e6c4ad90d46a ChangeLog 4800
-MD5 b01b23f93afb9df95bcd9477b82cf1ef kde-2.2.2-r1.ebuild 608
-MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
-MD5 517228b72c36990d84aaaec5beba35b0 kde-3.0.5b.ebuild 604
-MD5 6fd31fa85d8d638c506c34290d29a2b6 kde-3.1.1a.ebuild 624
 MD5 f71cef84544741221023480fdecaf1be kde-3.1.2.ebuild 608
-MD5 7ef874221631cfb03cb91564d30abe4d kde-3.1.3.ebuild 597
-MD5 8a6302de0a3c80df7e0c1d205df1c265 metadata.xml 323
 MD5 d569282f7db0bf9ba9a18092a44531b1 kde-3.1.4.ebuild 597
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-2.2.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.4 0
+MD5 70a68484fdacae476ad7a991bd9f574f ChangeLog 4994
+MD5 8a6302de0a3c80df7e0c1d205df1c265 metadata.xml 323
+MD5 517228b72c36990d84aaaec5beba35b0 kde-3.0.5b.ebuild 604
+MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
 MD5 b9017c5399befa28b08a2c99cf2c8f6c files/digest-kde-3.0.5b 60
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.1a 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.4 0
diff --git a/kde-base/kde/files/digest-kde-2.2.2-r1 b/kde-base/kde/files/digest-kde-2.2.2-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-2.2.2-r1
+++ /dev/null
diff --git a/kde-base/kde/files/digest-kde-3.1.1a b/kde-base/kde/files/digest-kde-3.1.1a
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.1.1a
+++ /dev/null
diff --git a/kde-base/kde/files/digest-kde-3.1.3 b/kde-base/kde/files/digest-kde-3.1.3
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.1.3
+++ /dev/null
diff --git a/kde-base/kde/kde-2.2.2-r1.ebuild b/kde-base/kde/kde-2.2.2-r1.ebuild
deleted file mode 100644
index 87c6cae84b0f..000000000000
--- a/kde-base/kde/kde-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-2.2.2-r1.ebuild,v 1.16 2003/07/16 16:16:37 pvdabeel Exp $
-
-IUSE=""
-DESCRIPTION="KDE $PV - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="~kdelibs-2.2.2a `echo ~kde-base/kde{base,admin,artwork,games,graphics,multimedia,network,pim,toys,utils,addons}-${PV}`"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
diff --git a/kde-base/kde/kde-3.1.1a.ebuild b/kde-base/kde/kde-3.1.1a.ebuild
deleted file mode 100644
index 37f0ba4bd969..000000000000
--- a/kde-base/kde/kde-3.1.1a.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.1.1a.ebuild,v 1.3 2003/06/22 19:38:46 caleb Exp $
-
-IUSE=""
-KEYWORDS="x86 ppc sparc ~alpha"
-DESCRIPTION="KDE 3.1 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-# removed: kdebindings, kdesdk, kdoc since these are developer-only packages
-RDEPEND="`echo ~kde-base/kde{libs,base,graphics}-${PV}`
-	`echo ~kde-base/kde{addons,admin,artwork,edu,games,multimedia,pim,toys,utils}-3.1.1`"
-LICENSE="GPL-2"
-
-SLOT="3.1"
diff --git a/kde-base/kde/kde-3.1.3.ebuild b/kde-base/kde/kde-3.1.3.ebuild
deleted file mode 100644
index a4037718131f..000000000000
--- a/kde-base/kde/kde-3.1.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.1.3.ebuild,v 1.5 2003/09/17 01:44:19 weeve Exp $
-
-IUSE=""
-KEYWORDS="x86 ~ppc sparc"
-DESCRIPTION="KDE 3.1 - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-# 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}-${PV}`"
-
-LICENSE="GPL-2"
-
-SLOT="3.1"
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index a5c06b937b78..cc6311b18746 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.51 2003/09/26 17:33:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.52 2003/09/27 17:25:39 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-2.2.2-r1.ebuild,
+  kdeaddons-2.2.2-r1.ebuild, kdeaddons-3.1.1.ebuild, kdeaddons-3.1.1.ebuild,
+  kdeaddons-3.1.3.ebuild, kdeaddons-3.1.3.ebuild:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index 2aef80b18bad..77b7825aa1ff 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,20 +1,14 @@
-MD5 8bee4223ef69c3d90d9cb4b066aef46b ChangeLog 6957
-MD5 40bf9097b4157cd3b95641d8e729479a kdeaddons-2.2.2-r1.ebuild 463
 MD5 3bf9136d3c3c79a44517a60b6c82bddf kdeaddons-3.0.4.ebuild 817
-MD5 cf8efeae531c50192c4b43441148aa96 kdeaddons-3.0.5b.ebuild 826
-MD5 ef7a807e0785aefe0b5b0d1df93557ec kdeaddons-3.1.1.ebuild 939
 MD5 dc2120a4612d763b0a60e63586a52858 kdeaddons-3.1.2.ebuild 1381
-MD5 72137849841d18f504b9087a5b652eec kdeaddons-3.1.3.ebuild 1349
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 854569971cbd73a10922f85697ae777e kdeaddons-3.1.4.ebuild 1351
-MD5 098c455a204e173354058b9d6f6c57d1 files/digest-kdeaddons-2.2.2-r1 68
-MD5 daf284d1e03ab78bef056c0b4c2a9285 files/digest-kdeaddons-3.0.4 68
-MD5 c6085bb9e78b909f1e887b6a60e86979 files/digest-kdeaddons-3.0.5b 69
-MD5 d449a692f809c2c21d804766ffc4d942 files/digest-kdeaddons-3.1.1 69
-MD5 df951d350da34a4f43c9ef55e2a1ff5c files/digest-kdeaddons-3.1.2 69
-MD5 ee73bf3fcf0e519e88151dd1d763fb60 files/digest-kdeaddons-3.1.3 69
+MD5 cf8efeae531c50192c4b43441148aa96 kdeaddons-3.0.5b.ebuild 826
+MD5 6c0e573982c1c0d7b3e950b78917a26b ChangeLog 7185
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.1-enable-crashes.diff 1415
+MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.4-enable-crashes.diff 1415
 MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.2-enable-crashes.diff 1415
-MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.3-enable-crashes.diff 1415
+MD5 c6085bb9e78b909f1e887b6a60e86979 files/digest-kdeaddons-3.0.5b 69
+MD5 daf284d1e03ab78bef056c0b4c2a9285 files/digest-kdeaddons-3.0.4 68
+MD5 df951d350da34a4f43c9ef55e2a1ff5c files/digest-kdeaddons-3.1.2 69
 MD5 8d1ae5ff34c78f700fc0ac98ded081b7 files/digest-kdeaddons-3.1.4 69
-MD5 ee9fff88c4c48e7e34d37f8bb495db0d files/kdeaddons-3.1.4-enable-crashes.diff 1415
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1 b/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1
deleted file mode 100644
index cd45277d8d9c..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-2.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9392da0992f4aede5f6a86840e47fef6 kdeaddons-2.2.2.tar.bz2 503536
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1
deleted file mode 100644
index bd2469a0525c..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d52ec39b0ea4005c48b22481d50bcc29 kdeaddons-3.1.1.tar.bz2 1080706
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.3 b/kde-base/kdeaddons/files/digest-kdeaddons-3.1.3
deleted file mode 100644
index 907cb1e655ba..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1835674847b1c94c16b508fedc2d85c kdeaddons-3.1.3.tar.bz2 1082159
diff --git a/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild b/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild
deleted file mode 100644
index c033ee9e4999..000000000000
--- a/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.2-r1.ebuild,v 1.11 2003/07/16 16:17:22 pvdabeel Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE $PV: addons - applets, plugins..."
-KEYWORDS="x86 sparc ppc"
-
-newdepend "~kde-base/kdebase-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	>=media-libs/libsdl-1.2"
-
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.1.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.1.ebuild
deleted file mode 100644
index 5b070f192cc3..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.1.ebuild,v 1.6 2003/09/11 01:16:25 msterret Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga xmms"
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend "=kde-base/kdebase-${PV}*
-	~kde-base/kdenetwork-${PV}*
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdegames-${PV}
-	~kde-base/arts-1.1.1
-	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
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
-	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
-		append-flags -mno-sse2
-	fi
-fi
diff --git a/kde-base/kdeaddons/kdeaddons-3.1.3.ebuild b/kde-base/kdeaddons/kdeaddons-3.1.3.ebuild
deleted file mode 100644
index 0b6f4cd0e978..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.1.3.ebuild,v 1.8 2003/09/17 01:35:46 weeve Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="sdl svga xmms"
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-KEYWORDS="x86 ~ppc sparc"
-
-newdepend "=kde-base/kdebase-${PV}*
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/arts-${PV//3./1.}
-	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
-
-# fix bug #7625
-if [ "$COMPILER" == "gcc3" ]; then
-	if [ -n "`is-flag -march=pentium4`" -o -n "`is-flag -mcpu=pentium4`" ]; then
-		append-flags -mno-sse2
-	fi
-fi
-
-# enable building of konqueror carsh recovery plugin. it was disabled accidentally
-# in the orig kde 3.1 release and was reenabled soon after in cvs head
-PATCHES="$FILESDIR/$P-enable-crashes.diff"
-
-need-automake 1.7
-need-autoconf 2.5
-
-src_compile() {
-	AMVERSION="`automake --version | head -1 | cut -d " " -f4`"
-	if [ "$AMVERSION" != "1.7.2" ]; then
-		rm -f configure configure.in
-	fi
-
-	kde_src_compile configure
-	kde_src_compile make
-}
-
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 43fb2dbd2645..35c7b9df622f 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.49 2003/09/27 14:54:25 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.50 2003/09/27 17:25:59 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-2.2.2.ebuild,
+  kdeadmin-2.2.2.ebuild, kdeadmin-3.1.1-r2.ebuild, kdeadmin-3.1.1-r2.ebuild,
+  kdeadmin-3.1.3.ebuild, kdeadmin-3.1.3.ebuild:
+  removing stale versions
 
 *kdeadmin-3.2.0_alpha2 (27 Sep 2003)
 
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index a4b3ca989072..b8c3cd168bb0 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,19 +1,13 @@
-MD5 a77dca576c789d7d8f9c9bf1c16697ea kdeadmin-2.2.2.ebuild 562
 MD5 78b647f58591ea9d8e14bbff3d86a7ea kdeadmin-3.1.4.ebuild 1352
 MD5 b2bdd0b01b78395be6bcb5d5af6a4d4b kdeadmin-3.0.5b.ebuild 791
-MD5 874868e2df667c088d36574bdf01c431 kdeadmin-3.1.3.ebuild 1352
-MD5 5186139d18e84c8d60149d2d4d7f6756 kdeadmin-3.1.1-r2.ebuild 1357
 MD5 7c75fb24fb56237ff873a742e469625f kdeadmin-3.2.0_alpha2.ebuild 1349
-MD5 0427229b4bbb780fd668c06c730ae7a1 ChangeLog 6698
+MD5 0ed6158770f51582d174195c2f06888c ChangeLog 6920
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
 MD5 a6705bd443a458d94e5cb40b6d8d17cd kdeadmin-3.1.2.ebuild 1599
-MD5 4e2463a3c245a4beec7d1b920d457216 files/digest-kdeadmin-2.2.2 67
 MD5 f8da196912e8b6de614b016bae287008 files/digest-kdeadmin-3.0.4 68
 MD5 9d9790e505ef8279e0aa0b2ab12e7330 files/digest-kdeadmin-3.1.2 68
-MD5 c8298ba6b3c4af51cd103b54b05e0fdf files/digest-kdeadmin-3.1.3 68
 MD5 8227cd79fb23631f6457559bb65559a6 files/digest-kdeadmin-3.1.4 68
 MD5 e2b72d434dab0dbae35cac6103442414 files/digest-kdeadmin-3.2.0_alpha2 69
 MD5 e741759e72657c73057f606db0adc641 files/kdeadmin-qt311-gentoo.diff 608
 MD5 b48f8a01e6d8bc732551640dbae3fcba files/digest-kdeadmin-3.0.5b 69
-MD5 127ebafdf182b5e161b6946b38587833 files/digest-kdeadmin-3.1.1-r2 68
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-2.2.2 b/kde-base/kdeadmin/files/digest-kdeadmin-2.2.2
deleted file mode 100644
index 32b96444dfb9..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f97fe83d9a2efe3bfb679a679693a45 kdeadmin-2.2.2.tar.bz2 902809
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2 b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2
deleted file mode 100644
index c994a88073ed..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 755deaf26d0841ed16eddd7596701004 kdeadmin-3.1.1.tar.bz2 1563569
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.3 b/kde-base/kdeadmin/files/digest-kdeadmin-3.1.3
deleted file mode 100644
index 4ba80e15a562..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e733972693e1f9196a11cc90953a93d8 kdeadmin-3.1.3.tar.bz2 1557695
diff --git a/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild b/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild
deleted file mode 100644
index ca840d7aa17b..000000000000
--- a/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.2.ebuild,v 1.15 2003/07/16 16:28:32 pvdabeel Exp $
-inherit kde-dist
-
-IUSE="pam"
-DESCRIPTION="KDE $PV - administration tools"
-KEYWORDS="x86 sparc ppc"
-
-newdepend ">=app-arch/rpm-3.0.5
-	dev-libs/popt
-	pam? ( >=sys-libs/pam-0.72 )"
-
-src_compile() {
-	kde_src_compile myconf
-	use pam		&& myconf="$myconf --with-pam"		|| myconf="$myconf --without-pam"
-	kde_src_compile configure make
-}
diff --git a/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild
deleted file mode 100644
index d505bbc504df..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.1.1-r2.ebuild,v 1.7 2003/09/11 01:16:25 msterret Exp $
-inherit kde-dist
-
-IUSE="pam foreign-package foreign-sysvinit"
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend "pam? ( >=sys-libs/pam-0.72 )
-	foreign-package? ( >=app-arch/rpm-4.0.4-r1 dev-libs/popt )"
-
-use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
-
-if [ -n "`use foreign-package`" ]; then
-	myconf="$myconf --with-rpmlib"
-else
-	myconf="$myconf --without-rpm"
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR kpackage"
-fi
-
-if [ -z "`use foreign-sysvinit`" ]; then
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR ksysv"
-fi
-
-
-# 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.1.3.ebuild b/kde-base/kdeadmin/kdeadmin-3.1.3.ebuild
deleted file mode 100644
index 1f38c40f9e76..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.1.3.ebuild,v 1.8 2003/09/17 01:36:51 weeve Exp $
-inherit kde-dist
-
-IUSE="pam foreign-package foreign-sysvinit"
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-KEYWORDS="x86 ~ppc sparc"
-
-newdepend "pam? ( >=sys-libs/pam-0.72 )
-	foreign-package? ( >=app-arch/rpm-4.0.4-r1 dev-libs/popt )"
-
-use pam		&& myconf="$myconf --with-pam"	|| myconf="$myconf --without-pam --with-shadow"
-
-#if [ -n "`use foreign-package`" ]; then
-#    myconf="$myconf --with-rpmlib"
-#else
-	myconf="$myconf --without-rpm"
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR kpackage"
-#fi
-
-if [ -z "`use foreign-sysvinit`" ]; then
-	KDE_REMOVE_DIR="$KDE_REMOVE_DIR ksysv"
-fi
-
-
-# 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/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 371b216c957e..9f955e1c0d3e 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.45 2003/09/26 17:36:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.46 2003/09/27 17:26:36 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-2.2.2.ebuild,
+  kdeartwork-2.2.2.ebuild, kdeartwork-3.1.1.ebuild, kdeartwork-3.1.1.ebuild,
+  kdeartwork-3.1.3.ebuild, kdeartwork-3.1.3.ebuild:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdeartwork/Manifest b/kde-base/kdeartwork/Manifest
index f1c973d248eb..b31e72368852 100644
--- a/kde-base/kdeartwork/Manifest
+++ b/kde-base/kdeartwork/Manifest
@@ -1,18 +1,12 @@
-MD5 4412e2f2cb5de6ee4cf8ef3b6d6d9348 ChangeLog 5746
-MD5 4b38c6481b61d0926f7532a256837d06 kdeartwork-2.2.2.ebuild 401
-MD5 d6f35cb5cfa1b2fde7a70b2f75a8010a kdeartwork-3.0.4.ebuild 776
 MD5 3e32aee79a022a10491626bd4648e368 kdeartwork-3.0.5b.ebuild 784
-MD5 3698a972f9988dff21e5e41f95a6d53f kdeartwork-3.1.1.ebuild 556
+MD5 d6f35cb5cfa1b2fde7a70b2f75a8010a kdeartwork-3.0.4.ebuild 776
 MD5 ae54e65e8e035373ad43d0f64b53a4be kdeartwork-3.1.2.ebuild 560
-MD5 41401d1e716812df90f016f7068100d1 kdeartwork-3.1.3.ebuild 547
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 315e946f391c60acdac09cd5edf02938 kdeartwork-3.1.4.ebuild 547
-MD5 e09643b7d8304e13d5a69d62946ec733 files/digest-kdeartwork-2.2.2 70
-MD5 f6e92fde8ace49b0d447aaf6ddf8f978 files/digest-kdeartwork-3.0.4 71
+MD5 cf09f9fe8d7b10170c646cd6422f09df ChangeLog 5974
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 f996175fbf4ca0e138709cbfc1301dfb files/digest-kdeartwork-3.0.5b 72
-MD5 e748fe1957c4ee16a31c8d47847e2f12 files/digest-kdeartwork-3.1.1 71
-MD5 23934ee4fc93b749a014c12e7aa4b421 files/digest-kdeartwork-3.1.2 71
-MD5 72636941bd0afa9df3792eeb3dca6edf files/digest-kdeartwork-3.1.3 71
 MD5 5c1ca939fc1dbb4714ca55f8c707ebf1 files/kdeartwork-screensaver.patch 634
-MD5 1579545755bc63505fd6c670f9e70bdc files/xsaver-conflicting-typedefs.diff 510
+MD5 f6e92fde8ace49b0d447aaf6ddf8f978 files/digest-kdeartwork-3.0.4 71
+MD5 23934ee4fc93b749a014c12e7aa4b421 files/digest-kdeartwork-3.1.2 71
 MD5 40c3002f32d017b017df654b265b09ec files/digest-kdeartwork-3.1.4 71
+MD5 1579545755bc63505fd6c670f9e70bdc files/xsaver-conflicting-typedefs.diff 510
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-2.2.2 b/kde-base/kdeartwork/files/digest-kdeartwork-2.2.2
deleted file mode 100644
index 64b356851208..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afaa475ba7d353453a5fa83d59b9f5e9 kdeartwork-2.2.2.tar.bz2 3410491
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.1 b/kde-base/kdeartwork/files/digest-kdeartwork-3.1.1
deleted file mode 100644
index 1911f6dcb805..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aaf6a2a8736f448766cd190685606d6a kdeartwork-3.1.1.tar.bz2 13841579
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.3 b/kde-base/kdeartwork/files/digest-kdeartwork-3.1.3
deleted file mode 100644
index effa4ba93790..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a68f5b45060777b5d81952ec188db749 kdeartwork-3.1.3.tar.bz2 13849478
diff --git a/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild b/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild
deleted file mode 100644
index 90f0f85db1dc..000000000000
--- a/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.2.ebuild,v 1.13 2003/07/16 16:18:11 pvdabeel Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE $PV - artwork"
-KEYWORDS="x86 sparc ppc"
-
-src_install() {
-	dodir ${KDEDIR}/share/apps/kthememgr/Themes
-	kde_src_install
-}
diff --git a/kde-base/kdeartwork/kdeartwork-3.1.1.ebuild b/kde-base/kdeartwork/kdeartwork-3.1.1.ebuild
deleted file mode 100644
index 69a3cd9227f1..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.1.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1.1.ebuild,v 1.5 2003/09/06 23:54:21 msterret Exp $
-inherit kde-dist
-
-IUSE="opengl"
-newdepend "opengl? ( virtual/opengl ) =kde-base/kdebase-${PV}*"
-
-DESCRIPTION="KDE artwork package"
-KEYWORDS="x86 ppc sparc ~alpha"
-PATCHES="$FILESDIR/xsaver-conflicting-typedefs.diff"
-
-myconf="$myconf --with-dpms"
-use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl"
diff --git a/kde-base/kdeartwork/kdeartwork-3.1.3.ebuild b/kde-base/kdeartwork/kdeartwork-3.1.3.ebuild
deleted file mode 100644
index 728f0f5ada27..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.1.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.1.3.ebuild,v 1.6 2003/09/17 01:29:29 weeve Exp $
-inherit kde-dist
-
-IUSE="opengl"
-newdepend "opengl? ( virtual/opengl ) =kde-base/kdebase-${PV}*"
-
-DESCRIPTION="KDE artwork package"
-KEYWORDS="x86 ~ppc sparc"
-PATCHES="$FILESDIR/xsaver-conflicting-typedefs.diff"
-
-myconf="$myconf --with-dpms"
-use opengl && myconf="$myconf --with-gl" || myconf="$myconf --without-gl"
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 2ce4a66d4b5b..dc6689500c1e 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.90 2003/09/26 21:22:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.91 2003/09/27 17:36:29 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-2.2.2-r5.ebuild,
+  kdebase-2.2.2-r5.ebuild, kdebase-3.1.1a.ebuild, kdebase-3.1.1a.ebuild,
+  kdebase-3.1.3.ebuild, kdebase-3.1.3.ebuild:
+  removing stale versions
 
   26 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
   files/focus-patch.diff:
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 277b73c32493..47d9327d801c 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,23 +1,17 @@
-MD5 79b42ed803947f6cc87b024f2171a1be kdebase-3.1.1a.ebuild 3608
 MD5 84d91eead31fcf756ae37c745232e88d kdebase-3.1.2.ebuild 3791
 MD5 46d2f98f4ec0ac0a50357b3ab351b8dc kdebase-3.0.5b.ebuild 7925
 MD5 4a590674ca453c7440a8e6f3a2598eca kdebase-3.1.4.ebuild 3959
 MD5 4c5f1af579421648a9bc8f7bc0b3e5f8 kdebase-3.0.4-r3.ebuild 4486
-MD5 3a402daa3c966cb11070be489af72824 kdebase-2.2.2-r5.ebuild 2949
 MD5 c5e47769d4235122e0d731ae7639cd64 kdebase-3.2.0_alpha2.ebuild 3236
-MD5 7f8caaad31ed3ee9ad12643b75ba08fa kdebase-3.1.3.ebuild 3918
-MD5 92e21a73318df9fd6f0e2f9823689da7 ChangeLog 15890
+MD5 1617468be0afb6253915c3101903eafd ChangeLog 16108
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
-MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
 MD5 f6156166c554420f1684f00d488f674a files/focus-patch.diff 542
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
 MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
-MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
 MD5 11389fa15ff0492536b0b153a0b11ff1 files/digest-kdebase-3.2.0_alpha2 69
 MD5 ad9e6eef841435f5c66f31ef9874c563 files/digest-kdebase-3.1.2 68
-MD5 3c02c49be312168eec3fd325e0dc3905 files/digest-kdebase-3.1.3 68
 MD5 13e89585cfb3d572a179ae7a8590fa95 files/digest-kdebase-3.1.4 68
 MD5 68409867ec02e18f4c594f2ea3dffd72 files/3.2.0_alpha2/kdmrc 17620
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0_alpha2/backgroundrc 342
@@ -27,9 +21,6 @@ MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.2/kdmrc 17661
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.2/backgroundrc 342
 MD5 9d860dc75112c99b5706fb02c9eacae0 files/3.1.2/fontconfig-2.2-support.patch 696
 MD5 7c9cbd2320beaf7cd91b417794e172d2 files/3.1.2/sftp.patch 337
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.3/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.3/backgroundrc 342
-MD5 8eb921e8d8edd7bb769af64521ec3404 files/3.1.3/startkde-3.1.3-gentoo.diff 1878
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.4/kdmrc 17661
 MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.4/backgroundrc 342
 MD5 8e50b3888c85740fe7425dbda247a12d files/3.1.4/startkde-3.1.4-gentoo.diff 1878
@@ -38,11 +29,7 @@ MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.dif
 MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
 MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
 MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
 MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
 MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
 MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
diff --git a/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo b/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo
deleted file mode 100644
index 3028aebbd49f..000000000000
--- a/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash --login
-export KDEDIR="_KDEDIR_"
-export KDEDIRS="_KDEDIR_:${KDEDIRS}"
-export PATH="_KDEDIR_/bin:${PATH}"
-rm -rf ~/.kde
-ln -fs ~/.kde2 ~/.kde
-[ -e "~/.kde2" ] || mkdir ~/.kde2
-####################################################
-# DEFAULT GENTOO KDE STARTUP SCRIPT ( KDE-2.2.2 ) ##
-####################################################
-
-#################################
-#Initial cleanup of old sessions#
-#################################
-real_display=`echo $DISPLAY | sed "s/://" | sed "s/\..*//"`
-rm -f ~/.DCOPserver-`/bin/hostname`_$DISPLAY
-
-#####################################
-#Check for space on /tmp and "$HOME"#
-#If not, abort startup		    #
-#####################################
-space_tmp=`df /tmp | xargs | cut -d" " -f11`
-space_home=`df "$HOME" | xargs | cut -d" " -f11`
-
-if [ $space_tmp -lt 50 ]; then
-    echo $"Not enough free disk space on /tmp"
-    exit 1
-fi
-
-if [ $space_home -lt 25 ]; then
-    echo $"Not enough free disk space on "$HOME""
-    exit 1
-fi
-
-############################################
-#Check for write access on /tmp and "$HOME"#
-#If not, abort startup              	   #
-############################################
-testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
-testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
-
-if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
-    echo $"You don't have write permissions for /tmp"
-    exit 1
-fi
-rm -f $testfile_tmp
-
-if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
-     echo $"You don't have write permissions for "$HOME""
-     exit 1
-fi
-rm -f $testfile_home
-
-##########################
-#Set Background and stuff#
-##########################
-xsetroot -cursor_name left_ptr -solid '#5477A0'
-
-#####################
-#Set the KDE Home...#
-####################
-kdehome=$HOME/.kde
-test -n "$KDEHOME" && kdehome=$KDEHOME
-
-###########################
-#Activate Font Directories#
-###########################
-usr_odir=$kdehome/share/fonts/override
-usr_fdir=$kdehome/share/fonts
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-########################################################
-#Check for newly installed fonts, if we have permission#
-########################################################
-
-test -d $usr_odir && (mkfontdir $usr_odir ; xset +fp $usr_odir)
-test -d $sys_odir && xset +fp $sys_odir
-test -d $usr_fdir && (mkfontdir $usr_fdir ; xset fp+ $usr_fdir)
-test -d $sys_fdir && xset fp+ $sys_fdir
-
-####################################
-# Ask X11 to rebuild its font list.#
-####################################
-xset fp rehash
-
-##################################################################
-#Link "tmp" resource to directory in /tmp                        #
-#Create a dir /tmp/kde-$USER, links $KDEHOME/tmp-$HOSTNAME to it.#
-##################################################################
-lnusertemp tmp >/dev/null
-
-########################################################################
-#Link "socket" resource to directory in /tmp                           #
-#Create a dir /tmp/ksocket-$USER, links $KDEHOME/socket-$HOSTNAME to it#
-########################################################################
-lnusertemp socket >/dev/null
-
-########################
-#Start the splashscreen#
-########################
-ksplash
-
-###########################################################
-#Set LD_BIND_NOW to increase the efficiency of kdeinit.   #
-#kdeinit unsets this variable before loading applications.#
-###########################################################
-# turn it off, it creates aa trouble
-#LD_BIND_NOW=true kdeinit +kcminit +knotify
-kdeinit +kcminit +knotify
-
-###########################################################
-# finally, give the session control to the session manager#
-###########################################################
-ksmserver --restore
-
-##########
-#Clean up#
-##########
-kdeinit_shutdown
diff --git a/kde-base/kdebase/files/3.1.1a/backgroundrc b/kde-base/kdebase/files/3.1.1a/backgroundrc
deleted file mode 100644
index d00db3a27bff..000000000000
--- a/kde-base/kdebase/files/3.1.1a/backgroundrc
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop0]
-BackgroundMode=VerticalGradient
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=14,120,131
-Color2=67,174,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=default_blue.jpg
-WallpaperList=
-WallpaperMode=NoWallpaper
diff --git a/kde-base/kdebase/files/3.1.1a/kdmrc b/kde-base/kdebase/files/3.1.1a/kdmrc
deleted file mode 100644
index 1d5018fc119d..000000000000
--- a/kde-base/kdebase/files/3.1.1a/kdmrc
+++ /dev/null
@@ -1,413 +0,0 @@
-# KDM configuration example.
-# Note, that all comments will be lost if you change this file with
-# the kcontrol frontend.
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in the Xservers file),
-# a colon and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Don't even think about changing it!
-ConfigVersion=2.0
-# If "false", KDM won't daemonize after startup. Note, that you needn't to
-# use this if you start KDM from inittab, as KDM won't daemonize in this case
-# automatically. Default is true.
-#DaemonMode=false
-# If the value starts with a slash (/), it specifies the file, where X-servers
-# to be used by KDM are listed; the file is in the usual XDM-Xservers format.
-# Otherwise it's interpreted like one line of the Xservers file, i.e., it
-# specifies exactly one X-server.
-# Default is ":0 local@tty1 /usr/X11R6/bin/X vt7"
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xservers=/etc/X11/xdm/Xservers
-# Where KDM should store its PID. Default is "" (don't store)
-PidFile=/var/run/xdm-pid
-# Whether KDM should lock the pid file to prevent having multiple KDM
-# instances running at once. Leave it "true", unless you're brave.
-#LockPidFile=false
-# Where to store authorization files. Default is /var/run/xauth
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed. Just keep it "true".
-#AutoRescan=false
-# Additional environment variables KDM should pass on to kdm_config, kdm_greet,
-# Xsetup, Xstartup, Xsession, and Xreset. LD_LIBRARY_PATH is a good candidate;
-# otherwise it shouldn't be necessary very often.
-#ExportList=SOME_VAR,ANOTHER_IMPORTANT_VAR
-# Where the command FiFos should be created. Make it empty to disable
-# the FiFos. Default is /var/run/xdmctl
-#FifoDir=/tmp
-# To which group the command FiFos should belong.
-# Default is -1 (effectively root)
-#FifoGroup=xdmctl
-
-[Xdmcp]
-# Whether KDM should listen to XDMCP requests. Default is true.
-Enable=false
-# The UDP port KDM should listen on for XDMCP requests. Don't change the 177.
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/kde/3.1/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is /usr/kde/3.1/share/config/kdm/Xaccess
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xaccess=/etc/X11/xdm/Xaccess
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser. Default is 15.
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain. Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection instead of the
-# host name. Use this on multihomed hosts. Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# BroadcastQuery requests.
-# By default no program is invoked and "Willing to manage" is sent.
-Willing=/etc/X11/xdm/Xwilling
-
-[Shutdown]
-# The command to run to halt the system. Default is /sbin/halt
-#HaltCmd=
-# The command to run to reboot the system. Default is /sbin/reboot
-#RebootCmd=
-# Whether one can shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether one can abort still running sessions when shutting down the system
-# via the global command FiFo. Default is true
-#AllowFifoNow=false
-# Offer LiLo boot options in shutdown dialog. Default is false
-#UseLilo=true
-# The location of the LiLo binary. Default is /sbin/lilo
-#LiloCmd=
-# The location of the LiLo map file. Default is /boot/map
-#LiloMap=
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime):
-#   OpenRepeat * (OpenTimeout + OpenDelay)
-# - starting a local X-server (ServerTime): ServerAttempts * ServerTimeout
-# - starting a display:
-#   - local display: StartAttempts * (ServerTime + OpenTime)
-#   - remote/foreign display: StartAttempts * OpenTime
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to start the display after various
-# errors. Default is 15
-#OpenDelay=
-# How long to wait before timing out XOpenDisplay. Default is 120
-#OpenTimeout=
-# How often to try the XOpenDisplay. Default is 5
-#OpenRepeat=
-# Try at most that many times to start a display. If this fails, the display
-# is disabled. Default is 4
-#StartAttempts=
-# The StartAttempt counter is reset after that many seconds. Default is 30
-#StartInterval=
-# Ping remote display every that many minutes. Default is 5
-#PingInterval=
-# Wait for a Pong that many minutes. Default is 5
-#PingTimeout=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory, etc. Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server. Default is 1 (SIGHUP)
-#ResetSignal=
-# The signal needed to terminate the local X-server. Default is 15 (SIGTERM)
-#TermSignal=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# Create X-authorizations for local displays. Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is MIT-MAGIC-COOKIE-1
-#AuthNames=
-# The name of this X-server's Xauth file. Default is "", which means, that
-# a random name in the AuthDir directory will be used.
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend doesn't care for this, so you don't need it unless you
-# use an alternative chooser or another background generator than kdmdesktop.
-# Default is ""
-Resources=/etc/X11/xdm/Xresources
-# The xrdb program to use to read the above specified recources.
-# Default is /usr/X11R6/bin/xrdb
-#Xrdb=
-# A program to run before the greeter is shown. You should start kdmdesktop
-# there. Also, xconsole can be started by this script.
-# Default is ""
-Setup=/etc/X11/xdm/Xsetup_0
-# A program to run before a user session starts. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Startup=/usr/kde/3.1/share/config/kdm/Xstartup
-# A program to run after a user session exits. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Reset=/usr/kde/3.1/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionTypes) and start an appropriate
-# session according to it.
-# Default is /usr/X11R6/bin/xterm -ls -T
-Session=/etc/X11/xdm/Xsession
-# The program to run if Session fails.
-# Default is /usr/X11R6/bin/xterm
-#FailsafeClient=
-# The PATH for the Session program. Default is
-# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#UserPath=/usr/kde/3.1/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The PATH for Setup, Startup and Reset, etc. Default is
-# /sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#SystemPath=/usr/kde/3.1/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The default system shell. Default is /bin/sh
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created. Default is /tmp
-#UserAuthDir=
-# The host chooser program to use.
-# Default is /usr/kde/3.1/bin/chooser
-# XXX this is going to be integrated into the greeter (probably).
-#Chooser=
-# If "true", KDM will automatically restart a session after an X-server
-# crash (or if it is killed by Alt-Ctrl-BackSpace). Note, that enabling
-# this opens a security hole: a secured display lock can be circumvented
-# (unless you use KDE's built-in screen lock). Default is false
-#AutoReLogin=true
-# Allow root logins? Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password? Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo. Default is All
-# "None" - no "Shutdown..." button is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine (Default)
-AllowShutdown=Root
-# Who is allowed to abort all still running sessions when shutting down.
-# Same options as for AllowShutdown. Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shutdown after all sessions exit (possibly at once) (Default)
-# "TryNow" - shutdown, if no sessions are open, otherwise do nothing
-# "ForceNow" - shutdown unconditionally
-#DefaultSdMode=ForceNow
-# If this is false the user must select the shutdown condition/timing already
-# in the shutdown dialog. If this is true he won't be bothered with the options,
-# but will be asked what to do if sessions are actually open. Default is true
-# NOTE: the interaction is currently not implemented. If this is set to true,
-# a normal forced shutdown will happen (without caring for the AllowSdForceNow
-# option!), i.e., KDM will behave exactly as before KDE 3.0.
-#InteractiveSd=false
-# Where (relatively to the user's home directory) to store the last
-# selected session. Default is .wmrc
-#SessSaveFile=
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Session types the users can select. It is advisable to have "default" and
-# "failsafe" listed herein, which is also the default.
-# Note, that the meaning of this value is entirely up to your Session program.
-SessionTypes=Xsession,kde-3.0.4,kde-3.1_rc2,
-# Widget Style of the greeter:
-# Default, Windows, Platinum, Motif, MotifPlus, CDE, SGI, and any styles you
-# may have installed, e.g., HighColor; Default is "Default"
-GUIStyle=Keramik
-# Widget Colors of the greeter:
-# Default, and any color schemes you may have installed. Default is "Default"
-#ColorScheme=Pumpkin
-# What should be shown righthand of the input lines:
-# "Logo" - the image specified by LogoPixmap (Default)
-# "Clock" - a neat analog clock
-# "None" - nothing
-LogoArea=None
-# The image to show when LogoArea=Logo. Default is kdelogo.png
-LogoPixmap=
-# Normally, the greeter is centered on the screen. Use this, if you want
-# it to appear elsewhere on the screen. Default is false
-#GreeterPosFixed=true
-#GreeterPosX=200
-#GreeterPosY=100
-# The headline in the greeter.
-# The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-#GreetString=K Desktop Environment (%n)
-# The font for the headline. Default is charter,24,bold
-GreetFont=verdana,24,5,0,50,0
-# The normal font used in the greeter. Default is helvetica,12
-StdFont=verdana,12,5,0,50,0
-# The font used for the "Login Failed" message. Default is helvetica,12,bold
-FailFont=verdana,12,5,0,75,0
-# Whether the fonts shown in the greeter should be antialiased. Default is false
-AntiAliasing=true
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "On" -> - turn on
-# "Off" -> - turn off
-# "Keep" -> - don't change the state (Default)
-#NumLock=Off
-# Language to use in the greeter. Default is en_US
-#Language=de_DE
-# Specify, which user names (along with pictures) should be shown in the
-# greeter.
-# "NotHidden" - all users except those listed in HiddenUsers (Default)
-# "Selected" - only the users listed in SelectedUsers
-# "None" - no user list will be shown at all
-#ShowUsers=None
-# For ShowUsers=Selected. Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a UID less than this number
-# (except root) will not be shown as well. Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well. Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically. Default is true
-#SortUsers=false
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from $KDEDIR/share/apps/kdm/pics/users/$USER.png (Default)
-# "UserOnly" - from the user's $HOME/.face
-# "PreferAdmin" - prefer $USER.png; fallback on $HOME/.face
-# "PreferUser" - ... and the other way round
-FaceSource=PreferUser
-# Specify, if/which user should be preselected for log in.
-# Note, that enabling this feature can be considered a security hole,
-# as it presents a valid login name to a potential attacker, so he "only"
-# needs to guess the password.
-# "None" - don't preselect any user (Default)
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser field
-#PreselectUser=Previous
-# The user to preselect if PreselectUser=Default
-#DefaultUser=ethel
-# If this is true, the password input line is focused automatically if
-# a user is preselected. Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "NoEcho" - nothing is shown at all, the cursor doesn't move
-# "OneStar" - "*" is shown for every typed letter (Default)
-# "ThreeStars" - "***" is shown for every typed letter
-#EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM. Otherwise, the
-# Setup script should be used to setup the background. Default is true
-#UseBackground=false
-# The configuration file to be used by krootimage.
-# Default is /usr/kde/3.1/share/config/kdm/backgroundrc
-#BackgroundCfg=
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script. Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed. Default is 3
-#GrabTimeout=
-# Warn, if local X-authorization cannot be created. Default is true
-# XXX this is a dummy currently
-AuthComplain=true
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up. Default is 1
-#ServerAttempts=
-# How long to wait for a local X-server to come up. Default is 15
-#ServerTimeout=
-# See above
-AllowShutdown=All
-# See above
-AllowRootLogin=true
-# See above
-AllowNullPasswd=true
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that don't need to provide a password to log in. NEVER list root!
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-#AuthComplain=false
-# The screen the greeter should be displayed on in multi-headed setups.
-# The numbering starts with 0 and corresponds to the listing order in the
-# active ServerLayout section of XF86Config. -1 means to use the upper-left
-# screen, -2 means to use the upper-right screen. Default is 0
-#GreeterScreen=-1
-
-# Core config for 1st local display
-[X-:0-Core]
-# Enable automatic login on this display. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify root!
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is to be logged into a NIS or Kerberos domain. If you use
-# it, you should "chmod 600 kdmrc" for obvious reasons.
-#AutoLoginPass=secret!
-# The session for the user to log in automatically. This becomes useless after
-# the user's first login, as the last used session will take precedence.
-#AutoLoginSession=kde
-# If "true", the auto-login is truly automatic, i.e., the user is logged in
-# when KDM comes up. If "false", the auto-login must be initiated by crashing
-# the X-server with Alt-Ctrl-BackSpace. Default is true
-#AutoLogin1st=false
-# See above
-Authorize=true
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
-
-[X-:1-Core]
-# See above
-Authorize=true
-
diff --git a/kde-base/kdebase/files/3.1.1a/startkde-3.1.1a-gentoo.diff b/kde-base/kdebase/files/3.1.1a/startkde-3.1.1a-gentoo.diff
deleted file mode 100644
index 3f55769643df..000000000000
--- a/kde-base/kdebase/files/3.1.1a/startkde-3.1.1a-gentoo.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- startkde~	2003-03-12 18:20:54.000000000 +0100
-+++ startkde	2003-03-12 18:26:10.000000000 +0100
-@@ -1,12 +1,34 @@
--#!/bin/sh
-+#!/bin/sh --login
- #
--#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.1.1 )
-+#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.1.1 )
- #
- 
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo part:
-+export PATH="_KDEDIR_/bin:${PATH}"
-+export KDEDIR="_KDEDIR_"
-+# Use env.d's KDEDIRS. They should only include locations like /usr though, not
-+# actual KDE installations
-+
-+# handle ~/.kde* dirs - separate ones for separate KDEs
-+cd ~
-+[ -d .kde ] && /bin/mv .kde .kde.backup
-+if [ ! -e .kde3.1 ]; then
-+	if [ -e .kde3 ]; then
-+		/bin/cp -r .kde3 .kde3.1
-+	else
-+		/bin/mkdir .kde3.1
-+	fi
-+fi
-+/bin/ln -sf .kde3.1 .kde
-+
-+#export KDEHOME="${HOME}/.kdecvs"
-+
-+# Gentoo part ends
-+
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -29,12 +51,12 @@
- # especially necessary on slow machines, where starting KDE takes one or two
- # minutes until anything appears on the screen.
- #
--# Set the background to plain grey.
-+# Set the background to cyan (Gentoo version change).
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
- 
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #5477A0"
- xsetroot -cursor_name left_ptr $bkg
- 
- # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -140,7 +162,11 @@
- fi
- 
- # the splashscreen and progress indicator
--ksplash
-+if [ -n "$KSPLASH" ]; then
-+	$KSPLASH
-+else
-+	ksplash
-+fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
diff --git a/kde-base/kdebase/files/3.1.3/backgroundrc b/kde-base/kdebase/files/3.1.3/backgroundrc
deleted file mode 100644
index d00db3a27bff..000000000000
--- a/kde-base/kdebase/files/3.1.3/backgroundrc
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop0]
-BackgroundMode=VerticalGradient
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=14,120,131
-Color2=67,174,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=fish
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=default_blue.jpg
-WallpaperList=
-WallpaperMode=NoWallpaper
diff --git a/kde-base/kdebase/files/3.1.3/kdmrc b/kde-base/kdebase/files/3.1.3/kdmrc
deleted file mode 100644
index 1d5018fc119d..000000000000
--- a/kde-base/kdebase/files/3.1.3/kdmrc
+++ /dev/null
@@ -1,413 +0,0 @@
-# KDM configuration example.
-# Note, that all comments will be lost if you change this file with
-# the kcontrol frontend.
-#
-# Definition: the greeter is the login dialog, i.e., the part of KDM
-# which the user sees.
-#
-# You can configure every X-display individually.
-# Every display has a display name, which consists of a host name
-# (which is empty for local displays specified in the Xservers file),
-# a colon and a display number. Additionally, a display belongs to a
-# display class (which can be ignored in most cases; the control center
-# does not support this feature at all).
-# Sections with display-specific settings have the formal syntax
-# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
-# You can use the "*" wildcard for host, number and class. You may omit
-# trailing components; they are assumed to be "*" then.
-# The host part may be a domain specification like ".inf.tu-dresden.de".
-# From which section a setting is actually taken is determined by these
-# rules:
-# - an exact match takes precedence over a partial match (for the host part),
-#   which in turn takes precedence over a wildcard
-# - precedence decreases from left to right for equally exact matches
-# Example: display name "myhost:0", class "dpy".
-# [X-myhost:0_dpy] precedes
-# [X-myhost:0_*] (same as [X-myhost:0]) precedes
-# [X-myhost:*_dpy] precedes
-# [X-myhost:*_*] (same as [X-myhost]) precedes
-# [X-*:0_dpy] precedes
-# [X-*:0_*] (same as [X-*:0]) precedes
-# [X-*:*_*] (same as [X-*])
-# These sections do NOT match this display:
-# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
-# If a setting is not found in any matching section, the default is used.
-#
-# Every comment applies to the following section or key.
-# The defaults refer to KDM's built-in values, not anything set in this file.
-#
-
-[General]
-# This option exists solely for the purpose of a clean automatic upgrade.
-# Don't even think about changing it!
-ConfigVersion=2.0
-# If "false", KDM won't daemonize after startup. Note, that you needn't to
-# use this if you start KDM from inittab, as KDM won't daemonize in this case
-# automatically. Default is true.
-#DaemonMode=false
-# If the value starts with a slash (/), it specifies the file, where X-servers
-# to be used by KDM are listed; the file is in the usual XDM-Xservers format.
-# Otherwise it's interpreted like one line of the Xservers file, i.e., it
-# specifies exactly one X-server.
-# Default is ":0 local@tty1 /usr/X11R6/bin/X vt7"
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xservers=/etc/X11/xdm/Xservers
-# Where KDM should store its PID. Default is "" (don't store)
-PidFile=/var/run/xdm-pid
-# Whether KDM should lock the pid file to prevent having multiple KDM
-# instances running at once. Leave it "true", unless you're brave.
-#LockPidFile=false
-# Where to store authorization files. Default is /var/run/xauth
-#AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
-# finds them having changed. Just keep it "true".
-#AutoRescan=false
-# Additional environment variables KDM should pass on to kdm_config, kdm_greet,
-# Xsetup, Xstartup, Xsession, and Xreset. LD_LIBRARY_PATH is a good candidate;
-# otherwise it shouldn't be necessary very often.
-#ExportList=SOME_VAR,ANOTHER_IMPORTANT_VAR
-# Where the command FiFos should be created. Make it empty to disable
-# the FiFos. Default is /var/run/xdmctl
-#FifoDir=/tmp
-# To which group the command FiFos should belong.
-# Default is -1 (effectively root)
-#FifoGroup=xdmctl
-
-[Xdmcp]
-# Whether KDM should listen to XDMCP requests. Default is true.
-Enable=false
-# The UDP port KDM should listen on for XDMCP requests. Don't change the 177.
-#Port=177
-# File with the private keys of X-terminals. Required for XDM authentication.
-# Default is ""
-#KeyFile=/usr/kde/3.1/share/config/kdm/kdmkeys
-# XDMCP access control file in the usual XDM-Xaccess format.
-# Default is /usr/kde/3.1/share/config/kdm/Xaccess
-# XXX i'm planning to absorb this file into kdmrc, but i'm not sure how to
-# do this best.
-Xaccess=/etc/X11/xdm/Xaccess
-# Number of seconds to wait for display to respond after the user has
-# selected a host from the chooser. Default is 15.
-#ChoiceTimeout=10
-# Strip domain name from remote display names if it is equal to the local
-# domain. Default is true
-#RemoveDomainname=false
-# Use the numeric IP address of the incoming connection instead of the
-# host name. Use this on multihomed hosts. Default is false
-#SourceAddress=true
-# The program which is invoked to dynamically generate replies to XDMCP
-# BroadcastQuery requests.
-# By default no program is invoked and "Willing to manage" is sent.
-Willing=/etc/X11/xdm/Xwilling
-
-[Shutdown]
-# The command to run to halt the system. Default is /sbin/halt
-#HaltCmd=
-# The command to run to reboot the system. Default is /sbin/reboot
-#RebootCmd=
-# Whether one can shut down the system via the global command FiFo.
-# Default is false
-#AllowFifo=true
-# Whether one can abort still running sessions when shutting down the system
-# via the global command FiFo. Default is true
-#AllowFifoNow=false
-# Offer LiLo boot options in shutdown dialog. Default is false
-#UseLilo=true
-# The location of the LiLo binary. Default is /sbin/lilo
-#LiloCmd=
-# The location of the LiLo map file. Default is /boot/map
-#LiloMap=
-
-# Rough estimations about how many seconds KDM will spend at most on
-# - opening a connection to the X-server (OpenTime):
-#   OpenRepeat * (OpenTimeout + OpenDelay)
-# - starting a local X-server (ServerTime): ServerAttempts * ServerTimeout
-# - starting a display:
-#   - local display: StartAttempts * (ServerTime + OpenTime)
-#   - remote/foreign display: StartAttempts * OpenTime
-
-# Core config for all displays
-[X-*-Core]
-# How long to wait before retrying to start the display after various
-# errors. Default is 15
-#OpenDelay=
-# How long to wait before timing out XOpenDisplay. Default is 120
-#OpenTimeout=
-# How often to try the XOpenDisplay. Default is 5
-#OpenRepeat=
-# Try at most that many times to start a display. If this fails, the display
-# is disabled. Default is 4
-#StartAttempts=
-# The StartAttempt counter is reset after that many seconds. Default is 30
-#StartInterval=
-# Ping remote display every that many minutes. Default is 5
-#PingInterval=
-# Wait for a Pong that many minutes. Default is 5
-#PingTimeout=
-# Restart instead of resetting the local X-server after session exit.
-# Use it if the server leaks memory, etc. Default is false
-#TerminateServer=true
-# The signal needed to reset the local X-server. Default is 1 (SIGHUP)
-#ResetSignal=
-# The signal needed to terminate the local X-server. Default is 15 (SIGTERM)
-#TermSignal=
-# Need to reset the X-server to make it read initial Xauth file.
-# Default is false
-#ResetForAuth=true
-# Create X-authorizations for local displays. Default is true
-#Authorize=false
-# Which X-authorization mechanisms should be used.
-# Default is MIT-MAGIC-COOKIE-1
-#AuthNames=
-# The name of this X-server's Xauth file. Default is "", which means, that
-# a random name in the AuthDir directory will be used.
-#AuthFile=
-# Specify a file with X-resources for the greeter, chooser and background.
-# The KDE frontend doesn't care for this, so you don't need it unless you
-# use an alternative chooser or another background generator than kdmdesktop.
-# Default is ""
-Resources=/etc/X11/xdm/Xresources
-# The xrdb program to use to read the above specified recources.
-# Default is /usr/X11R6/bin/xrdb
-#Xrdb=
-# A program to run before the greeter is shown. You should start kdmdesktop
-# there. Also, xconsole can be started by this script.
-# Default is ""
-Setup=/etc/X11/xdm/Xsetup_0
-# A program to run before a user session starts. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Startup=/usr/kde/3.1/share/config/kdm/Xstartup
-# A program to run after a user session exits. You should invoke sessreg
-# there and optionally change the ownership of the console, etc.
-# Default is ""
-Reset=/usr/kde/3.1/share/config/kdm/Xreset
-# The program which is run as the user which logs in. It is supposed to
-# interpret the session argument (see SessionTypes) and start an appropriate
-# session according to it.
-# Default is /usr/X11R6/bin/xterm -ls -T
-Session=/etc/X11/xdm/Xsession
-# The program to run if Session fails.
-# Default is /usr/X11R6/bin/xterm
-#FailsafeClient=
-# The PATH for the Session program. Default is
-# /bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#UserPath=/usr/kde/3.1/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The PATH for Setup, Startup and Reset, etc. Default is
-# /sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-#SystemPath=/usr/kde/3.1/bin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin:/usr/local/bin
-# The default system shell. Default is /bin/sh
-#SystemShell=/bin/bash
-# Where to put the user's X-server authorization file if ~/.Xauthority
-# cannot be created. Default is /tmp
-#UserAuthDir=
-# The host chooser program to use.
-# Default is /usr/kde/3.1/bin/chooser
-# XXX this is going to be integrated into the greeter (probably).
-#Chooser=
-# If "true", KDM will automatically restart a session after an X-server
-# crash (or if it is killed by Alt-Ctrl-BackSpace). Note, that enabling
-# this opens a security hole: a secured display lock can be circumvented
-# (unless you use KDE's built-in screen lock). Default is false
-#AutoReLogin=true
-# Allow root logins? Default is true
-AllowRootLogin=false
-# Allow to log in, when user has set an empty password? Default is true
-AllowNullPasswd=false
-# Who is allowed to shut down the system. This applies both to the
-# greeter and to the command FiFo. Default is All
-# "None" - no "Shutdown..." button is shown at all
-# "Root" - the root password must be entered to shut down
-# "All" - everybody can shut down the machine (Default)
-AllowShutdown=Root
-# Who is allowed to abort all still running sessions when shutting down.
-# Same options as for AllowShutdown. Default is All
-#AllowSdForceNow=Root
-# The default choice for the shutdown condition/timing.
-# "Schedule" - shutdown after all sessions exit (possibly at once) (Default)
-# "TryNow" - shutdown, if no sessions are open, otherwise do nothing
-# "ForceNow" - shutdown unconditionally
-#DefaultSdMode=ForceNow
-# If this is false the user must select the shutdown condition/timing already
-# in the shutdown dialog. If this is true he won't be bothered with the options,
-# but will be asked what to do if sessions are actually open. Default is true
-# NOTE: the interaction is currently not implemented. If this is set to true,
-# a normal forced shutdown will happen (without caring for the AllowSdForceNow
-# option!), i.e., KDM will behave exactly as before KDE 3.0.
-#InteractiveSd=false
-# Where (relatively to the user's home directory) to store the last
-# selected session. Default is .wmrc
-#SessSaveFile=
-
-# Greeter config for all displays
-[X-*-Greeter]
-# Session types the users can select. It is advisable to have "default" and
-# "failsafe" listed herein, which is also the default.
-# Note, that the meaning of this value is entirely up to your Session program.
-SessionTypes=Xsession,kde-3.0.4,kde-3.1_rc2,
-# Widget Style of the greeter:
-# Default, Windows, Platinum, Motif, MotifPlus, CDE, SGI, and any styles you
-# may have installed, e.g., HighColor; Default is "Default"
-GUIStyle=Keramik
-# Widget Colors of the greeter:
-# Default, and any color schemes you may have installed. Default is "Default"
-#ColorScheme=Pumpkin
-# What should be shown righthand of the input lines:
-# "Logo" - the image specified by LogoPixmap (Default)
-# "Clock" - a neat analog clock
-# "None" - nothing
-LogoArea=None
-# The image to show when LogoArea=Logo. Default is kdelogo.png
-LogoPixmap=
-# Normally, the greeter is centered on the screen. Use this, if you want
-# it to appear elsewhere on the screen. Default is false
-#GreeterPosFixed=true
-#GreeterPosX=200
-#GreeterPosY=100
-# The headline in the greeter.
-# The following character pairs are replaced:
-# - %d -> current display
-# - %h -> host name, possibly with domain name
-# - %n -> node name, most probably the host name without domain name
-# - %s -> the operating system
-# - %r -> the operating system's version
-# - %m -> the machine (hardware) type
-# - %% -> a single %
-# Default is "Welcome to %s at %n"
-#GreetString=K Desktop Environment (%n)
-# The font for the headline. Default is charter,24,bold
-GreetFont=verdana,24,5,0,50,0
-# The normal font used in the greeter. Default is helvetica,12
-StdFont=verdana,12,5,0,50,0
-# The font used for the "Login Failed" message. Default is helvetica,12,bold
-FailFont=verdana,12,5,0,75,0
-# Whether the fonts shown in the greeter should be antialiased. Default is false
-AntiAliasing=true
-# What to do with the Num Lock modifier for the time the greeter is running:
-# "On" -> - turn on
-# "Off" -> - turn off
-# "Keep" -> - don't change the state (Default)
-#NumLock=Off
-# Language to use in the greeter. Default is en_US
-#Language=de_DE
-# Specify, which user names (along with pictures) should be shown in the
-# greeter.
-# "NotHidden" - all users except those listed in HiddenUsers (Default)
-# "Selected" - only the users listed in SelectedUsers
-# "None" - no user list will be shown at all
-#ShowUsers=None
-# For ShowUsers=Selected. Default is ""
-#SelectedUsers=root,johndoe
-# For ShowUsers=NotHidden. Default is ""
-#HiddenUsers=root
-# Special case of HiddenUsers: users with a UID less than this number
-# (except root) will not be shown as well. Default is 0
-MinShowUID=1000
-# Complement to MinShowUID: users with a UID greater than this number will
-# not be shown as well. Default is 65535
-MaxShowUID=65000
-# If false, the users are listed in the order they appear in /etc/passwd.
-# If true, they are sorted alphabetically. Default is true
-#SortUsers=false
-# Specify, where the users' pictures should be taken from.
-# "AdminOnly" - from $KDEDIR/share/apps/kdm/pics/users/$USER.png (Default)
-# "UserOnly" - from the user's $HOME/.face
-# "PreferAdmin" - prefer $USER.png; fallback on $HOME/.face
-# "PreferUser" - ... and the other way round
-FaceSource=PreferUser
-# Specify, if/which user should be preselected for log in.
-# Note, that enabling this feature can be considered a security hole,
-# as it presents a valid login name to a potential attacker, so he "only"
-# needs to guess the password.
-# "None" - don't preselect any user (Default)
-# "Previous" - the user which successfully logged in last time
-# "Default" - the user specified in the DefaultUser field
-#PreselectUser=Previous
-# The user to preselect if PreselectUser=Default
-#DefaultUser=ethel
-# If this is true, the password input line is focused automatically if
-# a user is preselected. Default is false
-#FocusPasswd=true
-# The password input fields cloak the typed in text. Specify, how to do it:
-# "NoEcho" - nothing is shown at all, the cursor doesn't move
-# "OneStar" - "*" is shown for every typed letter (Default)
-# "ThreeStars" - "***" is shown for every typed letter
-#EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM. Otherwise, the
-# Setup script should be used to setup the background. Default is true
-#UseBackground=false
-# The configuration file to be used by krootimage.
-# Default is /usr/kde/3.1/share/config/kdm/backgroundrc
-#BackgroundCfg=
-# Hold the X-server grabbed the whole time the greeter is visible. This
-# may be more secure, but it will disable any background and other
-# X-clients started from the Setup script. Default is false
-#GrabServer=true
-# How many seconds to wait for grab to succeed. Default is 3
-#GrabTimeout=
-# Warn, if local X-authorization cannot be created. Default is true
-# XXX this is a dummy currently
-AuthComplain=true
-
-# Core config for local displays
-[X-:*-Core]
-# How often to try to run the X-server. Running includes executing it and
-# waiting for it to come up. Default is 1
-#ServerAttempts=
-# How long to wait for a local X-server to come up. Default is 15
-#ServerTimeout=
-# See above
-AllowShutdown=All
-# See above
-AllowRootLogin=true
-# See above
-AllowNullPasswd=true
-# Enable password-less logins on this display. USE WITH EXTREME CARE!
-# Default is false
-#NoPassEnable=true
-# The users that don't need to provide a password to log in. NEVER list root!
-#NoPassUsers=fred,ethel
-
-# Greeter config for local displays
-[X-:*-Greeter]
-# See above
-#AuthComplain=false
-# The screen the greeter should be displayed on in multi-headed setups.
-# The numbering starts with 0 and corresponds to the listing order in the
-# active ServerLayout section of XF86Config. -1 means to use the upper-left
-# screen, -2 means to use the upper-right screen. Default is 0
-#GreeterScreen=-1
-
-# Core config for 1st local display
-[X-:0-Core]
-# Enable automatic login on this display. USE WITH EXTREME CARE!
-# Default is false
-#AutoLoginEnable=true
-# The user to log in automatically. NEVER specify root!
-#AutoLoginUser=fred
-# The password for the user to log in automatically. This is NOT required
-# unless the user is to be logged into a NIS or Kerberos domain. If you use
-# it, you should "chmod 600 kdmrc" for obvious reasons.
-#AutoLoginPass=secret!
-# The session for the user to log in automatically. This becomes useless after
-# the user's first login, as the last used session will take precedence.
-#AutoLoginSession=kde
-# If "true", the auto-login is truly automatic, i.e., the user is logged in
-# when KDM comes up. If "false", the auto-login must be initiated by crashing
-# the X-server with Alt-Ctrl-BackSpace. Default is true
-#AutoLogin1st=false
-# See above
-Authorize=true
-
-# Greeter config for 1st local display
-[X-:0-Greeter]
-# See above
-#PreselectUser=Default
-# See above
-#DefaultUser=johndoe
-
-[X-:1-Core]
-# See above
-Authorize=true
-
diff --git a/kde-base/kdebase/files/3.1.3/startkde-3.1.3-gentoo.diff b/kde-base/kdebase/files/3.1.3/startkde-3.1.3-gentoo.diff
deleted file mode 100644
index ccaae938b357..000000000000
--- a/kde-base/kdebase/files/3.1.3/startkde-3.1.3-gentoo.diff
+++ /dev/null
@@ -1,67 +0,0 @@
---- startkde	2003-03-12 18:20:54.000000000 +0100
-+++ startkde	2003-03-12 18:26:10.000000000 +0100
-@@ -1,12 +1,34 @@
--#!/bin/sh
-+#!/bin/sh --login
- #
--#  DEFAULT KDE STARTUP SCRIPT ( KDE-3.1.3 )
-+#  GENTOO CUSTOMIZED KDE STARTUP SCRIPT ( KDE-3.1.3 )
- #
- 
- # When the X server dies we get a HUP signal from xinit. We must ignore it
- # because we still need to do some cleanup.
- trap 'echo GOT SIGHUP' HUP
- 
-+# Gentoo part:
-+export PATH="_KDEDIR_/bin:${PATH}"
-+export KDEDIR="_KDEDIR_"
-+# Use env.d's KDEDIRS. They should only include locations like /usr though, not
-+# actual KDE installations
-+
-+# handle ~/.kde* dirs - separate ones for separate KDEs
-+cd ~
-+[ -d .kde ] && /bin/mv .kde .kde.backup
-+if [ ! -e .kde3.1 ]; then
-+	if [ -e .kde3 ]; then
-+		/bin/cp -r .kde3 .kde3.1
-+	else
-+		/bin/mkdir .kde3.1
-+	fi
-+fi
-+/bin/ln -sf .kde3.1 .kde
-+
-+#export KDEHOME="${HOME}/.kdecvs"
-+
-+# Gentoo part ends
-+
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -29,12 +51,12 @@
- # especially necessary on slow machines, where starting KDE takes one or two
- # minutes until anything appears on the screen.
- #
--# Set the background to plain grey.
-+# Set the background to cyan (Gentoo version change).
- # The standard X background is nasty, causing moire effects and exploding
- # people's heads. We use colours from the standard KDE palette for those with
- # palettised displays.
- 
--test "$XDM_MANAGED" || bkg="-solid #C0C0C0"
-+test "$XDM_MANAGED" || bkg="-solid #5477A0"
- xsetroot -cursor_name left_ptr $bkg
- 
- # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -140,7 +162,11 @@
- fi
- 
- # the splashscreen and progress indicator
--ksplash
-+if [ -n "$KSPLASH" ]; then
-+	$KSPLASH
-+else
-+	ksplash
-+fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
diff --git a/kde-base/kdebase/files/digest-kdebase-2.2.2-r5 b/kde-base/kdebase/files/digest-kdebase-2.2.2-r5
deleted file mode 100644
index e2c51e5f5a71..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-2.2.2-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39635e42056ab2afb8e6f2ff761eea38 kdebase-2.2.2.tar.bz2 12888455
-MD5 522331e2b47f84956eb2df1fcf89ba17 post-2.2.2-kdebase.diff 18908
-MD5 002e297cb41705f9b744f6cc64e9d79e post-2.2.2-kdebase-thumbnail.diff 485
diff --git a/kde-base/kdebase/files/digest-kdebase-3.1.1a b/kde-base/kdebase/files/digest-kdebase-3.1.1a
deleted file mode 100644
index c3a535ff038a..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.1.1a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4d84dd6a0f00d84850f2765766c6b780 kdebase-3.1.1a.diff.bz2 383898
-MD5 f360add935d13be629b43a2a280b759f kdebase-3.1.1.tar.bz2 14917696
diff --git a/kde-base/kdebase/files/digest-kdebase-3.1.3 b/kde-base/kdebase/files/digest-kdebase-3.1.3
deleted file mode 100644
index 6fe9af7cc1cf..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d11514ebed619de18869d95e2d110951 kdebase-3.1.3.tar.bz2 15196014
diff --git a/kde-base/kdebase/kdebase-2.2.2-r5.ebuild b/kde-base/kdebase/kdebase-2.2.2-r5.ebuild
deleted file mode 100644
index 499168c27bae..000000000000
--- a/kde-base/kdebase/kdebase-2.2.2-r5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.2-r5.ebuild,v 1.2 2003/07/16 16:29:37 pvdabeel Exp $
-
-IUSE="ssl motif ldap encode cups oggvorbis pam"
-inherit kde-dist eutils
-
-DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 sparc ppc"
-
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff
-	mirror://kde/security_patches/post-${PV}-${PN}-thumbnail.diff"
-
-export MAKEOPTS="${MAKEOPTS} -j1"
-
-newdepend ">=media-sound/cdparanoia-3.9.8
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( >=sys-libs/pam-0.73 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	encode? ( >=media-sound/lame-3.89b )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
-	cups? ( net-print/cups )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	media-libs/lcms"
-#	opengl? ( virtual/opengl )" #this last for opengl screensavers
-#	samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult
-#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-	cd ${S}/kioslave/thumbnail
-	epatch ${DISTDIR}/post-${PV}-${PN}-thumbnail.diff
-	kde_sandbox_patch ${S}/konsole/src
-}
-
-src_compile() {
-
-	kde_src_compile myconf
-
-	use ldap	&& myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap"
-	use pam	&& myconf="$myconf --with-pam"	|| myconf="$myconf --with-shadow"
-	use motif					|| myconf="$myconf --without-motif"
-	use encode					|| myconf="$myconf --without-lame"
-	use cups					|| myconf="$myconf --disable-cups"
-	use oggvorbis				|| myconf="$myconf --without-vorbis"
-	#use opengl					||
-	myconf="$myconf --without-gl"
-	use ssl					|| myconf="$myconf --without-ssl"
-
-	kde_src_compile configure make
-}
-
-
-src_install() {
-
-	kde_src_install
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/kscreensaver.pam kscreensaver
-	newins kde.pamd kde
-
-	cd ${D}/${KDEDIR}/bin
-	rm -f ./startkde
-	sed -e "s:_KDEDIR_:${KDEDIR}:" ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo > startkde
-	chmod a+x startkde
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	# old scheme - compatibility
-	exeinto /usr/X11R6/bin/wm
-	doexe kde-${PV}
-	# new scheme - for now >=xfree-4.2-r3 only
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm
-	mv kdmrc kdmrc.orig
-	sed -e 's/SessionTypes=/SessionTypes=kde-2.2.2,kde-3.0,xsession,/' kdmrc.orig | cat > kdmrc
-	rm kdmrc.orig
-
-	rm -rf ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# an empty dir that would otherwise be unmerged with the previous instance
-	# dodir ${KDEDIR}/share/templates/.source/emptydir
-	# temorary fix (bug #846) until portage tracks merged dirs' mtimes
-	addwrite ${KDEDIR}/share/templates/.source
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-}
diff --git a/kde-base/kdebase/kdebase-3.1.1a.ebuild b/kde-base/kdebase/kdebase-3.1.1a.ebuild
deleted file mode 100644
index bd9a44c0b183..000000000000
--- a/kde-base/kdebase/kdebase-3.1.1a.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.1a.ebuild,v 1.5 2003/09/06 23:54:21 msterret Exp $
-inherit kde-dist eutils
-
-IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend ">=media-sound/cdparanoia-3.9.8
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( >=sys-libs/pam-0.73 )
-	motif? ( virtual/motif )
-	encode? ( >=media-sound/lame-3.89b )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
-	cups? ( net-print/cups )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	opengl? ( virtual/opengl )
-	samba? ( net-fs/samba )
-	java? ( virtual/jdk )
-	>=media-libs/freetype-2"
-#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
-
-RDEPEND="$RDEPEND sys-apps/eject"
-
-myconf="$myconf --with-dpms --with-cdparanoia"
-
-use ldap	&& myconf="$myconf --with-ldap" 	|| myconf="$myconf --without-ldap"
-use pam		&& myconf="$myconf --with-pam"		|| myconf="$myconf --with-shadow"
-use motif	&& myconf="$myconf --with-motif"	|| myconf="$myconf --without-motif"
-use encode	&& myconf="$myconf --with-lame"		|| myconf="$myconf --without-lame"
-use cups	&& myconf="$myconf --with-cups"		|| myconf="$myconf --disable-cups"
-use oggvorbis 	&& myconf="$myconf --with-vorbis"	|| myconf="$myconf --without-vorbis"
-use opengl	&& myconf="$myconf --with-gl"		|| myconf="$myconf --without-gl"
-use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
-use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
-
-src_compile() {
-	kde_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_src_compile make
-}
-
-src_install() {
-
-	kde_src_install
-
-	# cf bug #5953
-	insinto /etc/pam.d
-	#newins ${FILESDIR}/kscreensaver.pam kscreensaver
-	newins ${FILESDIR}/kde.pam kde
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \
-	-e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-
-einfo "If you want to floppy:/ kioslave to work, please emerge the mtools package."
-einfo "This ioslave allows you to use fat/vfat filesystems (not only on floppies)"
-einfo "without mounting them. If you don't know what this is for, you can probably"
-einfo "go with the usual mounting method."
-
-}
diff --git a/kde-base/kdebase/kdebase-3.1.3.ebuild b/kde-base/kdebase/kdebase-3.1.3.ebuild
deleted file mode 100644
index 7e3f7bf4f6ed..000000000000
--- a/kde-base/kdebase/kdebase-3.1.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1.3.ebuild,v 1.7 2003/09/17 01:25:43 weeve Exp $
-inherit kde-dist eutils
-
-IUSE="ldap pam motif encode oggvorbis cups ssl opengl samba java"
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="x86 ~ppc sparc ~alpha"
-
-newdepend ">=media-sound/cdparanoia-3.9.8
-	ldap? ( >=net-nds/openldap-1.2 )
-	pam? ( >=sys-libs/pam-0.73 )
-	motif? ( virtual/motif )
-	encode? ( >=media-sound/lame-3.89b )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
-	cups? ( net-print/cups )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	opengl? ( virtual/opengl )
-	samba? ( net-fs/samba )
-	java? ( virtual/jdk )
-	>=media-libs/freetype-2
-	dev-util/pkgconfig"
-#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
-
-RDEPEND="$RDEPEND sys-apps/eject"
-
-myconf="$myconf --with-dpms --with-cdparanoia"
-
-use ldap	&& myconf="$myconf --with-ldap" 	|| myconf="$myconf --without-ldap"
-use pam		&& myconf="$myconf --with-pam"		|| myconf="$myconf --with-shadow"
-use motif	&& myconf="$myconf --with-motif"	|| myconf="$myconf --without-motif"
-use encode	&& myconf="$myconf --with-lame"		|| myconf="$myconf --without-lame"
-use cups	&& myconf="$myconf --with-cups"		|| myconf="$myconf --disable-cups"
-use oggvorbis 	&& myconf="$myconf --with-vorbis"	|| myconf="$myconf --without-vorbis"
-use opengl	&& myconf="$myconf --with-gl"		|| myconf="$myconf --without-gl"
-use ssl		&& myconf="$myconf --with-ssl"		|| myconf="$myconf --without-ssl"
-use pam		&& myconf="$myconf --with-pam=yes"	|| myconf="$myconf --with-pam=no --with-shadow"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
-
-PATCHES=""
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S} && aclocal
-}
-
-src_compile() {
-	rm -f configure configure.in # to make sure the fontconfig patch takes effect
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in
-	kde_src_compile configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde_fix_head_instances klipper/klipperrc.desktop
-	kde_src_compile make
-}
-
-src_install() {
-
-	kde_src_install
-
-	# cf bug #5953
-	insinto /etc/pam.d
-	#newins ${FILESDIR}/kscreensaver.pam kscreensaver
-	newins ${FILESDIR}/kde.pam kde
-
-	# startkde script
-	cd ${D}/${KDEDIR}/bin
-	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
-	mv startkde startkde.orig
-	sed -e "s:_KDEDIR_:${KDEDIR}:" startkde.orig > startkde
-	rm startkde.orig
-	chmod a+x startkde
-
-	# x11 session script
-	cd ${T}
-	echo "#!/bin/sh
-${KDEDIR}/bin/startkde" > kde-${PV}
-	chmod a+x kde-${PV}
-	exeinto /etc/X11/Sessions
-	doexe kde-${PV}
-
-	cd ${D}/${KDEDIR}/share/config/kdm || die
-	sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \
-	-e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:" \
-	${FILESDIR}/${PVR}/kdmrc > kdmrc
-	cp ${FILESDIR}/${PVR}/backgroundrc .
-
-	#backup splashscreen images, so they can be put back when unmerging
-	#mosfet or so.
-	if [ ! -d ${KDEDIR}/share/apps/ksplash.default ]
-	then
-		cd ${D}/${KDEDIR}/share/apps
-		cp -rf ksplash/ ksplash.default
-	fi
-
-	# Show gnome icons when choosing new icon for desktop shortcut
-	dodir /usr/share/pixmaps
-	mv ${D}/${KDEDIR}/share/apps/kdesktop/pics/* ${D}/usr/share/pixmaps/
-	rm -rf ${D}/${KDEDIR}/share/apps/kdesktop/pics/
-	cd ${D}/${KDEDIR}/share/apps/kdesktop/
-	ln -sf /usr/share/pixmaps/ pics
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-
-}
-
-pkg_postinst() {
-	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
-
-einfo "If you want to floppy:/ kioslave to work, please emerge the mtools package."
-einfo "This ioslave allows you to use fat/vfat filesystems (not only on floppies)"
-einfo "without mounting them. If you don't know what this is for, you can probably"
-einfo "go with the usual mounting method."
-
-}
diff --git a/kde-base/kdebindings/ChangeLog b/kde-base/kdebindings/ChangeLog
index dc9fe4d7fa36..c5eb65646803 100644
--- a/kde-base/kdebindings/ChangeLog
+++ b/kde-base/kdebindings/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebindings
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.38 2003/09/17 02:25:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.39 2003/09/27 17:28:56 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebindings-2.2.2.ebuild,
+  kdebindings-2.2.2.ebuild, kdebindings-3.1.1.ebuild,
+  kdebindings-3.1.1.ebuild, kdebindings-3.1.3.ebuild,
+  kdebindings-3.1.3.ebuild:
+  removing stale versions
 
 *kdebindings-3.1.4 (16 Sep 2003)
 
diff --git a/kde-base/kdebindings/Manifest b/kde-base/kdebindings/Manifest
index 4251da84d60d..e4174f25ab64 100644
--- a/kde-base/kdebindings/Manifest
+++ b/kde-base/kdebindings/Manifest
@@ -1,17 +1,11 @@
-MD5 32a36785eac254f25199134c3c29022e kdebindings-2.2.2.ebuild 913
 MD5 70813a9d4a25d0b4e644d1f41ea5aa04 kdebindings-3.1.4.ebuild 1407
 MD5 aef38763e2fd59f6de5d641c78f4303d kdebindings-3.0.5b.ebuild 1152
-MD5 b7cf054f48c9730627157ef053dfe5f5 kdebindings-3.1.1.ebuild 1399
-MD5 88ab7688211da1a66a689a15b6c42452 kdebindings-3.1.3.ebuild 1405
-MD5 e19fcbe97b3a4b7ec3e7989f6df98dff ChangeLog 5203
+MD5 9082a8dd2dbc2139ae4d22b2601426ec ChangeLog 5439
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 258aa46912c7020b1ea2534a1de494e5 kdebindings-3.0.4.ebuild 1106
 MD5 570c9b8092107b8b61c692da3dd0cf3f kdebindings-3.1.2.ebuild 1398
-MD5 9214bc981c8721fe53cefe1fd68dfa11 files/digest-kdebindings-2.2.2 71
 MD5 bd79d694689e0ff999dae51b33eeb8fd files/digest-kdebindings-3.0.4 71
-MD5 3752b01449392c37caa3f997b9f60f91 files/digest-kdebindings-3.1.1 71
 MD5 d1a84c5fa77f03a4ae669f1b02bbe7b6 files/digest-kdebindings-3.1.2 71
-MD5 5c23fd22d245b60b49da19ca4ea48980 files/digest-kdebindings-3.1.3 71
 MD5 3a2ce91840687906d62b2072006c0374 files/digest-kdebindings-3.1.4 71
 MD5 823592dd45da38fd48dd11d40e5bbb91 files/digest-kdebindings-3.0.5b 220
 MD5 452eac66c774d6c287648f4f68d6aa36 files/kdebindings-3.0.5a-qt31.diff 76610
diff --git a/kde-base/kdebindings/files/digest-kdebindings-2.2.2 b/kde-base/kdebindings/files/digest-kdebindings-2.2.2
deleted file mode 100644
index f5578d691657..000000000000
--- a/kde-base/kdebindings/files/digest-kdebindings-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a36231bc47965c26529fd1c15c0abba kdebindings-2.2.2.tar.bz2 2475511
diff --git a/kde-base/kdebindings/files/digest-kdebindings-3.1.1 b/kde-base/kdebindings/files/digest-kdebindings-3.1.1
deleted file mode 100644
index 514c5176c07c..000000000000
--- a/kde-base/kdebindings/files/digest-kdebindings-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1615ba2776120541d884e9a10fe2cffa kdebindings-3.1.1.tar.bz2 6102064
diff --git a/kde-base/kdebindings/files/digest-kdebindings-3.1.3 b/kde-base/kdebindings/files/digest-kdebindings-3.1.3
deleted file mode 100644
index e6708884bf36..000000000000
--- a/kde-base/kdebindings/files/digest-kdebindings-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c932da16560136940afaf2391782cde kdebindings-3.1.3.tar.bz2 6177928
diff --git a/kde-base/kdebindings/kdebindings-2.2.2.ebuild b/kde-base/kdebindings/kdebindings-2.2.2.ebuild
deleted file mode 100644
index 0829bb21e78a..000000000000
--- a/kde-base/kdebindings/kdebindings-2.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.2.ebuild,v 1.19 2003/09/06 23:54:21 msterret Exp $
-
-IUSE="python java"
-inherit kde-dist
-
-DESCRIPTION="KDE $PV - kde library bindings for languages other than c++"
-
-KEYWORDS="x86 sparc ppc"
-
-newdepend ">=kde-base/kdebase-${PV}
-	=x11-libs/gtk+-1.2*
-	dev-lang/perl
-	python? ( dev-lang/python )
-	java? (	virtual/jdk )
-	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*
-	>=kde-base/kdenetwork-${PV}"
-
-src_compile() {
-
-	kde_src_compile myconf
-
-	use python							|| myconf="$myconf --without-python"
-	use java	&& myconf="$myconf --with-java=${JAVA_HOME}"	|| myconf="$myconf --without-java"
-
-	kde_src_compile configure
-
-	# the library_path is a kludge for a strange bug
-	LIBRARY_PATH=${QTDIR}/lib LIBPYTHON=\"`python-config`\" make || die
-}
-
diff --git a/kde-base/kdebindings/kdebindings-3.1.1.ebuild b/kde-base/kdebindings/kdebindings-3.1.1.ebuild
deleted file mode 100644
index 8a80cfd3ae7f..000000000000
--- a/kde-base/kdebindings/kdebindings-3.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-3.1.1.ebuild,v 1.4 2003/09/06 23:54:21 msterret Exp $
-# TODO: add gnustep, objc bindings
-inherit kde-dist
-
-IUSE="mozilla java python"
-DESCRIPTION="KDE library bindings for languages other than c++"
-KEYWORDS="x86 ~sparc ~alpha ppc"
-
-newdepend "=kde-base/kdebase-${PV}*
-	=x11-libs/gtk+-1.2*
-	dev-lang/perl
-	python? ( dev-lang/python )
-	java? (	virtual/jdk )
-	=dev-libs/glib-1.2*
-	~kde-base/kdenetwork-${PV}
-	mozilla? ( net-www/mozilla )"
-
-use python									|| myconf="$myconf --without-python"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
-
-# obj bindings are officially broken
-#myconf="$myconf --enable-objc"
-
-# we need to have csant (from pnet, from portable.NET) in portage for qtsharp
-export DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"
-
-export LIBPYTHON="`python-config`"
-
-# fix bug #14756 fex. Doesn't compile well with -j2.
-export MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack()
-{
-	kde_src_unpack
-
-	if [ -z "`use mozilla`" ]; then
-	# disable mozilla bindings/xpart, because configure doesn't seem to do so
-	# even when it doesn't detect the mozilla headers
-	cd ${S}/xparts
-	cp Makefile.am Makefile.am.orig
-	sed -e 's:mozilla::' Makefile.am.orig > Makefile.am
-	fi
-}
-
diff --git a/kde-base/kdebindings/kdebindings-3.1.3.ebuild b/kde-base/kdebindings/kdebindings-3.1.3.ebuild
deleted file mode 100644
index 81e789a78671..000000000000
--- a/kde-base/kdebindings/kdebindings-3.1.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-3.1.3.ebuild,v 1.5 2003/09/21 22:10:58 caleb Exp $
-# TODO: add gnustep, objc bindings
-inherit kde-dist
-
-IUSE="mozilla java python"
-DESCRIPTION="KDE library bindings for languages other than c++"
-KEYWORDS="x86 sparc"
-
-newdepend "=kde-base/kdebase-${PV}*
-	=x11-libs/gtk+-1.2*
-	dev-lang/perl
-	python? ( dev-lang/python )
-	java? (	virtual/jdk )
-	=dev-libs/glib-1.2*
-	~kde-base/kdenetwork-${PV}
-	mozilla? ( net-www/mozilla )"
-
-use python									|| myconf="$myconf --without-python"
-use java	&& myconf="$myconf --with-java=$(java-config --jdk-home)"	|| myconf="$myconf --without-java"
-
-# obj bindings are officially broken
-#myconf="$myconf --enable-objc"
-
-# we need to have csant (from pnet, from portable.NET) in portage for qtsharp
-export DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"
-
-export LIBPYTHON="`python-config`"
-
-# fix bug #14756 fex. Doesn't compile well with -j2.
-export MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack()
-{
-	kde_src_unpack
-
-	if [ -z "`use mozilla`" ]; then
-	# disable mozilla bindings/xpart, because configure doesn't seem to do so
-	# even when it doesn't detect the mozilla headers
-	cd ${S}/xparts
-	cp Makefile.am Makefile.am.orig
-	sed -e 's:mozilla::' Makefile.am.orig > Makefile.am
-	fi
-
-	cd ${S} && aclocal
-}
-
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 473ba18988cf..9da57f401226 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.44 2003/09/26 17:32:27 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.45 2003/09/27 17:29:29 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.1.ebuild,
+  kdeedu-3.1.1.ebuild, kdeedu-3.1.3.ebuild, kdeedu-3.1.3.ebuild:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index 46f9fad608b9..a2a4942fbc6f 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,14 +1,10 @@
-MD5 b2ffb0e35e8d9b7414024063066ec42d ChangeLog 5602
 MD5 28a156d34db2bc5b1aad866a8ac0ba7a kdeedu-3.0.4.ebuild 625
-MD5 e20d4c8fa80c290a424f2a640e7fa7e4 kdeedu-3.0.5b.ebuild 634
-MD5 6b4235680c4655d66331953249f4d59e kdeedu-3.1.1.ebuild 418
 MD5 de35a085f99bd298af98c1368dc53b73 kdeedu-3.1.2.ebuild 423
-MD5 7b7195b76bb3acd44e3aeee24b439b2f kdeedu-3.1.3.ebuild 412
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 77b6e25b5fd295130683b3fbcaf58ea0 kdeedu-3.1.4.ebuild 412
-MD5 0c79179c373ac6bcb1623c57d87ce229 files/digest-kdeedu-3.0.4 66
+MD5 e20d4c8fa80c290a424f2a640e7fa7e4 kdeedu-3.0.5b.ebuild 634
+MD5 95de5ab05224c058217e6bdc8c98ae77 ChangeLog 5762
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 e5cc833cf9395a8fdb5aa2ee18943e17 files/digest-kdeedu-3.0.5b 211
-MD5 68a34630292321130142b9ce15fab8bb files/digest-kdeedu-3.1.1 67
+MD5 0c79179c373ac6bcb1623c57d87ce229 files/digest-kdeedu-3.0.4 66
 MD5 cd5a6b52f6412f8c1e0f5549e00c2340 files/digest-kdeedu-3.1.2 67
-MD5 e0d3eec47f1fea2f21aa768aa96c5138 files/digest-kdeedu-3.1.3 67
 MD5 78c0a58b06517e4a79380ed934510f91 files/digest-kdeedu-3.1.4 67
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.1.1 b/kde-base/kdeedu/files/digest-kdeedu-3.1.1
deleted file mode 100644
index 63fc4d6032c6..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6520da39109c5919437ac3c914342658 kdeedu-3.1.1.tar.bz2 19968353
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.1.3 b/kde-base/kdeedu/files/digest-kdeedu-3.1.3
deleted file mode 100644
index 1de425e757a4..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02996b08a1c2a2aa044406480c0eb8a7 kdeedu-3.1.3.tar.bz2 20038921
diff --git a/kde-base/kdeedu/kdeedu-3.1.1.ebuild b/kde-base/kdeedu/kdeedu-3.1.1.ebuild
deleted file mode 100644
index a1e45bf77692..000000000000
--- a/kde-base/kdeedu/kdeedu-3.1.1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.1.1.ebuild,v 1.3 2003/04/28 05:51:20 pylon Exp $
-inherit kde-dist flag-o-matic
-
-IUSE=""
-DESCRIPTION="KDE educational apps"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-if [ "`gcc -dumpversion`" == "2.95.3" ]; then
-	filter-flags "-fomit-frame-pointer"
-fi
diff --git a/kde-base/kdeedu/kdeedu-3.1.3.ebuild b/kde-base/kdeedu/kdeedu-3.1.3.ebuild
deleted file mode 100644
index c491130b1632..000000000000
--- a/kde-base/kdeedu/kdeedu-3.1.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.1.3.ebuild,v 1.5 2003/09/17 01:30:40 weeve Exp $
-inherit kde-dist flag-o-matic
-
-IUSE=""
-DESCRIPTION="KDE educational apps"
-KEYWORDS="x86 ~ppc sparc"
-
-if [ "`gcc -dumpversion`" == "2.95.3" ]; then
-	filter-flags "-fomit-frame-pointer"
-fi
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index 2a93907eb2b5..5dcebed3fa9a 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdegames
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.47 2003/09/27 14:21:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.48 2003/09/27 17:29:59 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-2.2.2-r1.ebuild,
+  kdegames-2.2.2-r1.ebuild, kdegames-3.1.1.ebuild, kdegames-3.1.1.ebuild,
+  kdegames-3.1.3.ebuild, kdegames-3.1.3.ebuild,
+  files/kdegames-3.1.3-gcc33.diff:
+  removing stale versions
 
 *kdegames-3.2.0_alpha2 (27 Sep 2003)
 
diff --git a/kde-base/kdegames/Manifest b/kde-base/kdegames/Manifest
index 814d6b2ecf2c..958df6d807b7 100644
--- a/kde-base/kdegames/Manifest
+++ b/kde-base/kdegames/Manifest
@@ -1,20 +1,13 @@
 MD5 0ea193b90df78ca5a5bec93cddf44286 kdegames-3.2.0_alpha2.ebuild 324
-MD5 b24de60c1eeda6be9a4e4d17a06191ce kdegames-2.2.2-r1.ebuild 487
 MD5 2df21a42b3519b94e7502ddefbee32c5 kdegames-3.0.4.ebuild 311
 MD5 d9164e76dfb045ccf9e60fd29b2f8bae kdegames-3.1.2.ebuild 1051
 MD5 e2cfb99a87ffd63e60cbc7645f0cc294 kdegames-3.0.5b.ebuild 360
 MD5 099fcef83cd29ea01143e241c661b489 kdegames-3.1.4.ebuild 1109
-MD5 db43a02b99fa75915c951c43a6012473 kdegames-3.1.1.ebuild 1043
-MD5 745e565c96ea59b5495940e5c4c8c509 ChangeLog 5894
+MD5 bb646b3dfa4218dfb05d55ddfae9aa34 ChangeLog 6151
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 c30890ac3c26164a2eac1de73968085f kdegames-3.1.3.ebuild 1108
 MD5 9454a7045d01e70b0b5b69c46be36801 files/kdegames-3.0.5b-gentoo.diff 592
-MD5 245411bbbf6ddc4fe9698b192374f69f files/digest-kdegames-2.2.2-r1 135
-MD5 a77f0add622f42b791e9f03d64cb9947 files/kdegames-3.1.3-gcc33.diff 918
 MD5 73a3b61ff37f70ff995d3eaf9ae3e7d5 files/digest-kdegames-3.0.4 68
-MD5 c607a5f007e635dc05b4cf219e0f3ee9 files/digest-kdegames-3.1.1 68
 MD5 cb8d2367fb5d185f5ed5a4be4740e40c files/digest-kdegames-3.1.2 68
-MD5 13a2dac31a33c8147a7edfe32c207611 files/digest-kdegames-3.1.3 68
 MD5 b1b7eb1ed81f80133b5d6b5530bfcbba files/digest-kdegames-3.1.4 68
 MD5 122789c8ad3e6ec2fa0eb7ccd11403c9 files/digest-kdegames-3.2.0_alpha2 69
 MD5 726d8204b4760054fba2739aad24a7e4 files/digest-kdegames-3.0.5b 286
diff --git a/kde-base/kdegames/files/digest-kdegames-2.2.2-r1 b/kde-base/kdegames/files/digest-kdegames-2.2.2-r1
deleted file mode 100644
index 380ed193b32b..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-2.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 65b1e9885bdda64597e6e3cdf129cee3 kdegames-2.2.2.tar.bz2 8828605
-MD5 0dbd747882b942465646efe0ba6af802 post-2.2.2-kdegames.diff 4747
diff --git a/kde-base/kdegames/files/digest-kdegames-3.1.1 b/kde-base/kdegames/files/digest-kdegames-3.1.1
deleted file mode 100644
index db79f722c28f..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7af6a8961bf94257d2d8a319e464693 kdegames-3.1.1.tar.bz2 8346757
diff --git a/kde-base/kdegames/files/digest-kdegames-3.1.3 b/kde-base/kdegames/files/digest-kdegames-3.1.3
deleted file mode 100644
index d94f6e946ffa..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98151556b1556e7e39930ab12bdeace2 kdegames-3.1.3.tar.bz2 8501085
diff --git a/kde-base/kdegames/files/kdegames-3.1.3-gcc33.diff b/kde-base/kdegames/files/kdegames-3.1.3-gcc33.diff
deleted file mode 100644
index 3dfde4281973..000000000000
--- a/kde-base/kdegames/files/kdegames-3.1.3-gcc33.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN kolf/config.cpp kolf/config.cpp
---- kolf/config.cpp	2002-09-29 12:35:30.000000000 -0300
-+++ kolf/config.cpp	2003-08-05 05:00:04.000000000 -0300
-@@ -6,7 +6,7 @@
- 
- #include "config.h"
- 
--Config::Config(QWidget *parent, const char *name = 0)
-+Config::Config(QWidget *parent, const char *name)
- 	: QFrame(parent, name)
- {
- 	startedUp = false;
-@@ -33,14 +33,14 @@
- 		emit modified();
- }
- 
--MessageConfig::MessageConfig(QString text, QWidget *parent, const char *name = 0)
-+MessageConfig::MessageConfig(QString text, QWidget *parent, const char *name )
- 	: Config(parent, name)
- {
- 	QVBoxLayout *layout = new QVBoxLayout(this, marginHint(), spacingHint());
- 	layout->addWidget(new QLabel(text, this));
- }
- 
--DefaultConfig::DefaultConfig(QWidget *parent, const char *name = 0)
-+DefaultConfig::DefaultConfig(QWidget *parent, const char *name)
- 	: MessageConfig(i18n("No configuration options"), parent, name)
- {
- }
diff --git a/kde-base/kdegames/kdegames-2.2.2-r1.ebuild b/kde-base/kdegames/kdegames-2.2.2-r1.ebuild
deleted file mode 100644
index 58f2991777f2..000000000000
--- a/kde-base/kdegames/kdegames-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-2.2.2-r1.ebuild,v 1.5 2003/07/16 16:22:12 pvdabeel Exp $
-inherit kde-dist eutils
-
-IUSE=""
-DESCRIPTION="KDE $PV - games"
-
-KEYWORDS="x86 sparc ppc"
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-}
diff --git a/kde-base/kdegames/kdegames-3.1.1.ebuild b/kde-base/kdegames/kdegames-3.1.1.ebuild
deleted file mode 100644
index 866102eeb899..000000000000
--- a/kde-base/kdegames/kdegames-3.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.1.1.ebuild,v 1.4 2003/09/11 01:16:25 msterret Exp $
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-IUSE=""
-KEYWORDS="x86 ppc sparc ~alpha"
-
-src_unpack() {
-	kde_src_unpack
-	if [ ${ARCH} == "alpha" ] ; then
-		einfo "Not building kmines due to linking problems on alpha"
-		cd ${S}
-		cp subdirs subdirs.orig
-		grep -v kmines subdirs.orig > subdirs
-	fi
-}
-
-src_compile() {
-	kde_src_compile myconf configure
-	if [ ${ARCH} == "alpha" ] ; then
-		# ksirtet dies without kmines' libkdehighscores, so we have to build it
-		# manually if we want ksirtet. Which we do. Everyone loves tetris!
-		# But first, build libkdegames, since libkdehighscores depends on it.
-		cd ${S}/libkdegames
-		emake || die "died trying to build libkdegames"
-		cd ../kmines/generic
-		emake || die "died trying to build kmines/generic/libkdehighscores.la"
-	fi
-	kde_src_compile make
-}
diff --git a/kde-base/kdegames/kdegames-3.1.3.ebuild b/kde-base/kdegames/kdegames-3.1.3.ebuild
deleted file mode 100644
index 353275dcbc5c..000000000000
--- a/kde-base/kdegames/kdegames-3.1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.1.3.ebuild,v 1.8 2003/09/17 01:33:08 weeve Exp $
-inherit kde-dist eutils
-
-DESCRIPTION="KDE games (solitaire :-)"
-IUSE=""
-KEYWORDS="x86 ~ppc sparc"
-
-#13 Jul 2003: drobbins: building kdegames-3.1.2 fails on dual Xeon; disabling parallel mode :/
-MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-gcc33.diff
-}
-
-src_compile() {
-	if [ ${ARCH} == "alpha" ] ; then
-		export DO_NOT_COMPILE="kmines" # still b0rken on alpha
-	fi
-	kde_src_compile myconf configure
-	if [ ${ARCH} == "alpha" ] ; then
-		# ksirtet dies without kmines' libkdehighscores, so we have to build it
-		# manually if we want ksirtet. Which we do. Everyone loves tetris!
-		# First, we build libkdegames, since libkdehighscores depends on it.
-		cd ${S}/libkdegames
-		emake || die "died trying to build libkdegames"
-		cd ../kmines/generic
-		emake || die "died trying to build kmines/generic/libkdehighscores.la"
-	fi
-	kde_src_compile make
-}
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index af2f6897e90b..1380eb3c1e3c 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.55 2003/09/26 17:35:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.56 2003/09/27 17:30:28 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-2.2.2-r1.ebuild,
+  kdegraphics-2.2.2-r1.ebuild, kdegraphics-2.2.2-r2.ebuild,
+  kdegraphics-2.2.2-r2.ebuild, kdegraphics-3.1.1a-r1.ebuild,
+  kdegraphics-3.1.1a-r1.ebuild, kdegraphics-3.1.3.ebuild,
+  kdegraphics-3.1.3.ebuild, files/kdegraphics-2.2.2-gentoo.diff:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 83509cfc797d..98688ef5d77a 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,21 +1,12 @@
-MD5 c5c22e4a5e5c4bbf802c7ccafb76861d ChangeLog 7995
-MD5 440b12d4902b7b08028c0b13d2019987 kdegraphics-2.2.2-r1.ebuild 1011
-MD5 8a330333e2e144738e0cc2e1090fe2c0 kdegraphics-2.2.2-r2.ebuild 1269
-MD5 c8f201f861f44cb6fc5523edf73c71f4 kdegraphics-3.0.4.ebuild 1474
+MD5 c579a0af41d77c5b6111b7709274b003 kdegraphics-3.1.4.ebuild 1206
 MD5 8e66c7e8876186f9cbe522cbe9c6786e kdegraphics-3.0.5b.ebuild 1483
-MD5 119c9144daf81fee6bcbcc92b338b265 kdegraphics-3.1.1a-r1.ebuild 1216
+MD5 c8f201f861f44cb6fc5523edf73c71f4 kdegraphics-3.0.4.ebuild 1474
 MD5 2f218b930d6f1aa11c2bc473a5448879 kdegraphics-3.1.2.ebuild 1216
-MD5 63244e4b05c5df6278266f1451b3c0c2 kdegraphics-3.1.3.ebuild 1206
+MD5 cfd6faaaa82b3e18eabd14163425c964 ChangeLog 8342
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 c579a0af41d77c5b6111b7709274b003 kdegraphics-3.1.4.ebuild 1206
-MD5 d5bbeb3731063072794323e195a7a99d files/digest-kdegraphics-2.2.2-r1 141
-MD5 e7cc7d6e6591c7dfdc7c247d5a436549 files/digest-kdegraphics-2.2.2-r2 299
+MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.4-kghostviewrc 335
 MD5 34693477929f801abd54b37a58efa7f0 files/digest-kdegraphics-3.0.4 71
-MD5 fcdc3bd9bfe2c49726ccc6d61cfb7fd4 files/digest-kdegraphics-3.0.5b 72
-MD5 de350fd2d3c202b454063623e3bfb286 files/digest-kdegraphics-3.1.1a-r1 145
 MD5 8182772f29e4abe216202a61593265ee files/digest-kdegraphics-3.1.2 71
-MD5 040b90f777e8fd211e0a10badc2e53fe files/digest-kdegraphics-3.1.3 71
-MD5 8e79f1d4682e90f425f1280578625492 files/kdegraphics-2.2.2-gentoo.diff 472
-MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.4-kghostviewrc 335
-MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5b-kghostviewrc 335
 MD5 2eb5733acffb2f31465f4badc38088fb files/digest-kdegraphics-3.1.4 71
+MD5 fcdc3bd9bfe2c49726ccc6d61cfb7fd4 files/digest-kdegraphics-3.0.5b 72
+MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5b-kghostviewrc 335
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r1
deleted file mode 100644
index 1db968078ce7..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b9341505c6b9de8f018dd9d1896356e9 kdegraphics-2.2.2.tar.bz2 1648936
-MD5 4b9c93acd452d1de2f4f0bca5b05593f post-2.2.2-kdegraphics.diff 9397
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2
deleted file mode 100644
index d1a9773808fa..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 b9341505c6b9de8f018dd9d1896356e9 kdegraphics-2.2.2.tar.bz2 1648936
-MD5 4b9c93acd452d1de2f4f0bca5b05593f post-2.2.2-kdegraphics.diff 9397
-MD5 1e7520b590e6573446487efb3995d8a3 post-2.2.2-kdegraphics-kghostview-2.diff 4492
-MD5 a0a87a2f7617e83c831d1a9c2588830e post-2.2.2-kdegraphics-kdvi.diff 3786
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.1a-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.1.1a-r1
deleted file mode 100644
index 938fee31e30f..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.1a-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 316e88f15097807565502930832b0089 kdegraphics-3.1.1a-r1.diff.bz2 22266
-MD5 c417474e1aa6b7efd9a0233fee81cf71 kdegraphics-3.1.1.tar.bz2 4535382
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.1.3
deleted file mode 100644
index 7cad6ea9d736..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14afcd5713481b19a5a9908e522445de kdegraphics-3.1.3.tar.bz2 4591104
diff --git a/kde-base/kdegraphics/files/kdegraphics-2.2.2-gentoo.diff b/kde-base/kdegraphics/files/kdegraphics-2.2.2-gentoo.diff
deleted file mode 100644
index 98491fbf120e..000000000000
--- a/kde-base/kdegraphics/files/kdegraphics-2.2.2-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- kooka/scanpackager.cpp~	2002-12-23 11:20:30.000000000 +0100
-+++ kooka/scanpackager.cpp	2002-12-23 11:20:40.000000000 +0100
-@@ -426,7 +426,7 @@
- /* ----------------------------------------------------------------------- */
- void ScanPackager::slShowContextMenue(QListViewItem *lvi, const QPoint &p, int col )
- {
--   kdDebug(28000) << "Showing Context Menue" << endl;
-+   kdDebug(28000) << "Showing Context Menue" << endl;
-    (void) col;
- 
-    PackagerItem *curr = 0;
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.2-r1.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.2-r1.ebuild
deleted file mode 100644
index 42aa94954287..000000000000
--- a/kde-base/kdegraphics/kdegraphics-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.2-r1.ebuild,v 1.8 2003/09/09 00:48:34 usata Exp $
-inherit kde-dist eutils
-
-IUSE="tetex gphoto2"
-DESCRIPTION="KDE $PV - graphics-related apps"
-KEYWORDS="x86 sparc ppc"
-DEPEND="$DEPEND dev-lang/perl
-	media-gfx/sane-backends
-	tetex? ( virtual/tetex )"
-
-newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )"
-
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	use gphoto2 && myconf="$myconf --with-gphoto2-includes=/usr/include/gphoto2 --with-gphoto2-libraries=/usr/lib/gphoto2" || myconf="$myconf --without-kamera"
-	use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-	kde_src_compile configure make
-}
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild
deleted file mode 100644
index 1a68228c9763..000000000000
--- a/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild,v 1.3 2003/09/09 00:48:34 usata Exp $
-inherit kde-dist eutils
-
-IUSE="tetex gphoto2"
-DESCRIPTION="KDE $PV - graphics-related apps"
-KEYWORDS="x86 sparc ppc"
-DEPEND="$DEPEND dev-lang/perl
-	media-gfx/sane-backends
-	tetex? ( virtual/tetex )"
-
-newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )"
-
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff
-	mirror://kde/security_patches/post-${PV}-${PN}-kghostview-2.diff
-	mirror://kde/security_patches/post-${PV}-${PN}-kdvi.diff"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	cd ${S}/kghostview
-	epatch ${DISTDIR}/post-${PV}-${PN}-kghostview-2.diff
-	cd ${S}/kdvi
-	epatch ${DISTDIR}/post-${PV}-${PN}-kdvi.diff
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	use gphoto2 && myconf="$myconf --with-gphoto2-includes=/usr/include/gphoto2 --with-gphoto2-libraries=/usr/lib/gphoto2" || myconf="$myconf --without-kamera"
-	use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-	kde_src_compile configure make
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.1.1a-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.1.1a-r1.ebuild
deleted file mode 100644
index ce809d319736..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.1.1a-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.1.1a-r1.ebuild,v 1.5 2003/09/09 00:48:34 usata Exp $
-inherit kde-dist
-
-IUSE="gphoto2 tetex scanner"
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
-	dev-lang/perl
-	scanner? ( media-gfx/sane-backends )
-	tetex? ( virtual/tetex )
-	media-libs/imlib
-	app-text/ghostscript
-	virtual/glut virtual/opengl
-	media-libs/tiff
-	!media-gfx/kpovmodeler
-	x86? ( scanner? sys-libs/libieee1284 )
-	>=sys-apps/portage-2.0.47" # needed for the above dep ANDing to work
-
-RDEPEND="$RDEPEND app-text/xpdf"
-
-use gphoto2	&& myconf="$myconf --with-kamera --with-gphoto2-includes=/usr/include/gphoto2 \
-				   --with-gphoto2-libraries=/usr/lib/gphoto2 \
-				   --with-gpio --with-gpio-includes=/usr/include \
-				   --with-gpio-libraries=/usr/lib" || myconf="$myconf --without-kamera"
-
-use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-
-use scanner	|| KDE_REMOVE_DIR="kooka libkscan"
-
-myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
-
diff --git a/kde-base/kdegraphics/kdegraphics-3.1.3.ebuild b/kde-base/kdegraphics/kdegraphics-3.1.3.ebuild
deleted file mode 100644
index b5d35033a661..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.1.3.ebuild,v 1.7 2003/09/17 01:41:50 weeve Exp $
-inherit kde-dist
-
-IUSE="gphoto2 tetex scanner"
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="x86 ~ppc sparc"
-
-newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )
-	dev-lang/perl
-	scanner? ( media-gfx/sane-backends )
-	tetex? ( virtual/tetex )
-	media-libs/imlib
-	app-text/ghostscript
-	virtual/glut virtual/opengl
-	media-libs/tiff
-	!media-gfx/kpovmodeler
-	x86? ( scanner? sys-libs/libieee1284 )
-	>=sys-apps/portage-2.0.47" # needed for the above dep ANDing to work
-
-RDEPEND="$RDEPEND app-text/xpdf"
-
-use gphoto2	&& myconf="$myconf --with-kamera --with-gphoto2-includes=/usr/include/gphoto2 \
-				   --with-gphoto2-libraries=/usr/lib/gphoto2 \
-				   --with-gpio --with-gpio-includes=/usr/include \
-				   --with-gpio-libraries=/usr/lib" || myconf="$myconf --without-kamera"
-
-use tetex 	&& myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
-
-use scanner	|| KDE_REMOVE_DIR="kooka libkscan"
-
-myconf="$myconf --with-imlib --with-imlib-config=/usr/bin"
-
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 87411defe744..7c491c2a6853 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.92 2003/09/26 16:19:17 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.93 2003/09/27 17:37:34 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-2.2.2a-r2.ebuild,
+  kdelibs-2.2.2a-r2.ebuild, kdelibs-3.0.5b.ebuild, kdelibs-3.0.5b.ebuild,
+  kdelibs-3.1.1a.ebuild, kdelibs-3.1.1a.ebuild, kdelibs-3.1.2.ebuild,
+  kdelibs-3.1.2.ebuild, kdelibs-3.1.3-r1.ebuild, kdelibs-3.1.3-r1.ebuild,
+  kdelibs-3.1.3.ebuild, kdelibs-3.1.3.ebuild,
+  files/kdelibs-2.2.2a-crosside.diff, files/kdelibs-2.2.2a-gentoo.diff,
+  files/kdelibs-3.1.2-http.patch, files/kdelibs-3.1.2-khtml.patch:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d00d1962d277..af23e7a8539f 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,35 +1,16 @@
-MD5 33aeeef19e716c0b27f571329cd1cdc5 ChangeLog 15640
-MD5 ecb842ef67a00a4a3348c92a784cc3b7 kdelibs-2.2.2a-r2.ebuild 2570
-MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
-MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
-MD5 b738a6c4ff97493257f186b1dfb853ee kdelibs-3.0.5b.ebuild 1921
-MD5 c1904a08290952b668274da4df0aad8a kdelibs-3.1.1a.ebuild 2647
 MD5 c6d6b8ad780f8c1bbc8f3402c6f9c2e4 kdelibs-3.1.2-r1.ebuild 2539
-MD5 434626ef575100a44e7f2424082808b5 kdelibs-3.1.2.ebuild 2441
-MD5 d3644c194ed974e8fdafaa060f287b2f kdelibs-3.1.3-r1.ebuild 2499
-MD5 83634808b03c92344adfcc587e7b99d6 kdelibs-3.1.3.ebuild 2424
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 604be000d886ae25246c3492b102c8b7 kdelibs-3.1.4.ebuild 2388
+MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
 MD5 cb3a72e767d85f302d891303273d56c3 kdelibs-3.2.0_alpha2.ebuild 2220
-MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
-MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b 68
-MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
-MD5 fe5064a43dd8ed966e50aee8b8f3364a files/digest-kdelibs-3.1.1a 136
-MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2 68
-MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
-MD5 0783bde2d3df61818e8563b3a445742b files/digest-kdelibs-3.1.3 68
-MD5 0783bde2d3df61818e8563b3a445742b files/digest-kdelibs-3.1.3-r1 68
-MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267
-MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788
-MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
+MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
+MD5 5cc50b3c9d19da195599b2d2534d6063 ChangeLog 16143
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
 MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
-MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 36a366fd1a948f28712eab93b5be7e52 files/kdelibs-3.1.3-render_root.patch 896
-MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
+MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
 MD5 762b24559d7e5b32397efa5526d5d15c files/digest-kdelibs-3.2.0_alpha2 69
+MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
+MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2
deleted file mode 100644
index 04b08eb13c7a..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51ec17dce9c62b50a3c2e97e4511cdcf kdelibs-2.2.2.tar.bz2 5955592
-MD5 e2c50fb7c97e1fbc8939e30a30054e45 post-2.2.2-kdelibs-kimgio.diff 509
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.5b b/kde-base/kdelibs/files/digest-kdelibs-3.0.5b
deleted file mode 100644
index 13369594cf91..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.0.5b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50b483665bc868f2dbc53aaaa3c2f302 kdelibs-3.0.5b.tar.bz2 7610088
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.1a b/kde-base/kdelibs/files/digest-kdelibs-3.1.1a
deleted file mode 100644
index 619bd5ee8ef1..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.1a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5687b1f9d7e0698f63c35c53322c786a kdelibs-3.1.1a.diff.bz2 156512
-MD5 15eb9412c589126844b277b9e80cfffc kdelibs-3.1.1.tar.bz2 10313173
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.2 b/kde-base/kdelibs/files/digest-kdelibs-3.1.2
deleted file mode 100644
index 8a9950b60c75..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b896ce9a6942e4cc4fe1758236bafa3 kdelibs-3.1.2.tar.bz2 10524265
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.3 b/kde-base/kdelibs/files/digest-kdelibs-3.1.3
deleted file mode 100644
index 70252e2d27cf..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0069e199dd69f27f20afbd5b64449725 kdelibs-3.1.3.tar.bz2 10533062
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1.3-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.1.3-r1
deleted file mode 100644
index 70252e2d27cf..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0069e199dd69f27f20afbd5b64449725 kdelibs-3.1.3.tar.bz2 10533062
diff --git a/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff b/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff
deleted file mode 100644
index 381eb166c6f6..000000000000
--- a/kde-base/kdelibs/files/kdelibs-2.2.2a-crosside.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- khtml/ecma/kjs_html.cpp	2002/01/08 13:42:53	1.108.2.3
-+++ khtml/ecma/kjs_html.cpp	2002/09/10 16:31:26	1.108.2.4
-@@ -858,7 +858,6 @@ KJSO KJS::HTMLElement::tryGet(const UStr
-     case ID_FRAME: {
-       DOM::HTMLFrameElement frameElement = element;
- 
--      // p == "document" ?
-       if (p == "frameBorder")          return getString(frameElement.frameBorder());
-       else if (p == "longDesc")        return getString(frameElement.longDesc());
-       else if (p == "marginHeight")    return getString(frameElement.marginHeight());
-@@ -873,9 +872,11 @@ KJSO KJS::HTMLElement::tryGet(const UStr
-     break;
-     case ID_IFRAME: {
-       DOM::HTMLIFrameElement iFrame = element;
-+      KHTMLPart* part = iFrame.isNull() ? 0 : static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle() )->frameDocument()->view()->part();
-       if (p == "align")                return getString(iFrame.align());
--      // ### security check ?
--      else if (p == "document") {
-+      else if ((iFrame.src().isEmpty() || !part || originCheck(part->url(), Window::retrieveActive()->part()->url())) 
-+
-+               && p == "document") {
-         if ( !iFrame.isNull() )
-           return getDOMNode( static_cast<DOM::HTMLIFrameElementImpl*>(iFrame.handle() )->frameDocument() );
- 
diff --git a/kde-base/kdelibs/files/kdelibs-2.2.2a-gentoo.diff b/kde-base/kdelibs/files/kdelibs-2.2.2a-gentoo.diff
deleted file mode 100644
index a1b8a0bae2cc..000000000000
--- a/kde-base/kdelibs/files/kdelibs-2.2.2a-gentoo.diff
+++ /dev/null
@@ -1,2385 +0,0 @@
-Index: kdelibs/arts/mcop/debug.cc
-diff -u kdelibs/arts/mcop/debug.cc:1.6 kdelibs/arts/mcop/debug.cc:1.6.2.2
---- arts/mcop/debug.cc:1.6	Wed Jul 25 12:41:35 2001
-+++ arts/mcop/debug.cc	Fri Dec  6 16:12:02 2002
-@@ -1,8 +1,11 @@
-     /*
- 
--    Copyright (C) 2000 Stefan Westerfeld
-+    Copyright (C) 2000-2002 Stefan Westerfeld
-                        stefan@space.twc.de
- 
-+	(see also below for details on the copyright of arts_strdup_printf,
-+	 which is taken from GLib)
-+ 
-     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
-@@ -33,8 +36,36 @@
- static char *messageAppName = 0;
- static Arts::Mutex *arts_debug_mutex = 0;
- 
-+/* routines for variable length sprintf without buffer overflow (from GLib) */
-+static char* arts_strdup_vprintf(const char *format, va_list args1);
-+static char* arts_strdup_printf (const char *format, ...);
-+
- namespace Arts {
- 
-+static char * shell_quote(const char *s)
-+{
-+   char *result;
-+   char *p;
-+   p = result = (char *) malloc(strlen(s)*5+1);
-+   while(*s)
-+   {
-+     if (*s == '\'')
-+     {
-+        *p++ = '\'';
-+        *p++ = '"';
-+        *p++ = *s++;
-+        *p++ = '"';
-+        *p++ = '\'';
-+     }
-+     else
-+     {
-+        *p++ = *s++;
-+     }
-+   }
-+   *p = '\0';
-+   return result;
-+}
-+
- /*
-  * Call the graphical application to display a message, if
-  * defined. Otherwise, send to standard error. Debug messages are
-@@ -42,8 +73,9 @@
-  * Note that the external application is run in the background to
-  * avoid blocking the sound server.
-  */
--void output_message(Debug::Level level, const char *msg) {
--	char buff[1024];
-+static void output_message(Debug::Level level, const char *msg) {
-+	char *quoted_msg;
-+	char *buff = 0;
- 
- 	/* default to text output if no message app is defined or if it is a debug message. */
- 	if (messageAppName == 0 || !strcmp(messageAppName, "") || (level == Debug::lDebug))
-@@ -52,20 +84,27 @@
- 		return;
- 	}
- 
-+        quoted_msg = shell_quote(msg);
- 	switch (level) {
- 	  case Debug::lFatal:
--		  sprintf(buff, "%s -e \"Sound server fatal error:\n\n%s\" &", messageAppName, msg);
-+		  buff = arts_strdup_printf("%s -e 'Sound server fatal error:\n\n%s' &", messageAppName, quoted_msg);
- 		  break;
- 	  case Debug::lWarning:
--		  sprintf(buff, "%s -w \"Sound server warning message:\n\n%s\" &", messageAppName, msg);
-+		  buff = arts_strdup_printf("%s -w 'Sound server warning message:\n\n%s' &", messageAppName, quoted_msg);
- 		  break;
- 	  case Debug::lInfo:
--		  sprintf(buff, "%s -i \"Sound server informational message:\n\n%s\" &", messageAppName, msg);
-+		  buff = arts_strdup_printf("%s -i 'Sound server informational message:\n\n%s' &", messageAppName, quoted_msg);
- 		  break;
- 	  default:
- 		  break; // avoid compile warning
- 	}
-+	free(quoted_msg);
-+	
-+	if(buff != 0)
-+	{
- 	system(buff);
-+		free(buff);
-+	}
- }
- 
- /*
-@@ -76,7 +115,7 @@
-  * previously repeated message (if any) and reset the last message and
-  * count.
-  */
--void display_message(Debug::Level level, const char *msg) {
-+static void display_message(Debug::Level level, const char *msg) {
- 	static char lastMsg[1024];
- 	static Debug::Level lastLevel;
- 	static int msgCount = 0;
-@@ -90,9 +129,10 @@
- 	} else {
- 		if (msgCount > 0)
- 		{
--			char buff[1024];
--			sprintf(buff, "%s\n(The previous message was repeated %d times.)", lastMsg, msgCount);
-+			char *buff;
-+			buff = arts_strdup_printf("%s\n(The previous message was repeated %d times.)", lastMsg, msgCount);
- 			output_message(lastLevel, buff);
-+			free(buff);
- 		}
- 		strncpy(lastMsg, msg, 1024);
- 		lastLevel = level;
-@@ -140,12 +180,15 @@
- 
- void Arts::Debug::fatal(const char *fmt, ...)
- {
--	char buff[1024];
-+	char *buff;
-     va_list ap;
-+
-     va_start(ap, fmt);
--	vsprintf(buff, fmt, ap);
-+	buff = arts_strdup_vprintf(fmt, ap);
-     va_end(ap);
-+
- 	display_message(Debug::lFatal, buff);
-+	free(buff);
- 
- 	if(arts_debug_abort) abort();
- 	exit(1);
-@@ -155,12 +198,15 @@
- {
- 	if(lWarning >= arts_debug_level)
- 	{
--		char buff[1024];
-+		char *buff;
- 		va_list ap;
-+
- 		va_start(ap, fmt);
--		vsprintf(buff, fmt, ap);
-+		buff = arts_strdup_vprintf(fmt, ap);
- 		va_end(ap);
-+
- 		display_message(Debug::lWarning, buff);
-+		free(buff);
- 	}
- }
- 
-@@ -168,12 +214,15 @@
- {
- 	if(lInfo >= arts_debug_level)
- 	{
--		char buff[1024];
-+		char *buff;
- 		va_list ap;
-+
- 		va_start(ap, fmt);
--		vsprintf(buff, fmt, ap);
-+		buff = arts_strdup_vprintf(fmt, ap);
- 		va_end(ap);
-+
- 		display_message(Debug::lInfo, buff);
-+		free(buff);
- 	}
- }
- 
-@@ -181,12 +230,15 @@
- {
- 	if(lDebug >= arts_debug_level)
- 	{
--		char buff[1024];
-+		char *buff;
- 		va_list ap;
-+
- 		va_start(ap, fmt);
--		vsprintf(buff, fmt, ap);
-+		buff = arts_strdup_vprintf(fmt, ap);
- 		va_end(ap);
-+
- 		display_message(Debug::lDebug, buff);
-+		free(buff);
- 	}
- }
- 
-@@ -209,4 +261,551 @@
- 
- 	delete arts_debug_mutex;
- 	arts_debug_mutex = 0;
-+}
-+
-+/*
-+ * For the sake of portability (snprintf is non-portable), what follows is an
-+ * implementation of a variant g_strdup_printf, to format debug messages of
-+ * an arbitary length appropriately. This is reduntant with flow/gsl/gslglib.c,
-+ * however, as libmcop doesn't necessarily link against gslglib.c, this is a
-+ * more-or-less complete copy.
-+ */
-+
-+/* GLIB - Library of useful routines for C programming
-+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
-+ *
-+ * GScanner: Flexible lexical scanner for general purpose.
-+ * Copyright (C) 1997, 1998 Tim Janik
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser 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
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+/*
-+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
-+ * file for a list of people on the GLib Team.  See the ChangeLog
-+ * files for a list of changes.  These files are distributed with
-+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
-+ */
-+
-+
-+#include <sys/types.h>
-+#include <stdarg.h>
-+#include <string.h>
-+
-+#define g_warning printf
-+#define g_strerror strerror
-+
-+/*--- gslglib.h ---*/
-+
-+#include <limits.h>
-+#include <float.h>
-+#include <stddef.h>
-+#include <stdarg.h>
-+
-+/* --- GLib typedefs --- */
-+typedef void*           gpointer;
-+typedef const void*     gconstpointer;
-+typedef char            gchar;
-+typedef unsigned char   guchar;
-+typedef signed short    gshort;
-+typedef unsigned short  gushort;
-+typedef signed int      gint;
-+typedef unsigned int    guint;
-+typedef signed long     glong;
-+typedef unsigned long   gulong;
-+typedef float           gfloat;
-+typedef double          gdouble;
-+typedef size_t          gsize;
-+typedef gchar           gint8;
-+typedef guchar          guint8;
-+typedef gshort          gint16;
-+typedef gushort         guint16;
-+typedef gint            gint32;
-+typedef guint           guint32;
-+typedef gint            gboolean;
-+typedef gint32          GTime;
-+#ifdef __alpha
-+typedef long int                gint64;
-+typedef unsigned long int       guint64;
-+#else
-+typedef long long int   gint64;
-+typedef unsigned long long int  guint64;
-+#endif
-+typedef struct _GString GString;
-+
-+/* --- standard macros --- */
-+#ifndef ABS
-+#define ABS(a)          ((a) > 0 ? (a) : -(a))
-+#endif
-+#ifndef MAX
-+#define MAX(a,b)        ((a) > (b) ? (a) : (b))
-+#endif
-+#ifndef MIN
-+#define MIN(a,b)        ((a) < (b) ? (a) : (b))
-+#endif
-+#ifndef CLAMP
-+#define CLAMP(v,l,h)    ((v) < (l) ? (l) : (v) > (h) ? (h) : (v))
-+#endif
-+#ifndef FALSE
-+#define FALSE           0
-+#endif
-+#ifndef TRUE
-+#define TRUE            (!FALSE)
-+#endif
-+#ifndef NULL
-+#define NULL            ((void*) 0)
-+#endif
-+
-+/* --- configure stuff!!! --- */
-+#ifdef WORDS_BIGENDIAN
-+#define G_BYTE_ORDER G_BIG_ENDIAN
-+#else
-+#define G_BYTE_ORDER G_LITTLE_ENDIAN
-+#endif
-+
-+/* #define      GLIB_HAVE_STPCPY        1 */
-+/* Define G_VA_COPY() to do the right thing for copying va_list variables.
-+ * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
-+ */
-+#if !defined (G_VA_COPY)
-+#  if defined (__GNUC__) && ( defined (__PPC__) || defined (__s390__) ) && (defined (_CALL_SYSV) || defined (_WIN32) || defined (__s390__) )
-+#    define G_VA_COPY(ap1, ap2)   (*(ap1) = *(ap2))
-+#  elif defined (G_VA_COPY_AS_ARRAY)
-+#    define G_VA_COPY(ap1, ap2)   g_memmove ((ap1), (ap2), sizeof (va_list))
-+#  else /* va_list is a pointer */
-+#    define G_VA_COPY(ap1, ap2)   ((ap1) = (ap2))
-+#  endif /* va_list is a pointer */
-+#endif /* !G_VA_COPY */
-+
-+/* --- glib macros --- */
-+#define G_MINFLOAT      FLT_MIN
-+#define G_MAXFLOAT      FLT_MAX
-+#define G_MINDOUBLE     DBL_MIN
-+#define G_MAXDOUBLE     DBL_MAX
-+#define G_MINSHORT      SHRT_MIN
-+#define G_MAXSHORT      SHRT_MAX
-+#define G_MAXUSHORT     USHRT_MAX
-+#define G_MININT        INT_MIN
-+#define G_MAXINT        INT_MAX
-+#define G_MAXUINT       UINT_MAX
-+#define G_MINLONG       LONG_MIN
-+#define G_MAXLONG       LONG_MAX
-+#define G_MAXULONG      ULONG_MAX
-+#define G_USEC_PER_SEC  1000000
-+#define G_LITTLE_ENDIAN 1234
-+#define G_BIG_ENDIAN    4321
-+
-+#define G_STRINGIFY(macro_or_string)    G_STRINGIFY_ARG (macro_or_string)
-+#define G_STRINGIFY_ARG(contents)       #contents
-+#if  defined __GNUC__ && !defined __cplusplus
-+#  define G_STRLOC      __FILE__ ":" G_STRINGIFY (__LINE__) ":" __PRETTY_FUNCTION__ "()"
-+#else
-+#  define G_STRLOC      __FILE__ ":" G_STRINGIFY (__LINE__)
-+#endif
-+       
-+/* subtract from biased_exponent to form base2 exponent (normal numbers) */
-+typedef union  _GDoubleIEEE754  GDoubleIEEE754;
-+typedef union  _GFloatIEEE754   GFloatIEEE754;
-+#define G_IEEE754_FLOAT_BIAS    (127)
-+#define G_IEEE754_DOUBLE_BIAS   (1023)
-+/* multiply with base2 exponent to get base10 exponent (nomal numbers) */
-+#define G_LOG_2_BASE_10         (0.30102999566398119521)
-+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-+union _GFloatIEEE754
-+{
-+  gfloat v_float;
-+  struct {
-+    guint mantissa : 23;
-+    guint biased_exponent : 8;
-+    guint sign : 1;
-+  } mpn;
-+};
-+union _GDoubleIEEE754
-+{
-+  gdouble v_double;
-+  struct {
-+    guint mantissa_low : 32;
-+    guint mantissa_high : 20;
-+    guint biased_exponent : 11;
-+    guint sign : 1;
-+  } mpn;
-+};
-+#elif G_BYTE_ORDER == G_BIG_ENDIAN
-+union _GFloatIEEE754
-+{
-+  gfloat v_float;
-+  struct {
-+    guint sign : 1;
-+    guint biased_exponent : 8;
-+    guint mantissa : 23;
-+  } mpn;
-+};
-+union _GDoubleIEEE754
-+{
-+  gdouble v_double;
-+  struct {
-+    guint sign : 1;
-+    guint biased_exponent : 11;
-+    guint mantissa_high : 20;
-+    guint mantissa_low : 32;
-+  } mpn;
-+};
-+#else /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-+#error unknown ENDIAN type
-+#endif /* !G_LITTLE_ENDIAN && !G_BIG_ENDIAN */
-+
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+
-+#define GLIB_SIZEOF_INTMAX      (8 /* educated guess */)
-+
-+typedef struct
-+{
-+  guint min_width;
-+  guint precision;
-+  gboolean alternate_format, zero_padding, adjust_left, locale_grouping;
-+  gboolean add_space, add_sign, possible_sign, seen_precision;
-+  gboolean mod_half, mod_long, mod_extra_long;
-+} PrintfArgSpec;
-+
-+
-+static gsize
-+printf_string_upper_bound (const gchar *format,
-+                           gboolean     may_warn,
-+                           va_list      args)
-+{
-+  static  gboolean honour_longs = sizeof(long) > 4 || sizeof(void*) > 4;
-+  gsize len = 1;
-+
-+  if (!format)
-+    return len;
-+
-+  while (*format)
-+    {
-+      register gchar c = *format++;
-+
-+      if (c != '%')
-+        len += 1;
-+      else /* (c == '%') */
-+        {
-+          PrintfArgSpec spec = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-+          gboolean seen_l = FALSE, conv_done = FALSE;
-+          gsize conv_len = 0;
-+          const gchar *spec_start = format;
-+
-+          do
-+            {
-+              c = *format++;
-+              switch (c)
-+                {
-+                  GDoubleIEEE754 u_double;
-+                  guint v_uint;
-+                  gint v_int;
-+                  const gchar *v_string;
-+
-+                  /* beware of positional parameters
-+                   */
-+                case '$':
-+                  if (may_warn)
-+                    g_warning (G_STRLOC ": unable to handle positional parameters (%%n$)");
-+                  len += 1024; /* try adding some safety padding */
-+                  break;
-+
-+                  /* parse flags
-+                   */
-+                case '#':
-+                  spec.alternate_format = TRUE;
-+                  break;
-+                case '0':
-+                  spec.zero_padding = TRUE;
-+                  break;
-+                case '-':
-+                  spec.adjust_left = TRUE;
-+                  break;
-+                case ' ':
-+                  spec.add_space = TRUE;
-+                  break;
-+                case '+':
-+                  spec.add_sign = TRUE;
-+                  break;
-+                case '\'':
-+                  spec.locale_grouping = TRUE;
-+                  break;
-+
-+                  /* parse output size specifications
-+                   */
-+                case '.':
-+                  spec.seen_precision = TRUE;
-+                  break;
-+                case '1':
-+                case '2':
-+                case '3':
-+                case '4':
-+                case '5':
-+                case '6':
-+                case '7':
-+                case '8':
-+                case '9':
-+                  v_uint = c - '0';
-+                  c = *format;
-+                  while (c >= '0' && c <= '9')
-+                    {
-+                      format++;
-+                      v_uint = v_uint * 10 + c - '0';
-+                      c = *format;
-+                    }
-+                  if (spec.seen_precision)
-+                    spec.precision = MAX (spec.precision, v_uint);
-+                  else
-+                    spec.min_width = MAX (spec.min_width, v_uint);
-+                  break;
-+                case '*':
-+                  v_int = va_arg (args, int);
-+                  if (spec.seen_precision)
-+                    {
-+                      /* forget about negative precision */
-+                      if (v_int >= 0)
-+                        spec.precision = MAX (spec.precision, (unsigned)v_int);
-+                    }
-+                  else
-+                    {
-+                      if (v_int < 0)
-+                        {
-+                          v_int = - v_int;
-+                          spec.adjust_left = TRUE;
-+                        }
-+                      spec.min_width = MAX (spec.min_width, (unsigned)v_int);
-+                    }
-+                  break;
-+
-+                  /* parse type modifiers
-+                   */
-+                case 'h':
-+                  spec.mod_half = TRUE;
-+                  break;
-+                case 'l':
-+                  if (!seen_l)
-+                    {
-+                      spec.mod_long = TRUE;
-+                      seen_l = TRUE;
-+                      break;
-+                    }
-+                  /* else, fall through */
-+                case 'L':
-+                case 'q':
-+                  spec.mod_long = TRUE;
-+                  spec.mod_extra_long = TRUE;
-+                  break;
-+                case 'z':
-+                case 'Z':
-+                  if (sizeof(size_t))
-+                    {
-+                      spec.mod_long = TRUE;
-+                      spec.mod_extra_long = TRUE;
-+                    }
-+                  break;
-+                case 't':
-+                  if (sizeof(ptrdiff_t) > 4)
-+                    {
-+                      spec.mod_long = TRUE;
-+                      spec.mod_extra_long = TRUE;
-+                    }
-+                  break;
-+                case 'j':
-+                  if (GLIB_SIZEOF_INTMAX > 4)
-+                    {
-+                      spec.mod_long = TRUE;
-+                      spec.mod_extra_long = TRUE;
-+                    }
-+                  break;
-+
-+                  /* parse output conversions
-+                   */
-+                case '%':
-+                  conv_len += 1;
-+                  break;
-+                case 'O':
-+                case 'D':
-+                case 'I':
-+                case 'U':
-+                  /* some C libraries feature long variants for these as well? */
-+                  spec.mod_long = TRUE;
-+                  /* fall through */
-+                case 'o':
-+                  conv_len += 2;
-+                  /* fall through */
-+                case 'd':
-+                case 'i':
-+                  conv_len += 1; /* sign */
-+                  /* fall through */
-+                case 'u':
-+                  conv_len += 4;
-+                  /* fall through */
-+                case 'x':
-+                case 'X':
-+                  spec.possible_sign = TRUE;
-+                  conv_len += 10;
-+                  if (spec.mod_long && honour_longs)
-+                    conv_len *= 2;
-+                  if (spec.mod_extra_long)
-+                    conv_len *= 2;
-+                  if (spec.mod_extra_long)
-+                    {
-+                      (void) va_arg (args, gint64);
-+                    }
-+                  else if (spec.mod_long)
-+                    (void) va_arg (args, long);
-+                  else
-+                    (void) va_arg (args, int);
-+                  break;
-+                case 'A':
-+                case 'a':
-+                  /*          0x */
-+                  conv_len += 2;
-+                  /* fall through */
-+                case 'g':
-+                case 'G':
-+                case 'e':
-+                case 'E':
-+                case 'f':
-+                  spec.possible_sign = TRUE;
-+                  /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
-+                  conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
-+                  if (may_warn && spec.mod_extra_long)
-+                    g_warning (G_STRLOC ": unable to handle long double, collecting double only");
-+#ifdef HAVE_LONG_DOUBLE
-+#error need to implement special handling for long double
-+#endif
-+                  u_double.v_double = va_arg (args, double);
-+                  /* %f can expand up to all significant digits before '.' (308) */
-+                  if (c == 'f' &&
-+                      u_double.mpn.biased_exponent > 0 && u_double.mpn.biased_exponent < 2047)
-+                    {
-+                      gint exp = u_double.mpn.biased_exponent;
-+
-+                      exp -= G_IEEE754_DOUBLE_BIAS;
-+                      exp = (gint)(exp * G_LOG_2_BASE_10 + 1);
-+                      conv_len += ABS (exp);    /* exp can be <0 */
-+                    }
-+                  /* some printf() implementations require extra padding for rounding */
-+                  conv_len += 2;
-+                  /* we can't really handle locale specific grouping here */
-+                  if (spec.locale_grouping)
-+                    conv_len *= 2;
-+                  break;
-+                case 'C':
-+                  spec.mod_long = TRUE;
-+                  /* fall through */
-+                case 'c':
-+                  conv_len += spec.mod_long ? MB_LEN_MAX : 1;
-+                  (void) va_arg (args, int);
-+                  break;
-+                case 'S':
-+                  spec.mod_long = TRUE;
-+                  /* fall through */
-+                case 's':
-+                  v_string = va_arg (args, char*);
-+                  if (!v_string)
-+                    conv_len += 8; /* hold "(null)" */
-+                  else if (spec.seen_precision)
-+                    conv_len += spec.precision;
-+                  else
-+                    conv_len += strlen (v_string);
-+                  conv_done = TRUE;
-+                  if (spec.mod_long)
-+                    {
-+                      if (may_warn)
-+                        g_warning (G_STRLOC": unable to handle wide char strings");
-+                      len += 1024; /* try adding some safety padding */
-+                    }
-+                  break;
-+                case 'P': /* do we actually need this? */
-+                  /* fall through */
-+                case 'p':
-+                  spec.alternate_format = TRUE;
-+                  conv_len += 10;
-+                  if (honour_longs)
-+                    conv_len *= 2;
-+                  /* fall through */
-+                case 'n':
-+                  conv_done = TRUE;
-+                  (void) va_arg (args, void*);
-+                  break;
-+                case 'm':
-+                  /* there's not much we can do to be clever */
-+                  v_string = g_strerror (errno);
-+                  v_uint = v_string ? strlen (v_string) : 0;
-+                  conv_len += MAX (256, v_uint);
-+                  break;
-+
-+                  /* handle invalid cases
-+                   */
-+                case '\000':
-+                  /* no conversion specification, bad bad */
-+                  conv_len += format - spec_start;
-+                  break;
-+                default:
-+                  if (may_warn)
-+                    g_warning (G_STRLOC": unable to handle `%c' while parsing format",
-+                               c);
-+                  break;
-+                }
-+              conv_done |= conv_len > 0;
-+            }
-+          while (!conv_done);
-+          /* handle width specifications */
-+          conv_len = MAX (conv_len, MAX (spec.precision, spec.min_width));
-+          /* handle flags */
-+          conv_len += spec.alternate_format ? 2 : 0;
-+          conv_len += (spec.add_space || spec.add_sign || spec.possible_sign);
-+          /* finally done */
-+          len += conv_len;
-+        } /* else (c == '%') */
-+    } /* while (*format) */
-+
-+  return len;
-+}
-+
-+static char*
-+arts_strdup_vprintf (const char *format, va_list args1)
-+{
-+  gchar *buffer;
-+  va_list args2;
-+
-+  G_VA_COPY (args2, args1);
-+
-+  buffer = (gchar *)malloc (printf_string_upper_bound (format, TRUE, args1));
-+
-+  vsprintf (buffer, format, args2);
-+  va_end (args2);
-+
-+  return buffer;
-+}
-+
-+char*
-+arts_strdup_printf (const char *format, ...)
-+{
-+  gchar *buffer;
-+  va_list args;
-+
-+  va_start (args, format);
-+  buffer = arts_strdup_vprintf (format, args);
-+  va_end (args);
-+
-+  return buffer;
- }
-Index: kdelibs/dcop/dcopc.c
-diff -u kdelibs/dcop/dcopc.c:1.17 kdelibs/dcop/dcopc.c:1.17.2.1
---- dcop/dcopc.c:1.17	Wed Apr 18 18:18:55 2001
-+++ dcop/dcopc.c	Sat Dec  7 18:48:29 2002
-@@ -36,6 +36,9 @@
- #include "dcopglobal.h"
- #include "dcopc.h"
- 
-+
-+#define BUFFER_SIZE 1024
-+
- enum {
-   DCOP_REPLY_PENDING,
-   DCOP_REPLY_OK,
-@@ -133,7 +136,11 @@
-   int length;
-   char * pos = dcop_read_int(buf, &length);
-   fprintf(stderr, "dcop_read_string: length == %d\n", length);
-+
-   *output = (char *)malloc(length);
-+  if (*output == NULL)
-+    return pos;
-+
-   memcpy(*output, pos, length);
-   return pos + length;
- }
-@@ -215,6 +222,8 @@
- 
-       fprintf(stderr, "dcop_process_message(): length == %ld\n", length);
-       buf = (char *)malloc(length);
-+      if (buf == NULL)
-+        return;
-       status = IceReadData(dcop_ice_conn, length, buf);
-       if (False == status) {
-         fprintf(stderr, "dcop_process_message(): IceReadData failed\n");
-@@ -253,6 +262,9 @@
-       fprintf(stderr, "dcop_process_message(): DCOPSend received\n");
- 
-       buf = (char *)malloc(length);
-+      if (buf == NULL)
-+        return;
-+
-       IceReadData(dcop_ice_conn, length, buf);
- 
-       pos = buf;
-@@ -307,6 +319,8 @@
- 
-   struct DCOPMsg * pMsgPtr = 0;
- 
-+  static const char sAnonymous = "anonymous";
-+
-   if (0 == dcop_ice_conn) {
-     fprintf(stderr, "Try running dcop_attach(), moron\n");
-     return False;
-@@ -338,10 +352,19 @@
-    * as last field into the dcop msg header ;-)
-    */
- 
--  header = (char *)malloc(1024);
-+  headerLength = strlen(sAnonymous) + 1 +
-+                 strlen(receiving_app) + 1 +
-+                 strlen(object) + 1 +
-+                 strlen(function) + 1 +
-+                 4*5;  /* 4 string lengths + 1 int */
-+
-+  header = (char *)malloc(headerLength);
-+  if (header == NULL)
-+    return False;
-+
-   pos = header;
- 
--  pos = dcop_write_string(pos, "anonymous");
-+  pos = dcop_write_string(pos, sAnonymous);
-   pos = dcop_write_string(pos, receiving_app);
-   pos = dcop_write_string(pos, object);
-   pos = dcop_write_string(pos, function);
-@@ -423,6 +446,8 @@
-   temp += 1024; /* Extra space for marshalling overhead */
- 
-   outputData = (char *)malloc(temp);
-+  if (outputData == NULL)
-+    return False;
- 
-   temp = 0;
- 
-@@ -556,10 +581,16 @@
-     /* Leave room for "-pid" */
-     int len = strlen(app_name) + 64;
-     dcop_requested_name = (char *)malloc(len);
-+    if (dcop_requested_name == NULL)
-+      return NULL;
-+
-     snprintf(dcop_requested_name, len, "%s-%ld", app_name, (long)getpid());
-   }
- 
-   data = (char *)malloc(strlen(dcop_requested_name) + 42);
-+  if (data == NULL)
-+    return NULL;
-+
-   pos = data;
-   pos = dcop_write_string(pos, dcop_requested_name);
-   dataLength = pos - data;
-@@ -616,6 +647,7 @@
-   return (dcop_major_opcode >= 0) ? True : False;
- }
- 
-+
- /***************************************************************************/
- 
-   Bool
-@@ -628,10 +660,10 @@
-   char      * homeDir       = 0L;
-   char      * display       = 0L;
-   char      * dcopServer    = 0L;
--  char        errBuf[1024];
--  char        fileName[512];
--  char        hostName[256];
--  char        displayName[256];
-+  char        errBuf[BUFFER_SIZE];
-+  char        fileName[BUFFER_SIZE];
-+  char        hostName[BUFFER_SIZE];
-+  char        displayName[BUFFER_SIZE];
-   char      * i;
- 
-   homeDir = getenv("HOME");
-@@ -644,7 +676,9 @@
-   if (NULL == display)
-     return False;
- 
--  strcpy(displayName, display);
-+  strncpy(displayName, display, sizeof(displayName));
-+  displayName[sizeof(displayName) - 1] = 0;
-+
-   if((i = strrchr(displayName, '.')) > strrchr(displayName, ':') && i)
-       *i = '\0';
- 
-@@ -668,9 +702,12 @@
-       return False;
-     }
- 
--    dcopServer = (char *)malloc(1024);
-+    dcopServer = (char *)malloc(BUFFER_SIZE);
-+    if (dcopServer == NULL)
-+      return False;
- 
--    bytesRead = fread((void *)dcopServer, sizeof(char), 1024, f);
-+    bytesRead = fread((void *)dcopServer, sizeof(char), BUFFER_SIZE, f);
-+    dcopServer[BUFFER_SIZE - 1] = 0;
- 
-     if (0 == bytesRead)
-       return False;
-@@ -719,7 +756,7 @@
-   int           majorVersion  = 0;
-   int           minorVersion  = 0;
-   int           status        = 0;
--  char          errBuf[1024];
-+  char          errBuf[BUFFER_SIZE];
- 
-   status =
-     IceProtocolSetup(
-@@ -731,7 +768,7 @@
-       &(minorVersion),
-       &(vendor),
-       &(release),
--      1024,
-+      BUFFER_SIZE,
-       errBuf
-     );
- 
-Index: kdelibs/dcop/dcopserver.cpp
-diff -u kdelibs/dcop/dcopserver.cpp:1.130 kdelibs/dcop/dcopserver.cpp:1.130.2.1
---- dcop/dcopserver.cpp:1.130	Thu Aug  2 19:23:20 2001
-+++ dcop/dcopserver.cpp	Sat Dec  7 18:48:31 2002
-@@ -475,12 +475,15 @@
-     char tempFile[PATH_MAX];
-     char *tmp;
- 
--    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
-+    snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix);
-     tmp = (char *) mktemp (tempFile);
-     if (tmp)
- 	{
- 	    char *ptr = (char *) malloc (strlen (tmp) + 1);
--	    strcpy (ptr, tmp);
-+        if (ptr != NULL)
-+        {
-+	        strcpy (ptr, tmp);
-+        }
- 	    return (ptr);
- 	}
-     else
-@@ -490,7 +493,7 @@
-     char tempFile[PATH_MAX];
-     char *ptr;
- 
--    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
-+    snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix);
-     ptr = static_cast<char *>(malloc(strlen(tempFile) + 1));
-     if (ptr != NULL)
- 	{
-@@ -541,7 +544,7 @@
-     FILE        *removefp = NULL;
-     const char  *path;
-     int         original_umask;
--    char        command[256];
-+    char        command[PATH_MAX + 32];
-     int         i;
- #ifdef HAVE_MKSTEMP
-     int         fd;
-@@ -613,7 +616,7 @@
- 
-     umask (original_umask);
- 
--    sprintf (command, "iceauth source %s", addAuthFile);
-+    snprintf (command, PATH_MAX + 32, "iceauth source %s", addAuthFile);
-     system (command);
- 
-     unlink(addAuthFile);
-Index: kdelibs/dcop/KDE-ICE/Xtrans.c
-diff -u kdelibs/dcop/KDE-ICE/Xtrans.c:1.2 kdelibs/dcop/KDE-ICE/Xtrans.c:1.2.2.1
---- dcop/KDE-ICE/Xtrans.c:1.2	Mon May 14 08:32:16 2001
-+++ dcop/KDE-ICE/Xtrans.c	Sat Dec  7 18:48:25 2002
-@@ -1021,7 +1021,7 @@
- 	if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN)
- 	    continue;
- 
--	sprintf(buffer,"%s/:%s", trans->TransName, port ? port : "");
-+	snprintf(buffer, 256, "%s/:%s", trans->TransName, port ? port : "");
- 
- 	PRMSG (5,"MakeAllCOTSServerListeners: opening %s\n",
- 	       buffer, 0, 0);
-@@ -1123,7 +1123,7 @@
- 	if (trans->flags&TRANS_ALIAS || trans->flags&TRANS_NOLISTEN)
- 	    continue;
- 
--	sprintf(buffer,"%s/:%s", trans->TransName, port ? port : "");
-+	snprintf(buffer, 256, "%s/:%s", trans->TransName, port ? port : "");
- 
- 	PRMSG (5,"MakeAllCLTSServerListeners: opening %s\n",
- 	    buffer, 0, 0);
-Index: kdelibs/dcop/KDE-ICE/Xtransutil.c
-diff -u kdelibs/dcop/KDE-ICE/Xtransutil.c:1.4 kdelibs/dcop/KDE-ICE/Xtransutil.c:1.4.2.1
---- dcop/KDE-ICE/Xtransutil.c:1.4	Sun May  6 18:35:54 2001
-+++ dcop/KDE-ICE/Xtransutil.c	Sat Dec  7 18:48:26 2002
-@@ -367,9 +367,9 @@
- 
- 	if (np = getnodebyaddr(saddr->sdn_add.a_addr,
- 	    saddr->sdn_add.a_len, AF_DECnet)) {
--	    sprintf(addrbuf, "%s:", np->n_name);
-+	    snprintf(addrbuf, 256, "%s:", np->n_name);
- 	} else {
--	    sprintf(addrbuf, "%s:", dnet_htoa(&saddr->sdn_add));
-+	    snprintf(addrbuf, 256, "%s:", dnet_htoa(&saddr->sdn_add));
- 	}
- 	addr = addrbuf;
- 	break;
-Index: kdelibs/dcop/KDE-ICE/process.c
-diff -u kdelibs/dcop/KDE-ICE/process.c:1.2 kdelibs/dcop/KDE-ICE/process.c:1.2.2.1
---- dcop/KDE-ICE/process.c:1.2	Tue Mar 13 02:36:38 2001
-+++ dcop/KDE-ICE/process.c	Sat Dec  7 18:48:28 2002
-@@ -734,7 +734,7 @@
- 	    case IceMajorOpcodeDuplicate:
- 
- 		prefix = "The major opcode was already used : ";
--		errorStr = (char *) malloc (strlen (prefix) + 2);
-+		errorStr = (char *) malloc (strlen (prefix) + 16);
- 		sprintf (errorStr, "%s%d", prefix, (int) *pData);
- 		break;
- 
-Index: kdelibs/kdecore/kapp.cpp
-diff -u kdelibs/kdecore/kapp.cpp:1.454.2.2 kdelibs/kdecore/kapp.cpp:1.454.2.3
---- kdecore/kapp.cpp:1.454.2.2	Sun Sep  2 21:36:47 2001
-+++ kdecore/kapp.cpp	Wed Dec  5 02:42:24 2001
-@@ -2163,6 +2163,8 @@
-   int pos = dirName.findRev('/');
-   if ( pos == -1 )
-     return false;   // No path in argument. This is evil, we won't allow this
-+  else if ( pos == 0 ) // don't turn e.g. /root into an empty string
-+      pos = 1;
- 
-   dirName.truncate(pos); // strip everything starting from the last '/'
- 
-Index: kdelibs/kdecore/kdebug.cpp
-diff -u kdelibs/kdecore/kdebug.cpp:1.97 kdelibs/kdecore/kdebug.cpp:1.97.2.2
---- kdecore/kdebug.cpp:1.97	Sun Jul 29 14:58:58 2001
-+++ kdecore/kdebug.cpp	Fri Dec  6 03:31:52 2002
-@@ -276,7 +276,7 @@
-           }
-         case 3: // syslog
-           {
--	      syslog( nPriority, data);
-+	      syslog( nPriority, "%s", data);
-           }
-         case 4: // nothing
-           {
-@@ -448,7 +448,8 @@
-     char buf[4096];
-     va_list arguments;
-     va_start( arguments, format );
--    vsprintf( buf, format, arguments );
-+    buf[sizeof(buf)-1] = '\0';
-+    vsnprintf( buf, sizeof(buf)-1, format, arguments );
-     va_end(arguments);
-     *this << buf;
-     return *this;
-Index: kdelibs/kdecore/ktempfile.cpp
-diff -u kdelibs/kdecore/ktempfile.cpp:1.19.2.1 kdelibs/kdecore/ktempfile.cpp:1.19.2.2
---- kdecore/ktempfile.cpp:1.19.2.1	Sat Aug 11 07:12:17 2001
-+++ kdecore/ktempfile.cpp	Mon Dec  3 01:48:46 2001
-@@ -90,6 +90,9 @@
- KTempFile::create(const QString &filePrefix, const QString &fileExtension,
- 		  int mode)
- {
-+   // make sure the random seed is randomized
-+   (void) KApplication::random();
-+
-    QCString ext = QFile::encodeName(fileExtension);
-    QCString nme = QFile::encodeName(filePrefix) + "XXXXXX" + ext;
-    if((mFd = mkstemps(nme.data(), ext.length())) < 0)
-Index: kdelibs/kdecore/netsupp.cpp
-diff -u kdelibs/kdecore/netsupp.cpp:1.21.2.3 kdelibs/kdecore/netsupp.cpp:1.21.2.4
---- kdecore/netsupp.cpp:1.21.2.3	Wed Oct 24 21:43:45 2001
-+++ kdecore/netsupp.cpp	Fri Dec 13 11:18:08 2002
-@@ -926,7 +926,7 @@
- 
-       if (servlen && serv != NULL)
- 	*serv = '\0';
--      if (host == NULL || hostlen < strlen(s._sun->sun_path))
-+      if (host != NULL && hostlen > strlen(s._sun->sun_path))
- 	strcpy(host, s._sun->sun_path);
- 
-       return 0;
-@@ -1008,7 +1008,7 @@
-     {
-       sprintf(buf2, "%u.%u.%u.%u", data[0], data[1], data[2], data[3]);
- 
--      if (len >= strlen(buf2))
-+      if (len > strlen(buf2))
- 	{
- 	  strcpy(buf, buf2);
- 	  return buf;
-@@ -1077,7 +1077,7 @@
- 	    }
- 	}
- 
--      if (strlen(buf2) <= len)
-+      if (strlen(buf2) < len)
- 	{
- 	  strcpy(buf, buf2);
- 	  return buf;
-Index: kdelibs/kdecore/tests/kmemtest.cpp
-diff -u kdelibs/kdecore/tests/kmemtest.cpp:1.1 kdelibs/kdecore/tests/kmemtest.cpp:1.1.6.1
---- kdecore/tests/kmemtest.cpp:1.1	Tue Feb 22 16:06:49 2000
-+++ kdecore/tests/kmemtest.cpp	Sat Dec  7 18:48:32 2002
-@@ -165,9 +165,9 @@
-      char buf[200];
-   
-      if (argc >=3)
--        sprintf(buf, "%s &", argv[2]);
-+        snprintf(buf, 200, "%s &", argv[2]);
-      else
--        sprintf(buf, "%s &", argv[0]);
-+        snprintf(buf, 200, "%s &", argv[0]);
- 
-      printf("Waiting for memory usage to settle down....\n");
-      long prev = showTotalMem();
-Index: kdelibs/kdeprint/lpd/make_driver_db_lpd.c
-diff -u kdelibs/kdeprint/lpd/make_driver_db_lpd.c:1.1 kdelibs/kdeprint/lpd/make_driver_db_lpd.c:1.1.2.1
---- kdeprint/lpd/make_driver_db_lpd.c:1.1	Mon Apr  2 15:21:07 2001
-+++ kdeprint/lpd/make_driver_db_lpd.c	Sat Dec  7 18:48:33 2002
-@@ -82,7 +82,7 @@
- 			c2 = strchr(c+12,'}');
- 			if (c1 && c2)
- 			{
--				char 	model[256], manuf[256];
-+				char 	model[BUFFER_SIZE], manuf[BUFFER_SIZE];
- 				char 	*c3;
- 
- 				*c2 = 0;
-Index: kdelibs/kdeprint/management/kmwlpd.cpp
-diff -u kdelibs/kdeprint/management/kmwlpd.cpp:1.11 kdelibs/kdeprint/management/kmwlpd.cpp:1.11.2.1
---- kdeprint/management/kmwlpd.cpp:1.11	Fri Aug  3 21:59:21 2001
-+++ kdeprint/management/kmwlpd.cpp	Sat Dec  7 18:48:34 2002
-@@ -122,12 +122,15 @@
- 	}
- 
- 	char	buf[1024] = {0};
--	int	n;
-+	int	n, tot(1);
- kdDebug() << "reading" << endl;
- 	while ((n=::read(sock,res,63)) > 0)
- 	{
- 		res[n] = 0;
-+		tot += n;
- kdDebug() << buf << endl;
-+		if (tot >= 1024)
-+			break;
- 		strncat(buf,res,1023);
- 	}
- 	close(sock);
-Index: kdelibs/kdeprint/management/smbview.cpp
-diff -u kdelibs/kdeprint/management/smbview.cpp:1.3 kdelibs/kdeprint/management/smbview.cpp:1.3.2.1
---- kdeprint/management/smbview.cpp:1.3	Mon Apr  2 21:01:00 2001
-+++ kdeprint/management/smbview.cpp	Fri Dec 13 12:23:22 2002
-@@ -19,6 +19,9 @@
- 
- #include "smbview.h"
- 
-+#include <config.h>
-+#include <stdlib.h>
-+
- #include <kprocess.h>
- #include <qheader.h>
- #include <qapplication.h>
-@@ -117,20 +120,36 @@
- {
- 	if (on && item->childCount() == 0)
- 	{
-+		QCString oldpw = getenv("PASSWD");
-+		QCString olduser = getenv("USER");
-+		QCString pw = m_password.local8Bit();
-+		setenv("PASSWD", pw, 1);
-+		QCString user = m_login.local8Bit();
-+		setenv("USER", user, 1);
- 		if (item->depth() == 0)
- 		{ // opening group
- 			m_current = item;
--			QString	cmd = QString("nmblookup -M %1 -S | grep '<20>' | awk '{print $1}' | xargs -iserv_name smbclient -L serv_name -W %2 %3").arg(item->text(0)).arg(item->text(0)).arg(smbPasswordString(m_login,m_password));
-+			QString	cmd = QString("nmblookup -M %1 -S | grep '<20>' | awk '{print $1}' | xargs -iserv_name ").arg(KShellProcess::quote(item->text(0)));
-+			cmd += QString("smbclient -L serv_name -N -W %1").arg(KShellProcess::quote(item->text(0)));
- 			m_proc->setExecutable(cmd);
- 			startProcess(ServerListing);
- 		}
- 		else if (item->depth() == 1)
- 		{ // opening server
- 			m_current = item;
--			QString	cmd = QString("smbclient -L %1 -W %2 %3").arg(item->text(0)).arg(item->parent()->text(0)).arg(smbPasswordString(m_login,m_password));
-+			QString	cmd = QString("smbclient -L %1 ").arg(KShellProcess::quote(item->text(0)));
-+			cmd += QString("-N -W %1").arg(KShellProcess::quote(item->parent()->text(0)));
- 			m_proc->setExecutable(cmd);
- 			startProcess(ShareListing);
- 		}
-+		if (oldpw.isNull())
-+		   unsetenv("PASSWD");
-+		else
-+		   setenv("PASSWD", oldpw, 1);
-+		if (olduser.isNull())
-+		   unsetenv("USER");
-+		else
-+		   setenv("USER", olduser, 1);
- 	}
- 	QListView::setOpen(item,on);
- }
-Index: kdelibs/kdoctools/meinproc.cpp
-diff -u kdelibs/kdoctools/meinproc.cpp:1.20.2.2 kdelibs/kdoctools/meinproc.cpp:1.20.2.3
---- kdoctools/meinproc.cpp:1.20.2.2	Fri Nov  9 08:50:49 2001
-+++ kdoctools/meinproc.cpp	Fri Dec  6 18:07:49 2002
-@@ -24,6 +24,7 @@
- #include <kdebug.h>
- #include <qtextcodec.h>
- #include <qfileinfo.h>
-+#include <kprocess.h>
- 
- extern int xmlLoadExtDtdDefaultValue;
- 
-@@ -145,7 +146,11 @@
-                 exe = locate( "exe", "xmllint" );
-         }
-         if ( !::access( QFile::encodeName( exe ), X_OK ) ) {
--            FILE *xmllint = popen( QString( exe + " --catalogs --valid --noout %1 2>&1" ).arg( file.fileName() ).local8Bit().data(), "r");
-+            QString cmd = exe;
-+            cmd += " --catalogs --valid --noout ";
-+            cmd += KShellProcess::quote(file.fileName());
-+            cmd += " 2>&1";
-+            FILE *xmllint = popen( QFile::encodeName( cmd ), "r");
-             bool noout = true;
-             while ( !feof( xmllint ) ) {
-                 int c;
-Index: kdelibs/kdoctools/xslt.cpp
-diff -u kdelibs/kdoctools/xslt.cpp:1.41.2.2 kdelibs/kdoctools/xslt.cpp:1.41.2.4
---- kdoctools/xslt.cpp:1.41.2.2	Fri Nov  9 08:50:49 2001
-+++ kdoctools/xslt.cpp	Wed Dec 11 14:09:47 2002
-@@ -95,7 +95,9 @@
-     /* if (contents.left(5) != "<?xml") {
-         fprintf(stderr, "xmlizer\n");
-         INFO(i18n("XMLize document"));
--        FILE *p = popen(QString::fromLatin1("xmlizer %1").arg(pat).latin1(), "r");
-+        QString cmd = "xmlizer ";
-+        cmd += KProcess::quote(pat);
-+        FILE *p = popen(QFile::encodeName(cmd), "r");
-         xmlFile.open(IO_ReadOnly, p);
-         char buffer[5001];
-         contents.truncate(0);
-@@ -403,12 +405,16 @@
-         for ( uint i = 0; i < len; i++ ) {
-             QCString test = locale->fromUnicode( part.mid( i, 1 ) );
-             if ( locale->toUnicode( test ) == part.mid( i, 1 ) ) {
-+                if (buffer_len + test.length() + 1 > sizeof(buffer))
-+                   break;
-                 strcpy( buffer + buffer_len, test.data() );
-                 buffer_len += test.length();
-             } else {
-                 QString res;
-                 res.sprintf( "&#%d;", part.at( i ).unicode() );
-                 test = locale->fromUnicode( res );
-+                if (buffer_len + test.length() + 1 > sizeof(buffer))
-+                   break;
-                 strcpy( buffer + buffer_len, test.data() );
-                 buffer_len += test.length();
-             }
-Index: kdelibs/khtml/html/html_baseimpl.cpp
-diff -u kdelibs/khtml/html/html_baseimpl.cpp:1.125.2.2 kdelibs/khtml/html/html_baseimpl.cpp:1.125.2.3
---- khtml/html/html_baseimpl.cpp:1.125.2.2	Fri Nov  2 14:44:05 2001
-+++ khtml/html/html_baseimpl.cpp	Fri Nov 30 07:24:07 2001
-@@ -272,7 +272,7 @@
-     while ((part = part->parentPart()))
-         depth++;
- 
--    if (depth > 6 || url.isNull()) {
-+    if (depth > 6) {
-         style()->setDisplay( NONE );
-         return;
-     }
-@@ -309,6 +309,7 @@
-       kdDebug( 6030 ) << "creating frame name: " << name.string() << endl;
-     }
- 
-+    if (!url.isNull())
-     w->part()->requestFrame( renderFrame, url.string(), name.string() );
- 
-     HTMLElementImpl::attach();
-Index: kdelibs/khtml/html/html_imageimpl.cpp
-diff -u kdelibs/khtml/html/html_imageimpl.cpp:1.104.2.1 kdelibs/khtml/html/html_imageimpl.cpp:1.104.2.2
---- khtml/html/html_imageimpl.cpp:1.104.2.1	Thu Oct 18 05:00:07 2001
-+++ khtml/html/html_imageimpl.cpp	Tue Jun 18 17:57:28 2002
-@@ -462,7 +462,7 @@
-         int y1 = coords->at(3)->minWidth(height_);
-         region = QRegion(x0,y0,x1-x0,y1-y0);
-     }
--    else /*if (shape==Default || shape == Unknown)*/ {
-+    else if (shape==Default) {
-         //cout << "default/unknown" << endl;
-         region = QRegion(0,0,width_,height_);
-     }
-Index: kdelibs/khtml/html/htmltokenizer.cpp
-diff -u kdelibs/khtml/html/htmltokenizer.cpp:1.193.2.6 kdelibs/khtml/html/htmltokenizer.cpp:1.193.2.7
---- khtml/html/htmltokenizer.cpp:1.193.2.6	Tue Nov  6 00:33:38 2001
-+++ khtml/html/htmltokenizer.cpp	Mon Nov 26 17:37:25 2001
-@@ -281,7 +281,7 @@
-     while ( src.length() ) {
-         checkScriptBuffer();
-         unsigned char ch = src->latin1();
--        if ( !scriptCodeResync && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-+        if ( !scriptCodeResync && !textarea && ch == '-' && scriptCodeSize >= 3 && !src.escaped() && QConstString( scriptCode+scriptCodeSize-3, 3 ).string() == "<!-" ) {
-             comment = true;
-             parseComment( src );
-             continue;
-Index: kdelibs/kimgio/eps.cpp
-diff -u kdelibs/kimgio/eps.cpp:1.14 kdelibs/kimgio/eps.cpp:1.14.2.1
---- kimgio/eps.cpp:1.14	Mon Jul  9 22:05:21 2001
-+++ kimgio/eps.cpp	Fri Dec  6 12:37:43 2002
-@@ -24,7 +24,6 @@
- {
- 	int ret = FALSE;
-         char buf[BUFLEN+1];
--        char dummy[BUFLEN+1];
- 
- 	while (imageio->ioDevice()->readLine(buf, BUFLEN) != -1)
-         {
-@@ -33,7 +32,7 @@
- 			// Some EPS files have non-integer values for the bbox
- 			// We don't support that currently, but at least we parse it
- 			float _x1, _y1, _x2, _y2;
--			if ( sscanf (buf, "%s %f %f %f %f", dummy,
-+                        if ( sscanf (buf, "%*s %f %f %f %f", 
- 				&_x1, &_y1, &_x2, &_y2) == 5) {
- 				*x1=(int)_x1; *y1=(int)_y1; *x2=(int)_x2; *y2=(int)_y2;
- 				ret = TRUE;
-@@ -152,7 +151,7 @@
-   QFile	inFile(tmpFile.name());
-   QString szBoxInfo;
- 
--  szBoxInfo.sprintf("%sBoundingBox: 0 0 %d %d\n", "%%",
-+  szBoxInfo.sprintf("%%%%BoundingBox: 0 0 %d %d\n", 
-                     imageio->image().width(),
-                     imageio->image().height());
- 
-Index: kdelibs/kimgio/netpbm.cpp
-diff -u kdelibs/kimgio/netpbm.cpp:1.2 kdelibs/kimgio/netpbm.cpp:1.2.6.1
---- kimgio/netpbm.cpp:1.2	Mon Mar 27 22:49:18 2000
-+++ kimgio/netpbm.cpp	Sat Dec  7 16:27:03 2002
-@@ -12,30 +12,31 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <qimage.h>
--
--#define CMDBUFLEN     4096
-+#include <qfile.h>
-+#include <kprocess.h>
-+#include <ktempfile.h>
- 
- //////
- // the real filter.
- //
- 
--void import_graphic (char *filter, QImageIO *image)
-+void import_graphic (const char *filter, QImageIO *image)
- {
--  char * tmpFileName;
-   QImage myimage;
- 
--  char cmdBuf [CMDBUFLEN];
--
--  tmpFileName = tmpnam(NULL);
-+  KTempFile tmp;
-+  tmp.close();
- 
--  sprintf (cmdBuf, "%s %s > %s", filter, image->fileName(), tmpFileName);
--//  printf (cmdBuf);
--//  fflush (stdout);
-+  QString cmd = filter;
-+  cmd += " ";
-+  cmd += KShellProcess::quote(image->fileName());
-+  cmd += " > ";
-+  cmd += KShellProcess::quote(tmp.name());
- 
--  system (cmdBuf);
--  myimage.load (tmpFileName);
-+  system (QFile::encodeName(cmd));
-+  myimage.load (tmp.name());
- 
--  unlink (tmpFileName);
-+  tmp.unlink();
- 
-   image->setImage (myimage);
-   image->setStatus (0);
-Index: kdelibs/kinit/lnusertemp.c
-diff -u kdelibs/kinit/lnusertemp.c:1.7 kdelibs/kinit/lnusertemp.c:1.7.2.1
---- kinit/lnusertemp.c:1.7	Wed Mar 14 20:22:29 2001
-+++ kinit/lnusertemp.c	Sat Dec  7 18:48:35 2002
-@@ -109,8 +109,8 @@
-      return 1;
-   }
- 
--  strcpy(user_tmp_dir, tmp_prefix);
--  strcat(user_tmp_dir, pw_ent->pw_name);
-+  strncpy(user_tmp_dir, tmp_prefix, PATH_MAX);
-+  strncat(user_tmp_dir, pw_ent->pw_name, PATH_MAX - strlen(tmp_prefix));
- 
-   if (!kde_home || !kde_home[0])
-   {
-@@ -130,9 +130,9 @@
-         exit(255);
-      }
-      kde_home++;
--     strcat(kde_tmp_dir, home_dir);
-+     strncpy(kde_tmp_dir, home_dir, PATH_MAX);
-   }
--  strcat(kde_tmp_dir, kde_home);
-+  strncat(kde_tmp_dir, kde_home, PATH_MAX - strlen(kde_tmp_dir));
- 
-   /** Strip trailing '/' **/
-   if ( kde_tmp_dir[strlen(kde_tmp_dir)-1] == '/')
-@@ -148,7 +148,7 @@
-      return 1;
-   }  
- 
--  strcat(kde_tmp_dir, kde_prefix);
-+  strncat(kde_tmp_dir, kde_prefix, PATH_MAX - strlen(kde_tmp_dir));
-   if (gethostname(kde_tmp_dir+strlen(kde_tmp_dir), PATH_MAX - strlen(kde_tmp_dir) - 1) != 0)
-   {
-      perror("Aborting. Could not determine hostname: ");
-@@ -168,7 +168,7 @@
-      result = create_link(kde_tmp_dir, user_tmp_dir);
-      if (result == 0) return 0; /* Success */
-      unlink(kde_tmp_dir);
--     strcat(user_tmp_dir, "XXXXXX");
-+     strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
-      mktemp(user_tmp_dir);
-      return create_link(kde_tmp_dir, user_tmp_dir);
-   }
-@@ -194,7 +194,7 @@
-      result = create_link(kde_tmp_dir, user_tmp_dir);
-      if (result == 0) return 0; /* Success */
-      unlink(kde_tmp_dir);
--     strcat(user_tmp_dir, "XXXXXX");
-+     strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
-      mktemp(user_tmp_dir);
-      return create_link(kde_tmp_dir, user_tmp_dir);
-      return 1;
-@@ -202,7 +202,7 @@
-   result = check_tmp_dir(tmp_buf);
-   if (result == 0) return 0; /* Success */
-   unlink(kde_tmp_dir);
--  strcat(user_tmp_dir, "XXXXXX");
-+  strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
-   mktemp(user_tmp_dir);
-   return create_link(kde_tmp_dir, user_tmp_dir);
- }
-Index: kdelibs/kinit/setproctitle.cpp
-diff -u kdelibs/kinit/setproctitle.cpp:1.6 kdelibs/kinit/setproctitle.cpp:1.6.4.2
---- kinit/setproctitle.cpp:1.6	Sun Feb  4 01:35:48 2001
-+++ kinit/setproctitle.cpp	Sat Dec  7 19:27:51 2002
-@@ -35,7 +35,6 @@
- # define _PATH_KMEM	"/dev/kmem"
- #endif
- 
--#define newstr(s)	strcpy((char*)malloc(strlen(s) + 1), s)
- #define SPACELEFT(buf, ptr)	(sizeof buf - ((ptr) - buf))
- 
- 
-@@ -143,8 +142,13 @@
- 	for (i = 0; envp[i] != NULL; i++)
- 		envpsize += strlen(envp[i]) + 1;
- 	environ = (char **) malloc(sizeof (char *) * (i + 1));
-+    if (environ == NULL)
-+        return;
-+
- 	for (i = 0; envp[i] != NULL; i++)
--		environ[i] = newstr(envp[i]);
-+    {
-+	environ[i] = strdup(envp[i]);
-+    }
- 	environ[i] = NULL;
- 
- 	/*
-Index: kdelibs/kinit/wrapper.c
-diff -u kdelibs/kinit/wrapper.c:1.22 kdelibs/kinit/wrapper.c:1.22.2.2
---- kinit/wrapper.c:1.22	Fri Jul 13 13:16:19 2001
-+++ kinit/wrapper.c	Fri Dec 13 11:23:21 2002
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <pwd.h>
- #include <signal.h>
-+#include <limits.h>
- 
- extern char **environ;
- 
-@@ -53,6 +54,9 @@
-       display = ":0";
-    }
-    result = malloc(strlen(display)+1);
-+   if (result == NULL)
-+      return NULL;
-+
-    strcpy(result, display);
-    screen = strrchr(result, '.');
-    colon = strrchr(result, ':');
-@@ -115,12 +119,12 @@
-   int s;
-   struct sockaddr_un server;
- #define MAX_SOCK_FILE 255
--  char sock_file[MAX_SOCK_FILE];
-+  char sock_file[MAX_SOCK_FILE + 1];
-   const char *home_dir = getenv("HOME");
-   const char *kde_home = getenv("KDEHOME");
-   char *display;
- 
--  sock_file[0] = 0;
-+  sock_file[0] = sock_file[MAX_SOCK_FILE] = 0;
- 
-   if (!kde_home || !kde_home[0])
-   {
-@@ -140,15 +144,15 @@
-         exit(255);
-      }
-      kde_home++;
--     strcat(sock_file, home_dir);
-+     strncpy(sock_file, home_dir, MAX_SOCK_FILE);
-   }
--  strcat(sock_file, kde_home);
-+  strncat(sock_file, kde_home, MAX_SOCK_FILE - strlen(sock_file));
- 
-   /** Strip trailing '/' **/
-   if ( sock_file[strlen(sock_file)-1] == '/')
-      sock_file[strlen(sock_file)-1] = 0;
-   
--  strcat(sock_file, "/socket-");
-+  strncat(sock_file, "/socket-", MAX_SOCK_FILE - strlen(sock_file));
-   if (gethostname(sock_file+strlen(sock_file), MAX_SOCK_FILE - strlen(sock_file) - 1) != 0)
-   {
-      perror("Aborting. Could not determine hostname: ");
-@@ -157,7 +161,13 @@
- 
-   /* append $DISPLAY */
-   display = getDisplay();
--  if (strlen(sock_file)+strlen(display)+2 > MAX_SOCK_FILE)
-+  if (display == NULL)
-+  {
-+     fprintf(stderr, "Error: Could not determine display.\n");
-+     return -1;
-+  }
-+
-+  if (strlen(sock_file)+strlen(display)+strlen("/kdeinit-")+2 > MAX_SOCK_FILE)
-   {
-      fprintf(stderr, "Aborting. Socket name will be too long.\n");
-      exit(255);
-@@ -401,6 +411,11 @@
-    write_socket(sock, (char *) &header, sizeof(header));
- 
-    buffer = (char *) malloc(size);
-+   if (buffer == NULL)
-+   {
-+        fprintf(stderr, "Error: malloc() failed.");
-+        exit(255);
-+   }
-    p = buffer;
-       
-    memcpy(p, &arg_count, sizeof(arg_count));
-@@ -472,6 +487,11 @@
-    {
-       long pid;
-       buffer = (char *) malloc(header.arg_length);
-+      if (buffer == NULL)
-+      {
-+          fprintf(stderr, "Error: malloc() failed\n");
-+          exit(255);
-+      }
-       read_socket(sock, buffer, header.arg_length);
-       pid = *((long *) buffer);
-       if( !kwrapper ) /* kwrapper shouldn't print any output */
-Index: kdelibs/kio/job.cpp
-diff -u kdelibs/kio/job.cpp:1.261.2.6 kdelibs/kio/job.cpp:1.261.2.8
---- kio/job.cpp:1.261.2.6	Fri Oct 19 22:09:57 2001
-+++ kio/job.cpp	Tue Jan 22 11:39:10 2002
-@@ -2588,11 +2588,18 @@
-             break;
-         case STATE_RENAMING: // We were trying to rename a directory
-         {
--            bool err = job->error() != 0;
-+            int err = job->error();
-             subjobs.remove( job );
-             assert ( subjobs.isEmpty() );
-             if ( err )
-             {
-+                // Only try copy+del if the reason for not renaming was "unsupported" (which includes EXDEV)
-+                // One case where we really don't want to go to copy+del is renaming 'a' to 'A' on a FAT partition
-+                if ( err != KIO::ERR_UNSUPPORTED_ACTION )
-+                {
-+                    Job::slotResult( job ); // will set the error and emit result(this)
-+                    return;
-+                }
-                 kdDebug(7007) << "Couldn't rename, starting listing, for copy and del" << endl;
-                 startListing( *m_currentStatSrc );
-             }
-@@ -2863,59 +2870,87 @@
-     //kdDebug(7007) << "deleteNextFile" << endl;
-     if ( !files.isEmpty() || !symlinks.isEmpty() )
-     {
--        // Take first file to delete out of list
--        KURL::List::Iterator it = files.begin();
--        bool isLink = false;
--        if ( it == files.end() ) // No more files
--        {
--            it = symlinks.begin(); // Pick up a symlink to delete
--            isLink = true;
--        }
-         SimpleJob *job;
--        // Use shredding ?
--        if ( m_shred && (*it).isLocalFile() && !isLink )
--        {
--            // KShred your KTie
--            KIO_ARGS << int(3) << (*it).path();
--            job = KIO::special(KURL("file:/"), packedArgs, false /*no GUI*/);
--            Scheduler::scheduleJob(job);
--            m_currentURL=(*it);
--            //emit deleting( this, *it );
--            connect( job, SIGNAL( processedSize( KIO::Job*, unsigned long ) ),
--                     this, SLOT( slotProcessedSize( KIO::Job*, unsigned long ) ) );
--        } else
--        {
--            // Normal deletion
--            job = KIO::file_delete( *it, false /*no GUI*/);
--            Scheduler::scheduleJob(job);
--            m_currentURL=(*it);
--            //emit deleting( this, *it );
--        }
--        if ( isLink )
--           symlinks.remove(it);
--        else
--           files.remove(it);
--        addSubjob(job);
--    } else
--    {
--        state = STATE_DELETING_DIRS;
--        deleteNextDir();
-+        do {
-+            // Take first file to delete out of list
-+            KURL::List::Iterator it = files.begin();
-+            bool isLink = false;
-+            if ( it == files.end() ) // No more files
-+            {
-+                it = symlinks.begin(); // Pick up a symlink to delete
-+                isLink = true;
-+            }
-+            // Use shredding ?
-+            if ( m_shred && (*it).isLocalFile() && !isLink )
-+            {
-+                // KShred your KTie
-+                KIO_ARGS << int(3) << (*it).path();
-+                job = KIO::special(KURL("file:/"), packedArgs, false /*no GUI*/);
-+                Scheduler::scheduleJob(job);
-+                m_currentURL=(*it);
-+                connect( job, SIGNAL( processedSize( KIO::Job*, KIO::filesize_t ) ),
-+                         this, SLOT( slotProcessedSize( KIO::Job*, KIO::filesize_t ) ) );
-+            } else
-+            {
-+                // Normal deletion
-+                // If local file, try do it directly
-+                if ( (*it).isLocalFile() && unlink( QFile::encodeName((*it).path()) ) == 0 ) {
-+                    job = 0;
-+                    m_processedFiles++;
-+                    if ( m_processedFiles % 300 == 0 ) { // update progress info every 300 files
-+                        m_currentURL = *it;
-+                        slotReport();
-+                    }
-+                } else
-+                { // if remote - or if unlink() failed (we'll use the job's error handling in that case)
-+                    job = KIO::file_delete( *it, false /*no GUI*/);
-+                    Scheduler::scheduleJob(job);
-+                    m_currentURL=(*it);
-+                }
-+            }
-+            if ( isLink )
-+                symlinks.remove(it);
-+            else
-+                files.remove(it);
-+            if ( job ) {
-+                addSubjob(job);
-+                return;
-+            }
-+            // loop only if direct deletion worked (job=0) and there is something else to delete
-+        } while (!job && (!files.isEmpty() || !symlinks.isEmpty()));
-     }
-+    state = STATE_DELETING_DIRS;
-+    deleteNextDir(); 
- }
- 
- void DeleteJob::deleteNextDir()
- {
-     if ( !dirs.isEmpty() ) // some dirs to delete ?
-     {
--        // Take first dir to delete out of list - last ones first !
--        KURL::List::Iterator it = dirs.fromLast();
--        SimpleJob *job = KIO::rmdir( *it );
--        Scheduler::scheduleJob(job);
--        dirs.remove(it);
--        addSubjob( job );
-+        do {
-+            // Take first dir to delete out of list - last ones first !
-+            KURL::List::Iterator it = dirs.fromLast();
-+            // If local dir, try to rmdir it directly
-+            if ( (*it).isLocalFile() && ::rmdir( QFile::encodeName((*it).path()) ) == 0 ) {
-+
-+                m_processedDirs++;
-+                if ( m_processedDirs % 100 == 0 ) { // update progress info every 100 dirs
-+                    m_currentURL = *it;
-+                    slotReport();
-+               }
-+            } else
-+            {
-+                SimpleJob *job = KIO::rmdir( *it );
-+                Scheduler::scheduleJob(job);
-+                dirs.remove(it);
-+                addSubjob( job );
-+                return;
-+            }
-+            dirs.remove(it);
-+        } while ( !dirs.isEmpty() );
-     }
--    else // We have finished deleting
--        startNextJob();
-+    // We have finished deleting
-+    startNextJob();
- }
- 
- void DeleteJob::slotProcessedSize( KIO::Job*, unsigned long data_size )
-@@ -3089,9 +3124,6 @@
-       assert( subjobs.isEmpty() );
-       m_processedFiles++;
- 
--      /*emit processedFiles( this, m_processedFiles );
--       if (!m_shred)
--       emitPercent( m_processedFiles, m_totalFilesDirs );*/
-       deleteNextFile();
-       break;
-    case STATE_DELETING_DIRS:
-Index: kdelibs/kio/kdirlister.cpp
-diff -u kdelibs/kio/kdirlister.cpp:1.64 kdelibs/kio/kdirlister.cpp:1.64.2.1
---- kio/kdirlister.cpp:1.64	Wed Jun  6 22:39:51 2001
-+++ kio/kdirlister.cpp	Sun Nov 11 16:50:41 2001
-@@ -159,7 +159,8 @@
-     return;
-   }
- 
--  m_url = _url;
-+  if ( m_url.isEmpty() || !_keep ) // Set toplevel URL if not set yet
-+    m_url = _url;
- 
-   m_bComplete = false;
-   d->urlChanged = false;
-@@ -261,15 +262,13 @@
-   {
-     job->showErrorDialog();
- 
--    if ( m_lstDirs.count() > 1 )
--      emit canceled( job->url() );
-+    emit canceled( job->url() );
-     if ( m_bComplete )
-       emit canceled();
-   }
-   else
-   {
--    if ( m_lstDirs.count() > 1 )
--      emit completed( job->url() );
-+    emit completed( job->url() );
-     if ( m_bComplete )
-       emit completed();
-   }
-@@ -308,7 +307,7 @@
- 
-     if ( name == dot )
-     {
--      if ( !m_rootFileItem ) // only if we didn't keep the previous dir
-+      if ( !m_rootFileItem && url == m_url ) // only if we didn't keep the previous dir
-       {
-         m_rootFileItem = createFileItem( *it, url, m_bDelayedMimeTypes );
-       }
-Index: kdelibs/kio/kmimemagic.cpp
-diff -u kdelibs/kio/kmimemagic.cpp:1.39 kdelibs/kio/kmimemagic.cpp:1.39.2.1
---- kio/kmimemagic.cpp:1.39	Thu Aug  2 11:21:27 2001
-+++ kio/kmimemagic.cpp	Sat Dec  7 18:48:04 2002
-@@ -1478,7 +1478,9 @@
- 					char *tmp;
- 					char buf2[BUFSIZ + BUFSIZ + 4];
- 
--					strcpy(buf2, fn);
-+					strncpy(buf2, fn, BUFSIZ);
-+                    buf2[BUFSIZ] = 0;
-+
- 					if ((tmp = strrchr(buf2, '/')) == NULL) {
- 						tmp = buf; /* in current dir */
- 					} else {
-Index: kdelibs/kio/kmimetype.cpp
-diff -u kdelibs/kio/kmimetype.cpp:1.134.2.1 kdelibs/kio/kmimetype.cpp:1.134.2.2
---- kio/kmimetype.cpp:1.134.2.1	Thu Nov  8 21:50:39 2001
-+++ kio/kmimetype.cpp	Sun Dec  8 01:58:10 2002
-@@ -653,7 +653,7 @@
-   // at the global file, or at a file not in share/mimelnk...
- 
-   KShellProcess p;
--  p << "kfmclient" << "openProperties" << url.path().local8Bit();
-+  p << "kfmclient" << "openProperties" << KShellProcess::quote(url.path());
-   p.start(KProcess::DontCare);
-   return p.getPid();
- }
-Index: kdelibs/kio/ktar.cpp
-diff -u kdelibs/kio/ktar.cpp:1.32 kdelibs/kio/ktar.cpp:1.32.2.1
---- kio/ktar.cpp:1.32	Tue Jun 26 22:22:37 2001
-+++ kio/ktar.cpp	Sat Dec  7 18:48:04 2002
-@@ -355,15 +355,20 @@
-     strcpy( buffer, "././@LongLink" );
-     fillBuffer( buffer, "     0", dirName.length()+1, 'L', user.local8Bit(), group.local8Bit() );
-     write( buffer, 0x200 );
--    memset( buffer, 0, 0x200 );
--    strcpy( buffer, QFile::encodeName(dirName) );
-+    strncpy( buffer, QFile::encodeName(dirName), 0x200 );
-+    buffer[0x200] = 0;
-+
-     // write long name
-     write( buffer, 0x200 );
-     // not even needed to reclear the buffer, tar doesn't do it
-   }
-   else
-+  {
-     // Write name
--    strcpy( buffer, QFile::encodeName(dirName) );
-+    strncpy( buffer, QFile::encodeName(dirName), 0x200 );
-+    buffer[0x200] = 0;
-+  }
-+          
- 
-   fillBuffer( buffer, " 40755", 0, 0x35, user.local8Bit(), group.local8Bit());
- 
-@@ -419,15 +424,19 @@
-     fillBuffer( buffer, "     0", fileName.length()+1, 'L', user.local8Bit(), group.local8Bit() );
-     write( buffer, 0x200 );
- 
--    memset( buffer, 0, 0x200 );
--    strcpy( buffer, QFile::encodeName(fileName) );
-+    strncpy( buffer, QFile::encodeName(fileName), 0x200 );
-+    buffer[0x200] = 0;
-     // write long name
-     write( buffer, 0x200 );
-     // not even needed to reclear the buffer, tar doesn't do it
-   }
-   else
-+  {
-     // Write name
--    strcpy( buffer, QFile::encodeName(fileName) );
-+    strncpy( buffer, QFile::encodeName(fileName), 0x200 );
-+    buffer[0x200] = 0;
-+  }
-+          
- 
-   fillBuffer( buffer, "100644", size, 0x30, user.local8Bit(), group.local8Bit() );
- 
-Index: kdelibs/kio/lex.l
-diff -u kdelibs/kio/lex.l:1.5 kdelibs/kio/lex.l:1.5.2.1
---- kio/lex.l:1.5	Wed Jun 13 16:16:39 2001
-+++ kio/lex.l	Sat Dec  7 18:48:04 2002
-@@ -58,9 +58,11 @@
- {
-   int l = strlen( _name )-1;
-   char *p = (char *)malloc( l );
--
--  strncpy( p, _name+1, l-1 );
--  p[l-1] = 0;
-+  if (p != NULL)
-+  {
-+    strncpy( p, _name+1, l-1 );
-+    p[l-1] = 0;
-+  }
- 
-   return p;
- }
-@@ -68,7 +70,10 @@
- char *putSymbol( char *_name )
- {
-   char *p = (char*)malloc( strlen( _name ) + 1 );
--  strcpy( p, _name );
-+  if (p != NULL)
-+  {
-+      strcpy( p, _name );
-+  }
-   return p;
- }
- 
-@@ -78,6 +83,10 @@
-   char *p = (char*)malloc( l );
-   char *s = _str + 1;
-   char *d = p;
-+
-+  if (p == NULL)
-+    return NULL;
-+
-   while ( s != _str + l - 1 )
-   {
-      if ( *s != '\\' )
-Index: kdelibs/kio/passdlg.cpp
-diff -u kdelibs/kio/passdlg.cpp:1.26 kdelibs/kio/passdlg.cpp:1.26.2.1
---- kio/passdlg.cpp:1.26	Sun May 27 01:00:31 2001
-+++ kio/passdlg.cpp	Sat Nov 10 18:52:33 2001
-@@ -279,8 +279,15 @@
-     if ( ret == Accepted )
-     {
-         user = dlg->username();
-+        if ( user.isNull() )
-+          user = "";
-+
-         pass = dlg->password();
--        if ( keep ) { (*keep) = dlg->keepPassword(); }
-+        if ( pass.isNull() )
-+          pass = "";
-+
-+        if ( keep )
-+          (*keep) = dlg->keepPassword();
-     }
-     delete dlg;
-     return ret;
-Index: kdelibs/kio/rlogin.protocol
-diff -u kdelibs/kio/rlogin.protocol:1.2 kdelibs/kio/rlogin.protocol:removed
---- kio/rlogin.protocol:1.2	Sun Jan 21 00:01:05 2001
-+++ kio/rlogin.protocol	Fri Dec 13 17:03:06 2002
-@@ -1,11 +0,0 @@
--[Protocol]
--exec=konsole -e rlogin `echo %u | sed -e 's,rlogin:/*,,'`
--protocol=rlogin
--input=none
--output=none
--helper=true
--listing=false
--reading=false
--writing=false
--makedir=false
--deleting=false
-Index: kdelibs/kio/telnet.protocol
-diff -u kdelibs/kio/telnet.protocol:1.3 kdelibs/kio/telnet.protocol:removed
---- kio/telnet.protocol:1.3	Wed Apr 11 07:37:55 2001
-+++ kio/telnet.protocol	Fri Dec 13 17:03:07 2002
-@@ -1,11 +0,0 @@
--[Protocol]
--exec=konsole -e telnet `echo %u | sed -e 's,telnet:/*,,' | sed -e 's,:\([0-9]*\), \1,'`
--protocol=telnet
--input=none
--output=none
--helper=true
--listing=false
--reading=false
--writing=false
--makedir=false
--deleting=false
-Index: kdelibs/kio/ftp/ftp.cc
-diff -u kdelibs/kio/ftp/ftp.cc:1.147.2.1 kdelibs/kio/ftp/ftp.cc:1.147.2.2
---- kio/ftp/ftp.cc:1.147.2.1	Thu Sep 27 18:37:20 2001
-+++ kio/ftp/ftp.cc	Wed Dec 11 23:03:47 2002
-@@ -1677,7 +1677,10 @@
-                     }
-                     else
-                       de.link = QString::null;
--
-+                      
-+                    if (strchr(p_name, '/'))
-+                       return 0L; // Don't trick us!
-+                    
-                     de.access = 0;
-                     de.type = S_IFREG;
-                     switch ( p_access[0] ) {
-Index: kdelibs/kparts/browserextension.cpp
-diff -u kdelibs/kparts/browserextension.cpp:1.34 kdelibs/kparts/browserextension.cpp:1.34.2.1
---- kparts/browserextension.cpp:1.34	Wed Jun 20 22:19:00 2001
-+++ kparts/browserextension.cpp	Fri Nov 29 12:39:09 2002
-@@ -541,7 +541,7 @@
- 
- BrowserHostExtension *BrowserHostExtension::childObject( QObject *obj )
- {
--    if ( !obj )
-+    if ( !obj || !obj->children() )
-         return 0L;
- 
-     // we try to do it on our own, in hope that we are faster than
-Index: kdelibs/kssl/kopenssl.cc
-diff -u kdelibs/kssl/kopenssl.cc:1.24.2.1 kdelibs/kssl/kopenssl.cc:1.24.2.2
---- kssl/kopenssl.cc:1.24.2.1	Tue Aug 21 18:07:31 2001
-+++ kssl/kopenssl.cc	Tue Aug 13 00:23:03 2002
-@@ -92,6 +92,7 @@
- static int (*K_SSL_get_error) (SSL*, int) = NULL;
- static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL;
- static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL;
-+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL;
- static void (*K_sk_free) (STACK*) = NULL;
- static int (*K_sk_num) (STACK*) = NULL;
- static char* (*K_sk_value) (STACK*, int) = NULL;
-@@ -254,6 +255,7 @@
-                 X509**, STACK_OF(X509)**)) _cryptoLib->symbol("PKCS12_parse");
-       K_EVP_PKEY_free = (void (*) (EVP_PKEY *)) _cryptoLib->symbol("EVP_PKEY_free");
-       K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain");
-+      K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose");
-       K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free");
-       K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num");
-       K_sk_value = (char* (*) (STACK *, int)) _cryptoLib->symbol("sk_value");
-@@ -742,6 +744,10 @@
- 
- void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) {
-    if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x);
-+}
-+
-+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) {
-+   if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose);
- }
- 
- 
-Index: kdelibs/kssl/kopenssl.h
-diff -u kdelibs/kssl/kopenssl.h:1.15 kdelibs/kssl/kopenssl.h:1.15.2.1
---- kssl/kopenssl.h:1.15	Fri Jul 27 11:55:02 2001
-+++ kssl/kopenssl.h	Tue Aug 13 00:23:03 2002
-@@ -277,6 +277,10 @@
-     */
-    void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x);
- 
-+   /*
-+    *   X509_STORE_CTX_set_purpose - set the purpose of the certificate 
-+    */
-+   void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose);
- 
-    /*
-     *   X509_verify_cert - verify the certificate
-Index: kdelibs/kssl/ksslcertificate.cc
-diff -u kdelibs/kssl/ksslcertificate.cc:1.39.2.6 kdelibs/kssl/ksslcertificate.cc:1.39.2.7
---- kssl/ksslcertificate.cc:1.39.2.6	Thu Oct 25 08:12:11 2001
-+++ kssl/ksslcertificate.cc	Tue Aug 13 00:23:03 2002
-@@ -262,6 +262,8 @@
-     // FIXME: do all the X509_STORE_CTX_set_flags(); here
-     //   +----->  Note that this is for 0.9.6 or better ONLY!
- 
-+    d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER);
-+
-     //kdDebug(7029) << "KSSL verifying.............." << endl;
-     certStoreCTX->error = X509_V_OK;
-     rc = d->kossl->X509_verify_cert(certStoreCTX);
-Index: kdelibs/kssl/ksslpeerinfo.cc
-diff -u kdelibs/kssl/ksslpeerinfo.cc:1.12.2.10 kdelibs/kssl/ksslpeerinfo.cc:1.12.2.11
---- kssl/ksslpeerinfo.cc:1.12.2.10	Wed Nov  7 06:47:37 2001
-+++ kssl/ksslpeerinfo.cc	Fri Nov 23 19:42:36 2001
-@@ -23,7 +23,6 @@
- #endif
- 
- #include "ksslpeerinfo.h"
--#include <qstring.h>
- #include <kdebug.h>
- 
- #include <ksockaddr.h>
-@@ -74,25 +73,54 @@
-   QString cn = certinfo.getValue("CN");
- 
-   if (d->proxying) {
--	if (cn.startsWith("*")) {
--		QRegExp cnre(cn.lower(), false, true);
--		if (cnre.match(d->proxyHost.lower()) >= 0) return true;
--	} else {
--		if (cn.lower() == d->proxyHost.lower()) return true;
--	}
--	return false;
-+    QStringList domains;
-+
-+    kdDebug(7029) << "Matching CN=" << cn << " to " << d->proxyHost << endl;
-+
-+    extractDomains(d->proxyHost, domains);
-+    QStringList::Iterator it = domains.begin();
-+    for (; it != domains.end(); it++)
-+    {
-+      int match = cn.findRev(*it, -1, false);
-+      kdDebug(7029) << "Match= " << match << ", CN.length= " << cn.length()
-+                    << ", host.length= " << (*it).length() << endl;
-+
-+      if (match > -1 && ((match + (*it).length()) == cn.length()))
-+      {
-+        kdDebug(7029) << "Found a match ==> " << (*it) << endl;
-+        return true;
-+      }
-+    }
-+    return false;
-   }
- 
- 
-   if (cn.startsWith("*")) {   // stupid wildcard cn
--     QRegExp cnre(cn.lower(), false, true);
-      QString host, port;
-+     QStringList domains;
- 
--     if (KExtendedSocket::resolve(d->host, host, port, NI_NAMEREQD) != 0) 
-+     if (KExtendedSocket::resolve(d->host, host, port, NI_NAMEREQD) != 0)
-         host = d->host->nodeName();
- 
-      kdDebug(7029) << "Matching CN=" << cn << " to " << host << endl;
--     if (cnre.match(host.lower()) >= 0) return true;
-+
-+     extractDomains( host, domains );
-+     QStringList::Iterator it = domains.begin();
-+
-+     for (; it != domains.end(); it++)
-+     {
-+        int match = cn.findRev(*it, -1, false);
-+        kdDebug(7029) << "Match= " << match << ", CN.length= " << cn.length()
-+                      << ", host.length= " << (*it).length() << endl;
-+
-+        if (match > -1 && ((match + (*it).length()) == cn.length()))
-+        {
-+          kdDebug(7029) << "Found a match ==> " << (*it) << endl;
-+          return true;
-+         }
-+     }
-+
-+     return false;
-   } else {
-      int err = 0;
-      QList<KAddressInfo> cns = KExtendedSocket::lookup(cn.latin1(), 0, 0, &err);
-@@ -102,17 +130,55 @@
-      }
-      cns.setAutoDelete(true);
- 
--//     kdDebug(7029) << "The original ones were: " << d->host->nodeName()
--//                   << " and: " << certinfo.getValue("CN").latin1()
--//                   << endl;
-+     kdDebug(7029) << "The original ones were: " << d->host->nodeName()
-+                   << " and: " << certinfo.getValue("CN").latin1()
-+                   << endl;
- 
-      for (KAddressInfo *x = cns.first(); x; x = cns.next()) {
-         if ((*x).address()->isCoreEqual(d->host)) {
-            return true;
-         }
-      }
-+     kdDebug(7029) << "Testing failed!" << endl;
-   }
- 
- #endif
-   return false;
-+}
-+
-+void KSSLPeerInfo::extractDomains(const QString &fqdn, QStringList &domains)
-+{
-+    domains.clear();
-+
-+    // If fqdn is an IP address, then only use
-+    // the entire IP address to find a match! (DA)
-+    if (fqdn[0] >= '0' && fqdn[0] <= '9') {
-+       domains.append(fqdn);
-+       return;
-+    }
-+
-+    QStringList partList = QStringList::split('.', fqdn, false);
-+
-+    if (partList.count())
-+        partList.remove(partList.begin()); // Remove hostname
-+
-+    while(partList.count()) {
-+       if (partList.count() == 1)
-+         break; // We only have a TLD left.
-+
-+       if (partList.count() == 2) {
-+          // If this is a TLD, we should stop. (e.g. co.uk)
-+          // We assume this is a TLD if it ends with .xx.yy or .x.yy
-+          if (partList[0].length() <= 2 && partList[1].length() == 2)
-+             break; // This is a TLD.
-+       }
-+
-+       QString domain = partList.join(".");
-+       domains.append(domain);
-+       partList.remove(partList.begin());
-+    }
-+
-+    // Add the entire FQDN at the end of the
-+    // list for fqdn == CN checks
-+    domains.append(fqdn);
- }
-Index: kdelibs/kssl/ksslpeerinfo.h
-diff -u kdelibs/kssl/ksslpeerinfo.h:1.12.2.1 kdelibs/kssl/ksslpeerinfo.h:1.12.2.2
---- kssl/ksslpeerinfo.h:1.12.2.1	Wed Nov  7 06:47:37 2001
-+++ kssl/ksslpeerinfo.h	Fri Nov 23 19:42:36 2001
-@@ -24,7 +24,7 @@
- class KSSL;
- 
- #include <qglobal.h>
--#include <qstring.h>
-+#include <qstringlist.h>
- #include <ksslcertificate.h>
- 
- class KSSLPeerInfoPrivate;
-@@ -38,14 +38,15 @@
-   KSSLCertificate& getPeerCertificate();
-   bool certMatchesAddress();
-   QString getPeerAddress();
--  
-+
-   void setProxying(bool active, QString realHost = QString::null);
-- 
-+
- protected:
-   KSSLPeerInfo();
- 
-   KSSLCertificate m_cert;
-   void setPeerAddress(KInetSocketAddress &x);
-+  void extractDomains(const QString &fqdn, QStringList &domains);
- 
- private:
-   KSSLPeerInfoPrivate *d;
-Index: kdelibs/libkmid/fmout.cc
-diff -u kdelibs/libkmid/fmout.cc:1.19 kdelibs/libkmid/fmout.cc:1.19.6.1
---- libkmid/fmout.cc:1.19	Tue Oct 10 00:09:23 2000
-+++ libkmid/fmout.cc	Sat Dec  7 18:48:38 2002
-@@ -34,6 +34,7 @@
- #include <string.h>
- #include <sys/param.h>
- #include <stdlib.h>
-+#include <limits.h>
- #include "midispec.h"
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-@@ -126,8 +127,8 @@
- void FMOut::loadFMPatches(void)
- {
- #ifdef HAVE_OSS_SUPPORT
--  char patchesfile[120];
--  char drumsfile[120];
-+  char patchesfile[PATH_MAX];
-+  char drumsfile[PATH_MAX];
-   int size;
-   struct sbi_instrument instr;
-   char tmp[60];
-@@ -140,12 +141,12 @@
- 
-   if (opl==3)
-   {
--    sprintf(patchesfile,"%s/std.o3",FMPatchesDirectory);
-+    snprintf(patchesfile, PATH_MAX, "%s/std.o3",FMPatchesDirectory);
-     size=60;
-   }
-   else
-   {
--    sprintf(patchesfile,"%s/std.sb",FMPatchesDirectory);
-+    snprintf(patchesfile, PATH_MAX, "%s/std.sb",FMPatchesDirectory);
-     size=52;
-   }
-   fh=fopen(patchesfile,"rb");
-@@ -170,11 +171,11 @@
- 
-   if (opl==3)
-   {
--    sprintf(drumsfile,"%s/drums.o3",FMPatchesDirectory);
-+    snprintf(drumsfile, PATH_MAX, "%s/drums.o3",FMPatchesDirectory);
-   }
-   else
-   {
--    sprintf(drumsfile,"%s/drums.sb",FMPatchesDirectory);
-+    snprintf(drumsfile, PATH_MAX, "%s/drums.sb",FMPatchesDirectory);
-   }
- 
-   fh=fopen(drumsfile,"rb");
-Index: kdelibs/libkmid/midfile.cc
-diff -u kdelibs/libkmid/midfile.cc:1.21 kdelibs/libkmid/midfile.cc:1.21.2.3
---- libkmid/midfile.cc:1.21	Tue Mar 13 17:41:09 2001
-+++ libkmid/midfile.cc	Fri Dec  6 15:24:24 2002
-@@ -34,6 +34,9 @@
- #include "sys/stat.h"
- #include <config.h>
- 
-+#include <kprocess.h>
-+#include <qfile.h>
-+
- int fsearch(FILE *fh,const char *text,long *ptr);
- 
- /* This function gives the metronome tempo, from a tempo data as found in
-@@ -51,26 +54,23 @@
- int uncompressFile(const char *gzname, char *tmpname)
-   // Returns 0 if OK, 1 if error (tmpname not set)
- {
--  char *cmd=new char[20+strlen(gzname)];
--  sprintf(cmd, "gzip -dc \"%s\"",gzname);
--  FILE *infile = popen( cmd, "r");
--  if (infile==NULL)
--  {
--    fprintf(stderr,"ERROR : popen failed : %s\n",cmd);
-+  QString cmd("gzip -dc " + KShellProcess::quote(gzname));
-+  FILE *infile = popen( QFile::encodeName(cmd).data(), "r");
-+  if (infile==NULL) {
-+    fprintf(stderr,"ERROR : popen failed : %s\n",QFile::encodeName(cmd).data());
-+    return 1;
-   }
-   strcpy(tmpname, "/tmp/KMid.XXXXXXXXXX");
-   int fd = mkstemp(tmpname);
-   if (fd == -1)
-   {
-     pclose(infile);
--    delete cmd;
-     return 1;
-   }
-   FILE *outfile= fdopen(fd,"wb");
-   if (outfile==NULL)
-   {
-     pclose(infile);
--    delete cmd;
-     return 1;
-   }
-   int n=getc(infile);
-@@ -79,7 +79,6 @@
-     pclose(infile);
-     fclose(outfile);
-     unlink(tmpname);
--    delete cmd;
-     return 1;
-   }
-   fputc(n,outfile);
-@@ -97,7 +96,6 @@
-   // Is it right for pclose to always fail ?
- 
-   fclose(outfile);
--  delete cmd;
-   return 0;
- }
- 
-Index: kdelibs/libkmid/midimapper.cc
-diff -u kdelibs/libkmid/midimapper.cc:1.12 kdelibs/libkmid/midimapper.cc:1.12.6.1
---- libkmid/midimapper.cc:1.12	Fri Jul 28 23:45:30 2000
-+++ libkmid/midimapper.cc	Sat Dec  7 18:48:39 2002
-@@ -184,7 +184,9 @@
- MidiMapper::Keymap *MidiMapper::createKeymap(char *name,uchar use_same_note,uchar note)
- {
-   Keymap *km=new Keymap;
--  strcpy(km->name,name);
-+  strncpy(km->name, name, KM_NAME_SIZE);
-+  km->name[KM_NAME_SIZE - 1] = 0;
-+
-   int i;
-   if (use_same_note==1)
-   {
-@@ -263,7 +265,7 @@
-   char s[101];
-   char v[101];
-   char t[101];
--  char name[101];
-+  char name[256]; /* Longer than t and 'AllKeysTo' */
-   int i=0;
-   int j,w;
- #ifdef MIDIMAPPERDEBUG
-@@ -323,7 +325,9 @@
-   removeSpaces(first_line);
-   getWord(v,first_line,2);
-   Keymap *km=new Keymap;
--  strcpy(km->name,v);
-+  strncpy(km->name, v, KM_NAME_SIZE);
-+  km->name[KM_NAME_SIZE - 1] = 0;
-+
-   int i=0;
-   while (i<128)
-   {
-Index: kdelibs/libkmid/midimapper.h
-diff -u kdelibs/libkmid/midimapper.h:1.8 kdelibs/libkmid/midimapper.h:1.8.6.1
---- libkmid/midimapper.h:1.8	Fri Jul 28 23:45:30 2000
-+++ libkmid/midimapper.h	Sat Dec  7 18:48:41 2002
-@@ -27,6 +27,8 @@
- #include <stdio.h>
- #include <libkmid/dattypes.h>
- 
-+#define KM_NAME_SIZE 30
-+
- /**
-  * A Midi Mapper class which defines the way MIDI events are translated
-  * (or "mapped") to different ones. This way, when two MIDI devices "talk"
-@@ -65,7 +67,7 @@
-      */
-     struct Keymap
-     {
--      char name[30];
-+      char name[KM_NAME_SIZE];
-       uchar key[128];
-       struct Keymap *next;
-     };
-Index: kdelibs/libkmid/player.cc
-diff -u kdelibs/libkmid/player.cc:1.41 kdelibs/libkmid/player.cc:1.41.2.1
---- libkmid/player.cc:1.41	Wed Aug  1 02:05:10 2001
-+++ libkmid/player.cc	Sat Dec  7 18:48:42 2002
-@@ -366,7 +366,8 @@
-                     {
-                       lasttexttime=pspev->absmilliseconds;
-                       lasttexttype=pspev->type;
--                      strcpy(lasttext,pspev->text);
-+                      strncpy(lasttext, pspev->text, 1024);
-+                      lasttext[1023] = 0;
- #endif
-                       pspev->next=new SpecialEvent;
- #ifdef PLAYERDEBUG
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch
deleted file mode 100644
index 930776d23a51..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kjs/ustring.cpp.orig	2003-01-23 15:49:49.000000000 -0500
-+++ kjs/ustring.cpp	2003-01-27 19:49:00.000000000 -0500
-@@ -421,8 +421,15 @@
- {
-   double d = toDouble();
-   bool b = true;
-+  /* useless temporary variable to work around gcc optimization bug */
-+  bool nan = false;
- 
--  if (isNaN(d) || d != static_cast<unsigned long>(d)) {
-+  if (isNaN(d)) {
-+    d = 0;
-+    nan = true;
-+  }
-+
-+  if (nan || d != static_cast<unsigned long>(d)) {
-     b = false;
-     d = 0;
-   }
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
deleted file mode 100644
index 2cae6948ddf9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kioslave/http/http.cc	7 May 2003 16:43:40 -0000	1.551.2.15
-+++ kioslave/http/http.cc	4 Jul 2003 11:37:27 -0000	1.551.2.21
-@@ -230,19 +229,30 @@
-   kdDebug(7113) << "(" << m_pid << ") ssl_was_in_use = "
-                 << metaData ("ssl_was_in_use") << endl;
- 
-+  m_request.referrer = QString::null;
-   if ( config()->readBoolEntry("SendReferrer", true) &&
-        (m_protocol == "https" || m_protocol == "webdavs" ||
-         metaData ("ssl_was_in_use") != "TRUE" ) )
--     m_request.referrer = metaData("referrer");
--  else
--     m_request.referrer = QString::null;
--
--  if (!m_request.referrer.startsWith("http"))
-   {
--     if (m_request.referrer.startsWith("webdav"))
--        m_request.referrer.replace(0, 6, "http");
--     else
--        m_request.referrer = QString::null;
-+     KURL referrerURL = metaData("referrer");
-+     if (referrerURL.isValid())
-+     {
-+        // Sanitize
-+        QString protocol = referrerURL.protocol();
-+        if (protocol.startsWith("webdav"))
-+        {
-+           protocol.replace(0, 6, "http");
-+           referrerURL.setProtocol(protocol);
-+        }
-+        
-+        if (protocol.startsWith("http"))
-+        {
-+           referrerURL.setRef(QString::null);
-+           referrerURL.setUser(QString::null);
-+           referrerURL.setPass(QString::null);
-+           m_request.referrer = referrerURL.url();
-+        }
-+     }
-   }
- 
-   if ( config()->readBoolEntry("SendLanguageSettings", true) )
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
deleted file mode 100644
index 276624135f4b..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- khtml/khtml_part.cpp	3 Jul 2003 17:13:02 -0000	1.770.2.27
-+++ khtml/khtml_part.cpp	10 Jul 2003 11:45:10 -0000
-@@ -4171,7 +4171,27 @@
- 
- QString KHTMLPart::referrer() const
- {
--   return d->m_pageReferrer;
-+   return d->m_referrer;
-+}
-+
-+QString KHTMLPart::pageReferrer() const
-+{
-+   KURL referrerURL = d->m_pageReferrer;
-+   if (referrerURL.isValid())
-+   {
-+      QString protocol = referrerURL.protocol();
-+
-+      if ((protocol == "http") ||
-+         ((protocol == "https") && (m_url.protocol() == "https")))
-+      {
-+          referrerURL.setRef(QString::null);
-+          referrerURL.setUser(QString::null);
-+          referrerURL.setPass(QString::null);
-+          return referrerURL.url();
-+      }
-+   }
-+   
-+   return QString::null;
- }
-
- 
---- khtml/khtml_part.h	18 May 2003 12:34:36 -0000	1.197.2.5
-+++ khtml/khtml_part.h	10 Jul 2003 11:45:11 -0000
-@@ -702,6 +702,11 @@
-   QString referrer() const;
- 
-   /**
-+   * Referrer used to obtain this page.
-+   */
-+  QString pageReferrer() const;
-+
-+  /**
-    * Last-modified date (in raw string format), if received in the [HTTP] headers.
-    */
-   QString lastModified() const;
-
---- khtml/html/html_documentimpl.cpp	27 Jun 2003 09:55:33 -0000	1.143.2.6
-+++ khtml/html/html_documentimpl.cpp	10 Jul 2003 11:45:11 -0000
-@@ -85,7 +85,7 @@
- DOMString HTMLDocumentImpl::referrer() const
- {
-     if ( view() )
--        return view()->part()->referrer();
-+        return view()->part()->pageReferrer();
-     return DOMString();
- }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch b/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch
deleted file mode 100644
index 930776d23a51..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.3-kjs-alphaev6-gcc3-workaround.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kjs/ustring.cpp.orig	2003-01-23 15:49:49.000000000 -0500
-+++ kjs/ustring.cpp	2003-01-27 19:49:00.000000000 -0500
-@@ -421,8 +421,15 @@
- {
-   double d = toDouble();
-   bool b = true;
-+  /* useless temporary variable to work around gcc optimization bug */
-+  bool nan = false;
- 
--  if (isNaN(d) || d != static_cast<unsigned long>(d)) {
-+  if (isNaN(d)) {
-+    d = 0;
-+    nan = true;
-+  }
-+
-+  if (nan || d != static_cast<unsigned long>(d)) {
-     b = false;
-     d = 0;
-   }
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.3-render_root.patch b/kde-base/kdelibs/files/kdelibs-3.1.3-render_root.patch
deleted file mode 100644
index 5dd45e95efae..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.1.3-render_root.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- khtml/rendering/render_root.cpp.orig	16 Jul 2003 00:13:32 -0000	1.116.2.3
-+++ khtml/rendering/render_root.cpp	2 Aug 2003 21:28:49 -0000	1.116.2.4
-@@ -118,7 +118,7 @@ void RenderRoot::layout()
- #endif
-     if (!m_printingMode) {
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       0);
-+                                       m_view->contentsHeight());
-         m_width = s.width();
-         m_height = s.height();
-     }
-@@ -132,7 +132,7 @@ void RenderRoot::layout()
-     if (!m_printingMode) {
-         m_view->resizeContents(docWidth(), docHeight());
-         QSize s = m_view->viewportSize(m_view->contentsWidth(),
--                                       m_view->contentsHeight());
-+                                       0);
-         setWidth( m_viewportWidth = s.width() );
-         setHeight(  m_viewportHeight = s.height() );
-     }
diff --git a/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild b/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild
deleted file mode 100644
index 0069458ceaa0..000000000000
--- a/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild,v 1.3 2003/07/16 16:23:02 pvdabeel Exp $
-inherit kde eutils
-#don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps!
-
-IUSE="ssl cups ipv6 alsa"
-DESCRIPTION="KDE $PV - base libraries needed by all kde programs"
-KEYWORDS="x86 sparc ppc"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/2.2.2/src/${PN}-${PV/a/}.tar.bz2
-		mirror://kde/security_patches/post-${PV/a/}-${PN}-kimgio.diff"
-
-SLOT="2"
-LICENSE="GPL-2 LGPL-2"
-
-S=$WORKDIR/kdelibs-2.2.2
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
-# DEPEND from scratch.
-DEPEND=""
-RDEPEND=""
-newdepend ">=sys-devel/gcc-2.95.2
-	virtual/glibc
-	dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( net-print/cups )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss"
-
-DEPEND="$DEPEND
-	sys-devel/make
-	sys-devel/autoconf
-	sys-devel/automake"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python"
-
-qtver-from-kdever $PV
-need-qt $selected_version
-
-set-kdedir $PV
-
-#this patch contains security issues backported from kde-3.0.5a.
-PATCHES="${FILESDIR}/${P}-gentoo.diff
-	${FILESDIR}/${P}-crosside.diff"
-
-#fix 11732 and friends
-MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	unpack ${PN}-${PV/a/}.tar.bz2
-	cd ${S}/kimgio
-	epatch ${DISTDIR}/post-${PV/a/}-${PN}-kimgio.diff
-	kde_sandbox_patch ${S}/{arts/soundserver,kio/kpac}
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"		|| myconf="$myconf --without-ssl"
-	use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-	use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-	kde_src_compile configure make
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	dodir /etc/env.d
-	if [ "${PREFIX}" != "/usr/kde/2" ]; then
-echo "PATH=${PREFIX}/bin:/usr/kde/2/bin
-ROOTPATH=${PREFIX}/bin:/usr/kde/2/bin
-LDPATH=${PREFIX}/lib:/usr/kde/2/lib" > ${D}/etc/env.d/70kdelibs-${PV}
-	else
-echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/bin
-LDPATH=${PREFIX}/lib" > ${D}/etc/env.d/70kdelibs-${PV}
-	fi
-
-	echo "KDEDIR=/usr/kde/2" > ${D}/etc/env.d/40kdedir-${PV}
-}
diff --git a/kde-base/kdelibs/kdelibs-3.0.5b.ebuild b/kde-base/kdelibs/kdelibs-3.0.5b.ebuild
deleted file mode 100644
index d859d1aa2748..000000000000
--- a/kde-base/kdelibs/kdelibs-3.0.5b.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5b.ebuild,v 1.4 2003/07/16 16:23:02 pvdabeel Exp $
-inherit kde eutils
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE $PV - base libraries needed by all kde programs"
-KEYWORDS="x86 ppc ~alpha sparc"
-HOMEPAGE="http//www.kde.org/"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
-SLOT="3.0"
-LICENSE="GPL-2 LGPL-2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
-# DEPEND from scratch.
-DEPEND=""
-RDEPEND=""
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss
-	~kde-base/arts-1.0.5b
-	app-text/ghostscript
-	sys-devel/gettext"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for bug #7359
-
-myconf="$myconf --with-distribution=Gentoo"
-use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-use ssl		&& myconf="$myconf --with-ssl-dir=/usr"		|| myconf="$myconf --without-ssl"
-use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-[ "$ARCH" == "x86" ] && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-libxml2-2.5.2.diff
-	kde_sandbox_patch ${S}/kio/misc/kpac
-}
-
-
-src_install() {
-
-	kde_src_install
-	dohtml *.html
-
-}
diff --git a/kde-base/kdelibs/kdelibs-3.1.1a.ebuild b/kde-base/kdelibs/kdelibs-3.1.1a.ebuild
deleted file mode 100644
index e0e61a0a603d..000000000000
--- a/kde-base/kdelibs/kdelibs-3.1.1a.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.1a.ebuild,v 1.5 2003/09/06 23:54:21 msterret Exp $
-inherit kde
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="x86 ppc sparc ~alpha"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$PV/src/${PN}-3.1.1.tar.bz2
-				mirror://gentoo/${PN}-${PVR}.diff.bz2"
-
-# for the 3.1.1a version - use incremental patches from 3.1.1
-S=${WORKDIR}/${PN}-3.1.1
-PATCHES1="${WORKDIR}/${P}.diff"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss
-	app-text/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.1.1" # this arts rev is part of the same fix
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for #7359
-
-myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-}
-
-pkg_postinst() {
-	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
-	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
-	line and env-update."
-}
diff --git a/kde-base/kdelibs/kdelibs-3.1.2.ebuild b/kde-base/kdelibs/kdelibs-3.1.2.ebuild
deleted file mode 100644
index 6f60e5335f4d..000000000000
--- a/kde-base/kdelibs/kdelibs-3.1.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.2.ebuild,v 1.7 2003/09/06 23:54:21 msterret Exp $
-inherit kde
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="x86 ppc sparc alpha hppa"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss
-	app-text/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.1.2"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for #7359
-
-myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-}
-
-pkg_postinst() {
-	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
-	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
-	line and env-update."
-}
diff --git a/kde-base/kdelibs/kdelibs-3.1.3-r1.ebuild b/kde-base/kdelibs/kdelibs-3.1.3-r1.ebuild
deleted file mode 100644
index 530f468924c9..000000000000
--- a/kde-base/kdelibs/kdelibs-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.3-r1.ebuild,v 1.3 2003/09/08 01:47:26 caleb Exp $
-inherit kde
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss
-	app-text/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	~kde-base/arts-1.1.3"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python
-	>=sys-apps/portage-2.0.36" # for #7359
-
-myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-	cd ${S} && epatch ${FILESDIR}/${P}-render_root.patch
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-}
-
-pkg_postinst() {
-	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
-	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
-	line and env-update."
-}
diff --git a/kde-base/kdelibs/kdelibs-3.1.3.ebuild b/kde-base/kdelibs/kdelibs-3.1.3.ebuild
deleted file mode 100644
index 39df1912710c..000000000000
--- a/kde-base/kdelibs/kdelibs-3.1.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1.3.ebuild,v 1.4 2003/09/17 01:24:50 weeve Exp $
-inherit kde
-#don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
-
-IUSE="alsa cups ipv6 ssl"
-DESCRIPTION="KDE libraries needed by all kde programs"
-KEYWORDS="~x86 ~ppc sparc ~alpha ~hppa"
-HOMEPAGE="http//www.kde.org/"
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-SRC_URI="mirror://kde/stable/$PV/src/${P}.tar.bz2"
-
-# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
-# so we recreate the entire DEPEND from scratch.
-DEPEND=""
-RDEPEND="doc? ( ~app-doc/kdelibs-apidocs-$PV )"
-newdepend "dev-lang/perl
-	>=media-libs/audiofile-0.1.9
-	>=sys-apps/bzip2-1.0.1
-	>=dev-libs/libxslt-1.0.7
-	>=dev-libs/libpcre-3.5
-	>=dev-libs/libxml2-2.4.10
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
-	cups? ( >=net-print/cups-1.1.14 )
-	>=media-libs/tiff-3.5.5
-	app-admin/fam-oss
-	app-text/ghostscript
-	media-libs/libart_lgpl
-	sys-devel/gettext
-	!=x11-libs/qt-3.2.0
-	~kde-base/arts-1.1.3"
-
-newdepend "/autotools"
-
-RDEPEND="$RDEPEND
-	app-text/sgml-common
-	cups? ( net-print/cups )
-	dev-lang/python"
-
-myconf="$myconf --with-distribution=Gentoo --enable-libfam --enable-dnotify"
-use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
-use ssl		&& myconf="$myconf --with-ssl-dir=/usr"	|| myconf="$myconf --without-ssl"
-use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
-use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
-
-use x86 && myconf="$myconf --enable-fast-malloc=full"
-
-qtver-from-kdever ${PV}
-need-qt $selected_version
-
-set-kdedir $PV
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/kio/misc/kpac
-	use alpha && cd ${S} && epatch ${FILESDIR}/${P}-kjs-alphaev6-gcc3-workaround.patch
-}
-
-src_install() {
-	kde_src_install
-	dohtml *.html
-
-	# kdelibs-apidocs is provided by kdelibs-apidocs ebuild, kdelibs ebuild
-	# shouldn't install anything into kdelibs-apidocs (bug #15102)
-	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
-}
-
-pkg_postinst() {
-	einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
-	If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
-	line and env-update."
-}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index b094c8950296..b26b4e939c4e 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.59 2003/09/26 17:30:39 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.60 2003/09/27 17:31:34 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-2.2.2-r1.ebuild,
+  kdemultimedia-2.2.2-r1.ebuild, kdemultimedia-3.1.1.ebuild,
+  kdemultimedia-3.1.1.ebuild, kdemultimedia-3.1.3-r1.ebuild,
+  kdemultimedia-3.1.3-r1.ebuild, kdemultimedia-3.1.3.ebuild,
+  kdemultimedia-3.1.3.ebuild, kdemultimedia-3.1.4.ebuild,
+  kdemultimedia-3.1.4.ebuild, files/kdemultimedia-2.2.2-r1-gentoo.diff,
+  files/kdemultimedia-3.1.1-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.1-ln-sf.diff, files/kdemultimedia-3.1.3-gcc33.diff,
+  files/kdemultimedia-3.1.3-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.3-ln-sf.diff:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.4-r1.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index d7d0ae6ed68e..04e0d0320370 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,34 +1,18 @@
-MD5 5a0645a0201276c941a28f72e672a65a ChangeLog 8465
-MD5 694e2e4f8dff3bda3c35a1e3a3a9bb78 kdemultimedia-2.2.2-r1.ebuild 1474
+MD5 92a3db6c047e9307261be505a8a8f1c2 kdemultimedia-3.1.4-r1.ebuild 2846
 MD5 d5c217233c94c5ca8ab5ab457b8cc05e kdemultimedia-3.0.4.ebuild 2516
-MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
-MD5 710052fafcbf2fc26709fc3801a045e7 kdemultimedia-3.1.1.ebuild 2699
-MD5 9346d26a0ffe17b3c90792d410c5543d kdemultimedia-3.1.2-r1.ebuild 2739
 MD5 ad5e44c7442e5a17f4473679209966c8 kdemultimedia-3.1.2.ebuild 2698
-MD5 d15a0d48107ccd1453bf60921806bb71 kdemultimedia-3.1.3.ebuild 2883
+MD5 9346d26a0ffe17b3c90792d410c5543d kdemultimedia-3.1.2-r1.ebuild 2739
+MD5 d37b080c8ff613b49250ff64e5082b97 ChangeLog 9101
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 d5219d96de924e7494d673e55f26a6d3 kdemultimedia-3.1.4.ebuild 2921
-MD5 07a654301f752943f99c12f95c5fe42d kdemultimedia-3.1.3-r1.ebuild 2810
-MD5 92a3db6c047e9307261be505a8a8f1c2 kdemultimedia-3.1.4-r1.ebuild 2846
-MD5 f6cf44aaa0e416ee6dcc0a66f734d83a files/digest-kdemultimedia-2.2.2-r1 146
-MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
-MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
-MD5 448728e6c262cd057b361af52d1f0c16 files/digest-kdemultimedia-3.1.1 73
-MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2 73
+MD5 5ba5ef8edef46a60644ba401b24c9332 kdemultimedia-3.0.5b.ebuild 2524
 MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2-r1 73
-MD5 e51533a7e8900c346150fa09c85e7f3e files/digest-kdemultimedia-3.1.3 73
-MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-r1-gentoo.diff 2416
+MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4-r1 73
+MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.4-ln-sf.diff 1278
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.1-gentoo-timidity.diff 694
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.1-ln-sf.diff 1278
 MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.2-gentoo-timidity.diff 694
+MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
+MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
+MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
+MD5 c40a9c32c318c81150a0d45d13501e75 files/digest-kdemultimedia-3.1.2 73
 MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.2-ln-sf.diff 1278
-MD5 00b4c2daf6b715380269812b4931047f files/kdemultimedia-3.1.3-gcc33.diff 529
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.3-gentoo-timidity.diff 694
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.3-ln-sf.diff 1278
-MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4 73
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.4-gentoo-timidity.diff 694
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.4-ln-sf.diff 1278
-MD5 e51533a7e8900c346150fa09c85e7f3e files/digest-kdemultimedia-3.1.3-r1 73
-MD5 7b2708e69eb657af7e7487bdb7ee7d4f files/digest-kdemultimedia-3.1.4-r1 73
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2-r1
deleted file mode 100644
index f8b5f3a77656..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-2.2.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 76981ca284663093cd0bc37500e10441 kdemultimedia-2.2.2.tar.bz2 4700495
-MD5 d1d25b39ee98e340ac3730f7afe54f0c post-2.2.2-kdemultimedia.diff 17629
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.1
deleted file mode 100644
index ab08057313ef..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdd53d23d13adf2419554e995417178e kdemultimedia-3.1.1.tar.bz2 5874375
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3
deleted file mode 100644
index d2aa1d048302..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da1e05b8284976359cab32f0abf4b87b kdemultimedia-3.1.3.tar.bz2 5932079
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3-r1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3-r1
deleted file mode 100644
index d2aa1d048302..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da1e05b8284976359cab32f0abf4b87b kdemultimedia-3.1.3.tar.bz2 5932079
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4
deleted file mode 100644
index 2fbee1983af0..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9f2b0b79a6a9ced3ae601b57da53129 kdemultimedia-3.1.4.tar.bz2 5932776
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-r1-gentoo.diff b/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-r1-gentoo.diff
deleted file mode 100644
index 548c6dd407ab..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-2.2.2-r1-gentoo.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
- 
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
- 
- #include <stdio.h>
-diff -ru kdemultimedia-2.2.1.orig/kmidi/alsa_a.cpp kdemultimedia-2.2.1/kmidi/alsa_a.cpp
---- kmidi/alsa_a.cpp	Thu Aug 24 21:49:04 2000
-+++ kmidi/alsa_a.cpp	Fri Oct 19 04:01:06 2001
-@@ -254,7 +254,7 @@
-                == 1 warning
-                == -1 fails
-  */
--static int set_playback_info (void* handle__,
-+static int set_playback_info (snd_pcm_t* handle__,
- 			      uint32* encoding__, uint32* rate__,
- 			      const int32 extra_param[5])
- {
-@@ -426,13 +426,13 @@
-     playback_params.fragments_max = extra_param[0];
- #endif
-   playback_params.buf.block.frags_min = 1;
--  snd_pcm_plugin_flush(handle__, SND_PCM_CHANNEL_PLAYBACK);
-+  snd_pcm_plugin_flush((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK);
- 
-   playback_params.start_mode = SND_PCM_START_FULL;
-   playback_params.stop_mode = SND_PCM_STOP_STOP;
-   //playback_params.stop_mode = SND_PCM_STOP_ROLLOVER;
- 
--  tmp = snd_pcm_channel_params (handle__, &playback_params);
-+  tmp = snd_pcm_channel_params ((snd_pcm_t *)handle__, &playback_params);
- 
- //fprintf(stderr,"tmp = %d from snd_pcm_channel_params\n",tmp);
-   if (tmp != 0)
-@@ -448,7 +448,7 @@
-     }
- 
- 
--  if (snd_pcm_plugin_prepare(handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
-+  if (snd_pcm_plugin_prepare((snd_pcm_t *)handle__, SND_PCM_CHANNEL_PLAYBACK) < 0) {
-       fprintf(stderr, "unable to prepare channel\n");
-       return -1;
-   } 
-@@ -456,7 +456,7 @@
-   memset(&setup, 0, sizeof(setup));
-   setup.channel = SND_PCM_CHANNEL_PLAYBACK;
-   setup.mode = SND_PCM_MODE_BLOCK;
--  if (snd_pcm_plugin_setup(handle__, &setup) < 0) {
-+  if (snd_pcm_plugin_setup((snd_pcm_t *)handle__, &setup) < 0) {
-       fprintf(stderr, "unable to obtain setup\n");
-       return -1;
-   }
-@@ -466,7 +466,7 @@
- //fprintf(stderr, "setup frags = %d\n", setup.buf.block.frags);
- //fprintf(stderr, "setup frag_size = %d\n", setup.buf.block.frag_size);
- 
--  if(snd_pcm_plugin_status(handle__, &playback_status) == 0)
-+  if(snd_pcm_plugin_status((snd_pcm_t *)handle__, &playback_status) == 0)
-     {
-       if (setup.format.rate != orig_rate)
- 	{
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-gentoo-timidity.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
-
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
-
- #include <stdio.h>
---- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
-+++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
-@@ -12,6 +12,7 @@
-  *================================================================*/
- #ifdef TCLTK
-
-+#include <sys/errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-ln-sf.diff
deleted file mode 100644
index ee6daa91f3dc..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.1-ln-sf.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:27 2002
-+++ kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:15 2002
-@@ -3,7 +3,7 @@ srcdir=$1
- for header in common config controls ctl effects filter instrum mix \
-               output playmidi readmidi resample sbk sflayer tables \
-               version ; do
--    if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi
-+    if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi
- done
- 
- for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \
-@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd
- 	     playmidi raw_a readmidi readsbk resample resample_f \
- 	     resample_l reverb_e sbktext sf2cfg slang_c sndfont \
- 	     sun_a tables timidity wav2pat wave_a ; do
--    if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
-+    if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
- done
- 
- for lfile in cfg ; do
--    if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi
-+    if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi
- done
- 
- # LEAVE THIS ONE AT THE END!!
- for other in BITMAPS ; do
--    if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi
-+    if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi
- done
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gcc33.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gcc33.diff
deleted file mode 100644
index 50d1d55d3295..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gcc33.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN noatun/modules/winskin/vis/visQueue.cpp noatun/modules/winskin/vis/visQueue.cpp
---- noatun/modules/winskin/vis/visQueue.cpp	2001-11-30 22:13:12.000000000 -0300
-+++ noatun/modules/winskin/vis/visQueue.cpp	2003-08-05 04:45:09.000000000 -0300
-@@ -17,7 +17,7 @@
- VISQueue::VISQueue(int elements) {
-   this->elements=elements;
-   int i;
--  visArrayQueue=new (std::vector<float>*[elements]);
-+  visArrayQueue=new std::vector<float>* [elements];
-   for(i=0;i<elements;i++) {
-     visArrayQueue[i]=new std::vector<float>;
-   }
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gentoo-timidity.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gentoo-timidity.diff
deleted file mode 100644
index f392a244212e..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-gentoo-timidity.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru kdemultimedia-2.2.1.orig/kmidi/TIMIDITY/motif_p.c kdemultimedia-2.2.1/kmidi/TIMIDITY/motif_p.c
---- kmidi/TIMIDITY/motif_p.c	Mon Feb 28 19:07:37 2000
-+++ kmidi/TIMIDITY/motif_p.c	Fri Oct 19 04:00:10 2001
-@@ -22,6 +22,7 @@
-     pipe communication between motif interface and sound generator
-
-     */
-+#include <sys/errno.h>
- #ifdef IA_MOTIF
-
- #include <stdio.h>
---- kmidi/TIMIDITY/tk_c.c       2002-04-04 21:15:35.000000000 -0600
-+++ kmidi/TIMIDITY/tk_c.c       2002-04-04 21:17:06.000000000 -0600
-@@ -12,6 +12,7 @@
-  *================================================================*/
- #ifdef TCLTK
-
-+#include <sys/errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-ln-sf.diff b/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-ln-sf.diff
deleted file mode 100644
index ee6daa91f3dc..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-3.1.3-ln-sf.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:27 2002
-+++ kmidi/TIMIDITY/makelinks	Sat Aug 24 11:36:15 2002
-@@ -3,7 +3,7 @@ srcdir=$1
- for header in common config controls ctl effects filter instrum mix \
-               output playmidi readmidi resample sbk sflayer tables \
-               version ; do
--    if [ ! -h ${header}.h ]; then ln -s ${srcdir}/${header}.h . ; fi
-+    if [ ! -h ${header}.h ]; then ln -sf ${srcdir}/${header}.h . ; fi
- done
- 
- for cfile in alsa_a arts_a b_out bag bsd20_a celeste_e chorus_e \
-@@ -13,14 +13,14 @@ for cfile in alsa_a arts_a b_out bag bsd
- 	     playmidi raw_a readmidi readsbk resample resample_f \
- 	     resample_l reverb_e sbktext sf2cfg slang_c sndfont \
- 	     sun_a tables timidity wav2pat wave_a ; do
--    if [ ! -h ${cfile}.c ]; then ln -s ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
-+    if [ ! -h ${cfile}.c ]; then ln -sf ${srcdir}/${cfile}.cpp ${cfile}.c ; fi
- done
- 
- for lfile in cfg ; do
--    if [ ! -h ${lfile}.l ]; then ln -s ${srcdir}/${lfile}.l . ; fi
-+    if [ ! -h ${lfile}.l ]; then ln -sf ${srcdir}/${lfile}.l . ; fi
- done
- 
- # LEAVE THIS ONE AT THE END!!
- for other in BITMAPS ; do
--    if [ ! -h ${other} ]; then ln -s ${srcdir}/${other} . ; fi
-+    if [ ! -h ${other} ]; then ln -sf ${srcdir}/${other} . ; fi
- done
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild
deleted file mode 100644
index 4ba31cab06ae..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2-r1.ebuild,v 1.6 2003/09/11 01:16:25 msterret Exp $
-
-IUSE="nas esd motif gtk slang alsa"
-inherit kde-dist eutils
-
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff"
-
-DESCRIPTION="KDE $PV - multimedia apps"
-KEYWORDS="x86 sparc ppc"
-MAKEOPTS="${MAKEOPTS} -j1"
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	alsa? ( >=media-libs/alsa-lib-0.5.9 )
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	slang? ( >=sys-libs/slang-1.4.4 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	kde_src_compile myconf
-
-	local myaudio
-	local myinteface
-	myaudio="--enable-audio=oss"
-	myinterface="--enable-interface=xaw,ncurses"
-
-	use alsa	&& myconf="$myconf --with-alsa" && myaudio="$myaudio,alsa"
-	use nas		&& myaudio="$myaudio,nas"
-	use esd		&& myaudio="$myaudio,esd"
-	use motif	&& myinterface="$myinterface,motif"
-	use gtk		&& myinterface="$myinterface,gtk"
-	use slang	&& myinterface="$myinterface,slang"
-# tcl tk does not work
-
-	myconf="$myconf $myaudio $myinterface"
-
-	kde_src_compile configure make
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.1.ebuild
deleted file mode 100644
index cea2294ddbfd..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.1.ebuild,v 1.4 2003/09/06 23:54:21 msterret Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( virtual/motif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )"
-	#>=media-libs/xine-lib-0.9.14" # not yet available
-	#gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-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
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff"
-
-# 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"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-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"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-# xine doesn't compile yet
-# also turn off kaudiocreator if cdr isn't in use
-KDE_REMOVE_DIR="xine_artsplugin"
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.3-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.3-r1.ebuild
deleted file mode 100644
index 67cabdef9711..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.3-r1.ebuild,v 1.2 2003/09/21 22:09:37 caleb Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 ~sparc ~ppc"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( virtual/motif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )
-	>=media-libs/xine-lib-1_beta10"
-#	gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-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
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff
-	$FILESDIR/${P}-gcc33.diff"
-
-# 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"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-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"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-src_unpack() {
-	kde_src_unpack
-	cd ${S} && aclocal
-}
-
-src_compile() {
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure
-	kde_src_compile configure make
-}
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.3.ebuild
deleted file mode 100644
index 4741cbf92f30..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.3.ebuild,v 1.8 2003/09/17 01:35:09 weeve Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 sparc ~ppc"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( virtual/motif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )"
-	#>=media-libs/xine-lib-0.9.14" # not yet available
-	#gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-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
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff
-	$FILESDIR/${P}-gcc33.diff"
-
-# 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"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-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"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-# xine doesn't compile yet
-# also turn off kaudiocreator if cdr isn't in use
-KDE_REMOVE_DIR="xine_artsplugin"
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-src_compile() {
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure
-	kde_src_compile configure make
-}
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild
deleted file mode 100644
index e039e69aab60..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.1.4.ebuild,v 1.3 2003/09/25 15:28:57 caleb Exp $
-inherit kde-dist flag-o-matic
-
-IUSE="nas esd motif slang tcltk oggvorbis cdr"
-DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
-KEYWORDS="x86 ~sparc ~ppc"
-
-newdepend ">=sys-libs/ncurses-5.2
-	>=media-sound/cdparanoia-3.9.8
-	>=media-libs/libvorbis-1.0_beta4
-	>=media-video/xanim-2.80.1
-	nas? ( >=media-libs/nas-1.4.1 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	motif? ( virtual/motif )
-	slang? ( >=sys-libs/slang-1.4.4 )
-	>=media-sound/mpg123-0.59r
-	tcltk? ( >=dev-lang/tk-8.0.5-r2 )
-	>=dev-libs/glib-1.3.3
-	oggvorbis? ( media-libs/libvorbis )"
-	#>=media-libs/xine-lib-0.9.14" # not yet available
-	#gtk? ( =x11-libs/gtk+-1.2* )
-#	alsa? ( >=media-libs/alsa-lib-0.5.9 )"
-
-RDEPEND="$RDEPEND
-	cdr? ( app-cdr/cdrtools
-	>=app-cdr/cdrdao-1.1.5 )"
-
-replace-flags "-O3" "-O2"
-filter-flags "-fno-default-inline"
-
-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
-export MAKEOPTS="$MAKEOPTS -j1"
-
-PATCHES="$FILESDIR/$P-gentoo-timidity.diff
-	$FILESDIR/$P-ln-sf.diff"
-	#$FILESDIR/${P}-gcc33.diff"
-
-# 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"
-# kmidi/TIMIDITY miscompiles with gtk
-#use gtk		&& myinterface="$myinterface,gtk"   && myconf="$myconf --enable-gtk"
-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"
-
-use cdr		|| KDE_REMOVE_DIR="kaudiocreator"
-
-# xine doesn't compile yet
-# also turn off kaudiocreator if cdr isn't in use
-KDE_REMOVE_DIR="xine_artsplugin"
-[ -z "`use cdr`" ] && KDE_REMOVE_DIR="$KDE_REMOVE_DIR kaudiocreator"
-
-myconf="$myconf $myaudio $myinterface"
-
-src_compile() {
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4.in configure
-	kde_src_compile configure make
-}
-
-pkg_postinst() {
-	if [ -n "`use alsa`" ]; then
-	einfo "WARNING: alsa support has been removed becuase of a bug in kdemm sources.
-For further information see bug #2324 on bugs.gentoo.org and bug #39574 on bugs.kde.org.
-Meanwhile, you can use the alsa oss emulation."
-	fi
-}
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 077c5905eba0..25630909a258 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.51 2003/09/26 17:26:11 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.52 2003/09/27 17:31:57 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-2.2.2-r2.ebuild,
+  kdenetwork-2.2.2-r2.ebuild, kdenetwork-3.1.1-r1.ebuild,
+  kdenetwork-3.1.1-r1.ebuild, kdenetwork-3.1.3.ebuild,
+  kdenetwork-3.1.3.ebuild, files/kdenetwork-3.1.1-kmail-sig.diff:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 93ccf8a8b15e..5e2de8d65084 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,23 +1,16 @@
-MD5 d93afbc3a6d04d19c895b915e17fbd7e ChangeLog 6977
-MD5 39700f4cd59b4a9a38ac566b4267fe2c kdenetwork-2.2.2-r2.ebuild 608
-MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
 MD5 7e817e7218f39f054e7a36aba705462d kdenetwork-3.0.5b.ebuild 967
-MD5 a4a1fa16ea4a6a56789826fa8cbcdb05 kdenetwork-3.1.1-r1.ebuild 997
 MD5 c19d19fa121c8ab24dadf4fb7dbec00c kdenetwork-3.1.2.ebuild 882
-MD5 77555347616317c54b91e4756b57ce26 kdenetwork-3.1.3.ebuild 869
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 20c766c11e52f2be346906c4358ee895 kdenetwork-3.2.0_alpha2.ebuild 978
 MD5 a627257cd833255ffcb596a7ed35533e kdenetwork-3.1.4.ebuild 868
-MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139
-MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151
-MD5 f67a62b0d07393c5fe1e38380eee7225 files/digest-kdenetwork-3.0.5b 71
-MD5 9ffa1c32d0e67edf1ea46483e02ceb91 files/digest-kdenetwork-3.1.1-r1 70
-MD5 bf764f7c6af05def055c6a5b25cad6aa files/digest-kdenetwork-3.1.2 70
-MD5 65e3212c76ef0ebd8b600cd1e662be2a files/digest-kdenetwork-3.1.3 70
-MD5 1b93352391186816969c66a339688062 files/kdenetwork-3.1.1-kmail-sig.diff 1442
+MD5 20c766c11e52f2be346906c4358ee895 kdenetwork-3.2.0_alpha2.ebuild 978
+MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
+MD5 5ded5c16be4a40f00db3105c4ae7b2f7 ChangeLog 7258
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559
-MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
 MD5 86ce22554d0bf8df52bc6fe7425184a3 files/reslisa 570
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
+MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
+MD5 f67a62b0d07393c5fe1e38380eee7225 files/digest-kdenetwork-3.0.5b 71
 MD5 a20976401d51fc03947b60f8c2184b3e files/digest-kdenetwork-3.2.0_alpha2 71
+MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151
+MD5 bf764f7c6af05def055c6a5b25cad6aa files/digest-kdenetwork-3.1.2 70
 MD5 e7b8db748b83c643fca5c3b306f16c9f files/digest-kdenetwork-3.1.4 70
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-2.2.2-r2 b/kde-base/kdenetwork/files/digest-kdenetwork-2.2.2-r2
deleted file mode 100644
index 8571070a6480..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-2.2.2-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ef664b35f9d8ab083855ac5118b9c7b2 kdenetwork-2.2.2.tar.bz2 3168454
-MD5 59ac7be4995bed8b119a4e5882e54cff post-2.2.2-kdenetwork.diff 8640
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1
deleted file mode 100644
index c9621f46a951..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d981fa1114d06256230bed4a4b948766 kdenetwork-3.1.1.tar.bz2 4962697
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.3 b/kde-base/kdenetwork/files/digest-kdenetwork-3.1.3
deleted file mode 100644
index faa4a7a6819a..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18b1a274575eddf053dd6e72ad5554c7 kdenetwork-3.1.3.tar.bz2 4989774
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff b/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff
deleted file mode 100644
index 95a46980627c..000000000000
--- a/kde-base/kdenetwork/files/kdenetwork-3.1.1-kmail-sig.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-===================================================================
-RCS file: /home2/webcvs/mirror/kdenetwork/kmail/Attic/kmcomposewin.cpp,v
-retrieving revision 1.627.2.11
-retrieving revision 1.627.2.12
-diff -u -p -r1.627.2.11 -r1.627.2.12
---- kmail/kmcomposewin.cpp	2003/03/08 16:49:14	1.627.2.11
-+++ kmail/kmcomposewin.cpp	2003/03/24 20:23:01	1.627.2.12
-@@ -1857,10 +1857,7 @@ Kpgp::Result KMComposeWin::composeMessag
-     innerBodyPart.setBodyEncoded( body );
-     DwBodyPart* innerDwPart = theMessage.createDWBodyPart( &innerBodyPart );
-     innerDwPart->Assemble();
--    // insert an empty line before the first body part because some broken MTAs
--    // seem to add an empty line if it's not present and this would break the
--    // signature (cf. bug 55629)
--    body  = "\n--";
-+    body  = "--";
-     body +=     boundaryCStr;
-     body +=                 "\n";
-     body += innerDwPart->AsString().c_str();
-@@ -2631,11 +2628,7 @@ kdDebug() << "**************************
- 
-       QCString mainStr;
- 
--      // insert an empty line before the first body part because some broken
--      // MTAs seem to add an empty line if it's not present and this would
--      // break the signature of a message which contains this message as
--      // attachment (cf. bug 55629)
--      mainStr  = "\n--";
-+      mainStr  = "--";
-       mainStr +=       boundaryCStr;
- 
-       if( structuring.data.includeCleartext && (0 < clearCStr.length()) ) {
diff --git a/kde-base/kdenetwork/kdenetwork-2.2.2-r2.ebuild b/kde-base/kdenetwork/kdenetwork-2.2.2-r2.ebuild
deleted file mode 100644
index 112c0b80b693..000000000000
--- a/kde-base/kdenetwork/kdenetwork-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.2.2-r2.ebuild,v 1.5 2003/07/16 16:23:50 pvdabeel Exp $
-inherit kde-dist eutils
-
-IUSE=""
-DESCRIPTION="KDE $PV - network apps: kmail..."
-KEYWORDS="x86 sparc ppc"
-SRC_URI="${SRC_URI}
-	mirror://kde/security_patches/post-${PV}-${PN}.diff"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/post-${PV}-${PN}.diff
-	kde_sandbox_patch ${S}/kppp
-}
-src_install() {
-	kde_src_install
-	chmod +s ${D}/${KDEDIR}/bin/reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild
deleted file mode 100644
index 1ba00d7a020b..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.1.1-r1.ebuild,v 1.5 2003/09/06 23:54:21 msterret Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE network apps: kmail, kppp, knode..."
-KEYWORDS="x86 ppc sparc ~alpha"
-newdepend "=kde-base/kdebase-${PV}*"
-
-# fix bug where pgp sigs are broken when signining messages with attachements
-PATCHES="$FILESDIR/$P-kmail-sig.diff"
-
-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.1.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.1.3.ebuild
deleted file mode 100644
index fe3aef707657..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.1.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.1.3.ebuild,v 1.6 2003/09/17 01:27:49 weeve Exp $
-inherit kde-dist
-
-IUSE=""
-DESCRIPTION="KDE network apps: kmail, kppp, knode..."
-KEYWORDS="x86 ~ppc sparc"
-newdepend "=kde-base/kdebase-${PV}*"
-
-
-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/ChangeLog b/kde-base/kdepim/ChangeLog
index bcf8f0bfc2e4..627b6eab021a 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.52 2003/09/26 17:33:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.53 2003/09/27 17:32:24 caleb Exp $
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-2.2.2-r1.ebuild,
+  kdepim-2.2.2-r1.ebuild, kdepim-3.1.1.ebuild, kdepim-3.1.1.ebuild,
+  kdepim-3.1.3.ebuild, kdepim-3.1.3.ebuild, files/kdepim-2.2.2-gentoo.diff,
+  files/kdepim-3.1.3-gcc33.diff, files/post-2.2.2-kdepim.diff:
+  removing stale versions
 
   26 Sep 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.4.ebuild:
   Added sparc keyword.
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 8a5108775b79..f719b75d8c83 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,24 +1,15 @@
-MD5 7b249e06031630a46dd918b3d4412b5f ChangeLog 6832
-MD5 c73ee51f1fdcc1139fb4934ac8f78b1d kdepim-2.2.2-r1.ebuild 700
 MD5 a354060b9af1f8b8d8705c003fc976ee kdepim-3.0.4.ebuild 569
-MD5 7eefe33e5fa8de798421ee125378d399 kdepim-3.0.5b.ebuild 577
-MD5 0603d540e6eab00d5cd0dac07c3ee8a6 kdepim-3.1.1.ebuild 750
-MD5 0ddec5d7dec99cac69d3e13bb3b4ebc4 kdepim-3.1.2-r1.ebuild 1009
 MD5 c459f9f78b0d6b1018568ad4534ddd77 kdepim-3.1.2.ebuild 748
-MD5 7248718dc9c5660d728fc44f8abb6abe kdepim-3.1.3.ebuild 912
+MD5 3039989349eb23266eddb8af5131a401 kdepim-3.1.4.ebuild 838
+MD5 0ddec5d7dec99cac69d3e13bb3b4ebc4 kdepim-3.1.2-r1.ebuild 1009
+MD5 8af785e5286ca3fb7d1278b299e28eb4 ChangeLog 7137
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 7eefe33e5fa8de798421ee125378d399 kdepim-3.0.5b.ebuild 577
 MD5 5951765db3b64fb009215621a7051343 kdepim-3.2.0_alpha2.ebuild 705
-MD5 3039989349eb23266eddb8af5131a401 kdepim-3.1.4.ebuild 838
-MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
 MD5 ce5fa57255f8b647438149e6fc6c0cd0 files/digest-kdepim-3.0.4 66
-MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
-MD5 d4b7a2d165d35d1c82d4b79713209870 files/digest-kdepim-3.1.1 66
 MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2 66
-MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2-r1 66
-MD5 0416c7d10d9725d1fa0e87794660f3dd files/digest-kdepim-3.1.3 66
-MD5 9531924495b374de9fc7acf45105c3d7 files/kdepim-2.2.2-gentoo.diff 1054
+MD5 10f1253acc1418066ffea529e8818b43 files/digest-kdepim-3.1.4 66
+MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
 MD5 c13bf6597f7d7edba5e3cdc29efcae2a files/kdepim-3.1.2-libmal-support.diff 1134
-MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
-MD5 59c7b887af9f082914f0e5537bd7c5ce files/kdepim-3.1.3-gcc33.diff 602
+MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2-r1 66
 MD5 5108e10d94da560b1b983f635996b0b7 files/digest-kdepim-3.2.0_alpha2 67
-MD5 10f1253acc1418066ffea529e8818b43 files/digest-kdepim-3.1.4 66
diff --git a/kde-base/kdepim/files/digest-kdepim-2.2.2-r1 b/kde-base/kdepim/files/digest-kdepim-2.2.2-r1
deleted file mode 100644
index f0a6a7a67937..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-2.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55daf69b90108509895814b96fc8b671 kdepim-2.2.2.tar.bz2 2428768
diff --git a/kde-base/kdepim/files/digest-kdepim-3.1.1 b/kde-base/kdepim/files/digest-kdepim-3.1.1
deleted file mode 100644
index a93249469113..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 482a24da0eae33a053ec656f9e50083e kdepim-3.1.1.tar.bz2 3218417
diff --git a/kde-base/kdepim/files/digest-kdepim-3.1.3 b/kde-base/kdepim/files/digest-kdepim-3.1.3
deleted file mode 100644
index 73f96efaa693..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a556df5e5ae4c00c8bea4cd8f9c1f3e kdepim-3.1.3.tar.bz2 3293360
diff --git a/kde-base/kdepim/files/kdepim-2.2.2-gentoo.diff b/kde-base/kdepim/files/kdepim-2.2.2-gentoo.diff
deleted file mode 100644
index 7b5f3a7ec14a..000000000000
--- a/kde-base/kdepim/files/kdepim-2.2.2-gentoo.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- korganizer/calprinter.cpp	2001-07-29 07:01:34.000000000 +0200
-+++ korganizer/calprinter.cpp	2002-12-23 19:26:21.000000000 +0100
-@@ -412,7 +412,7 @@
-   p.end();
- }
- 
--void CalPrinter::drawTodo(int count, Todo * item, QPainter &p,int level=0,QRect *r=0)
-+void CalPrinter::drawTodo(int count, Todo * item, QPainter &p,int level,QRect *r)
- {
-   QString outStr;
-   KLocale *local = KGlobal::locale();
---- ldif/ldif.cpp	2001-01-08 20:46:36.000000000 +0100
-+++ ldif/ldif.cpp	2003-01-17 16:22:48.000000000 +0100
-@@ -13,6 +13,7 @@
- 
- #include <ctype.h>
- 
-+using namespace std;
- // The copyright notice below refers to the base64 and quoted-printable codec
- // functions used below, which are modified from the original sources.
- 
---- libdif/ldif.cpp	2001-01-08 20:46:36.000000000 +0100
-+++ libdif/ldif.cpp	2003-01-17 16:22:48.000000000 +0100
-@@ -13,6 +13,7 @@
- 
- #include <ctype.h>
- 
-+using namespace std;
- // The copyright notice below refers to the base64 and quoted-printable codec
- // functions used below, which are modified from the original sources.
- 
diff --git a/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff b/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff
deleted file mode 100644
index 0db7bdaf8980..000000000000
--- a/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libkpimexchange/core/exchangeaccount.cpp libkpimexchange/core/exchangeaccount.cpp
---- libkpimexchange/core/exchangeaccount.cpp	2003-05-07 08:48:01.000000000 -0300
-+++ libkpimexchange/core/exchangeaccount.cpp	2003-08-05 04:56:21.000000000 -0300
-@@ -255,7 +255,7 @@
-   return result;
- }
-   
--static QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
-+QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
-   KURL url = KURL( _url );
-   url.setUser( user );
-   url.setPass( password );
diff --git a/kde-base/kdepim/files/post-2.2.2-kdepim.diff b/kde-base/kdepim/files/post-2.2.2-kdepim.diff
deleted file mode 100644
index 6f6d3266c148..000000000000
--- a/kde-base/kdepim/files/post-2.2.2-kdepim.diff
+++ /dev/null
@@ -1,210 +0,0 @@
-Index: kdepim/korganizer/komailclient.cpp
-diff -u kdepim/korganizer/komailclient.cpp:1.18 kdepim/korganizer/komailclient.cpp:1.18.2.1
---- kdepim/korganizer/komailclient.cpp:1.18	Sun May  6 20:57:36 2001
-+++ kdepim/korganizer/komailclient.cpp	Fri Dec  6 18:35:26 2002
-@@ -14,6 +14,7 @@
- #include <kurl.h>
- #include <kapp.h>
- #include <dcopclient.h>
-+#include <kprocess.h>
- 
- #include "version.h"
- #include "event.h"
-@@ -67,17 +68,16 @@
-       command = KStandardDirs::findExe(QString::fromLatin1("mail"));
-       if (command.isNull()) return false; // give up
-     
--      command.append(QString::fromLatin1(" -s \x22"));
--      command.append(subject);
--      command.append(QString::fromLatin1("\x22"));
-+      command.append(QString::fromLatin1(" -s "));
-+      command.append(KShellProcess::quote(subject));
- 
-       if (bcc) {
-         command.append(QString::fromLatin1(" -b "));
--        command.append(from);
-+        command.append(KShellProcess::quote(from));
-       }
- 
-       command.append(" ");
--      command.append(to);
-+      command.append(KShellProcess::quote(to));
- 
-       needHeaders = false;
-     }
-Index: kdepim/kpilot/conduits/popmail/parsedate.c
-diff -u kdepim/kpilot/conduits/popmail/parsedate.c:1.4 kdepim/kpilot/conduits/popmail/parsedate.c:1.4.6.3
---- kdepim/kpilot/conduits/popmail/parsedate.c:1.4	Fri Jul 28 01:07:16 2000
-+++ kdepim/kpilot/conduits/popmail/parsedate.c	Thu Dec  5 19:34:09 2002
-@@ -1676,7 +1676,7 @@
-     for ( ; ; ) {
- 	(void)printf("\t> ");
- 	(void)fflush(stdout);
--	if (gets(buff) == NULL || buff[0] == '\n')
-+	if (fgets(stdin,buff,sizeof(buff)-1) == NULL || buff[0] == '\n')
- 	    break;
- #if YYDEBUG
- 	if (strcmp(buff, "yydebug") == 0) {
-Index: kdepim/libical/src/libicalss/icalfileset.c
-diff -u kdepim/libical/src/libicalss/icalfileset.c:1.5 kdepim/libical/src/libicalss/icalfileset.c:1.5.2.1
---- kdepim/libical/src/libicalss/icalfileset.c:1.5	Wed Apr 11 17:37:32 2001
-+++ kdepim/libical/src/libicalss/icalfileset.c	Fri Dec  6 17:16:04 2002
-@@ -282,12 +282,6 @@
- 
- }
- 
--#ifdef ICAL_SAFESAVES
--int icalfileset_safe_saves=1;
--#else
--int icalfileset_safe_saves=0;
--#endif
--
- icalerrorenum icalfileset_commit(icalfileset* cluster)
- {
-     char tmp[ICAL_PATH_MAX]; 
-@@ -306,15 +300,6 @@
- 	return ICAL_NO_ERROR;
-     }
-     
--    if(icalfileset_safe_saves == 1){
--	snprintf(tmp,ICAL_PATH_MAX,"cp %s %s.bak",impl->path,impl->path);
--	
--	if(system(tmp) < 0){
--	    icalerror_set_errno(ICAL_FILE_ERROR);
--	    return ICAL_FILE_ERROR;
--	}
--    }
--
-     if(lseek(impl->fd,SEEK_SET,0) < 0){
- 	icalerror_set_errno(ICAL_FILE_ERROR);
- 	return ICAL_FILE_ERROR;
-Index: kdepim/libical/src/test/regression.c
-diff -u kdepim/libical/src/test/regression.c:1.4 kdepim/libical/src/test/regression.c:1.4.2.1
---- kdepim/libical/src/test/regression.c:1.4	Wed Apr 11 17:37:32 2001
-+++ kdepim/libical/src/test/regression.c	Fri Dec  6 18:25:09 2002
-@@ -2863,8 +2863,6 @@
-     struct icaldurationtype d;
-     int i;
-     int final,sec;
--
--    icalfileset_safe_saves = 1;
- 
-     icalerror_clear_errno();
- 
---- kdepim/libical/src/libical/icalmime.c~	2003-01-17 17:58:09.000000000 +0100
-+++ kdepim/libical/src/libical/icalmime.c	2003-01-17 17:59:40.000000000 +0100
-@@ -205,8 +205,8 @@
- 	}
- 
- 	if(parts[i].header.error!=SSPM_NO_ERROR){
--	    char *str;
--	    char* temp[256];
-+	    const char *str = "Unknown Error";
-+	    char temp[256];
- 
- 	    if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
- 		str = "Got an unexpected boundary, possibly due to a MIME header for a MULTIPART part that is missing the Content-Type line";
-@@ -227,16 +227,16 @@
- 	    }
- 
- 	    if(parts[i].header.error_text != 0){
--		snprintf((char*)temp,256,
-+		snprintf(temp,sizeof(temp),
- 			 "%s: %s",str,parts[i].header.error_text);
- 	    } else {
--		strcpy((char*)temp,str);
-+		strcpy(temp,str);
- 	    }
- 
- 	    icalcomponent_add_property
- 		(comp,
- 		 icalproperty_vanew_xlicerror(
--		     (char*)temp,
-+		     temp,
- 		     icalparameter_new_xlicerrortype(
- 			 ICAL_XLICERRORTYPE_MIMEPARSEERROR),
- 		     0));  
-Index: libical/icalparameter.c
-===================================================================
-RCS file: /home/kde/kdepim/libical/src/libical/icalparameter.c,v
-retrieving revision 1.4
-diff -u -r1.4 icalparameter.c
---- kdepim/libical/src/libical/icalparameter.c	11 Apr 2001 15:37:32 -0000	1.4
-+++ kdepim/libical/src/libical/icalparameter.c	15 Dec 2002 21:58:11 -0000
-@@ -257,7 +257,7 @@
-     /* Now, copy the buffer to a tmp_buffer, which is safe to give to
-        the caller without worring about de-allocating it. */
-     
--    out_buf = icalmemory_tmp_buffer(strlen(buf));
-+    out_buf = icalmemory_tmp_buffer(strlen(buf)+1);
-     strcpy(out_buf, buf);
- 
-     icalmemory_free_buffer(buf);
-Index: libical/sspm.c
-===================================================================
-RCS file: /home/kde/kdepim/libical/src/libical/sspm.c,v
-retrieving revision 1.4
-diff -u -r1.4 sspm.c
---- kdepim/libical/src/libical/sspm.c	11 Apr 2001 15:37:32 -0000	1.4
-+++ kdepim/libical/src/libical/sspm.c	15 Dec 2002 21:58:12 -0000
-@@ -948,7 +948,8 @@
- 		
- 		assert(strlen(buf) < BUF_SIZE);
- 		
--		strcpy(header_lines[current_line],buf);
-+		strncpy(header_lines[current_line],buf,BUF_SIZE);
-+		header_lines[current_line][BUF_SIZE-1] = '\0';
- 		
- 		break;
- 	    }
-@@ -984,7 +984,7 @@
- 		
- 		assert( strlen(buf_start) + strlen(last_line) < BUF_SIZE);
- 		
--		strcat(last_line,buf_start);
-+		strncat(last_line,buf_start, BUF_SIZE-strlen(last_line)-1);
- 		
- 		break;
- 	    }
-Index: libicalvcal/vobject.c
-===================================================================
-RCS file: /home/kde/kdepim/libical/src/libicalvcal/vobject.c,v
-retrieving revision 1.1
-diff -u -r1.1 vobject.c
---- kdepim/libical/src/libicalvcal/vobject.c	1 Jan 2001 15:37:08 -0000	1.1
-+++ kdepim/libical/src/libicalvcal/vobject.c	15 Dec 2002 21:58:12 -0000
-@@ -1247,9 +1247,10 @@
-     char buf2[256];
-     strcpy(buf1,NAME_OF(o));
-     while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
--	strcpy(buf2,STRINGZ_VALUE_OF(o));
--	strcat(buf2,".");
--	strcat(buf2,buf1);
-+	strncpy(buf2,STRINGZ_VALUE_OF(o), sizeof(buf2));
-+	buf2[sizeof(buf2)-1] = '\0';
-+	strncat(buf2,".", sizeof(buf2)-strlen(buf2)-1);
-+	strncat(buf2,buf1, sizeof(buf2)-strlen(buf2)-1);
- 	strcpy(buf1,buf2);
- 	}
-     appendsOFile(fp,buf1);
-Index: versit/vobject.c
-===================================================================
-RCS file: /home/kde/kdepim/libkcal/versit/vobject.c,v
-retrieving revision 1.1
-diff -u -r1.1 vobject.c
---- kdepim/libkcal/versit/vobject.c	18 Apr 2001 23:28:58 -0000	1.1
-+++ kdepim/libkcal/versit/vobject.c	15 Dec 2002 21:52:11 -0000
-@@ -1226,9 +1226,10 @@
-     char buf2[256];
-     strcpy(buf1,NAME_OF(o));
-     while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
--	strcpy(buf2,STRINGZ_VALUE_OF(o));
--	strcat(buf2,".");
--	strcat(buf2,buf1);
-+	strncpy(buf2,STRINGZ_VALUE_OF(o),sizeof(buf2));
-+	buf2[sizeof(buf2)] = '\0';
-+	strncat(buf2,".",sizeof(buf2)-strlen(buf2)-1);
-+	strncat(buf2,buf1,sizeof(buf2)-strlen(buf2)-1);
- 	strcpy(buf1,buf2);
- 	}
-     appendsOFile(fp,buf1);
diff --git a/kde-base/kdepim/kdepim-2.2.2-r1.ebuild b/kde-base/kdepim/kdepim-2.2.2-r1.ebuild
deleted file mode 100644
index 901e3cb294ef..000000000000
--- a/kde-base/kdepim/kdepim-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.2-r1.ebuild,v 1.7 2003/08/30 10:19:25 liquidx Exp $
-inherit kde-dist eutils
-
-IUSE=""
-DESCRIPTION="KDE $PV - PIM (Personal Information Management) apps: korganizer..."
-KEYWORDS="x86 sparc ppc"
-
-newdepend ">=app-pda/pilot-link-0.9.0
-	dev-lang/perl"
-
-# doesn't compile with gcc3/glibc3.2 and will not be fixed
-KDE_REMOVE_DIR="kpilot"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/post-${PV}-${PN}.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.1.1.ebuild b/kde-base/kdepim/kdepim-3.1.1.ebuild
deleted file mode 100644
index 19b73872d7e0..000000000000
--- a/kde-base/kdepim/kdepim-3.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.1.ebuild,v 1.7 2003/09/06 23:54:21 msterret Exp $
-inherit kde-dist
-
-IUSE="pda"
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer..."
-KEYWORDS="x86 ppc sparc ~alpha"
-
-newdepend "pda? ( >=app-pda/pilot-link-0.11.1-r1 )
-	dev-lang/perl
-	=kde-base/kdebase-${PV}*
-	>=kde-base/kdenetwork-${PV}" # mimelib is needed for support of some stuff with exchange servers
-
-use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
-
-# reported by doctomoe on ppc
-MAKEOPTS="$MAKEOPTS -j1"
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/kde-base/kdepim/kdepim-3.1.3.ebuild b/kde-base/kdepim/kdepim-3.1.3.ebuild
deleted file mode 100644
index 44fb594af531..000000000000
--- a/kde-base/kdepim/kdepim-3.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.3.ebuild,v 1.9 2003/09/17 01:41:08 weeve Exp $
-inherit kde-dist
-
-IUSE="pda"
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer..."
-KEYWORDS="x86 ~ppc sparc"
-
-newdepend "pda? ( >=app-pda/pilot-link-0.11.1-r1
-				>=dev-libs/libmal-0.31 )
-	dev-lang/perl
-	=kde-base/kdebase-${PV}*
-	~kde-base/kdenetwork-${PV}" # mimelib is needed for support of some stuff with exchange servers
-
-use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
-
-# reported by doctomoe on ppc
-MAKEOPTS="$MAKEOPTS -j1"
-
-src_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/${P}-gcc33.diff
-}
-
-src_compile() {
-	kde_src_compile myconf configure
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	docinto html
-	dodoc *.html
-}