Remove 3.5.0 and 3.5.1 monolithic ebuilds.

Package-Manager: portage-2.1_pre7-r4

113 files changed, 97 insertions, 3439 deletions

diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index b06398b41e45..c2fa5e7b8523 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.139 2006/04/04 02:49:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.140 2006/04/05 22:58:35 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kde-3.5.0.ebuild,
+  -kde-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> kde-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kde/files/digest-kde-3.5.0 b/kde-base/kde/files/digest-kde-3.5.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.5.0
+++ /dev/null
diff --git a/kde-base/kde/files/digest-kde-3.5.1 b/kde-base/kde/files/digest-kde-3.5.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/kde-base/kde/files/digest-kde-3.5.1
+++ /dev/null
diff --git a/kde-base/kde/kde-3.5.0.ebuild b/kde-base/kde/kde-3.5.0.ebuild
deleted file mode 100644
index c9e3376c9263..000000000000
--- a/kde-base/kde/kde-3.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.0.ebuild,v 1.2 2005/12/17 20:51:00 corsair Exp $
-
-DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="accessibility"
-
-# excluded: kdebindings, kdesdk, since these are developer-only packages
-RDEPEND="~kde-base/kdelibs-${PV}
-	~kde-base/kdebase-${PV}
-	~kde-base/kdeaddons-${PV}
-	~kde-base/kdeadmin-${PV}
-	~kde-base/kdeartwork-${PV}
-	~kde-base/kdeedu-${PV}
-	~kde-base/kdegames-${PV}
-	~kde-base/kdegraphics-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdepim-${PV}
-	~kde-base/kdetoys-${PV}
-	~kde-base/kdeutils-${PV}
-	~kde-base/kdewebdev-${PV}
-	accessibility? ( ~kde-base/kdeaccessibility-${PV} )"
diff --git a/kde-base/kde/kde-3.5.1.ebuild b/kde-base/kde/kde-3.5.1.ebuild
deleted file mode 100644
index 16bfe49836a8..000000000000
--- a/kde-base/kde/kde-3.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.1.ebuild,v 1.3 2006/03/25 11:29:57 agriffis Exp $
-
-DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-SLOT="3.5"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="accessibility"
-
-# excluded: kdebindings, kdesdk, since these are developer-only packages
-RDEPEND="~kde-base/kdelibs-${PV}
-	~kde-base/kdebase-${PV}
-	~kde-base/kdeaddons-${PV}
-	~kde-base/kdeadmin-${PV}
-	~kde-base/kdeartwork-${PV}
-	~kde-base/kdeedu-${PV}
-	~kde-base/kdegames-${PV}
-	~kde-base/kdegraphics-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdenetwork-${PV}
-	~kde-base/kdepim-${PV}
-	~kde-base/kdetoys-${PV}
-	~kde-base/kdeutils-${PV}
-	~kde-base/kdewebdev-${PV}
-	accessibility? ( ~kde-base/kdeaccessibility-${PV} )"
diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog
index 38aef5a67fbf..6b1fcab0a4a2 100644
--- a/kde-base/kdeaccessibility/ChangeLog
+++ b/kde-base/kdeaccessibility/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaccessibility
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.100 2006/03/25 19:56:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.101 2006/04/05 22:52:06 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaccessibility-3.5.0.ebuild, -kdeaccessibility-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
 *kdeaccessibility-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0
deleted file mode 100644
index 654e46c1d3ff..000000000000
--- a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f88f3340acdd219050759df86e3d97d0 kdeaccessibility-3.5.0.tar.bz2 8437276
diff --git a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.1 b/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.1
deleted file mode 100644
index 9d87eb19d208..000000000000
--- a/kde-base/kdeaccessibility/files/digest-kdeaccessibility-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc0773103053a6800b3d35e6021b6719 kdeaccessibility-3.5.1.tar.bz2 8456936
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild
deleted file mode 100644
index 22854c6b3667..000000000000
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild,v 1.3 2005/12/17 20:30:50 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa gstreamer"
-
-DEPEND="media-libs/akode
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )"
-
-RDEPEND="${DEPEND}
-	|| ( app-accessibility/festival
-	     app-accessibility/epos
-	     app-accessibility/flite
-	     app-accessibility/freetts )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	local myconf="--with-akode
-	             $(use_with alsa) $(use_with gstreamer)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.1.ebuild
deleted file mode 100644
index ae473e943caa..000000000000
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.1.ebuild,v 1.1 2006/01/28 14:45:47 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE accessibility module"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa gstreamer"
-
-DEPEND="media-libs/akode
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )"
-
-RDEPEND="${DEPEND}
-	|| ( app-accessibility/festival
-	     app-accessibility/epos
-	     app-accessibility/flite
-	     app-accessibility/freetts )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	local myconf="--with-akode
-	             $(use_with alsa) $(use_with gstreamer)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index 16ca88a6c6d6..1f5e384f0eb4 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeaddons
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.161 2006/04/03 23:18:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.162 2006/04/05 22:52:50 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaddons-3.5.0.ebuild, -kdeaddons-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   03 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.5.0 b/kde-base/kdeaddons/files/digest-kdeaddons-3.5.0
deleted file mode 100644
index 002f9b8c7e9b..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a61bcb10580208c3abb8c47aed198597 kdeaddons-3.5.0.tar.bz2 1618786
diff --git a/kde-base/kdeaddons/files/digest-kdeaddons-3.5.1 b/kde-base/kdeaddons/files/digest-kdeaddons-3.5.1
deleted file mode 100644
index 9938fafced38..000000000000
--- a/kde-base/kdeaddons/files/digest-kdeaddons-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbd2a6f65ae7338736d93b72bfdf5ae3 kdeaddons-3.5.1.tar.bz2 1618807
diff --git a/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild
deleted file mode 100644
index fd14bcaee744..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild,v 1.5 2006/02/21 18:31:15 carlo Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts berkdb sdl xmms"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdegames-${PV}
-	arts? ( ~kde-base/arts-${PV} )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	xmms? ( media-sound/xmms )
-	berkdb? ( || ( =sys-libs/db-4.3*
-	               =sys-libs/db-4.2* ) )
-	!kde-misc/metabar"
-
-src_compile() {
-	local myconf="$(use_with sdl) $(use_with xmms)"
-
-	if use berkdb; then
-		if has_version "=sys-libs/db-4.3*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.3
-			        --with-extra-includes=/usr/include/db4.3"
-		elif has_version "=sys-libs/db-4.2*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.2
-			        --with-extra-includes=/usr/include/db4.2"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeaddons/kdeaddons-3.5.1.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.1.ebuild
deleted file mode 100644
index 131321dbafc6..000000000000
--- a/kde-base/kdeaddons/kdeaddons-3.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.1.ebuild,v 1.2 2006/02/21 18:31:15 carlo Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts berkdb sdl xmms"
-
-DEPEND="~kde-base/kdepim-${PV}
-	~kde-base/kdemultimedia-${PV}
-	~kde-base/kdegames-${PV}
-	arts? ( ~kde-base/arts-${PV} )
-	sdl? ( >=media-libs/libsdl-1.2 )
-	xmms? ( media-sound/xmms )
-	berkdb? ( || ( =sys-libs/db-4.3*
-	               =sys-libs/db-4.2* ) )
-	!kde-misc/metabar"
-
-src_compile() {
-	local myconf="$(use_with sdl) $(use_with xmms)"
-
-	if use berkdb; then
-		if has_version "=sys-libs/db-4.3*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.3
-			        --with-extra-includes=/usr/include/db4.3"
-		elif has_version "=sys-libs/db-4.2*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.2
-			        --with-extra-includes=/usr/include/db4.2"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 068d0d6923ab..fec280143609 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.155 2006/04/03 23:50:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.156 2006/04/05 22:53:26 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdeadmin-3.5.0.ebuild,
+  -kdeadmin-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   03 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.5.0 b/kde-base/kdeadmin/files/digest-kdeadmin-3.5.0
deleted file mode 100644
index bb54c29e2233..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d0f914d2d0d3fbef8ed51cfdab36d40 kdeadmin-3.5.0.tar.bz2 2098408
diff --git a/kde-base/kdeadmin/files/digest-kdeadmin-3.5.1 b/kde-base/kdeadmin/files/digest-kdeadmin-3.5.1
deleted file mode 100644
index 46d26d668199..000000000000
--- a/kde-base/kdeadmin/files/digest-kdeadmin-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08e9bddd2b42e0783d7f79d08cdb031b kdeadmin-3.5.1.tar.bz2 2099139
diff --git a/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild b/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild
deleted file mode 100644
index 3d8228e5cf99..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild,v 1.5 2005/12/17 20:37:24 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}"
-RDEPEND="${DEPEND}
-	virtual/cron"
-
-src_compile() {
-	# 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
-	if use x86; then
-		echo > ${S}/lilo-config/configure.in.in
-		make -f admin/Makefile.common
-	fi
-
-	local myconf="--with-shadow"
-
-	export DO_NOT_COMPILE="${DO_NOT_COMPILE} ksysv"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeadmin/kdeadmin-3.5.1.ebuild b/kde-base/kdeadmin/kdeadmin-3.5.1.ebuild
deleted file mode 100644
index c8f146d39da1..000000000000
--- a/kde-base/kdeadmin/kdeadmin-3.5.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5.1.ebuild,v 1.1 2006/01/28 14:30:55 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE administration tools (user manager, etc.)"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="~kde-base/kdebase-${PV}"
-RDEPEND="${DEPEND}
-	virtual/cron"
-
-src_compile() {
-	# 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
-	if use x86; then
-		echo > ${S}/lilo-config/configure.in.in
-		make -f admin/Makefile.common
-	fi
-
-	local myconf="--with-shadow"
-
-	export DO_NOT_COMPILE="${DO_NOT_COMPILE} ksysv"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 7939917380a2..2441fce3fb98 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeartwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.153 2006/04/04 00:02:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.154 2006/04/05 22:54:04 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-3.5.0.ebuild, -kdeartwork-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.5.0 b/kde-base/kdeartwork/files/digest-kdeartwork-3.5.0
deleted file mode 100644
index 2e62a440db7e..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 052c736c9c12defbb2e7de04ff0b2ae6 kdeartwork-3.5.0.tar.bz2 16610564
diff --git a/kde-base/kdeartwork/files/digest-kdeartwork-3.5.1 b/kde-base/kdeartwork/files/digest-kdeartwork-3.5.1
deleted file mode 100644
index c10ad5c4053b..000000000000
--- a/kde-base/kdeartwork/files/digest-kdeartwork-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8053bb1a1b2a5844b29f5f96328b1d96 kdeartwork-3.5.1.tar.bz2 16595339
diff --git a/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild
deleted file mode 100644
index 77889e2beef3..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild,v 1.4 2005/12/17 20:38:16 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="opengl xscreensaver"
-
-DEPEND="~kde-base/kdebase-${PV}
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )"
-
-src_compile() {
-	local myconf="--with-dpms --with-libart
-	              $(use_with opengl gl) $(use_with xscreensaver)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeartwork/kdeartwork-3.5.1.ebuild b/kde-base/kdeartwork/kdeartwork-3.5.1.ebuild
deleted file mode 100644
index b8501de0f010..000000000000
--- a/kde-base/kdeartwork/kdeartwork-3.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5.1.ebuild,v 1.1 2006/01/28 14:31:52 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE artwork package"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="opengl xscreensaver"
-
-DEPEND="~kde-base/kdebase-${PV}
-	media-libs/libart_lgpl
-	opengl? ( virtual/opengl )
-	xscreensaver? ( x11-misc/xscreensaver )"
-
-src_compile() {
-	local myconf="--with-dpms --with-libart
-	              $(use_with opengl gl) $(use_with xscreensaver)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index cfd20a2c0799..b93fe0d1be8b 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.269 2006/04/02 13:07:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.270 2006/04/05 22:55:18 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.5.1-kicker.patch, -files/kwin-3.5.1-systray.patch,
+  -files/kxkb3.5.1.xx_XX_layouts.patch, -kdebase-3.5.0-r1.ebuild,
+  -kdebase-3.5.1.ebuild, -kdebase-3.5.1-r1.ebuild, -kdebase-3.5.1-r2.ebuild,
+  -kdebase-3.5.1-r3.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/drkonqi-3.5.2-splitdebug.patch,
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.0-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.0-r1
deleted file mode 100644
index 37052d4ffe23..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
-MD5 b86622c029ee8ab656a67c6467fff887 kdebase-3.5.0.tar.bz2 23233185
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1 b/kde-base/kdebase/files/digest-kdebase-3.5.1
deleted file mode 100644
index e7fa262ae41d..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
-MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.1-r1
deleted file mode 100644
index e7fa262ae41d..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
-MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1-r2 b/kde-base/kdebase/files/digest-kdebase-3.5.1-r2
deleted file mode 100644
index 5df56523fdfb..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.1-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
-RMD160 c7e8356d2f46d2fd3a0e7e25f661843f09ff1296 kdebase-3.5.0-patches-1.tar.bz2 4654
-SHA256 599e92f2c488fef6fcd6f337b952e6ce72b27576df37dcb4b86f0961eb26e617 kdebase-3.5.0-patches-1.tar.bz2 4654
-MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
-RMD160 5308bfe188f49815e68392b2f3a48e7def34dee0 kdebase-3.5.1.tar.bz2 23587827
-SHA256 f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.1-r3 b/kde-base/kdebase/files/digest-kdebase-3.5.1-r3
deleted file mode 100644
index 5df56523fdfb..000000000000
--- a/kde-base/kdebase/files/digest-kdebase-3.5.1-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 d964df13021d0ffe3045b6b143c3247f kdebase-3.5.0-patches-1.tar.bz2 4654
-RMD160 c7e8356d2f46d2fd3a0e7e25f661843f09ff1296 kdebase-3.5.0-patches-1.tar.bz2 4654
-SHA256 599e92f2c488fef6fcd6f337b952e6ce72b27576df37dcb4b86f0961eb26e617 kdebase-3.5.0-patches-1.tar.bz2 4654
-MD5 484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 23587827
-RMD160 5308bfe188f49815e68392b2f3a48e7def34dee0 kdebase-3.5.1.tar.bz2 23587827
-SHA256 f35169e4d46531f98576522e4e32ff73dc3592083848e73d8d2680838fc3b434 kdebase-3.5.1.tar.bz2 23587827
diff --git a/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch b/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch
deleted file mode 100644
index 6cf272391a96..000000000000
--- a/kde-base/kdebase/files/kdebase-3.5.1-kicker.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- branches/KDE/3.5/kdebase/kicker/taskmanager/taskmanager.cpp #505029:505030
-@@ -378,9 +378,8 @@
-     }
- 
-     // check if any state we are interested in is marked dirty
--    if (!(dirty & (NET::WMVisibleName | NET::WMVisibleIconName | NET::WMName |
--                   NET::WMIconName | NET::WMState | NET::WMIcon |
--                   NET::XAWMState | NET::WMDesktop) ||
-+    if (!(dirty & (NET::WMVisibleName | NET::WMName | NET::WMIcon |
-+                  NET::WMState | NET::XAWMState | NET::WMDesktop) ||
-           (m_trackGeometry && dirty & NET::WMGeometry)))
-     {
-         return;
-@@ -404,9 +403,12 @@
-     if (dirty & NET::WMIcon)
-     {
-         t->refreshIcon();
-+
-+        // we're done with the icon processing, don't pass this on anymore
-+        dirty ^= NET::WMIcon;
-     }
- 
--    if (dirty != NET::WMIcon)
-+    if (dirty)
-     {
-         // only refresh this stuff if we have other changes besides icons
-         t->refresh(dirty);
-@@ -725,10 +727,10 @@
- 
- void Task::refresh(unsigned int dirty)
- {
--    QString name = visibleIconicName();
-+    QString name = visibleName();
-     _info = KWin::windowInfo(_win, 0, NET::WM2AllowedActions);
- 
--    if (dirty != NET::WMName || name != visibleIconicName())
-+    if (dirty != NET::WMName || name != visibleName())
-     {
-         emit changed();
-     } 
\ No newline at end of file
diff --git a/kde-base/kdebase/files/kwin-3.5.1-systray.patch b/kde-base/kdebase/files/kwin-3.5.1-systray.patch
deleted file mode 100644
index 76f623945870..000000000000
--- a/kde-base/kdebase/files/kwin-3.5.1-systray.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** kdebase-3.5.1.orig/kwin/events.cpp	2006-01-20 03:31:07.000000000 +1030
---- kdebase-3.5.1/kwin/events.cpp	2006-02-28 08:48:32.000000000 +1030
-***************
-*** 324,337 ****
-              }
-          case MapNotify:
-              {
-- #if KDE_IS_VERSION( 3, 9, 90 )
-- #warning Consider dumping this workaround.
-- #endif
--             // See bug #100177, especially comments #6 and #14. This workaround shouldn't be
--             // necessary when X.org with that fix becomes available and it's an unnecessary
--             // X roundtrip for an experimental unstable feature.
--             if( addSystemTrayWin( e->xmap.window ))
--                 return true;
-              return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
-              }
-          case ReparentNotify:
---- 324,329 ----
diff --git a/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch b/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch
deleted file mode 100644
index 741c0d348ffa..000000000000
--- a/kde-base/kdebase/files/kxkb3.5.1.xx_XX_layouts.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: rules.cpp
-===================================================================
---- kxkb/rules.cpp	(revision 504758)
-+++ kxkb/rules.cpp	(working copy)
-@@ -300,7 +300,7 @@
-  */
- const QString KeyRules::getLayout(const QString &layvar) const
- {
--  static const char* LAYOUT_PATTERN = "[a-z0-9_-]*";
-+  static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(LAYOUT_PATTERN);
-   int pos = rx.search(varLine, 0);
-@@ -318,7 +318,7 @@
-  */
- const QString KeyRules::getVariant(const QString &layvar) const
- {
--  static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)";
-+  static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)";
-   QString varLine = layvar.stripWhiteSpace();
-   QRegExp rx(VARIANT_PATTERN);
-   int pos = rx.search(varLine, 0);
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
deleted file mode 100644
index d97326f10286..000000000000
--- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.15 2006/02/12 18:38:08 spyderous Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-${PV}-patches-1.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-
-	# Fix the location bar focus, bug 114329.
-	epatch "${WORKDIR}/patches/konqueror-3.5.0-location-bar-focus.patch"
-
-	# add support for non-lazy-bindings, see bug #114049
-	epatch "${WORKDIR}/patches/kdesu-3.5.0-bindnow.patch"
-	epatch "${WORKDIR}/patches/kcheckpass-3.5.0-bindnow.patch"
-
-	# Fix (again) modular support, when /usr/X11R6 is present this time
-	epatch "${WORKDIR}/patches/kxkb-3.5.0-modularxkb.patch"
-
-	# Add configure option to use /usr/share/misc/usb.ids instead of installing
-	# another copy for kcmusb. SVN Commit 492985.
-	epatch "${WORKDIR}/patches/kcontrol-3.5.0-global-usbids.patch"
-
-	# Add --without-composite option to kdebase's configure and then support it
-	# in kwin and kicker.
-	epatch "${WORKDIR}/patches/kdebase-3.5.0-composite.patch"
-	epatch "${WORKDIR}/patches/kwin-3.5.0-composite.patch"
-	epatch "${WORKDIR}/patches/kicker-3.5.0-composite.patch"
-
-	# Add --without-xscreenserver option to disable libXSS support
-	epatch "${WORKDIR}/patches/kdesktop-3.5.0-xscreensaver.patch"
-
-	# Add --without-xinerama option to disable xinerama on ksplashml
-	epatch "${WORKDIR}/patches/ksplashml-3.5.0-xinerama.patch"
-
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild b/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
deleted file mode 100644
index 5f23f4ee68e0..000000000000
--- a/kde-base/kdebase/kdebase-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r1.ebuild,v 1.2 2006/02/12 18:38:08 spyderous Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch
-	${FILESDIR}/kdebase-3.5.1-kicker.patch"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.1-r2.ebuild b/kde-base/kdebase/kdebase-3.5.1-r2.ebuild
deleted file mode 100644
index 043ac3beefeb..000000000000
--- a/kde-base/kdebase/kdebase-3.5.1-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r2.ebuild,v 1.1 2006/02/24 17:29:01 flameeyes Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch
-	${FILESDIR}/kdebase-3.5.1-kicker.patch
-	${FILESDIR}/konsole-3.5.1-detach-send2all.patch"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.1-r3.ebuild b/kde-base/kdebase/kdebase-3.5.1-r3.ebuild
deleted file mode 100644
index a6d4c339cae2..000000000000
--- a/kde-base/kdebase/kdebase-3.5.1-r3.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1-r3.ebuild,v 1.3 2006/03/09 10:53:38 flameeyes Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	|| ( (
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXfixes
-			x11-libs/libXrender
-			x11-libs/libXtst
-			x11-libs/libXext
-			xscreensaver? ( x11-libs/libXScrnSaver )
-			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	|| ( (
-			xscreensaver? ( x11-proto/scrnsaverproto )
-			xinerama? ( x11-proto/xineramaproto )
-			x11-apps/bdftopcf
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kxkb3.5.1.xx_XX_layouts.patch
-	${FILESDIR}/kdebase-3.5.1-kicker.patch
-	${FILESDIR}/konsole-3.5.1-detach-send2all.patch
-	${FILESDIR}/kwin-3.5.1-systray.patch"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdebase/kdebase-3.5.1.ebuild b/kde-base/kdebase/kdebase-3.5.1.ebuild
deleted file mode 100644
index 3c2f1e6b3927..000000000000
--- a/kde-base/kdebase/kdebase-3.5.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.1.ebuild,v 1.3 2006/02/12 18:38:08 spyderous Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5.0-patches-1.tar.bz2"
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite xscreensaver xinerama"
-# hal: enables hal backend for 'media:' ioslave
-
-DEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	pam? ( kde-base/kdebase-pam )
-	>=dev-libs/cyrus-sasl-2
-	ldap? ( >=net-nds/openldap-2 )
-	cups? ( net-print/cups )
-	ssl? ( dev-libs/openssl )
-	opengl? ( virtual/opengl )
-	openexr? ( >=media-libs/openexr-1.2 )
-	samba? ( >=net-fs/samba-3.0.4 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )
-	ieee1394? ( sys-libs/libraw1394 )
-	hal? ( >=sys-apps/dbus-0.33
-	       =sys-apps/hal-0.5*
-		   sys-apps/pmount )
-	zeroconf? ( net-misc/mDNSResponder )"
-
-RDEPEND="${DEPEND}
-	sys-apps/usbutils
-	java? ( >=virtual/jre-1.4 )
-	virtual/eject
-	|| ( (
-			x11-apps/xmessage
-			x11-apps/xsetroot
-			x11-apps/xset
-			x11-apps/xrandr
-			x11-apps/mkfontdir
-			|| ( x11-misc/xkeyboard-config x11-misc/xkbdata )
-			x11-apps/setxkbmap
-		) virtual/x11 )
-	xcomposite? ( || ( (
-			x11-libs/libXcomposite
-			x11-libs/libXdamage
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-libs/libXScrnSaver virtual/x11 ) )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
-
-DEPEND="${DEPEND}
-	xcomposite? ( || ( (
-			x11-proto/compositeproto
-			x11-proto/damageproto
-			) <=x11-base/xorg-x11-6.9 )
-		)
-	xscreensaver? ( || ( x11-proto/scrnsaverproto virtual/x11 ) )
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${WORKDIR}/patches/kdebase-3.5-startkde-gentoo.patch"
-
-	# Avoid using imake (kde bug 114466).
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-
-	# For the noimake patch.
-	make -f admin/Makefile.common || die
-}
-
-src_compile() {
-	local myconf="--with-dpms
-	              $(use_with arts) $(use_with ldap)
-	              $(use_with opengl gl) $(use_with ssl)
-	              $(use_with samba) $(use_with openexr)
-	              $(use_with lm_sensors sensors) $(use_with logitech-mouse libusb)
-	              $(use_with ieee1394 libraw1394) $(use_with hal)
-	              $(use_enable zeroconf dnssd)
-				  $(use_with xcomposite composite)
-				  $(use_with xscreensaver)
-				  $(use_with xinerama)
-				  --with-usbids=/usr/share/misc/usb.ids"
-
-	if use pam; then
-		myconf="${myconf} --with-pam=yes"
-	else
-		myconf="${myconf} --with-pam=no --with-shadow"
-	fi
-
-	# the java test is problematic (see kde bug 100729) and
-	# useless. All that's needed for java applets to work is
-	# to have the 'java' executable in PATH.
-	myconf="${myconf} --without-java"
-
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# startup and shutdown scripts
-	insinto ${KDEDIR}/env
-	doins ${FILESDIR}/agent-startup.sh
-
-	exeinto ${KDEDIR}/shutdown
-	doexe ${FILESDIR}/agent-shutdown.sh
-
-	# freedesktop environment variables
-	cat <<EOF > ${T}/xdg.sh
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins ${T}/xdg.sh
-
-	# x11 session script
-	cat <<EOF > ${T}/kde-${SLOT}
-#!/bin/sh
-exec ${KDEDIR}/bin/startkde
-EOF
-	exeinto /etc/X11/Sessions
-	doexe ${T}/kde-${SLOT}
-
-	# freedesktop compliant session script
-	sed -e "s:@KDE_BINDIR@:${KDEDIR}/bin:g;s:Name=KDE:Name=KDE ${SLOT}:" \
-		${S}/kdm/kfrontend/sessions/kde.desktop.in > ${T}/kde-${SLOT}.desktop
-	insinto /usr/share/xsessions
-	doins ${T}/kde-${SLOT}.desktop
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-
-	rmdir ${D}/${KDEDIR}/share/templates/.source/emptydir
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
-	fi
-	if [ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]; then
-		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
-		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
-			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
-	fi
-
-	mkdir -p ${ROOT}${KDEDIR}/share/templates/.source/emptydir
-
-	echo
-	einfo "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	einfo "edit ${KDEDIR}/env/agent-startup.sh and"
-	einfo "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-}
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 03fcfa95f649..361f399447d1 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.174 2006/03/25 19:37:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.175 2006/04/05 22:56:16 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdeedu-3.5.0.ebuild,
+  -kdeedu-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
 *kdeedu-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.5.0 b/kde-base/kdeedu/files/digest-kdeedu-3.5.0
deleted file mode 100644
index 192885870e7f..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac66cfcc8e23227973596cf62cf78a4c kdeedu-3.5.0.tar.bz2 30006209
diff --git a/kde-base/kdeedu/files/digest-kdeedu-3.5.1 b/kde-base/kdeedu/files/digest-kdeedu-3.5.1
deleted file mode 100644
index 75961e855000..000000000000
--- a/kde-base/kdeedu/files/digest-kdeedu-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fe31b9a2ec4e299531c6b7beeab09534 kdeedu-3.5.1.tar.bz2 29972269
diff --git a/kde-base/kdeedu/kdeedu-3.5.0.ebuild b/kde-base/kdeedu/kdeedu-3.5.0.ebuild
deleted file mode 100644
index fcbe1d01cdf3..000000000000
--- a/kde-base/kdeedu/kdeedu-3.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5.0.ebuild,v 1.3 2005/12/17 20:39:20 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kig-scripting"
-
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
-
-src_compile() {
-	local myconf="$(use_enable kig-scripting kig-python-scripting)
-	              --disable-ocamlsolver"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeedu/kdeedu-3.5.1.ebuild b/kde-base/kdeedu/kdeedu-3.5.1.ebuild
deleted file mode 100644
index 89cd46e49e27..000000000000
--- a/kde-base/kdeedu/kdeedu-3.5.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5.1.ebuild,v 1.2 2006/03/18 00:04:27 gustavoz Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE educational apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kig-scripting"
-
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
-
-src_compile() {
-	local myconf="$(use_enable kig-scripting kig-python-scripting)
-	              --disable-ocamlsolver"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index 11b7b6571244..57e2dca23657 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegames
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.149 2006/04/03 20:10:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.150 2006/04/05 22:57:03 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdegames-3.5.0.ebuild,
+  -kdegames-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   03 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdegames-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdegames/files/digest-kdegames-3.5.0 b/kde-base/kdegames/files/digest-kdegames-3.5.0
deleted file mode 100644
index 92db3dfaf9df..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba86fe9280ca57698ce3be0e0242b140 kdegames-3.5.0.tar.bz2 10297262
diff --git a/kde-base/kdegames/files/digest-kdegames-3.5.1 b/kde-base/kdegames/files/digest-kdegames-3.5.1
deleted file mode 100644
index 12abac6ad956..000000000000
--- a/kde-base/kdegames/files/digest-kdegames-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15a4bb4e193e19be7decd4f147a31396 kdegames-3.5.1.tar.bz2 10824798
diff --git a/kde-base/kdegames/kdegames-3.5.0.ebuild b/kde-base/kdegames/kdegames-3.5.0.ebuild
deleted file mode 100644
index 882c3e419853..000000000000
--- a/kde-base/kdegames/kdegames-3.5.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5.0.ebuild,v 1.4 2005/12/17 20:40:17 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE games (not just solitaire ;-)"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# For backgrounds in kpat.
-RDEPEND="~kde-base/kdebase-${PV}"
diff --git a/kde-base/kdegames/kdegames-3.5.1.ebuild b/kde-base/kdegames/kdegames-3.5.1.ebuild
deleted file mode 100644
index ef6d44ab9f85..000000000000
--- a/kde-base/kdegames/kdegames-3.5.1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5.1.ebuild,v 1.1 2006/01/28 14:28:24 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE games (not just solitaire ;-)"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# For backgrounds in kpat.
-RDEPEND="~kde-base/kdebase-${PV}"
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 599eafc917f0..b7c6df05d68b 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.245 2006/04/04 20:53:00 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.246 2006/04/05 22:57:59 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kpdf-3.5.0-cropbox-fix.patch,
+  -files/post-3.5.0-kdegraphics-CAN-2005-3193.diff,
+  -files/kdegraphics-3.5.0-kpovmodeler.patch,
+  -files/kpdf-3.5.0-splitter-io.patch,
+  -files/post-3.5.1-kdegraphics-CVE-2006-0301.diff,
+  -files/kpdf-3.5.1-saveas.patch, -kdegraphics-3.5.0.ebuild,
+  -kdegraphics-3.5.0-r2.ebuild, -kdegraphics-3.5.0-r3.ebuild,
+  -kdegraphics-3.5.0-r4.ebuild, -kdegraphics-3.5.1.ebuild,
+  -kdegraphics-3.5.1-r1.ebuild, -kdegraphics-3.5.1-r2.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
   kdegraphics-3.3.2-r3.ebuild, kdegraphics-3.4.1-r1.ebuild,
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r2
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r4 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r4
deleted file mode 100644
index 44e671a5ef99..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.0-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 7094349
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1
deleted file mode 100644
index 9166f01a0810..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r1
deleted file mode 100644
index 9166f01a0810..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2
deleted file mode 100644
index e6a9b99356b1..000000000000
--- a/kde-base/kdegraphics/files/digest-kdegraphics-3.5.1-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 2cd1c5348b7df46cf7f9d91e1dbfebd2 kdegraphics-3.5.1.tar.bz2 7315482
-RMD160 a8b2b94c0378c689c9be808a1f57e93ecef54418 kdegraphics-3.5.1.tar.bz2 7315482
-SHA256 d0f1fed464c1d410b66c115a60245e1c639de828eebde181f26cc8185a0c9ad6 kdegraphics-3.5.1.tar.bz2 7315482
-MD5 f7ca204c5796c0633a1e51410c1b47b1 kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-RMD160 87eadc4d7f032580ccb5c3c12423d9aeb02fc640 kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-SHA256 f623a43e67f731067dbe8688963b72565a5f63c5af7ab0cf2fccf3cbc0873adc kpdf-3.5.1-poppler-0.5.1-bis.patch.bz2 2076
-MD5 357d6f2afde33c2dcb3e07d7ce74b216 kpdf-3.5.1-poppler-2.patch.bz2 5847
-RMD160 2351c506ccd34dade7cd7fdfdabaa4561fa7226e kpdf-3.5.1-poppler-2.patch.bz2 5847
-SHA256 3daf7caec19b6060eeb454dd668986fda28f1ad2faea9d91cdc89bf8e4e3a58e kpdf-3.5.1-poppler-2.patch.bz2 5847
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch b/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch
deleted file mode 100644
index bf31eac7c151..000000000000
--- a/kde-base/kdegraphics/files/kdegraphics-3.5.0-kpovmodeler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp kdegraphics-3.5.0/kpovmodeler/pmshell.cpp
---- kdegraphics-3.5.0.orig/kpovmodeler/pmshell.cpp	2005-09-10 10:18:54.000000000 +0200
-+++ kdegraphics-3.5.0/kpovmodeler/pmshell.cpp	2005-12-11 09:35:08.000000000 +0100
-@@ -641,7 +641,7 @@
- 
- bool PMShell::overwriteURL( const KURL& u )
- {
--   int query = KMessageBox::Yes;
-+   int query = KMessageBox::Continue;
- 
-    if( u.isLocalFile( ) )
-    {
diff --git a/kde-base/kdegraphics/files/kpdf-3.5.0-cropbox-fix.patch b/kde-base/kdegraphics/files/kpdf-3.5.0-cropbox-fix.patch
deleted file mode 100644
index 17fbeeaee27c..000000000000
--- a/kde-base/kdegraphics/files/kpdf-3.5.0-cropbox-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf/Page.cc	2005/09/09 18:24:18	459064
-+++ branches/KDE/3.5/kdegraphics/kpdf/xpdf/xpdf/Page.cc	2005/12/18 21:44:35	489480
-@@ -66,6 +66,20 @@
-   if (!haveCropBox) {
-     cropBox = mediaBox;
-   }
-+  else
-+  {
-+    // cropBox can not be bigger than mediaBox
-+    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
-+    {
-+      cropBox.x1 = mediaBox.x1;
-+      cropBox.x2 = mediaBox.x2;
-+    }
-+    if (cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
-+    {
-+      cropBox.y1 = mediaBox.y1;
-+      cropBox.y2 = mediaBox.y2;
-+    }
-+  }
- 
-   // other boxes
-   bleedBox = cropBox;
diff --git a/kde-base/kdegraphics/files/kpdf-3.5.0-splitter-io.patch b/kde-base/kdegraphics/files/kpdf-3.5.0-splitter-io.patch
deleted file mode 100644
index 82e4311bba5c..000000000000
--- a/kde-base/kdegraphics/files/kpdf-3.5.0-splitter-io.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kpdf/part.cpp
-===================================================================
---- kpdf/part.cpp	(revision 485446)
-+++ kpdf/part.cpp	(revision 485447)
-@@ -274,6 +274,8 @@
- 	connect( m_watcher, SIGNAL( dirty( const QString& ) ), this, SLOT( slotFileDirty( const QString& ) ) );
- 	m_dirtyHandler = new QTimer( this );
- 	connect( m_dirtyHandler, SIGNAL( timeout() ),this, SLOT( slotDoFileDirty() ) );
-+	m_saveSplitterSizeTimer = new QTimer( this );
-+	connect( m_saveSplitterSizeTimer, SIGNAL( timeout() ),this, SLOT( saveSplitterSize() ) );
- 
- 	slotNewConfig();
- 
-@@ -478,7 +480,7 @@
- {
-     // if pageView has been resized, save splitter sizes
-     if ( watched == m_pageView && e->type() == QEvent::Resize )
--        saveSplitterSize();
-+        m_saveSplitterSizeTimer->start(500, true);
- 
-     // only intercept events, don't block them
-     return false;
-Index: kpdf/part.h
-===================================================================
---- kpdf/part.h	(revision 485446)
-+++ kpdf/part.h	(revision 485447)
-@@ -146,6 +146,11 @@
- 	// static instances counter
- 	static unsigned int m_count;
- 
-+	// this is a hack because we can not use writeConfig on part destructor
-+	// and we don't want to writeconfig every time someone moves the splitter
-+	// so we use a QTimer each 500 ms
-+	QTimer *m_saveSplitterSizeTimer;
-+
- 	KDirWatch *m_watcher;
- 	QTimer *m_dirtyHandler;
- 	DocumentViewport m_viewportDirty;
diff --git a/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch b/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch
deleted file mode 100644
index 7649d393453e..000000000000
--- a/kde-base/kdegraphics/files/kpdf-3.5.1-saveas.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/18 21:57:05	499855
-+++ branches/KDE/3.5/kdegraphics/kpdf/part.cpp	2006/01/23 23:11:54	501814
-@@ -697,6 +697,11 @@
-     KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
-     if ( saveURL.isValid() && !saveURL.isEmpty() )
-     {
-+        if (saveURL == url())
-+        {
-+            KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
-+            return;
-+        }
-         if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
-         {
-             if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
diff --git a/kde-base/kdegraphics/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff b/kde-base/kdegraphics/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff
deleted file mode 100644
index 0b6f22303de8..000000000000
--- a/kde-base/kdegraphics/files/post-3.5.0-kdegraphics-CAN-2005-3193.diff
+++ /dev/null
@@ -1,287 +0,0 @@
-Index: kpdf/xpdf/xpdf/JBIG2Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JBIG2Stream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -681,6 +682,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = wA;
-   h = hA;
-   line = (wA + 7) >> 3;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) {
-+    data = NULL;
-+    return;
-+  }
-+  
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   data[h * line] = 0;
-@@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, 
-   w = bitmap->w;
-   h = bitmap->h;
-   line = bitmap->line;
-+
-+  if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
-+    data = NULL;
-+    return;
-+  }
-+ 
-   // need to allocate one extra guard byte for use in combine()
-   data = (Guchar *)gmalloc(h * line + 1);
-   memcpy(data, bitmap->data, h * line);
-@@ -720,7 +733,8 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint
- }
- 
- void JBIG2Bitmap::expand(int newH, Guint pixel) {
--  if (newH <= h) {
-+
-+  if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
-     return;
-   }
-   // need to allocate one extra guard byte for use in combine()
-@@ -2305,6 +2319,15 @@ void JBIG2Stream::readHalftoneRegionSeg(
-     error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment");
-     return;
-   }
-+  if (gridH == 0 || gridW >= INT_MAX / gridH) {
-+    error(getPos(), "Bad size in JBIG2 halftone segment");
-+    return;
-+  }
-+  if (h < 0 || w == 0 || h >= INT_MAX / w) {
-+     error(getPos(), "Bad size in JBIG2 bitmap segment");
-+    return;
-+  }
-+
-   patternDict = (JBIG2PatternDict *)seg;
-   bpp = 0;
-   i = 1;
-@@ -2936,6 +2959,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef
-   JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2;
-   int x, y, pix;
- 
-+  if (w < 0 || h <= 0 || w >= INT_MAX / h)
-+    return NULL;
-+
-   bitmap = new JBIG2Bitmap(0, w, h);
-   bitmap->clearToZero();
- 
-Index: kpdf/xpdf/xpdf/Stream.cc
-===================================================================
---- kpdf/xpdf/xpdf/Stream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.cc	(revision 488715)
-@@ -15,6 +15,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <stddef.h>
-+#include <limits.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif
-@@ -408,13 +409,27 @@ StreamPredictor::StreamPredictor(Stream 
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
-+
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps >= INT_MAX / nBits ||
-+      width >= INT_MAX / nComps / nBits)
-+    return;
- 
-   nVals = width * nComps;
-+  if (nVals * nBits + 7 <= 0)
-+    return;
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0)
-+    return;
-+
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1006,6 +1021,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-@@ -1258,8 +1277,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s
-   endOfLine = endOfLineA;
-   byteAlign = byteAlignA;
-   columns = columnsA;
--  if (columns < 1) {
--    columns = 1;
-+  if (columns < 1 || columns >= INT_MAX / sizeof(short)) {
-+     error(getPos(), "Bad number of columns in CCITTFaxStream");
-+     exit(1);
-   }
-   rows = rowsA;
-   endOfBlock = endOfBlockA;
-@@ -2903,7 +2923,12 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
--  if (prec != 8) {
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+ if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-   }
-@@ -2929,6 +2954,11 @@ GBool DCTStream::readProgressiveSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -2951,6 +2981,11 @@ GBool DCTStream::readScanInfo() {
- 
-   length = read16() - 2;
-   scanInfo.numComps = str->getChar();
-+  if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
-+    scanInfo.numComps = 0;
-+    error(getPos(), "Bad number of components in DCT stream");
-+    return gFalse;
-+  }
-   --length;
-   if (length != 2 * scanInfo.numComps + 3) {
-     error(getPos(), "Bad DCT scan info block");
-@@ -3035,12 +3070,12 @@ GBool DCTStream::readHuffmanTables() {
-   while (length > 0) {
-     index = str->getChar();
-     --length;
--    if ((index & 0x0f) >= 4) {
-+    if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) {
-       error(getPos(), "Bad DCT Huffman table");
-       return gFalse;
-     }
-     if (index & 0x10) {
--      index &= 0x0f;
-+      index &= 0x03;
-       if (index >= numACHuffTables)
- 	numACHuffTables = index+1;
-       tbl = &acHuffTables[index];
-@@ -3833,6 +3868,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (!pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }
-   } else {
-     pred = NULL;
-   }
-Index: kpdf/xpdf/xpdf/Stream.h
-===================================================================
---- kpdf/xpdf/xpdf/Stream.h	(revision 481099)
-+++ kpdf/xpdf/xpdf/Stream.h	(revision 488715)
-@@ -232,6 +232,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -249,6 +251,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------
---- kpdf/xpdf/xpdf/JPXStream.cc	(revision 481099)
-+++ kpdf/xpdf/xpdf/JPXStream.cc	(revision 488715)
-@@ -7,6 +7,7 @@
- //========================================================================
- 
- #include <aconf.h>
-+#include <limits.h>
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma implementation
-@@ -783,7 +784,7 @@ GBool JPXStream::readCodestream(Guint /*
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -818,8 +819,13 @@ GBool JPXStream::readCodestream(Guint /*
- 	            / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- 	            / img.yTileSize;
--      img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
--				     sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      // check for overflow before allocating memory
-+      if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) {
-+	error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+	return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- 	img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
- 							sizeof(JPXTileComp));
-Index: kpdf/xpdf/goo/gmem.c
-===================================================================
---- kpdf/xpdf/goo/gmem.c	(revision 481099)
-+++ kpdf/xpdf/goo/gmem.c	(revision 488715)
-@@ -11,6 +11,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <limits.h>
- #include "gmem.h"
- 
- #ifdef DEBUG_MEM
-@@ -141,7 +142,7 @@ void *gmallocn(int nObjs, int objSize) {
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
-@@ -152,7 +153,7 @@ void *greallocn(void *p, int nObjs, int 
-   int n;
- 
-   n = nObjs * objSize;
--  if (objSize == 0 || n / objSize != nObjs) {
-+  if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
-     fprintf(stderr, "Bogus memory allocation size\n");
-     exit(1);
-   }
diff --git a/kde-base/kdegraphics/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff b/kde-base/kdegraphics/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff
deleted file mode 100644
index e2e19b511dd7..000000000000
--- a/kde-base/kdegraphics/files/post-3.5.1-kdegraphics-CVE-2006-0301.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- kpdf/xpdf/splash/SplashXPathScanner.cc	(Revision 505052)
-+++ kpdf/xpdf/splash/SplashXPathScanner.cc	(Arbeitskopie)
-@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
- }
- 
- void SplashXPathScanner::computeIntersections(int y) {
--  SplashCoord ySegMin, ySegMax, xx0, xx1;
-+  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
-   SplashXPathSeg *seg;
-   int i, j;
- 
-@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
-     } else if (seg->flags & splashXPathVert) {
-       xx0 = xx1 = seg->x0;
-     } else {
--      if (ySegMin <= y) {
--	// intersection with top edge
--	xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+      if (seg->x0 < seg->x1) {
-+	xSegMin = seg->x0;
-+	xSegMax = seg->x1;
-       } else {
--	// x coord of segment endpoint with min y coord
--	xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
-+	xSegMin = seg->x1;
-+	xSegMax = seg->x0;
-       }
--      if (ySegMax >= y + 1) {
--	// intersection with bottom edge
--	xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
--      } else {
--	// x coord of segment endpoint with max y coord
--	xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
-+      // intersection with top edge
-+      xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+      // intersection with bottom edge
-+      xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-+      // the segment may not actually extend to the top and/or bottom edges
-+      if (xx0 < xSegMin) {
-+	xx0 = xSegMin;
-+      } else if (xx0 > xSegMax) {
-+	xx0 = xSegMax;
-+      }
-+      if (xx1 < xSegMin) {
-+	xx1 = xSegMin;
-+      } else if (xx1 > xSegMax) {
-+	xx1 = xSegMax;
-       }
-     }
-     if (xx0 < xx1) {
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0-r2.ebuild
deleted file mode 100644
index 2d3645ad6e31..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0-r2.ebuild,v 1.2 2006/01/22 18:50:09 genone Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff ${FILESDIR}/kpdf-3.5.0-splitter-io.patch"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild
deleted file mode 100644
index 0006e643a97e..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0-r3.ebuild,v 1.3 2006/01/22 18:50:09 genone Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff ${FILESDIR}/kpdf-3.5.0-splitter-io.patch"
-
-# Fix saving in kpovmodeler (kde bug 116895). Applied for 3.5.1.
-PATCHES="${PATCHES} ${FILESDIR}/kdegraphics-3.5.0-kpovmodeler.patch"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0-r4.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0-r4.ebuild
deleted file mode 100644
index 5f3662e7e30d..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.0-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0-r4.ebuild,v 1.5 2006/01/22 18:50:09 genone Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-# tiff is mandatory for kfile-plugins/tiff and kooka, the check comes
-# from acinclude.m4.in and there's no switch. There is a --with-tiff
-# check coming from kviewshell/plugins/djvu/libdjvu/configure.in.in,
-# but it has no effect.
-
-PATCHES="${FILESDIR}/post-3.5.0-kdegraphics-CAN-2005-3193.diff
-	${FILESDIR}/kpdf-3.5.0-splitter-io.patch
-	${FILESDIR}/kpdf-3.5.0-cropbox-fix.patch
-	${FILESDIR}/kdegraphics-3.5.0-kpovmodeler.patch"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild
deleted file mode 100644
index e87dd2424f3e..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild,v 1.6 2006/01/22 18:50:09 genone Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1-r1.ebuild
deleted file mode 100644
index 697bb26ab718..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1-r1.ebuild,v 1.2 2006/02/15 22:23:37 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kpdf-3.5.1-saveas.patch
-	${FILESDIR}/post-3.5.1-kdegraphics-CVE-2006-0301.diff"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild
deleted file mode 100644
index 18dd34140a3a..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1-r2.ebuild,v 1.6 2006/03/05 19:27:14 flameeyes Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-0.5.0-r1
-		>=app-text/poppler-bindings-0.5.0 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kpdf-${PV}-poppler-2.patch.bz2
-	mirror://gentoo/kpdf-${PV}-poppler-0.5.1-bis.patch.bz2"
-
-PATCHES="${FILESDIR}/kpdf-3.5.1-saveas.patch
-	${DISTDIR}/kpdf-${PV}-poppler-2.patch.bz2"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler-bindings  compiled with Qt support."
-		eerror "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-		die "Please reemerge app-text/poppler-bindings with USE=\"qt\"."
-	fi
-}
-
-src_unpack() {
-	kde_src_unpack
-
-	# Lovely when libraries changes API in micro releases.
-	has_version ">=app-text/poppler-0.5.1" && \
-		epatch "${DISTDIR}/kpdf-${PV}-poppler-0.5.1-bis.patch.bz2"
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-	use pdf || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpdf"
-
-	replace-flags "-Os" "-O2" # see bug 114822
-
-	rm -f ${S}/configure # ask rebuilding
-	kde_src_compile
-}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
deleted file mode 100644
index 3c8090bf9b75..000000000000
--- a/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.1.ebuild,v 1.4 2006/02/15 22:23:37 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE graphics-related apps"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gphoto2 imlib openexr opengl pdf povray scanner tetex"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	gphoto2? ( media-libs/libgphoto2 )
-	scanner? ( media-gfx/sane-backends )
-	media-libs/libart_lgpl
-	media-libs/lcms
-	dev-libs/fribidi
-	imlib? ( media-libs/imlib )
-	virtual/ghostscript
-	media-libs/tiff
-	openexr? ( >=media-libs/openexr-1.2 )
-	povray? ( media-gfx/povray
-		  virtual/opengl )
-	pdf? ( >=app-text/poppler-bindings-0.3.1 )"
-
-RDEPEND="${DEPEND}
-	tetex? (
-	|| ( >=app-text/tetex-2
-	     app-text/ptex
-	     app-text/cstetex
-	     app-text/dvipdfm ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kpdf-3.5.1-saveas.patch"
-
-pkg_setup() {
-	if ! built_with_use virtual/ghostscript X; then
-		eerror "This package requires virtual/ghostscript compiled with X11 support."
-		eerror "Please reemerge virtual/ghostscript with USE=\"X\"."
-		die "Please reemerge virtual/ghostscript with USE=\"X\"."
-	fi
-	if use pdf && ! built_with_use app-text/poppler-bindings qt; then
-		eerror "This package requires app-text/poppler compiled with Qt support."
-		eerror "Please reemerge app-text/poppler with USE=\"qt\"."
-		die "Please reemerge app-text/poppler with USE=\"qt\"."
-	fi
-}
-
-src_compile() {
-	local myconf="$(use_with openexr) $(use_with pdf poppler)
-	              $(use_with gphoto2 kamera)"
-
-	use imlib || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kuickshow"
-	use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan"
-	use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler"
-
-	replace-flags "-Os" "-O2" # see bug 114822
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 2d9a7ba675d9..38e52eac2b9d 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.197 2006/04/03 21:08:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.198 2006/04/05 22:59:26 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-3.5.0.ebuild, -kdemultimedia-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   03 Apr 2006; Aron Griffis <agriffis@gentoo.org>
   kdemultimedia-3.4.3.ebuild:
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.0
deleted file mode 100644
index 685fa72e0138..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd0ba9ccb2f522508c6543cd24e54c98 kdemultimedia-3.5.0.tar.bz2 5519386
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.1
deleted file mode 100644
index 1b04cc52ea3c..000000000000
--- a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 595f637c637987a92f6dac9d9cd6667d kdemultimedia-3.5.1.tar.bz2 5502185
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild
deleted file mode 100644
index 336d04511667..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild,v 1.5 2005/12/17 20:43:30 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
-
-DEPEND="~kde-base/kdebase-${PV}
-	media-sound/cdparanoia
-	media-libs/akode
-	>=media-libs/taglib-1.2
-	audiofile? ( media-libs/audiofile )
-	xine? ( >=media-libs/xine-lib-1.0 )
-	alsa? ( media-libs/alsa-lib )
-	theora? ( media-libs/libtheora )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( media-libs/tunepimp
-	               media-libs/musicbrainz )
-	encode? ( mp3? ( media-sound/lame )
-	          vorbis? ( media-sound/vorbis-tools )
-	          flac? ( media-libs/flac ) )"
-
-RDEPEND="${DEPEND}
-	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	local myconf="--with-cdparanoia --with-taglib
-	              --with-akode $(use_with alsa)
-	              $(use_with audiofile) $(use_with gstreamer)
-	              $(use_with xine) $(use_with theora)
-	              $(use_with musicbrainz)"
-
-	# encoding can happen through:
-	# - kio_audiocd (based on libflac for flac,
-	#   on libvorbis for vorbis, on the lame binary for mp3)
-	# - kaudiocreator (based on the flac binary for flac,
-	#   on the lame binary for mp3, on the oggenc binary for vorbis)
-	# - krec (based on libvorbis for vorbis,
-	#   on libmp3lame for mp3)
-	if use encode; then
-		myconf="${myconf} $(use_with mp3 lame)
-	                $(use_with vorbis) $(use_with flac)"
-	else
-		myconf="${myconf} --without-lame
-	                --without-vorbis --without-flac"
-	fi
-
-	# Not used anymore and scheduled for removal.
-	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.1.ebuild
deleted file mode 100644
index 7d4bff4660d8..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.1.ebuild,v 1.1 2006/01/28 14:37:13 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa audiofile encode flac gstreamer mp3 musicbrainz theora vorbis xine"
-
-DEPEND="~kde-base/kdebase-${PV}
-	media-sound/cdparanoia
-	media-libs/akode
-	>=media-libs/taglib-1.2
-	audiofile? ( media-libs/audiofile )
-	xine? ( >=media-libs/xine-lib-1.0 )
-	alsa? ( media-libs/alsa-lib )
-	theora? ( media-libs/libtheora )
-	gstreamer? ( =media-libs/gstreamer-0.8*
-	             =media-libs/gst-plugins-0.8* )
-	musicbrainz? ( media-libs/tunepimp
-	               media-libs/musicbrainz )
-	encode? ( mp3? ( media-sound/lame )
-	          vorbis? ( media-sound/vorbis-tools )
-	          flac? ( media-libs/flac ) )"
-
-RDEPEND="${DEPEND}
-	gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* )
-		     vorbis? ( =media-plugins/gst-plugins-ogg-0.8*
-		               =media-plugins/gst-plugins-vorbis-0.8* )
-		     flac? ( =media-plugins/gst-plugins-flac-0.8* ) )"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	local myconf="--with-cdparanoia --with-taglib
-	              --with-akode $(use_with alsa)
-	              $(use_with audiofile) $(use_with gstreamer)
-	              $(use_with xine) $(use_with theora)
-	              $(use_with musicbrainz)"
-
-	# encoding can happen through:
-	# - kio_audiocd (based on libflac for flac,
-	#   on libvorbis for vorbis, on the lame binary for mp3)
-	# - kaudiocreator (based on the flac binary for flac,
-	#   on the lame binary for mp3, on the oggenc binary for vorbis)
-	# - krec (based on libvorbis for vorbis,
-	#   on libmp3lame for mp3)
-	if use encode; then
-		myconf="${myconf} $(use_with mp3 lame)
-	                $(use_with vorbis) $(use_with flac)"
-	else
-		myconf="${myconf} --without-lame
-	                --without-vorbis --without-flac"
-	fi
-
-	# Not used anymore and scheduled for removal.
-	export DO_NOT_COMPILE="${DO_NOT_COMPILE} mpeglib mpeglib_artsplug"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 0ae0bfd24af3..95fa29a21a72 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.194 2006/04/04 01:05:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.195 2006/04/05 23:00:11 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kopete-3.5.x-msn-filetransfer.patch, -kdenetwork-3.5.0.ebuild,
+  -kdenetwork-3.5.1.ebuild, -kdenetwork-3.5.1-r1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.0 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.0
deleted file mode 100644
index 46847d2fb629..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c83dce8cc496b6ec8773483df1c85119 kdenetwork-3.5.0.tar.bz2 7452959
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1
deleted file mode 100644
index f57ac6b88848..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02ced8c14c80f28635056488949d56d7 kdenetwork-3.5.1.tar.bz2 7464777
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1
deleted file mode 100644
index 96a5bc218b79..000000000000
--- a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-RMD160 6f3271dd50f4bebf1784c3822cab91a6b41d6fb6 kdenetwork-3.5.1.tar.bz2 7464777
-SHA256 4067db7d60927c309cfd268609d5a638c67786da6c573bb32a5af18c3939c725 kdenetwork-3.5.1.tar.bz2 7464777
-MD5 02ced8c14c80f28635056488949d56d7 kdenetwork-3.5.1.tar.bz2 7464777
diff --git a/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch b/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch
deleted file mode 100644
index 9aee13aa697d..000000000000
--- a/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: kopete/protocols/msn/incomingtransfer.cpp
-===================================================================
---- kopete/protocols/msn/incomingtransfer.cpp	(revision 516055)
-+++ kopete/protocols/msn/incomingtransfer.cpp	(revision 516056)
-@@ -256,19 +256,26 @@
- 			{
- 				// NOTE The sending client can ask for a direct connections
- 				// if one was established before.
--				QFile *destionation = new QFile(m_transfer->destinationURL().path());
--				if(!destionation->open(IO_WriteOnly))
-+				if(!m_file)
- 				{
--					if(m_transfer){
--						m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
--						m_transfer = 0l;
-+					QFile *destionation = new QFile(m_transfer->destinationURL().path());
-+					if(!destionation->open(IO_WriteOnly))
-+					{
-+						if(m_transfer){
-+							m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing"));
-+							m_transfer = 0l;
-+						}
-+						
-+						error();
-+						return;
- 					}
--					
--					error();
--					return;
-+				
-+					m_file = destionation;
- 				}
--			
--				m_file = destionation;
-+				else
-+				{
-+					// TODO
-+				}
- 			}
- 			
- 			m_state = DataTransfer;
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild
deleted file mode 100644
index 291ab2c33d94..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild,v 1.3 2005/12/17 20:44:24 corsair Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget..."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="rdesktop sametime slp ssl wifi xmms"
-
-DEPEND="~kde-base/kdebase-${PV}
-	dev-libs/libxslt
-	dev-libs/libxml2
-	net-dns/libidn
-	>=dev-libs/glib-2
-	sametime? ( =net-libs/meanwhile-0.4* )
-	slp? ( net-libs/openslp )
-	wifi? ( net-wireless/wireless-tools )
-	xmms? ( media-sound/xmms )"
-# glib: for webcam support in Kopete.
-
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
-	dev-lang/perl
-	ssl? ( app-crypt/qca-tls
-	       dev-perl/IO-Socket-SSL )"
-# perl: for KSirc.
-# qca-tls: for Kopete jabber plugin.
-# IO-Socket-SSL: for SSL support in KSirc.
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
-	${FILESDIR}/lisa-3.5.0-bindnow.patch"
-
-src_compile() {
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	local myconf="--with-libidn
-	              $(use_enable sametime sametime-plugin)
-	              $(use_enable slp) $(use_with wifi)
-	              $(use_with xmms) --without-external-libgadu"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod u+s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	dodir /etc
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
-	exeinto /etc/init.d
-	doexe ${T}/lisa ${T}/reslisa
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
deleted file mode 100644
index 095699a3c531..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild,v 1.4 2006/03/25 05:33:42 agriffis Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget..."
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="rdesktop sametime slp ssl wifi xmms"
-
-BOTH_DEPEND="~kde-base/kdebase-${PV}
-	dev-libs/libxslt
-	dev-libs/libxml2
-	net-dns/libidn
-	>=dev-libs/glib-2
-	app-crypt/qca
-	sametime? ( =net-libs/meanwhile-0.4* )
-	xmms? ( media-sound/xmms )
-	slp? ( net-libs/openslp )
-	wifi? ( net-wireless/wireless-tools )
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		) virtual/x11 )
-	kernel_linux? ( virtual/opengl )"
-
-RDEPEND="${BOTH_DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
-	dev-lang/perl
-	ssl? ( dev-perl/IO-Socket-SSL
-		app-crypt/qca-tls )"
-
-DEPEND="${BOTH_DEPEND}
-	kernel_linux? ( virtual/os-headers )
-	|| ( (
-			x11-proto/videoproto
-			x11-proto/xextproto
-			x11-proto/xproto
-			kernel_linux? ( x11-libs/libXv )
-			x11-proto/scrnsaverproto
-		) virtual/x11 )
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
-	${FILESDIR}/lisa-3.5.0-bindnow.patch
-	${FILESDIR}/kopete-3.5.x-msn-filetransfer.patch"
-
-src_compile() {
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	local myconf="--with-libidn
-	              $(use_enable sametime sametime-plugin)
-	              $(use_enable slp) $(use_with wifi)
-	              $(use_with xmms) --without-external-libgadu"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod u+s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	dodir /etc
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
-	exeinto /etc/init.d
-	doexe ${T}/lisa ${T}/reslisa
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/lisa.conf lisa
-	newins ${FILESDIR}/reslisa.conf reslisa
-}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.1.ebuild
deleted file mode 100644
index 2cd3766513b6..000000000000
--- a/kde-base/kdenetwork/kdenetwork-3.5.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.1.ebuild,v 1.1 2006/01/28 14:38:40 danarmak Exp $
-
-inherit kde-dist eutils flag-o-matic
-
-DESCRIPTION="KDE network apps: kopete, kppp, kget..."
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="rdesktop sametime slp ssl wifi xmms"
-
-DEPEND="~kde-base/kdebase-${PV}
-	dev-libs/libxslt
-	dev-libs/libxml2
-	net-dns/libidn
-	>=dev-libs/glib-2
-	sametime? ( =net-libs/meanwhile-0.4* )
-	slp? ( net-libs/openslp )
-	wifi? ( net-wireless/wireless-tools )
-	xmms? ( media-sound/xmms )"
-# glib: for webcam support in Kopete.
-
-RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
-	dev-lang/perl
-	ssl? ( app-crypt/qca-tls
-	       dev-perl/IO-Socket-SSL )"
-# perl: for KSirc.
-# qca-tls: for Kopete jabber plugin.
-# IO-Socket-SSL: for SSL support in KSirc.
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig"
-
-PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch
-	${FILESDIR}/lisa-3.5.0-bindnow.patch"
-
-src_compile() {
-	export BINDNOW_FLAGS="$(bindnow-flags)"
-
-	local myconf="--with-libidn
-	              $(use_enable sametime sametime-plugin)
-	              $(use_enable slp) $(use_with wifi)
-	              $(use_with xmms) --without-external-libgadu"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	chmod u+s ${D}/${KDEDIR}/bin/reslisa
-
-	# empty config file needed for lisa to work with default settings
-	dodir /etc
-	touch ${D}/etc/lisarc
-
-	# lisa, reslisa initscripts
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
-	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
-	exeinto /etc/init.d
-	doexe ${T}/lisa ${T}/reslisa
-
-	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 3392eb1462e2..bee0a05c596c 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.196 2006/04/03 22:50:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.197 2006/04/05 23:01:12 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdepim-3.5.0-kmail-branch.patch, -kdepim-3.5.0.ebuild,
+  -kdepim-3.5.0-r3.ebuild, -kdepim-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   03 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdepim-3.4.3.ebuild:
   Mark 3.4.3 stable on ia64
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.0 b/kde-base/kdepim/files/digest-kdepim-3.5.0
deleted file mode 100644
index 8cfd9db2e7e4..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 12865623
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.0-r3 b/kde-base/kdepim/files/digest-kdepim-3.5.0-r3
deleted file mode 100644
index 8cfd9db2e7e4..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.5.0-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e19a2a40e422ecd483884ce6e9ac8925 kdepim-3.5.0.tar.bz2 12865623
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.1 b/kde-base/kdepim/files/digest-kdepim-3.5.1
deleted file mode 100644
index 2bfcb8caf853..000000000000
--- a/kde-base/kdepim/files/digest-kdepim-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e87c9cbe1f0c0f983f94d804a5bc8f9 kdepim-3.5.1.tar.bz2 12885355
diff --git a/kde-base/kdepim/files/kdepim-3.5.0-kmail-branch.patch b/kde-base/kdepim/files/kdepim-3.5.0-kmail-branch.patch
deleted file mode 100644
index 88d6aaa49f40..000000000000
--- a/kde-base/kdepim/files/kdepim-3.5.0-kmail-branch.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -Nur kdepim-3.5.0.orig/kmail/actionscheduler.cpp kdepim-3.5.0/kmail/actionscheduler.cpp
---- kdepim-3.5.0.orig/kmail/actionscheduler.cpp	2005-09-10 10:24:02.000000000 +0200
-+++ kdepim-3.5.0/kmail/actionscheduler.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -570,7 +570,7 @@
-        (!mAccount ||
- 	(mAccount && (*mFilterIt).applyOnAccount(mAccountId)))) ||
-       ((mSet & KMFilterMgr::Explicit) && (*mFilterIt).applyOnExplicit())) {
--      
-+
-       // filter is applicable
-     if ( FilterLog::instance()->isLogging() ) {
-       QString logText( i18n( "<b>Evaluating filter rules:</b> " ) );
-@@ -646,8 +646,11 @@
-   if (!orgMsg || !orgMsg->parent()) {
-     // Original message is gone, no point filtering it anymore
-     mSrcFolder->removeMsg( mSrcFolder->find( msg ) );
-+    kdDebug(5006) << "The original serial number is missing. "
-+                  << "Cannot complete the filtering." << endl;
-     mExecutingLock = false;
-     processMessageTimer->start( 0, true );
-+    return;
-   } else {
-     if (!folder) // no filter folder specified leave in current place
-       folder = orgMsg->parent();
-@@ -659,7 +662,7 @@
-   mSrcFolder->addMsg( msg );
-   mIgnore = false;
- 
--  if (msg && kmkernel->folderIsTrash( folder ))
-+  if (msg && folder && kmkernel->folderIsTrash( folder ))
-     KMFilterAction::sendMDN( msg, KMime::MDN::Deleted );
- 
-   timeOutTime = QTime::currentTime();
-@@ -722,8 +725,6 @@
- 
- void ActionScheduler::copyMessageFinished( KMCommand *command )
- {
--  // FIXME remove the debug output
--  kdDebug(5006) << "##### ActionScheduler::copyMessageFinished( KMCommand *command )" << endl;
-   if ( command->result() != KMCommand::OK )
-     actionMessage( KMFilterAction::ErrorButGoOn );
-   else 
-@@ -803,4 +804,11 @@
-     return sEnabled;
- }
- 
-+bool ActionScheduler::ignoreChanges( bool ignore )
-+{
-+  bool oldValue = mIgnore;
-+  mIgnore = ignore;
-+  return oldValue;
-+}
-+
- #include "actionscheduler.moc"
-diff -Nur kdepim-3.5.0.orig/kmail/actionscheduler.h kdepim-3.5.0/kmail/actionscheduler.h
---- kdepim-3.5.0.orig/kmail/actionscheduler.h	2005-09-10 10:24:02.000000000 +0200
-+++ kdepim-3.5.0/kmail/actionscheduler.h	2005-12-07 23:34:28.000000000 +0100
-@@ -77,10 +77,10 @@
-    of messages left to process is empty */
-   void setFilterList( QValueList<KMFilter*> filters );
- 
--  /* Set the id of the account associated with this scheduler */
-+  /** Set the id of the account associated with this scheduler */
-   void setAccountId( uint id  ) { mAccountId = id; mAccount = true; }
- 
--  /* Clear the id of the account associated with this scheduler */
-+  /** Clear the id of the account associated with this scheduler */
-   void clearAccountId() { mAccountId = 0; mAccount = false; }
- 
-   /** Queue a message for filtering */
-@@ -88,9 +88,16 @@
-   void execFilters(const QPtrList<KMMsgBase> msgList);
-   void execFilters(KMMsgBase* msgBase);
-   void execFilters(Q_UINT32 serNum);
-+
-   static QString debug();
-   static bool isEnabled();
- 
-+  /** Allow or deny manipulations on the message to be filtered.
-+      This is needed when using pipe-through filters, because the
-+      changes made by the filter have to be written back.
-+      The old value before applying the new value is returned. */
-+  bool ignoreChanges( bool ignore );
-+
- signals:
-   /** Emitted when filtering is completed */
-   void result(ReturnCode);
-diff -Nur kdepim-3.5.0.orig/kmail/kmcommands.cpp kdepim-3.5.0/kmail/kmcommands.cpp
---- kdepim-3.5.0.orig/kmail/kmcommands.cpp	2005-10-10 17:02:11.000000000 +0200
-+++ kdepim-3.5.0/kmail/kmcommands.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -1464,15 +1464,20 @@
- 
- KMCommand::Result KMFilterActionCommand::execute()
- {
-+  KCursorSaver busy( KBusyPtr::busy() );
-   QPtrList<KMMessage> msgList = retrievedMsgs();
- 
-   for (KMMessage *msg = msgList.first(); msg; msg = msgList.next())
-     if( msg->parent() )
-       kmkernel->filterMgr()->tempOpenFolder(msg->parent());
- 
-+  int counter = 0;
-   for (KMMessage *msg = msgList.first(); msg; msg = msgList.next()) {
-     msg->setTransferInProgress(false);
- 
-+    if ( !( ++counter % 20 ) )
-+      KApplication::kApplication()->processEvents( 50 );
-+
-     int filterResult = kmkernel->filterMgr()->process(msg, mFilter);
-     if (filterResult == 2) {
-       // something went horribly wrong (out of space?)
-@@ -1496,30 +1501,30 @@
- 
- void KMMetaFilterActionCommand::start()
- {
--#if 0 // use action scheduler
--  KMFilterMgr::FilterSet set = KMFilterMgr::All;
--  QPtrList<KMFilter> filters;
--  filters.append( mFilter );
--  ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
--  scheduler->setAlwaysMatch( true );
--  scheduler->setAutoDestruct( true );
--
--  int contentX, contentY;
--  HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
--  QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
--  mHeaders->finalizeMove( nextItem, contentX, contentY );
--
--
--  for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
--    scheduler->execFilters( msg );
--#else
--  KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
--  *mHeaders->selectedMsgs(), mFilter);
--  filterCommand->start();
--  int contentX, contentY;
--  HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
--  mHeaders->finalizeMove( item, contentX, contentY );
--#endif
-+  if (ActionScheduler::isEnabled() ) {
-+    // use action scheduler
-+    KMFilterMgr::FilterSet set = KMFilterMgr::All;
-+    QValueList<KMFilter*> filters;
-+    filters.append( mFilter );
-+    ActionScheduler *scheduler = new ActionScheduler( set, filters, mHeaders );
-+    scheduler->setAlwaysMatch( true );
-+    scheduler->setAutoDestruct( true );
-+
-+    int contentX, contentY;
-+    HeaderItem *nextItem = mHeaders->prepareMove( &contentX, &contentY );
-+    QPtrList<KMMsgBase> msgList = *mHeaders->selectedMsgs(true);
-+    mHeaders->finalizeMove( nextItem, contentX, contentY );
-+
-+    for (KMMsgBase *msg = msgList.first(); msg; msg = msgList.next())
-+      scheduler->execFilters( msg );
-+  } else {
-+    KMCommand *filterCommand = new KMFilterActionCommand( mMainWidget,
-+    *mHeaders->selectedMsgs(), mFilter);
-+    filterCommand->start();
-+    int contentX, contentY;
-+    HeaderItem *item = mHeaders->prepareMove( &contentX, &contentY );
-+    mHeaders->finalizeMove( item, contentX, contentY );
-+  }
- }
- 
- FolderShortcutCommand::FolderShortcutCommand( KMMainWidget *mainwidget,
-diff -Nur kdepim-3.5.0.orig/kmail/kmfilteraction.cpp kdepim-3.5.0/kmail/kmfilteraction.cpp
---- kdepim-3.5.0.orig/kmail/kmfilteraction.cpp	2005-09-10 10:24:02.000000000 +0200
-+++ kdepim-3.5.0/kmail/kmfilteraction.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -1617,6 +1617,9 @@
-       FILE *p;
-       QByteArray ba;
- 
-+      // backup the serial number in case the header gets lost
-+      QString origSerNum = mMsg->headerField( "X-KMail-Filtered" );
-+
-       p = popen(QFile::encodeName(mCmd), "r");
-       int len =100;
-       char buffer[100];
-@@ -1630,7 +1633,20 @@
-       pclose(p);
-       if ( !ba.isEmpty() ) {
-         KPIM::ThreadWeaver::debug (1, "PipeJob::run: %s", QString(ba).latin1() );
-+        KMFolder *filterFolder =  mMsg->parent();
-+        ActionScheduler *handler = MessageProperty::filterHandler( mMsg->getMsgSerNum() );
-+
-         mMsg->fromByteArray( ba );
-+        if ( !origSerNum.isEmpty() )
-+          mMsg->setHeaderField( "X-KMail-Filtered", origSerNum );
-+        if ( filterFolder && handler ) {
-+          bool oldStatus = handler->ignoreChanges( true );
-+          filterFolder->take( filterFolder->find( mMsg ) );
-+          filterFolder->addMsg( mMsg );
-+          handler->ignoreChanges( oldStatus );
-+        } else {
-+          kdDebug(5006) << "Warning: Cannot refresh the message from the external filter." << endl;
-+        }
-       }
- 
-       KPIM::ThreadWeaver::debug (1, "PipeJob::run: done.\n" );
-diff -Nur kdepim-3.5.0.orig/kmail/kmfolder.cpp kdepim-3.5.0/kmail/kmfolder.cpp
---- kdepim-3.5.0.orig/kmail/kmfolder.cpp	2005-11-19 11:56:46.000000000 +0100
-+++ kdepim-3.5.0/kmail/kmfolder.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -263,8 +263,13 @@
-     }
-   }
- 
--  mChild = new KMFolderDir( this, parent(), childName,
--    (folderType() == KMFolderTypeImap) ? KMImapDir : KMStandardDir);
-+  KMFolderDirType newType = KMStandardDir;
-+  if( folderType() == KMFolderTypeCachedImap )
-+    newType = KMDImapDir;
-+  else if( folderType() == KMFolderTypeImap )
-+    newType = KMImapDir;
-+
-+  mChild = new KMFolderDir( this, parent(), childName, newType );
-   if( !mChild )
-     return 0;
-   mChild->reload();
-diff -Nur kdepim-3.5.0.orig/kmail/kmheaders.cpp kdepim-3.5.0/kmail/kmheaders.cpp
---- kdepim-3.5.0.orig/kmail/kmheaders.cpp	2005-10-10 17:02:11.000000000 +0200
-+++ kdepim-3.5.0/kmail/kmheaders.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -1339,7 +1339,11 @@
-     CREATE_TIMER(filter);
-     START_TIMER(filter);
- 
-+    KCursorSaver busy( KBusyPtr::busy() );
-+    int counter = 0;
-     for (KMMsgBase* msgBase=msgList->first(); msgBase; msgBase=msgList->next()) {
-+      if ( !( ++counter % 20 ) )
-+        KApplication::kApplication()->processEvents( 50 );
-       int idx = msgBase->parent()->find(msgBase);
-       assert(idx != -1);
-       KMMessage * msg = msgBase->parent()->getMsg(idx);
-diff -Nur kdepim-3.5.0.orig/kmail/kmkernel.cpp kdepim-3.5.0/kmail/kmkernel.cpp
---- kdepim-3.5.0.orig/kmail/kmkernel.cpp	2005-11-08 23:33:29.000000000 +0100
-+++ kdepim-3.5.0/kmail/kmkernel.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -1432,11 +1432,11 @@
-   the_msgIndex = 0;
- #endif
- 
--#if 0
-+//#if 0
-   the_weaver =  new KPIM::ThreadWeaver::Weaver( this );
-   the_weaverLogger = new KPIM::ThreadWeaver::WeaverThreadLogger(this);
-   the_weaverLogger->attach (the_weaver);
--#endif
-+//#endif
- 
-   connect( the_folderMgr, SIGNAL( folderRemoved(KMFolder*) ),
-            this, SIGNAL( folderRemoved(KMFolder*) ) );
-diff -Nur kdepim-3.5.0.orig/kmail/kmmainwidget.cpp kdepim-3.5.0/kmail/kmmainwidget.cpp
---- kdepim-3.5.0.orig/kmail/kmmainwidget.cpp	2005-10-10 17:02:11.000000000 +0200
-+++ kdepim-3.5.0/kmail/kmmainwidget.cpp	2005-12-07 23:34:28.000000000 +0100
-@@ -1644,11 +1644,11 @@
- {
-   if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online ) {
-     // if online; then toggle and set it offline.
--    actionCollection()->action( "online_status" )->setText( i18n("Network State (online)") );
-+    actionCollection()->action( "online_status" )->setText( i18n("Go Online") );
-     kmkernel->stopNetworkJobs();
-     BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be offline; all network jobs are suspended"));
-   } else {
--    actionCollection()->action( "online_status" )->setText( i18n("Network State (offline)") );
-+    actionCollection()->action( "online_status" )->setText( i18n("Go Offline") );
-     kmkernel->resumeNetworkJobs();
-     BroadcastStatus::instance()->setStatusMsg( i18n("KMail is set to be online; all network jobs resumed"));
-   }
-@@ -3000,9 +3000,9 @@
-     actionCollection()->action( "send_queued" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
-     actionCollection()->action( "send_queued_via" )->setEnabled( kmkernel->outboxFolder()->count() > 0 );
-     if ( GlobalSettings::self()->networkState() == GlobalSettings::EnumNetworkState::Online )
--      actionCollection()->action( "online_status" )->setText( i18n("Network State (offline)") );
-+      actionCollection()->action( "online_status" )->setText( i18n("Go Offline") );
-     else
--      actionCollection()->action( "online_status" )->setText( i18n("Network State (online)") );
-+      actionCollection()->action( "online_status" )->setText( i18n("Go Online") );
-     if (action( "edit_undo" ))
-       action( "edit_undo" )->setEnabled( mHeaders->canUndo() );
- 
-@@ -3311,6 +3311,7 @@
-       if(!addedSeparator) {
-         mApplyFilterActionsMenu->popupMenu()->insertSeparator();
-         addedSeparator = !addedSeparator;
-+	mFilterMenuActions.append( new KActionSeparator());
-       }
-       filterAction->plug( mApplyFilterActionsMenu->popupMenu() );
-       mFilterMenuActions.append(filterAction);
diff --git a/kde-base/kdepim/kdepim-3.5.0-r3.ebuild b/kde-base/kdepim/kdepim-3.5.0-r3.ebuild
deleted file mode 100644
index c4a9edbb679d..000000000000
--- a/kde-base/kdepim/kdepim-3.5.0-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0-r3.ebuild,v 1.2 2005/12/17 20:45:42 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt gnokii pda"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=dev-libs/cyrus-sasl-2
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix crash when applying filters (kde bug 113730). applied for 3.5.1.
-	epatch "${FILESDIR}/${P}-kmail-branch.patch"
-}
-
-src_compile() {
-	local myconf="--with-sasl $(use_with gnokii)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdepim/kdepim-3.5.0.ebuild b/kde-base/kdepim/kdepim-3.5.0.ebuild
deleted file mode 100644
index b6a2c5598721..000000000000
--- a/kde-base/kdepim/kdepim-3.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0.ebuild,v 1.3 2005/12/04 23:39:34 vapier Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="crypt gnokii pda"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=dev-libs/cyrus-sasl-2
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_compile() {
-	local myconf="--with-sasl $(use_with gnokii)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdepim/kdepim-3.5.1.ebuild b/kde-base/kdepim/kdepim-3.5.1.ebuild
deleted file mode 100644
index 48273aaf7a3c..000000000000
--- a/kde-base/kdepim/kdepim-3.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.1.ebuild,v 1.2 2006/02/14 19:40:55 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt gnokii pda"
-
-DEPEND="~kde-base/kdebase-${PV}
-	>=dev-libs/cyrus-sasl-2
-	pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
-
-src_compile() {
-	local myconf="--with-sasl $(use_with gnokii)"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index 2ae2cc9f0d24..3b03681ad6ee 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdesdk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.114 2006/03/25 19:57:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.115 2006/04/05 23:01:50 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdesdk-3.5.0.ebuild,
+  -kdesdk-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
 *kdesdk-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index 46e23d0461de..789c34051fb4 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -1,6 +1,6 @@
-MD5 b10a1aae506ffd3821f6258febb6e9d1 ChangeLog 14856
-RMD160 93baaf5e1a7ce84504f545ceea0b9255137beb68 ChangeLog 14856
-SHA256 b39d2053fe83fb4ed33de8012e14182694de3a846a189e8a434724dc8f7f7196 ChangeLog 14856
+MD5 54de8c9401cafb33518791786146662e ChangeLog 15001
+RMD160 f305773edc79cd9adfbece96b2086be6a0748305 ChangeLog 15001
+SHA256 6c6905c6f052651cbb1ceaf1e4c9b4a5f0d7c04e120452d9ff8bd8f0cc62f211 ChangeLog 15001
 MD5 05b78a43919e346c710b79326bac8ad5 files/digest-kdesdk-3.3.2 66
 RMD160 dc529cbe00051a1c8b1e5b36cea41adfad892482 files/digest-kdesdk-3.3.2 66
 SHA256 08c1ec822d3774ba3f3824baadb4a8e6d6a0b19da4e719ad2216daee6d6fd29f files/digest-kdesdk-3.3.2 66
@@ -13,12 +13,6 @@ SHA256 7513ad88973a1794da64335d70b02ab648eb48c2aeb33bd6be81b8b96fad1414 files/di
 MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kdesdk-3.4.3 66
 RMD160 f98c638a74524f4ba73ec5e5b6937e006f0eac58 files/digest-kdesdk-3.4.3 66
 SHA256 afdef23e83c0fedba0db5fbd5dc71a68a84f831545b9e4aa504279d91b2e4780 files/digest-kdesdk-3.4.3 66
-MD5 1e423fe06c976614875c91024253a35c files/digest-kdesdk-3.5.0 66
-RMD160 0f688457c3ce31725bc9e7dacd02fc00b522d5ba files/digest-kdesdk-3.5.0 66
-SHA256 68c3f0a231df037d9f160ef681108bd3667c570c618c70c218c18be641c7e3de files/digest-kdesdk-3.5.0 66
-MD5 37b63842d3bb2d884b13ebf46628a792 files/digest-kdesdk-3.5.1 66
-RMD160 4a4f776257134dc5753f59936f47f0a5c89ead63 files/digest-kdesdk-3.5.1 66
-SHA256 c55dc0a628300f22699d6bed9ebcd180dec8d93221eadc66b964184b1e09ca50 files/digest-kdesdk-3.5.1 66
 MD5 735367f045761a378c59b0aedd04892c files/digest-kdesdk-3.5.2 244
 RMD160 6b0561e97b2c584c31c601eabe995ca3348f8a85 files/digest-kdesdk-3.5.2 244
 SHA256 85ed46a0b0c32506130eea2adbd51b3c866bbe3002ac4dcf21bbdb652ef26707 files/digest-kdesdk-3.5.2 244
@@ -37,12 +31,6 @@ SHA256 e554f853b01336cb91ed98893c45890f6827034af17ea3320a8105fb797af22c kdesdk-3
 MD5 95517709776adda367c02b8d630fd84c kdesdk-3.4.3.ebuild 1285
 RMD160 7acb9ca4790ea025171dd6a8d267c38770c5d133 kdesdk-3.4.3.ebuild 1285
 SHA256 33e2ae438bcb328c9c9943efe781730588085d78412274d6b7efc53e8cbe8746 kdesdk-3.4.3.ebuild 1285
-MD5 c2d9dccd8686d511fc997c52bb385f5e kdesdk-3.5.0.ebuild 1095
-RMD160 ed4a972b48eaa7922c126faf1c1fac3492debd0d kdesdk-3.5.0.ebuild 1095
-SHA256 9bcfa471ff0b06f2275d1037c61fad0a1acdd61504fc1b743a21d91b5869312b kdesdk-3.5.0.ebuild 1095
-MD5 ab7fba74bef0f16723ba99ae063984a0 kdesdk-3.5.1.ebuild 1095
-RMD160 dba293938585695fb7b7c0e86d7a14a7ee5a23b0 kdesdk-3.5.1.ebuild 1095
-SHA256 6f80739e9d08d028df6d585fe4c3fa4585767438c21213a0a563a3dca76a4e3f kdesdk-3.5.1.ebuild 1095
 MD5 174755951fd3217aa0a6d7f67cf2d4ec kdesdk-3.5.2.ebuild 1094
 RMD160 ad53c3762dd1cd0ad686554abe5b6ed41c10a15d kdesdk-3.5.2.ebuild 1094
 SHA256 ccbadcb5f7a9f2f35b232cf4a15f52014638cb081a5191be01dd5956f3ecc12b kdesdk-3.5.2.ebuild 1094
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5.0 b/kde-base/kdesdk/files/digest-kdesdk-3.5.0
deleted file mode 100644
index a452be27a394..000000000000
--- a/kde-base/kdesdk/files/digest-kdesdk-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc91ffcfa8114cf4f9d40bc9ffe47d97 kdesdk-3.5.0.tar.bz2 4832117
diff --git a/kde-base/kdesdk/files/digest-kdesdk-3.5.1 b/kde-base/kdesdk/files/digest-kdesdk-3.5.1
deleted file mode 100644
index 7079e5ca456d..000000000000
--- a/kde-base/kdesdk/files/digest-kdesdk-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93199b8bf5793681fdb2e5cbcfcfbd93 kdesdk-3.5.1.tar.bz2 4972114
diff --git a/kde-base/kdesdk/kdesdk-3.5.0.ebuild b/kde-base/kdesdk/kdesdk-3.5.0.ebuild
deleted file mode 100644
index f0edb4497d8e..000000000000
--- a/kde-base/kdesdk/kdesdk-3.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.0.ebuild,v 1.3 2006/02/16 09:32:23 flameeyes Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
-
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="berkdb subversion"
-
-DEPEND="x86? ( dev-util/callgrind )
-	subversion? ( dev-util/subversion )
-	berkdb? ( || ( =sys-libs/db-4.3*
-	               =sys-libs/db-4.2* ) )"
-
-RDEPEND="${DEPEND}
-	dev-util/cvs
-	media-gfx/graphviz"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_compile() {
-	local myconf="$(use_with subversion)"
-
-	if use berkdb; then
-		if has_version "=sys-libs/db-4.3*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
-			        --with-db-include-dir=/usr/include/db4.3"
-		elif has_version "=sys-libs/db-4.2*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
-			        --with-db-include-dir=/usr/include/db4.2"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	kde_src_compile
-}
diff --git a/kde-base/kdesdk/kdesdk-3.5.1.ebuild b/kde-base/kdesdk/kdesdk-3.5.1.ebuild
deleted file mode 100644
index c3750311bb81..000000000000
--- a/kde-base/kdesdk/kdesdk-3.5.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.1.ebuild,v 1.2 2006/02/16 09:32:23 flameeyes Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
-
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="berkdb subversion"
-
-DEPEND="x86? ( dev-util/callgrind )
-	subversion? ( dev-util/subversion )
-	berkdb? ( || ( =sys-libs/db-4.3*
-	               =sys-libs/db-4.2* ) )"
-
-RDEPEND="${DEPEND}
-	dev-util/cvs
-	media-gfx/graphviz"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-src_compile() {
-	local myconf="$(use_with subversion)"
-
-	if use berkdb; then
-		if has_version "=sys-libs/db-4.3*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
-			        --with-db-include-dir=/usr/include/db4.3"
-		elif has_version "=sys-libs/db-4.2*"; then
-			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
-			        --with-db-include-dir=/usr/include/db4.2"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	kde_src_compile
-}
diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog
index ce64cc384ef8..20552cf9af6a 100644
--- a/kde-base/kdetoys/ChangeLog
+++ b/kde-base/kdetoys/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdetoys
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.140 2006/03/25 19:51:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.141 2006/04/05 23:02:27 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> -kdetoys-3.5.0.ebuild,
+  -kdetoys-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
 *kdetoys-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.5.0 b/kde-base/kdetoys/files/digest-kdetoys-3.5.0
deleted file mode 100644
index 297689810e22..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aebe4a9586728b37543bd515d35e76e1 kdetoys-3.5.0.tar.bz2 3172108
diff --git a/kde-base/kdetoys/files/digest-kdetoys-3.5.1 b/kde-base/kdetoys/files/digest-kdetoys-3.5.1
deleted file mode 100644
index d2aa8e79b926..000000000000
--- a/kde-base/kdetoys/files/digest-kdetoys-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d98d4f30a8aa6d43b0af06421d4d6586 kdetoys-3.5.1.tar.bz2 3173620
diff --git a/kde-base/kdetoys/kdetoys-3.5.0.ebuild b/kde-base/kdetoys/kdetoys-3.5.0.ebuild
deleted file mode 100644
index 947fd6efe8b3..000000000000
--- a/kde-base/kdetoys/kdetoys-3.5.0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.0.ebuild,v 1.2 2005/12/17 20:47:35 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.5.1.ebuild b/kde-base/kdetoys/kdetoys-3.5.1.ebuild
deleted file mode 100644
index 52f5babf2d70..000000000000
--- a/kde-base/kdetoys/kdetoys-3.5.1.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.1.ebuild,v 1.1 2006/01/28 14:42:07 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE toys"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 5d71048829bd..776b644330c5 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.156 2006/04/04 01:33:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.157 2006/04/05 23:03:14 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/superkaramba-3.5.0-fbsd.patch, -kdeutils-3.5.0.ebuild,
+  -kdeutils-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.3-r1.ebuild:
   Mark 3.4.3-r1 stable on ia64
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.0 b/kde-base/kdeutils/files/digest-kdeutils-3.5.0
deleted file mode 100644
index 45ccee2adb7a..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6b2cbe8b7d15166eff261f20ece2718 kdeutils-3.5.0.tar.bz2 2958132
diff --git a/kde-base/kdeutils/files/digest-kdeutils-3.5.1 b/kde-base/kdeutils/files/digest-kdeutils-3.5.1
deleted file mode 100644
index 237ef72bc94c..000000000000
--- a/kde-base/kdeutils/files/digest-kdeutils-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1286c6a09b04452adfe492de2fad79bd kdeutils-3.5.1.tar.bz2 2974660
diff --git a/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch b/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch
deleted file mode 100644
index 4528b7fa6fe7..000000000000
--- a/kde-base/kdeutils/files/superkaramba-3.5.0-fbsd.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Index: superkaramba/src/memsensor.cpp
-===================================================================
---- superkaramba/src/memsensor.cpp	(revision 487000)
-+++ superkaramba/src/memsensor.cpp	(revision 487001)
-@@ -14,7 +14,7 @@
- #include <qstring.h>
- #include <qregexp.h>
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-@@ -32,14 +32,14 @@
- #include <sys/swap.h>
- #endif
- 
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
- /* define pagetok in terms of pageshift */
- #define pagetok(size) ((size) << pageshift)
- #endif
- 
- MemSensor::MemSensor(int msec) : Sensor(msec)
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-    /* get the page size with "getpagesize" and calculate pageshift from it */
-     int pagesize = getpagesize();
-     pageshift = 0;
-@@ -51,7 +51,7 @@
- 
-     /* we only need the amount of log(2)1024 for our conversion */
-     pageshift -= 10;
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     connect(&ksp, SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,SLOT(receivedStdout(KProcess *, char *, int )));
-     connect(&ksp, SIGNAL(processExited(KProcess *)),
-@@ -62,7 +62,7 @@
-     MaxSet = false;
- 
-     readValues();
--# elif defined __FreeBSD__
-+# elif defined Q_OS_FREEBSD
-     kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open");
- # endif
- #else
-@@ -73,7 +73,7 @@
- MemSensor::~MemSensor()
- {}
- 
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- void MemSensor::receivedStdout(KProcess *, char *buffer, int len )
- {
-     buffer[len] = 0;
-@@ -87,7 +87,7 @@
- 
- void MemSensor::processExited(KProcess *)
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     QStringList stringList = QStringList::split('\n',sensorResult);
-     sensorResult = "";
-     QStringList itemsList = QStringList::split(' ', stringList[1]);
-@@ -99,7 +99,7 @@
- 
- int MemSensor::getMemTotal()
- {
--#if defined __FreeBSD || defined(Q_OS_NETBSD)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -114,7 +114,7 @@
- 
- int MemSensor::getMemFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -138,7 +138,7 @@
- 
- int MemSensor::getBuffers()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -159,7 +159,7 @@
- 
- int MemSensor::getCached()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
-     static int mem = 0;
-     size_t size = sizeof(mem);
- 
-@@ -179,7 +179,7 @@
- 
- int MemSensor::getSwapTotal()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal);
- # else
-@@ -221,7 +221,7 @@
- 
- int MemSensor::getSwapFree()
- {
--#ifdef __FreeBSD__
-+#ifdef Q_OS_FREEBSD
- # if __FreeBSD_version < 500018
-     return(swapTotal - swapUsed);
- # else
-@@ -266,8 +266,8 @@
- 
- void MemSensor::readValues()
- {
--#if defined __FreeBSD__ || defined(Q_OS_NETBSD)
--# if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if defined Q_OS_FREEBSD || defined(Q_OS_NETBSD)
-+# if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     ksp.clearArguments();
-     ksp << "swapinfo";
-     ksp.start( KProcess::NotifyOnExit,KProcIO::Stdout);
-@@ -291,7 +291,7 @@
-     SensorParams *sp;
-     Meter *meter;
-     QObjectListIt it( *objList );
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     bool set = false;
- #endif
-     int totalMem = getMemTotal();
-@@ -303,7 +303,7 @@
-     while (it != 0)
-     {
-         sp = (SensorParams*)(*it);
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-         if ( (!MaxSet) && (totalSwap > 0) ) {
-            setMaxValue(sp);
-            bool set = true;
-@@ -331,7 +331,7 @@
-         meter->setValue(format);
-         ++it;
-     }
--#if (defined(__FreeBSD__) && __FreeBSD_version < 500018)
-+#if (defined(Q_OS_FREEBSD) && __FreeBSD_version < 500018)
-     if (set)
-         MaxSet = true;
- #endif
diff --git a/kde-base/kdeutils/kdeutils-3.5.0.ebuild b/kde-base/kdeutils/kdeutils-3.5.0.ebuild
deleted file mode 100644
index 64e3d8e7aebd..000000000000
--- a/kde-base/kdeutils/kdeutils-3.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0.ebuild,v 1.3 2005/12/17 20:49:02 corsair Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt snmp pbbuttonsd xmms"
-
-DEPEND="~kde-base/kdebase-${PV}
-	snmp? ( net-analyzer/net-snmp )
-	pbbuttonsd? ( app-laptop/pbbuttonsd )
-	dev-lang/python
-	xmms? ( media-sound/xmms )
-	dev-libs/gmp"
-
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/gnupg )
-	!x11-misc/superkaramba"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix output of klaptopdaemon (kde bug 103437).
-	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
-
-	# Fix memory calculations for FreeBSD systems
-	epatch "${FILESDIR}/superkaramba-3.5.0-fbsd.patch"
-}
-
-src_compile() {
-	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
-	              $(use_with xmms)"
-
-	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdeutils/kdeutils-3.5.1.ebuild b/kde-base/kdeutils/kdeutils-3.5.1.ebuild
deleted file mode 100644
index cb5805e6a291..000000000000
--- a/kde-base/kdeutils/kdeutils-3.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.1.ebuild,v 1.4 2006/03/25 04:01:13 agriffis Exp $
-
-inherit kde-dist eutils
-
-DESCRIPTION="KDE utilities"
-
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt snmp pbbuttonsd xmms"
-
-BOTH_DEPEND="~kde-base/kdebase-${PV}
-	snmp? ( net-analyzer/net-snmp )
-	pbbuttonsd? ( app-laptop/pbbuttonsd )
-	dev-lang/python
-	xmms? ( media-sound/xmms )
-	dev-libs/gmp
-	|| ( x11-libs/libXtst virtual/x11 )"
-
-RDEPEND="${BOTH_DEPEND}
-	crypt? ( app-crypt/gnupg )
-	!x11-misc/superkaramba"
-
-DEPEND="${BOTH_DEPEND}
-	|| ( (
-			x11-libs/libX11
-			x11-proto/xextproto
-			x11-proto/xproto
-		) virtual/x11 )
-	virtual/os-headers"
-
-src_unpack() {
-	kde_src_unpack
-
-	# Fix output of klaptopdaemon (kde bug 103437).
-	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
-}
-
-src_compile() {
-	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
-	              $(use_with xmms)"
-
-	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
-
-	kde_src_compile
-}
diff --git a/kde-base/kdewebdev/ChangeLog b/kde-base/kdewebdev/ChangeLog
index 8a5cb1c34af5..25ee042b3471 100644
--- a/kde-base/kdewebdev/ChangeLog
+++ b/kde-base/kdewebdev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdewebdev
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.96 2006/03/25 19:54:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.97 2006/04/05 23:03:53 flameeyes Exp $
+
+  05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -kdewebdev-3.5.0.ebuild, -kdewebdev-3.5.1.ebuild:
+  Remove 3.5.0 and 3.5.1 monolithic ebuilds.
 
 *kdewebdev-3.5.2 (25 Mar 2006)
 
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.5.0 b/kde-base/kdewebdev/files/digest-kdewebdev-3.5.0
deleted file mode 100644
index b701cc05ce4a..000000000000
--- a/kde-base/kdewebdev/files/digest-kdewebdev-3.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 58bb4d025fa125c5ad0dc43769ba9786 kdewebdev-3.5.0.tar.bz2 6021886
diff --git a/kde-base/kdewebdev/files/digest-kdewebdev-3.5.1 b/kde-base/kdewebdev/files/digest-kdewebdev-3.5.1
deleted file mode 100644
index e611c6970cfe..000000000000
--- a/kde-base/kdewebdev/files/digest-kdewebdev-3.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0faea4e8088005ae60f58b21c60b32ea kdewebdev-3.5.1.tar.bz2 6025620
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild
deleted file mode 100644
index 424f5378718e..000000000000
--- a/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild,v 1.2 2005/12/17 20:49:52 corsair Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE web development - Quanta"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc tidy"
-
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2"
-
-RDEPEND="${DEPEND}
-	tidy? ( app-text/htmltidy )
-	doc? ( app-doc/quanta-docs )"
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.1.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.1.ebuild
deleted file mode 100644
index 36c44cdbfbe8..000000000000
--- a/kde-base/kdewebdev/kdewebdev-3.5.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.1.ebuild,v 1.1 2006/01/28 14:44:40 danarmak Exp $
-
-inherit kde-dist
-
-DESCRIPTION="KDE web development - Quanta"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc tidy"
-
-DEPEND="dev-libs/libxslt
-	dev-libs/libxml2"
-
-RDEPEND="${DEPEND}
-	tidy? ( app-text/htmltidy )
-	doc? ( app-doc/quanta-docs )"