epatch doesn't like non-existant patches.

Package-Manager: portage-2.1.4

4 files changed, 72 insertions, 15 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index bf9fff70686b..61067fce4151 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # 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.414 2008/01/18 00:27:23 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.415 2008/01/18 06:17:57 ingmar Exp $
+
+  18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kdm-4.0.0-genkdmconf.patch, kdebase-4.0.0.ebuild:
+  epatch doesn't like non-existant patches.
 
   18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> kdebase-4.0.0.ebuild:
   Make KDE 4.0.0's kdebase-meta block kdebase-{runtime,workspace}-meta.
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 92a55f0afaf2..71aede00531f 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -54,6 +54,10 @@ AUX kdm-3.5.8-login.diff 921 RMD160 d4c0563ef09e17c15ce384dfa30abeff5b4bbdc5 SHA
 MD5 205b2928f5a3b6f68527f33c05f56fb4 files/kdm-3.5.8-login.diff 921
 RMD160 d4c0563ef09e17c15ce384dfa30abeff5b4bbdc5 files/kdm-3.5.8-login.diff 921
 SHA256 f7b458f1dff83e2c67e4d696363209c548fb8a2a85029d2f5e1be512286a84ad files/kdm-3.5.8-login.diff 921
+AUX kdm-4.0.0-genkdmconf.patch 1446 RMD160 6c7ea0b876d4bafae8aca0316f8b86b53f26211d SHA1 988df857629211609399795646d8a0a7a86693c2 SHA256 a901555fad54bc5eaf48ddd9598a799ff19fdbcca4da2dc4d12be7efb4ce0a45
+MD5 02a08c625e1f0bdb6ac519a2abf7d198 files/kdm-4.0.0-genkdmconf.patch 1446
+RMD160 6c7ea0b876d4bafae8aca0316f8b86b53f26211d files/kdm-4.0.0-genkdmconf.patch 1446
+SHA256 a901555fad54bc5eaf48ddd9598a799ff19fdbcca4da2dc4d12be7efb4ce0a45 files/kdm-4.0.0-genkdmconf.patch 1446
 AUX konqueror-3.5.7-185603-spoofing.diff 1901 RMD160 bb59c1e78e5709d72b123c5b3b5a538fc09f564e SHA1 3868392701ebe9fce14567a1f52d458d00f31287 SHA256 70a5022b38aa93616032c02518b66a9b938f17aa42c14a9b1de71d0ee73d1e72
 MD5 e15d6b5580c5a20ab935f8e553d113e0 files/konqueror-3.5.7-185603-spoofing.diff 1901
 RMD160 bb59c1e78e5709d72b123c5b3b5a538fc09f564e files/konqueror-3.5.7-185603-spoofing.diff 1901
@@ -177,14 +181,14 @@ EBUILD kdebase-3.5.8.ebuild 7057 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5
 MD5 37eea3820dbd3438733985f9316abf58 kdebase-3.5.8.ebuild 7057
 RMD160 5532c9ccf5100febf5e8002fdbec2f5d4dfce8f5 kdebase-3.5.8.ebuild 7057
 SHA256 fb3f20fdce989e0b09a994858c5265fb6880407be24a8ff78582b78207b933c6 kdebase-3.5.8.ebuild 7057
-EBUILD kdebase-4.0.0.ebuild 9728 RMD160 bfd8533acd89d4f4623e500c7503fbb29fae6b6b SHA1 c73c24e86613814e5a3c1a80d3430235a5eb8ed1 SHA256 c9913ace05e390e746e5e1f89c365a837528d6740b181cfc117c04883c68208f
-MD5 781d4692196ba005ccbb26d0f16a6376 kdebase-4.0.0.ebuild 9728
-RMD160 bfd8533acd89d4f4623e500c7503fbb29fae6b6b kdebase-4.0.0.ebuild 9728
-SHA256 c9913ace05e390e746e5e1f89c365a837528d6740b181cfc117c04883c68208f kdebase-4.0.0.ebuild 9728
-MISC ChangeLog 69723 RMD160 56e569a5f3719d4929e57c704bb194d4053f559a SHA1 a8bee26839db19ada1170aed7e493318145a51fe SHA256 cb181cc3654a144dcb962c835f973a8ccd01dc4b07e8b8c44e7dde4bce0c1055
-MD5 20ead7441f2524edf8eda76d69aecccb ChangeLog 69723
-RMD160 56e569a5f3719d4929e57c704bb194d4053f559a ChangeLog 69723
-SHA256 cb181cc3654a144dcb962c835f973a8ccd01dc4b07e8b8c44e7dde4bce0c1055 ChangeLog 69723
+EBUILD kdebase-4.0.0.ebuild 9652 RMD160 a6198e73d9d19a0a70011b2da94bdeb25302a836 SHA1 31bd339250bded129e5b89945b7059f247e51f4a SHA256 211fe34e1f58c6e138bf605f5f75d6f68d55d625f9285af3fe11c611ab343e7f
+MD5 35b292c7de4f17b997fb2a5f68aadd0d kdebase-4.0.0.ebuild 9652
+RMD160 a6198e73d9d19a0a70011b2da94bdeb25302a836 kdebase-4.0.0.ebuild 9652
+SHA256 211fe34e1f58c6e138bf605f5f75d6f68d55d625f9285af3fe11c611ab343e7f kdebase-4.0.0.ebuild 9652
+MISC ChangeLog 69879 RMD160 327e7ff485d1d1acb55375843a7a4fec0bde82d6 SHA1 9115f6f188dbd9142b0bfc727fc2f6a78ac7545f SHA256 b3ae61b00f2ecc54a091a6ac18fecd92aee058b363fb9459da8489fb74bcaa57
+MD5 2e651d16db5f80c8919c9c2694b75c76 ChangeLog 69879
+RMD160 327e7ff485d1d1acb55375843a7a4fec0bde82d6 ChangeLog 69879
+SHA256 b3ae61b00f2ecc54a091a6ac18fecd92aee058b363fb9459da8489fb74bcaa57 ChangeLog 69879
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch b/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch
new file mode 100644
index 000000000000..0cdb0faf852f
--- /dev/null
+++ b/kde-base/kdebase/files/kdm-4.0.0-genkdmconf.patch
@@ -0,0 +1,53 @@
+    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
index b77d0eccaddb..14a2d01c6f32 100644
--- a/kde-base/kdebase/kdebase-4.0.0.ebuild
+++ b/kde-base/kdebase/kdebase-4.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/01/18 00:27:23 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.0.ebuild,v 1.3 2008/01/18 06:17:57 ingmar Exp $
 
 EAPI="1"
 
@@ -94,9 +94,6 @@ RDEPEND="${COMMONDEPEND}
 		|| ( >=sys-apps/eject-2.1.5
 			sys-block/unieject ) )
 "
-
-# FIXME: look at krunner and kwin deps again when X11 deps are fixed.
-
 #IUSE="xscreensaver"
 #
 #COMMONDEPEND="
@@ -106,14 +103,13 @@ RDEPEND="${COMMONDEPEND}
 #	x11-apps/setxkbmap
 #	|| ( x11-misc/xkeyboard-config
 #		x11-misc/xkbdata )
-#"
 #
 #DEPEND="${COMMONDEPEND}
 #	x11-apps/xhost
 #	xscreensaver? ( x11-proto/scrnsaverproto )"
 
 PATCHES="${FILESDIR}/gentoo-startkde.patch
-	${FILESDIR}/kdm-9999.4-genkdmconf.patch
+	${FILESDIR}/kdm-${PV}-genkdmconf.patch
 	${FILESDIR}/${P}-pam-optional.patch"
 
 pkg_setup() {