From: Ingmar Vanhassel <ingmar@gentoo.org>
Date: Tue, 19 Feb 2008 00:03:17 +0000 (+0000)
Subject: Remove monolithic KDE 4.0, bug 209586.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=65a7153e04758d12e9abb97c315b2cfe601caf51;p=gentoo.git

Remove monolithic KDE 4.0, bug 209586.
Package-Manager: portage-2.1.4.4
---

diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index f780325eb162..ee4474cf5cc5 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kde
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.196 2008/02/18 13:13:05 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.197 2008/02/19 00:03:17 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kde-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kde-3.5.5.ebuild,
   -kde-3.5.6.ebuild, -kde-3.5.7.ebuild:
diff --git a/kde-base/kde/kde-4.0.0.ebuild b/kde-base/kde/kde-4.0.0.ebuild
deleted file mode 100644
index 261802fb1570..000000000000
--- a/kde-base/kde/kde-4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-4.0.0.ebuild,v 1.2 2008/01/18 13:46:03 ingmar Exp $
-
-EAPI="1"
-
-DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
-HOMEPAGE="http://www.kde.org/"
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="kde-4"
-IUSE="accessibility"
-
-# excluded: kdebindings, kdesdk, kdevelop, since these are developer-only packages
-# excluded: kde-base/kdepim since this wasn't released with KDE 4.0.0
-RDEPEND="
-	~kde-base/kdelibs-${PV}:${SLOT}
-	~kde-base/kdepimlibs-${PV}:${SLOT}
-	~kde-base/kdebase-${PV}:${SLOT}
-	~kde-base/kdeadmin-${PV}:${SLOT}
-	~kde-base/kdeartwork-${PV}:${SLOT}
-	~kde-base/kdeedu-${PV}:${SLOT}
-	~kde-base/kdegames-${PV}:${SLOT}
-	~kde-base/kdegraphics-${PV}:${SLOT}
-	~kde-base/kdemultimedia-${PV}:${SLOT}
-	~kde-base/kdenetwork-${PV}:${SLOT}
-	~kde-base/kdetoys-${PV}:${SLOT}
-	~kde-base/kdeutils-${PV}:${SLOT}
-	accessibility? ( ~kde-base/kdeaccessibility-${PV}:${SLOT} )"
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index c62502a3ae48..cff0d4053246 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeadmin
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.208 2008/02/18 13:09:42 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.209 2008/02/19 00:00:30 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/lilo-config-4.0.0.patch, -kdeadmin-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdeadmin-3.5.5.ebuild,
   -kdeadmin-3.5.6.ebuild, -kdeadmin-3.5.7.ebuild:
diff --git a/kde-base/kdeadmin/files/lilo-config-4.0.0.patch b/kde-base/kdeadmin/files/lilo-config-4.0.0.patch
deleted file mode 100644
index 7f17fc048cda..000000000000
--- a/kde-base/kdeadmin/files/lilo-config-4.0.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur kdeadmin-3.96.0/doc/CMakeLists.txt /kdeadmin-3.96.0/doc/CMakeLists.txt
---- kdeadmin-3.96.0/doc/CMakeLists.txt	2007-06-27 12:51:13.000000000 +0200
-+++ /kdeadmin-3.96.0/doc/CMakeLists.txt	2007-11-22 11:34:12.000000000 +0100
-@@ -2,7 +2,7 @@
- #add_subdirectory(kdat)
- #add_subdirectory(ksysv)
- 
--FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO  PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo  )
-+SET(LILO_EXECUTABLE ALWAYS_ON)
- 
- if ( UNIX )
-   add_subdirectory(kuser)
-diff -ur kdeadmin-3.96.0/lilo-config/CMakeLists.txt /kdeadmin-3.96.0/lilo-config/CMakeLists.txt
---- kdeadmin-3.96.0/lilo-config/CMakeLists.txt	2006-10-26 04:22:38.000000000 +0200
-+++ /kdeadmin-3.96.0/lilo-config/CMakeLists.txt	2007-11-22 11:34:08.000000000 +0100
-@@ -1,6 +1,6 @@
- project(lilo-config)
- 
--FIND_PROGRAM(LILO_EXECUTABLE NAMES lilo LILO  PATHS /sbin /usr/sbin /usr/local/sbin /opt/lilo  )
-+SET(LILO_EXECUTABLE ALWAYS_ON)
- 
- if(LILO_EXECUTABLE)
- 	ADD_DEFINITIONS(-DUSE_KDE ) # added manually
diff --git a/kde-base/kdeadmin/kdeadmin-4.0.0.ebuild b/kde-base/kdeadmin/kdeadmin-4.0.0.ebuild
deleted file mode 100644
index 229d591af40d..000000000000
--- a/kde-base/kdeadmin/kdeadmin-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-4.0.0.ebuild,v 1.1 2008/01/17 23:39:55 philantrop Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE admin module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook lilo"
-LICENSE="GPL-2 LGPL-2"
-
-RDEPEND="virtual/cron
-	|| ( >=kde-base/kdebase-${PV}:${SLOT} >=kde-base/knotify-${PV}:${SLOT} )"
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		-DBUILD_lilo-config=$(use lilo && echo TRUE || echo FALSE)
-		-DLILO_EXECUTABLE=TRUE"
-
-	kde4-base_src_compile
-}
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index f55e4a4165d5..89cf0c2e6eb4 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.431 2008/02/18 15:47:11 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.432 2008/02/19 00:02:00 ingmar Exp $
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdm-4.0.0-genkdmconf.patch, -files/kdebase-4.0.0-opengl.patch,
+  -files/kdebase-4.0.0-pam-optional.patch, -kdebase-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdebase-3.5.8-r6.ebuild:
   Don't use bindnow-flags. Bug 210583.
diff --git a/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch b/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch
deleted file mode 100644
index 76d5c4ed6439..000000000000
--- a/kde-base/kdebase/files/kdebase-4.0.0-opengl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- workspace/CMakeLists.txt    (revision 767202)
-+++ workspace/CMakeLists.txt    (working copy)
-@@ -16,8 +16,6 @@
- include (MacroLibrary)
- include (KDE4Defaults)
-
--macro_optional_find_package(OpenGL)
--
- include(ConfigureChecks.cmake)
- configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
---- workspace/kcontrol/screensaver/CMakeLists.txt       (revision 766878)
-+++ workspace/kcontrol/screensaver/CMakeLists.txt       (working copy)
-@@ -1,5 +1,7 @@
-
-+if(WITH_OpenGL)
- check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
-+endif(WITH_OpenGL)
- configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
-
- add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
---- workspace/krunner/lock/CMakeLists.txt       (revision 766878)
-+++ workspace/krunner/lock/CMakeLists.txt       (working copy)
-@@ -5,7 +5,9 @@
- ########### next target ###############
-
- check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
-+if(WITH_OpenGL)
- check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
-+endif(WITH_OpenGL)
-
- configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
-
diff --git a/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch
deleted file mode 100644
index 6fb54f05c547..000000000000
--- a/kde-base/kdebase/files/kdebase-4.0.0-pam-optional.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
-index 3499836..cd1c2bb 100644
---- a/kdebase/workspace/cmake/modules/FindPAM.cmake
-+++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
-@@ -5,6 +5,8 @@
- #  PAM_INCLUDE_DIR - the pam include directory
- #  PAM_LIBRARIES - libpam library
- 
-+if (WITH_PAM)
-+
- if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
- 	# Already in cache, be silent
- 	set(PAM_FIND_QUIETLY TRUE)
-@@ -72,3 +74,5 @@ else (PAM_FOUND)
- endif (PAM_FOUND)
- 
- mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
-+
-+endif (WITH_PAM)
-diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-index ed8ab9e..ce3bcc2 100644
---- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
-+++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
-@@ -1,4 +1,4 @@
--find_package(PAM)
-+macro_optional_find_package(PAM)
- 
- set(UNIXAUTH_LIBRARIES)
- set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch b/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch
deleted file mode 100644
index 0cdb0faf852f..000000000000
--- a/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-    Added a patch to KDE/kdebase/workspace/kdm/kfrontend/genkdmconf.c, to NOT create directories.
----
- kdebase/workspace/kdm/kfrontend/genkdmconf.c |   31 --------------------------
- 1 files changed, 0 insertions(+), 31 deletions(-)
-
-diff --git a/kdebase/workspace/kdm/kfrontend/genkdmconf.c b/kdebase/workspace/kdm/kfrontend/genkdmconf.c
-index 2d8343d..20aaf8f 100644
---- a/kdebase/workspace/kdm/kfrontend/genkdmconf.c
-+++ b/kdebase/workspace/kdm/kfrontend/genkdmconf.c
-@@ -266,43 +266,12 @@ isTrue( const char *val )
- static int
- mkpdirs( const char *name, const char *what )
- {
--	char *mfname = mstrdup( name );
--	int i;
--	struct stat st;
--
--	for (i = 1; mfname[i]; i++)
--		if (mfname[i] == '/') {
--			mfname[i] = 0;
--			if (stat( mfname, &st )) {
--				if (mkdir( mfname, 0755 )) {
--					fprintf( stderr, "Cannot create parent %s of %s directory %s: %s\n",
--					         mfname, what, name, strerror( errno ) );
--					free( mfname );
--					return False;
--				}
--				chmod( mfname, 0755 );
--			}
--			mfname[i] = '/';
--		}
--	free( mfname );
- 	return True;
- }
- 
- static int
- mkdirp( const char *name, int mode, const char *what, int existok )
- {
--	struct stat st;
--
--	if (stat( name, &st )) {
--		mkpdirs( name, what );
--		if (mkdir( name, mode )) {
--			fprintf( stderr, "Cannot create %s directory %s: %s\n",
--			         what, name, strerror( errno ) );
--			return False;
--		}
--		chmod( name, mode );
--		return True;
--	}
- 	return existok;
- }
- 
diff --git a/kde-base/kdebase/kdebase-4.0.0.ebuild b/kde-base/kdebase/kdebase-4.0.0.ebuild
deleted file mode 100644
index bb46dfe63eb9..000000000000
--- a/kde-base/kdebase/kdebase-4.0.0.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.6 2008/02/01 05:54:19 zlin Exp $
-
-EAPI="1"
-
-inherit multilib kde4-base
-
-DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
-HOMEPAGE="http://www.kde.org/"
-URI="${SRC_URI}"
-SRC_URI="${URI} ${URI/${PN}/${PN}-runtime} ${URI/${PN}/${PN}-workspace}"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="3dnow altivec bluetooth +bzip2 captury debug ieee1394 htmlhandbook kerberos
-lm_sensors mmx networkmanager pam openexr opengl samba sse sse2
-ssl test +usb +xcb xcomposite +xine xinerama"
-
-LICENSE="GPL-2 LGPL-2"
-RESTRICT="test"
-
-COMMONDEPEND="
-	!kde-base/kdebase-runtime
-	!kde-base/kdebase-workspace
-	>=app-misc/strigi-0.5.7
-	dev-cpp/clucene
-	>=dev-libs/cyrus-sasl-2
-	>=dev-libs/glib-2
-	>=dev-libs/soprano-2.0.0
-	>=kde-base/qimageblitz-0.0.4
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/libpng
-	>=sys-apps/dbus-1.0.2
-	>=sys-apps/hal-0.5.9
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/libxklavier-3.2
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	bzip2? ( app-arch/bzip2 )
-	bluetooth? ( net-wireless/bluez-libs )
-	captury? ( media-libs/libcaptury )
-	ieee1394? ( sys-libs/libraw1394 )
-	kerberos? ( virtual/krb5 )
-	lm_sensors? ( sys-apps/lm_sensors )
-	networkmanager? ( =net-misc/networkmanager-0.6* )
-	samba? ( >=net-fs/samba-3.0.1 )
-	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	opengl? ( virtual/glu virtual/opengl )
-	pam? ( >=kde-base/kdebase-pam-7
-		sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	usb? ( >=dev-libs/libusb-0.1.10a )
-	xcomposite? ( x11-libs/libXcomposite )
-	xine? ( >=media-libs/xine-lib-1.1.9
-		xcb? ( x11-libs/libxcb ) )
-	xinerama? ( x11-libs/libXinerama )
-"
-
-DEPEND="${COMMONDEPEND}
-	x11-apps/bdftopcf
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/xextproto
-	x11-proto/xf86miscproto
-	xcomposite? ( x11-proto/compositeproto
-		x11-proto/damageproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	sys-apps/usbutils
-	sys-devel/gdb
-	>=www-misc/htdig-3.2.0_beta6-r1
-	x11-apps/mkfontdir
-	x11-apps/setxkbmap
-	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage
-	x11-apps/xprop
-	>=x11-apps/xrandr-1.2.1
-	x11-apps/xset
-	x11-apps/xsetroot
-	|| ( x11-misc/xkeyboard-config
-		x11-misc/xkbdata )
-	virtual/ssh
-	kernel_linux? (
-		|| ( >=sys-apps/eject-2.1.5
-			sys-block/unieject ) )
-"
-
-PDEPEND="
-	|| ( kde-base/kdeartwork-iconthemes:${SLOT}
-		kde-base/kdeartwork:${SLOT} )"
-
-#IUSE="xscreensaver"
-#
-#COMMONDEPEND="
-#	xscreensaver? ( x11-libs/libXScrnSaver )
-#"
-#DEPEND="${COMMONDEPEND}
-#	x11-apps/xhost
-#	xscreensaver? ( x11-proto/scrnsaverproto )"
-
-PATCHES="${FILESDIR}/gentoo-startkde.patch
-	${FILESDIR}/kdm-${PV}-genkdmconf.patch
-	${FILESDIR}/${P}-pam-optional.patch
-	${FILESDIR}/${P}-opengl.patch"
-
-pkg_setup() {
-	KDE4_BUILT_WITH_USE_CHECK="--missing false kde-base/kdelibs:${SLOT} alsa semantic-desktop
-		app-misc/strigi dbus qt4"
-	if use xine && use xcb; then
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			media-libs/xine-lib xcb"
-	else
-		ewarn "You will _NOT_ have multimedia support unless you enable USE=\"xcb xine\""
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	mv "${WORKDIR}/${PN}-runtime-${PV}" "${S}/runtime"
-	mv "${WORKDIR}/${PN}-workspace-${PV}" "${S}/workspace"
-
-	kde4-base_src_unpack
-}
-
-src_compile() {
-	if ! use captury; then
-		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
-			-i "${S}"/workspace/kwin/effects/CMakeLists.txt || \
-			die "Making captury optional failed."
-	fi
-
-	# Patch the startkde script to setup the environment for KDE 4.0
-	# Add our KDEDIR
-	sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
-		-i "${S}/workspace/startkde.cmake" || die "Sed for PREFIX failed."
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	# Complete LDPATH
-	sed -e "s#@REPLACE_LIBS@#${_libdirs}#" \
-		-i "${S}/workspace/startkde.cmake" || die "Sed for LDPATH failed."
-
-	# Upstream moved kdesu to libexec first, then decided to move it back
-	# to /${PREFIX}/bin/ , so I'm doing that now already.
-	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
-		-i "${S}"/runtime/kdesu/kdesu/CMakeLists.txt || \
-		die "Moving kdesu from libexec to bin failed."
-
-	mycmakeargs="${mycmakeargs}
-		-DWITH_LibXKlavier=ON -DWITH_GLIB2=ON -DWITH_GObject=ON
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
-		$(cmake-utils_use_with bluetooth BlueZ)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with ieee1394 RAW1394)
-		$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
-		$(cmake-utils_use_with lm_sensors Sensors)
-		$(cmake-utils_use_with networkmanager NetworkManager)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pam PAM)
-		$(cmake-utils_use_with samba Samba)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with usb USB)
-		$(cmake-utils_use_with xcomposite X11_Xcomposite)
-		$(cmake-utils_use_with xine Xine)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	"
-	if use xine; then
-		mycmakeargs="${mycmakeargs}
-			$(cmake-utils_use_with xcb XCB)"
-		use xcb || mycmakeargs="${mycmakeargs} -DKDE4_DISABLE_MULTIMEDIA=ON"
-	fi
-
-	# FIXME: there's no Xscreensaver argument at the moment
-	# FIXME There are more flags which currently aren't managed:
-	# KDE4_KDM_XCONSOLE -> Build KDM with built-in xconsole - Default OFF
-	# KDE4_KERBEROS4 ->  Compile KDM with Kerberos v4 support - Default OFF
-	#
-	# KDE4_KRB5AUTH -> Use Sun's secure RPC for Xauth cookies in KDM (? -
-	# probably an error in cmake help) - Default OFF
-	#
-	# KDE4_RPCAUTH ->  Use Sun's secure RPC for Xauth cookies in KDM - Default
-	# OFF
-	#
-	# KDE4_XDMCP ->  Build KDM with XDMCP support - Default ON
-	#
-	# KONSOLE_GENERATE_LINEFONT -> Konsole: regenerate linefont file - Default
-	# OFF
-	# WITH_XKB -> Enable/Disable building of Konsole with support for XKB
-
-	kde4-base_src_compile
-}
-
-src_test() {
-	sed -i -e "/testkioarchive/s/^#DONOTTEST /" \
-		"${S}"/runtime/kioslave/archive/tests/CMakeLists.txt
-	sed -i -e "/testtrash/s/^#DONOTTEST /" \
-		"${S}"/runtime/kioslave/trash/tests/CMakeLists.txt
-	sed -i -e "/kurifiltertest/s/^#DONOTTEST /" \
-		"${S}"/runtime/kurifilter-plugins/tests/CMakeLists.txt
-	sed -e "/konqpopupmenutest/s/^/#DONOTTEST /" \
-		-i "${S}"/apps/lib/konq/tests/CMakeLists.txt
-	sed -e '/guitest/s/^/#DONOTTEST/' \
-		-i "${S}"/workspace/libs/ksysguard/tests/CMakeLists.txt
-	sed -e "s/packagestructuretest//" \
-		-i "${S}"/workspace/libs/plasma/tests/CMakeLists.txt
-
-	kde4-base_src_test
-}
-
-src_install() {
-	# This needs to be removed because it simply doesn't work and either
-	# causes a sandbox violation or just does nothing.
-	sed -i -e "/exec_program/d" "${S}"/workspace/kdm/kfrontend/CMakeLists.txt
-
-	kde4-base_src_install
-
-	dodir "${PREFIX}"/share/config/kdm
-	fperms 755 "${PREFIX}"/share/config/kdm
-	# We need to generate the kdm configuration here because it won't work
-	# in any other way.
-	"${WORKDIR}"/${PN}_build/workspace/kdm/kfrontend/genkdmconf --in "${D}/${PREFIX}/share/config/kdm" \
-		--no-in-notice --face-src "${S}"/kdm/kfrontend/pics --no-old --no-backup
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
-		"${D}"/${PREFIX}/share/config/kdm/kdmrc || \
-		die "Failed to set SessionsDirs correctly."
-
-	# 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}/${SLOT}"
-	#!/bin/sh
-	exec ${KDEDIR}/bin/startkde
-	EOF
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${SLOT}"
-
-	# freedesktop compliant session script
-	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=${SLOT}:" \
-		"${S}/workspace/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${SLOT}.desktop"
-	insinto /usr/share/xsessions
-	doins "${T}/${SLOT}.desktop"
-}
-
-pkg_postinst() {
-	kde4-base_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
-	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
-	elog "edit ${KDEDIR}/env/agent-startup.sh and"
-	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
-	echo
-	elog "If you can't open new konqueror windows and get something like"
-	elog "'WARNING: Outdated database found' when starting konqueror in a console, run"
-	elog "kbuildsycoca as the user you're running KDE under."
-	elog "This is NOT a bug."
-	echo
-	elog "To use Java on webpages: emerge >=virtual/jre-1.4"
-	echo
-}
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 68f3b503679c..5009df51371c 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.234 2008/02/18 13:10:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.235 2008/02/18 23:56:05 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kstars-4.0.0-destdir.patch, -files/marble-4.0.0-fix-tests.patch,
+  -files/kdeedu-4.0.0-opengl.patch, -kdeedu-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdeedu-3.5.5.ebuild,
   -kdeedu-3.5.6.ebuild, -kdeedu-3.5.7.ebuild:
diff --git a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch b/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
deleted file mode 100644
index 0ca889f566e9..000000000000
--- a/kde-base/kdeedu/files/kdeedu-4.0.0-opengl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: kalgebra/src/CMakeLists.txt
-===================================================================
---- kalgebra/src/CMakeLists.txt	(revision 767350)
-+++ kalgebra/src/CMakeLists.txt	(working copy)
-@@ -24,7 +24,6 @@
- 	functionedit.cpp
- 	varedit.cpp
- 	main.cpp
--	graph3d.cpp
- 	algebrahighlighter.cpp
- 	expressionedit.cpp
- 	graph2d.cpp
-@@ -33,6 +32,10 @@
- 	functionimpl.cpp
- )
- 
-+if(OPENGL_FOUND)
-+   set(kalgebra_SRCS ${kalgebra_SRCS} graph3d.cpp)
-+endif(OPENGL_FOUND)
-+
- kde4_add_library(analitza ${analitza_SRCS})
- target_link_libraries(analitza ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KDECORE_LIBS})
- 
diff --git a/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch b/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch
deleted file mode 100644
index 4cf63b5f89db..000000000000
--- a/kde-base/kdeedu/files/kstars-4.0.0-destdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- kstars/kstars/indi/CMakeLists.txt
-+++ kstars/kstars/indi/CMakeLists.txt
-@@ -213,10 +213,10 @@
- #TODO fix for windows.
- if(UNIX)
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake 
--"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200classic)\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200autostar)\n 
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200_16)\n
--exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic ${BIN_INSTALL_DIR}/indi_lx200gps)\n
-+"exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200classic\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200autostar\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200_16\")\n
-+exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${BIN_INSTALL_DIR}/indi_lx200generic \"$ENV{D}/${BIN_INSTALL_DIR}/indi_lx200gps\")\n
- ")
- set_target_properties(indi_lx200generic PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_lx200generic_symlink.cmake)
- endif(UNIX)
diff --git a/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch b/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch
deleted file mode 100644
index 50b3df636cad..000000000000
--- a/kde-base/kdeedu/files/marble-4.0.0-fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- marble/tests/CMakeLists.txt
-+++ marble/tests/CMakeLists.txt
-@@ -9,7 +9,9 @@
- # source dirs
-   ${CMAKE_CURRENT_SOURCE_DIR}/../src
-   ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
-+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/AbstractLayer
-+  ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/geodata/data
- # include dirs
-   ${QT_INCLUDE_DIR}
-   )
- ADD_DEFINITIONS(-DTEST_DATA_DIR="\\"${TEST_DATA_DIR}\\"")
diff --git a/kde-base/kdeedu/kdeedu-4.0.0.ebuild b/kde-base/kdeedu/kdeedu-4.0.0.ebuild
deleted file mode 100644
index 922585355de5..000000000000
--- a/kde-base/kdeedu/kdeedu-4.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-4.0.0.ebuild,v 1.4 2008/01/27 23:02:56 zlin Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE education module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook cviewer opengl readline solver kig-scripting fits
-nova sbig usb designer-plugin gps"
-
-LICENSE="GPL-2 LGPL-2"
-
-RESTRICT="test"
-
-COMMONDEPEND="
-	gps? ( sci-geosciences/gpsd )
-	fits? ( sci-libs/cfitsio )
-	nova? ( >=sci-libs/libnova-0.12.1 )
-	sbig? ( sci-libs/indilib
-		usb? ( dev-libs/libusb ) )
-	cviewer? ( >=dev-cpp/eigen-1.0.5
-		>=sci-chemistry/openbabel-2.1
-		virtual/opengl )
-	solver? ( dev-ml/facile )
-	opengl? ( virtual/opengl )
-	readline? ( sys-libs/readline )
-	kig-scripting? ( >=dev-libs/boost-1.32 )"
-DEPEND="${COMMONDEPEND}"
-RDEPEND="${COMMONDEPEND}
-	|| ( ( >=kde-base/knotify-${PV}:${SLOT} >=kde-base/phonon-${PV}:${SLOT} )
-		>=kde-base/kdebase-${PV}:${SLOT} )"
-
-PATCHES="${FILESDIR}/kstars-4.0.0-destdir.patch
-		${FILESDIR}/marble-4.0.0-fix-tests.patch
-		${FILESDIR}/${P}-opengl.patch"
-
-pkg_setup() {
-	use cviewer && QT4_BUILT_WITH_USE_CHECK="${QT4_BUILT_WITH_USE_CHECK} opengl"
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	# Either of these needs OpenGL support, but using cmake-utils_use_with
-	# and appending that to $mycmakeargs would let them override each other.
-	if use cviewer || use opengl; then
-		mycmakeargs="${mycmakeargs}
-			-DWITH_OpenGL=ON"
-	else
-		mycmakeargs="${mycmakeargs}
-			-DWITH_OpenGL=OFF"
-	fi
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with readline Readline)
-		$(cmake-utils_use_with cviewer Eigen)
-		$(cmake-utils_use_with cviewer OpenBabel2)
-		$(cmake-utils_use_with solver OCaml)
-		$(cmake-utils_use_with solver Libfacile)
-		$(cmake-utils_use_with kig-scripting BoostPython)
-		$(cmake-utils_use_with fits CFitsio)
-		$(cmake-utils_use_with nova Nova)
-		$(cmake-utils_use_with sbig SBIG)
-		$(cmake-utils_use_with usb USB)
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)"
-
-	if use gps; then
-		mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1"
-	else
-		sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \
-			marble/Findlibgps.cmake || die "sed failed."
-	fi
-
-	kde4-base_src_compile
-}
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index a94d9f863305..eaba1e546045 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegames
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.202 2008/02/18 13:10:45 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.203 2008/02/18 23:56:23 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/lskat-4.0.0-link.patch, -kdegames-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdegames-3.5.5.ebuild,
   -kdegames-3.5.6.ebuild, -kdegames-3.5.7.ebuild:
diff --git a/kde-base/kdegames/files/lskat-4.0.0-link.patch b/kde-base/kdegames/files/lskat-4.0.0-link.patch
deleted file mode 100644
index 283dd68d87fe..000000000000
--- a/kde-base/kdegames/files/lskat-4.0.0-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kdegames/lskat/src/CMakeLists.txt
-+++ b/kdegames/lskat/src/CMakeLists.txt
-@@ -31,7 +31,8 @@ configure_file(config-src.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-src.h)
- kde4_add_app_icon(lskat_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-lskat.png")
- kde4_add_executable( lskat ${lskat_SRCS} )
- 
--target_link_libraries( lskat kdegames )
-+target_link_libraries( lskat ${KDE4_KNEWSTUFF2_LIBS}
-+		kdegames )
-
- install(TARGETS lskat  DESTINATION  ${BIN_INSTALL_DIR} )
diff --git a/kde-base/kdegames/kdegames-4.0.0.ebuild b/kde-base/kdegames/kdegames-4.0.0.ebuild
deleted file mode 100644
index fb6f83f32f12..000000000000
--- a/kde-base/kdegames/kdegames-4.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-4.0.0.ebuild,v 1.3 2008/01/27 21:41:36 zlin Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE games module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook opengl"
-LICENSE="GPL-2 LGPL-2"
-
-DEPEND="opengl? ( virtual/opengl )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-PATCHES="${FILESDIR}/lskat-4.0.0-link.patch"
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with opengl OpenGL)"
-
-	kde4-base_src_compile
-}
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index a9f589fe342f..2854478b2f6c 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.335 2008/02/18 13:11:06 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.336 2008/02/18 23:57:29 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -kdegraphics-4.0.0.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -kdegraphics-3.5.5.ebuild, -kdegraphics-3.5.5-r1.ebuild,
diff --git a/kde-base/kdegraphics/kdegraphics-4.0.0.ebuild b/kde-base/kdegraphics/kdegraphics-4.0.0.ebuild
deleted file mode 100644
index 9dd358427f10..000000000000
--- a/kde-base/kdegraphics/kdegraphics-4.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-4.0.0.ebuild,v 1.2 2008/01/18 03:07:23 mr_bones_ Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE graphics module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="debug htmlhandbook chm jpeg djvu pdf tiff"
-LICENSE="GPL-2 LGPL-2"
-
-#RESTRICT="test"
-
-DEPEND="media-gfx/exiv2
-	media-libs/libgphoto2
-	x11-apps/xgamma
-	x11-libs/libXxf86vm
-	x11-proto/xf86vidmodeproto
-	media-gfx/sane-backends
-	media-libs/freetype
-	virtual/ghostscript
-	jpeg? ( media-libs/jpeg )
-	chm? ( app-doc/chmlib )
-	djvu? ( >=app-text/djvu-3.5.17 )
-	pdf? ( >=app-text/poppler-0.5.4
-		>=app-text/poppler-bindings-0.5.4 )
-	tiff? ( media-libs/tiff )
-	kde-base/qimageblitz"
-
-pkg_setup() {
-	if use pdf; then
-		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
-			app-text/poppler-bindings qt4"
-	fi
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with chm CHM)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff TIFF)"
-
-	kde4-base_src_compile
-}
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index fbf70bcb6e63..2997581f5dd4 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.267 2008/02/18 13:11:26 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.268 2008/02/18 23:57:27 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdemultimedia-4.0.0-flac-1.1.3.patch,
+  -kdemultimedia-4.0.0-r1.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -kdemultimedia-3.5.5.ebuild, -kdemultimedia-3.5.6.ebuild,
diff --git a/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch b/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch
deleted file mode 100644
index 98df4cf05ec6..000000000000
--- a/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp
-===================================================================
---- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 749997)
-+++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (working copy)
-@@ -48,7 +48,16 @@ public:
-     unsigned long data;
- };
- 
--static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
-+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder,
-+                                                    const FLAC__byte buffer[],
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+                                                    unsigned bytes,
-+#else
-+                                                    size_t bytes,
-+#endif
-+                                                    unsigned samples,
-+                                                    unsigned current_frame,
-+                                                    void *client_data)
- {
-     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
- 
-@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim
- long EncoderFLAC::readInit(long size) {
-     kDebug(7117) << "EncoderFLAC::readInit() called";
-     d->data = 0;
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
-     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
-     FLAC__stream_encoder_set_client_data(d->encoder, d);
-+#endif
- 
-     // The options match approximely those of flac compression-level-3
-     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
-@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) {
-     if (size > 0)
-         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
- 
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-     FLAC__stream_encoder_init(d->encoder);
-+#else
-+    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
-+#endif
-     return d->data;
- }
- 
diff --git a/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild
deleted file mode 100644
index 169083d28267..000000000000
--- a/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild,v 1.1 2008/01/28 01:53:36 zlin Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE multimedia module"
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug encode htmlhandbook flac musicbrainz tunepimp vorbis"
-LICENSE="GPL-2 LGPL-2"
-
-RESTRICT="test"
-
-DEPEND=">=kde-base/kdebase-${PV}:${SLOT}
-	media-libs/taglib
-	media-sound/cdparanoia
-	alsa? ( media-libs/alsa-lib )
-	encode? ( flac? ( >=media-libs/flac-1.1.2
-		>=kde-base/kdelibs-4.0.0-r1:kde-4 )
-		vorbis? ( media-libs/libvorbis ) )
-	musicbrainz? ( media-libs/musicbrainz )
-	tunepimp? ( media-libs/tunepimp )"
-
-PATCHES="${FILESDIR}/${P}-flac-1.1.3.patch"
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with alsa Alsa)
-		$(cmake-utils_use_enable musicbrainz MusicBrainz)
-		$(cmake-utils_use_with tunepimp TunePimp)"
-
-	if use encode; then
-		mycmakeargs="${mycmakeargs}
-			$(cmake-utils_use_with flac Flac)"
-			$(cmake-utils_use_with vorbis OggVorbis)
-	else
-		mycmakeargs="${mycmakeargs}
-			-DWITH_OggVorbis=OFF -DWITH_Flac=OFF"
-	fi
-
-	kde4-base_src_compile
-}
-
-pkg_postinst() {
-	if use encode; then
-		echo
-		elog "In order to use the lame plugin to encode mp3 files you will need to"
-		elog "install media-sound/lame"
-		echo
-	fi
-}
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index bc0d3eac39d2..acee22aaba4a 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.289 2008/02/18 15:46:07 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.290 2008/02/18 23:58:35 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -kdenetwork-4.0.0-r1.ebuild:
+  Remove monolithic KDE 4.0, bug 209586.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdenetwork-3.5.8.ebuild:
   Don't use bindnow-flags. Bug 210583.
diff --git a/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild b/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild
deleted file mode 100644
index c912229b7e68..000000000000
--- a/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild,v 1.2 2008/01/28 09:49:39 ingmar Exp $
-
-EAPI="1"
-
-inherit kde4-base
-
-DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="+addbookmarks +alias +autoreplace bindist +contactnotes debug gadu groupwise
-+highlight +history htmlhandbook +jabber jpeg latex +msn +nowlistening oscar
-+plasma ppp +privacy qq slp sms ssl +statistics testbed +texteffect +translator
-+urlpicpreview vnc +webpresence winpopup yahoo zeroconf"
-# telepathy is broken
-LICENSE="GPL-2 LGPL-2"
-RESTRICT="test"
-
-# TODO: SMPPPD = (SuSE Meta PPP Daemon). No ebuild known.
-# FIXME: x11-proto/xf86vidmodeproto is in fact an optional dep,
-# but without a cmake switch. Hard dep for now, no clue what it enables though.
-
-# IUSE="jingle -meanwhile messenger"
-#		jingle and irc are disabled in the package
-#		meanwhile hasn't been ported to kde4 yet
-#		messenger is the new msn support protocol (it's not ready yet)
-
-COMMONDEPEND="
-	dev-libs/libpcre
-	kde-base/qimageblitz
-	x11-libs/libXScrnSaver
-	gadu? ( dev-libs/openssl )
-	groupwise? ( app-crypt/qca:2 )
-	jabber? ( net-dns/libidn app-crypt/qca:2 )
-	jpeg? ( media-libs/jpeg )
-	plasma? ( || ( kde-base/kdebase:${SLOT}
-			kde-base/plasma:${SLOT} ) )
-
-	slp? ( net-libs/openslp x11-libs/libXdamage )
-	statistics? ( dev-db/sqlite:3 )
-	vnc? ( >=net-libs/libvncserver-0.9 )
-	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
-	zeroconf? ( || ( net-dns/avahi bindist? ( net-misc/mDNSResponder ) ) )
-"
-#	telepathy? ( net-libs/decibel )
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/scrnsaverproto"
-
-RDEPEND="${COMMON_DEPEND}
-	ppp? ( net-dialup/ppp )
-	ssl? ( dev-perl/IO-Socket-SSL )
-"
-
-pkg_setup() {
-	if use zeroconf && has_version net-dns/avahi; then
-		KDE4_BUILT_WITH_USE_CHECK="
-			${KDE4_BUILT_WITH_USE_CHECK} net-dns/avahi mdnsresponder-compat"
-	fi
-
-	kde4-base_pkg_setup
-}
-
-src_compile() {
-	# Translated Category fields cause protocols not appearing, bug 206877.
-	sed -e '/X-KDE-PluginInfo-Category\[.*/d' \
-		-i "${S}"/kopete/protocols/*/kopete_*.desktop || die "Sed failed."
-
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	fi
-
-	# kdenetwork looks for 'xmms' which isn't in the official portage tree.
-	# I've disabled this check to prevent linking to user-installed things.
-	mycmakeargs="${mycmakeargs}
-		-DWITH_telepathy=OFF
-		-DWITH_Xmms=OFF
-		$(cmake-utils_use_with addbookmarks)
-		$(cmake-utils_use_with alias)
-		$(cmake-utils_use_with autoreplace)
-		$(cmake-utils_use_with contactnotes)
-		$(cmake-utils_use_with gadu OPENSSL)
-		$(cmake-utils_use_with groupwise)
-		$(cmake-utils_use_with groupwise QCA2)
-		$(cmake-utils_use_with highlight)
-		$(cmake-utils_use_with history)
-		$(cmake-utils_use_with jabber IDN)
-		$(cmake-utils_use_with jabber QCA2)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with latex)
-		$(cmake-utils_use_with msn)
-		$(cmake-utils_use_with plasma Plasma)
-		$(cmake-utils_use_with nowlistening)
-		$(cmake-utils_use_with oscar)
-		$(use ppp && echo -DBUILD_kppp=TRUE || echo -DBUILD_kppp=FALSE)
-		$(cmake-utils_use_with privacy)
-		$(cmake-utils_use_with qq)
-		$(cmake-utils_use_with slp LibVNCServer)
-		$(cmake-utils_use_with slp SLP)
-		$(cmake-utils_use_with sms)
-		$(cmake-utils_use_with statistics Sqlite)
-		$(cmake-utils_use_with statistics)
-		$(cmake-utils_use_with testbed)
-		$(cmake-utils_use_with texteffect)
-		$(cmake-utils_use_with translator)
-		$(cmake-utils_use_with urlpicpreview)
-		$(cmake-utils_use_with vnc LibVNCServer)
-		$(cmake-utils_use_with webpresence LibXml2)
-		$(cmake-utils_use_with webpresence LibXslt)
-		$(cmake-utils_use_with webpresence)
-		$(cmake-utils_use_with winpopup)
-		$(cmake-utils_use_with yahoo)
-	"
-	#	$(cmake-utils_use_with messenger)
-	#	$(cmake-utils_use_with telepathy)
-	#	$(cmake-utils_use_with telepathy Decibel)
-
-	kde4-base_src_compile
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	#if use telepathy; then
-	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
-	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
-	#	elog "export TELEPATHY_DATA_PATH=/usr/share/telepathy/managers/"
-	#fi
-
-	if use jabber; then
-		elog "In order to use ssl in jabber, messenger and irc you'll need to have qca-ossl"
-	fi
-
-	echo
-	elog "If you want to use the remote desktop protocol (RDP) in krdc install >=net-misc/rdesktop-1.4.1"
-	echo
-}