Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly; remove old patch

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

3 files changed, 10 insertions, 46 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 4c0ecd30cb37..83a015791846 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.250 2011/06/10 21:25:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.251 2011/06/12 23:06:38 abcd Exp $
+
+  12 Jun 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kdm-4.3.5-xdm-restart.patch, kdm-4.6.2-r1.ebuild:
+  Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT
+  properly; remove old patch
 
   10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> Manifest:
   Remanifest as tarball was changed
diff --git a/kde-base/kdm/files/kdm-4.3.5-xdm-restart.patch b/kde-base/kdm/files/kdm-4.3.5-xdm-restart.patch
deleted file mode 100644
index a47150c0266e..000000000000
--- a/kde-base/kdm/files/kdm-4.3.5-xdm-restart.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kdm-4.3.5/kdm/backend/dm.c.orig	2010-05-08 17:00:38.000000000 -0700
-+++ kdm-4.3.5/kdm/backend/dm.c	2010-05-08 17:38:17.000000000 -0700
-@@ -1469,7 +1469,15 @@
- 
- 		d->hstent->lock = d->hstent->rLogin = d->hstent->goodExit =
- 			d->sdRec.how = 0;
--		d->lastStart = now;
-+		/* If this is a local server then we record the actual
-+		 * start time of the server - this is because the server
-+		 * can be reset without restarting and it can crash when,
-+		 * or after, reset - we don't want to disable it if it
-+		 * crashes in this case.  (See exitDisplay() below.)
-+		 * 'lastStart' is set in server.c to make this work.
-+		 */
-+		if ((d->displayType & d_location) != dLocal)
-+			d->lastStart = now;
- 		break;
- 	}
- }
-@@ -1558,7 +1566,7 @@
- 		} else {
- 			if (serverCmd == XS_RETRY) {
- 				if ((d->displayType & d_location) == dLocal) {
--					if (he->lastExit - d->lastStart < 120) {
-+					if (he->lastExit - d->lastStart < 20) {
- 						logError( "Unable to fire up local display %s;"
- 						          " disabling.\n", d->name );
- 						stopDisplay( d );
---- kdm-4.3.5/kdm/backend/server.c.orig	2010-05-08 17:00:43.000000000 -0700
-+++ kdm-4.3.5/kdm/backend/server.c	2010-05-08 17:35:34.000000000 -0700
-@@ -76,6 +76,10 @@
- 
- 	debug( "startServerOnce for %s, try %d\n", d->name, ++d->startTries );
- 	d->serverStatus = starting;
-+	/* For the local X server record the start time of the server, not the
-+	 * session, so set the time here and not in dm.c:startDisplayP2()
-+	 */
-+	d->lastStart = now;
- 	switch (Fork( &d->serverPid )) {
- 	case 0:
- 		argv = prepareServerArgv( d, d->serverArgsLocal );
diff --git a/kde-base/kdm/kdm-4.6.2-r1.ebuild b/kde-base/kdm/kdm-4.6.2-r1.ebuild
index 46cd49117e80..c926e46f9837 100644
--- a/kde-base/kdm/kdm-4.6.2-r1.ebuild
+++ b/kde-base/kdm/kdm-4.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2-r1.ebuild,v 1.4 2011/06/01 18:19:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.2-r1.ebuild,v 1.5 2011/06/12 23:06:38 abcd Exp $
 
 EAPI=3
 
@@ -50,7 +50,7 @@ pkg_setup() {
 	kde4-meta_pkg_setup
 
 	# Create kdm:kdm user
-	KDM_HOME=/var/lib/kdm-${SLOT}
+	KDM_HOME=/var/lib/kdm-$(get_kde_version)
 	enewgroup kdm
 	enewuser kdm -1 -1 "${KDM_HOME}" kdm
 }
@@ -78,8 +78,8 @@ src_install() {
 	# - SessionDirs set to /usr/share/xsessions
 	# - increase server timeout to 30s
 	# - TerminateServer=true to workaround X server regen bug, bug 278473
-	# - DataDir set to /var/lib/kdm-${SLOT}
-	# - FaceDir set to /var/lib/kdm-${SLOT}/faces
+	# - DataDir set to /var/lib/kdm-$(get_kde_version)
+	# - FaceDir set to /var/lib/kdm-$(get_kde_version)/faces
 	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
 		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
 		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \