Spring cleaning.

(Portage version: 2.1.4.4)

14 files changed, 10 insertions, 840 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index a51170563c91..8b0d24adbc79 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.123 2008/02/07 00:12:22 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.124 2008/02/17 03:16:05 ingmar Exp $
+
+  17 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kdm-3.5.5-grub-patch.diff, -files/kdm-3.5.7-login.diff,
+  -files/kdm-4.0.0-genkdmconf.patch,
+  -files/kdebase-4.0.0-pam-optional.patch, -kdm-3.5.5-r1.ebuild,
+  -kdm-3.5.6.ebuild, -kdm-3.5.6-r1.ebuild, -kdm-3.5.7.ebuild,
+  -kdm-3.5.7-r1.ebuild, -kdm-3.5.7-r2.ebuild, -kdm-3.5.7-r3.ebuild,
+  -kdm-3.5.8.ebuild, -kdm-4.0.0.ebuild:
+  Spring cleaning
 
 *kdm-4.0.1 (06 Feb 2008)
 
diff --git a/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.0-pam-optional.patch
deleted file mode 100644
index 6fb54f05c547..000000000000
--- a/kde-base/kdm/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/kdm/files/kdm-3.5.5-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff
deleted file mode 100644
index 3dace6dd0677..000000000000
--- a/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naur kdm-3.5.5-orig/kdm/backend/bootman.c kdm-3.5.5/kdm/backend/bootman.c
---- kdm-3.5.5-orig/kdm/backend/bootman.c	2006-10-01 19:32:15.000000000 +0200
-+++ kdm-3.5.5/kdm/backend/bootman.c	2006-11-05 03:03:54.000000000 +0100
-@@ -82,7 +82,7 @@
- 	int len;
- 	char line[1000];
- 
--	if (!grub && !(grub = locate( "grub" )))
-+	if (!grub && !(grub = locate( "grub-set-default" )))
- 		return BO_NOMAN;
- 
- 	*def = 0;
-@@ -132,19 +132,14 @@
- static void
- commitGrub( void )
- {
--	FILE *f;
--	int pid;
--	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
-+	char command[256];
- 
- 	if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
- 	    setGrub( sdRec.osname, &sdRec ) != BO_OK)
- 		return;
- 
--	args[0] = grub;
--	if ((f = pOpen( (char **)args, 'w', &pid ))) {
--		fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
--		pClose( f, pid );
--	}
-+	sprintf(command, "%s %d", grub, sdRec.osindex);
-+	system(command);
- }
- 
- static char *lilo;
diff --git a/kde-base/kdm/files/kdm-3.5.7-login.diff b/kde-base/kdm/files/kdm-3.5.7-login.diff
deleted file mode 100644
index 40b6abb8ec0e..000000000000
--- a/kde-base/kdm/files/kdm-3.5.7-login.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- kdm/backend/session.c
-+++ kdm/bakcend/session.c
-@@ -121,8 +121,9 @@
- static void
- DoAutoLogon( void )
- {
--	StrDup( &curuser, td->autoUser );
--	StrDup( &curpass, td->autoPass );
-+	ReStr( &curuser, td->autoUser );
-+	ReStr( &curpass, td->autoPass );
-+	ReStr( &curtype, "classic" );
- 	cursource = PWSRC_AUTOLOGIN;
- }
- 
-@@ -141,7 +142,9 @@
- 		td->hstent->npass = 0;
- 		newdmrc = td->hstent->nargs;
- 		td->hstent->nargs = 0;
-+		ReStr( &curtype, "classic" );
- 		cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
-+		return 1;
- 	} else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain))
- 	{
- 		unsigned int lmask;
-@@ -153,11 +156,9 @@
- 		if (lmask & ShiftMask)
- 			return 0;
- 		DoAutoLogon();
--	} else {
--		cursource = PWSRC_MANUAL;
--		return 0;
-+		return 1;
- 	}
--	return 1;
-+	return 0;
- }
- 
- 
-@@ -369,6 +370,7 @@
- 			if (curtype) free( curtype );
- 			curtype = GRecvStr();
- 			Debug( " type %\"s\n", curtype );
-+			cursource = PWSRC_MANUAL;
- 			if (Verify( conv_interact, rootok )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -378,7 +380,6 @@
- 		case G_AutoLogin:
- 			Debug( "G_AutoLogin\n" );
- 			DoAutoLogon();
--			StrDup( &curtype, "classic" );
- 			if (Verify( conv_auto, FALSE )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -565,7 +566,7 @@
- 	tdiff = td->autoAgain ? 
- 	           1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
- 	if (AutoLogon( tdiff )) {
--		if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto, FALSE ))
-+		if (!Verify( conv_auto, FALSE ))
- 			goto gcont;
- 		if (greeter)
- 			GSendInt( V_OK );
diff --git a/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch b/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch
deleted file mode 100644
index 95d787cdc239..000000000000
--- a/kde-base/kdm/files/kdm-4.0.0-genkdmconf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Disable creating dirs in the live file system,
-and let the package manager handle it.
-diff -ur kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c
---- kdebase-workspace-3.97.0.orig/kdm/kfrontend/genkdmconf.c	2007-12-09 06:56:49.000000000 +0100
-+++ kdebase-workspace-3.97.0/kdm/kfrontend/genkdmconf.c	2007-12-09 10:28:05.000000000 +0100
-@@ -266,43 +266,12 @@
- 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/kdm/kdm-3.5.5-r1.ebuild b/kde-base/kdm/kdm-3.5.5-r1.ebuild
deleted file mode 100644
index 4b9f2cc9a6a5..000000000000
--- a/kde-base/kdm/kdm-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.5-r1.ebuild,v 1.10 2007/07/22 10:42:14 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	x11-apps/xinit
-	x11-apps/xmessage
-	kde-base/kdepasswd"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/${P}-grub-patch.diff"
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	# Avoid using imake (kde bug 114466)
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-}
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.6-r1.ebuild b/kde-base/kdm/kdm-3.5.6-r1.ebuild
deleted file mode 100644
index bc2bc49f3e4d..000000000000
--- a/kde-base/kdm/kdm-3.5.6-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.6-r1.ebuild,v 1.2 2007/07/11 01:08:47 mr_bones_ Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.6.ebuild b/kde-base/kdm/kdm-3.5.6.ebuild
deleted file mode 100644
index 8b8ada1f9d10..000000000000
--- a/kde-base/kdm/kdm-3.5.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.6.ebuild,v 1.3 2007/07/22 10:42:14 omp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	x11-apps/xinit
-	x11-apps/xmessage
-	kde-base/kdepasswd"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/kdm-3.5.5-grub-patch.diff"
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	# Avoid using imake (kde bug 114466)
-	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
-}
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.7-r1.ebuild b/kde-base/kdm/kdm-3.5.7-r1.ebuild
deleted file mode 100644
index 95ba60c865fa..000000000000
--- a/kde-base/kdm/kdm-3.5.7-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.7-r1.ebuild,v 1.1 2007/08/20 12:32:19 uberlord Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/${P}-bsd-shutdown.patch"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.7-r2.ebuild b/kde-base/kdm/kdm-3.5.7-r2.ebuild
deleted file mode 100644
index d08fb966527c..000000000000
--- a/kde-base/kdm/kdm-3.5.7-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.7-r2.ebuild,v 1.6 2007/09/26 10:39:22 armin76 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/${P}-bsd-shutdown.patch
-		${FILESDIR}/${P}-login.diff"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.7-r3.ebuild b/kde-base/kdm/kdm-3.5.7-r3.ebuild
deleted file mode 100644
index 1229fd783e8f..000000000000
--- a/kde-base/kdm/kdm-3.5.7-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.7-r3.ebuild,v 1.6 2007/12/05 15:20:01 welp Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/${P}-bsd-shutdown.patch
-		${FILESDIR}/${P}-login.diff
-		${FILESDIR}/${PN}-3.5.8-login.diff"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd "${S}"/kdm && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		"${D}"/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.7.ebuild b/kde-base/kdm/kdm-3.5.7.ebuild
deleted file mode 100644
index 316b4dfe140f..000000000000
--- a/kde-base/kdm/kdm-3.5.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.7.ebuild,v 1.8 2007/08/11 16:31:24 armin76 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-3.5.8.ebuild b/kde-base/kdm/kdm-3.5.8.ebuild
deleted file mode 100644
index 9505ac549898..000000000000
--- a/kde-base/kdm/kdm-3.5.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.8.ebuild,v 1.1 2007/10/19 22:50:05 philantrop Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="elibc_glibc kdehiddenvisibility pam"
-
-KMEXTRA="kdmlib/"
-# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
-# 3.5_beta1.
-KMEXTRACTONLY="libkonq/konq_defaults.h"
-#		kioslave/thumbnail/configure.in.in"
-KMCOMPILEONLY="kcontrol/background"
-DEPEND="pam? ( kde-base/kdebase-pam )
-	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
-	# Requires the desktop background settings and kdm kcontrol modules
-RDEPEND="${DEPEND}
-	kde-base/kdepasswd
-	x11-apps/xinit
-	x11-apps/xmessage"
-PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
-
-PATCHES="${FILESDIR}/${PN}-3.5.7-bsd-shutdown.patch"
-
-src_compile() {
-	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
-
-	if ! use pam && use elibc_glibc; then
-		myconf="${myconf} --with-shadow"
-	fi
-
-	export USER_LDFLAGS="${LDFLAGS}"
-
-	kde-meta_src_compile myconf configure
-	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
-	kde-meta_src_compile make
-}
-
-src_install() {
-	kde-meta_src_install
-	cd "${S}/kdm" && make DESTDIR="${D}" GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
-
-	# Customize the kdmrc configuration
-	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		"${D}/${KDEDIR}/share/config/kdm/kdmrc" || die
-}
-
-pkg_postinst() {
-	kde_pkg_postinst
-
-	# set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}
diff --git a/kde-base/kdm/kdm-4.0.0.ebuild b/kde-base/kdm/kdm-4.0.0.ebuild
deleted file mode 100644
index 10c39c62e405..000000000000
--- a/kde-base/kdm/kdm-4.0.0.ebuild
+++ /dev/null
@@ -1,78 +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/kdm/kdm-4.0.0.ebuild,v 1.2 2008/01/18 03:26:13 ingmar Exp $
-
-EAPI="1"
-
-KMNAME=kdebase-workspace
-inherit kde4-meta
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug elibc_glibc htmlhandbook kerberos pam"
-
-DEPEND="
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXtst
-	kerberos? ( virtual/krb5 )
-	pam? ( >=kde-base/kcheckpass-${PV}:${SLOT}
-		sys-libs/pam )"
-RDEPEND="${DEPEND}
-	>=kde-base/kdepasswd-${PV}:${SLOT}
-	>=x11-apps/xinit-1.0.5-r2
-	x11-apps/xmessage"
-
-KMEXTRACTONLY="
-	kcontrol/background/
-	kcontrol/kdm/
-	kdm/frontend/sessions"
-# kde-base/kdebase-startkde installs the xession entry, so only extract here
-KMEXTRA="libs/kdm/"
-
-# Disable creating dirs in the live file system.
-PATCHES="
-${FILESDIR}/${P}-genkdmconf.patch
-${FILESDIR}/kdebase-${PV}-pam-optional.patch"
-
-src_compile() {
-	mycmakeargs="${mycmakeargs}
-		$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
-		$(cmake-utils_use_with pam PAM)"
-	kde4-meta_src_compile
-}
-
-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}"/kdm/kfrontend/CMakeLists.txt
-
-	kde4-meta_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}"/kdm_build/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."
-}
-
-pkg_postinst() {
-	# Set the default kdm face icon if it's not already set by the system admin
-	# because this is user-overrideable in that way, it's not in src_install
-	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
-}