[kde-base/kdm] Clean unneeded patches

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 10 insertions, 86 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 9b78fce05a82..1ff00962f483 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.166 2009/06/14 10:57:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.167 2009/06/14 13:07:04 alexxy Exp $
+
+  14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+  -files/kdm-3.5.8-login.diff, -files/kdm-4.2.0-qt4.5_h.patch,
+  -files/kdm-4.2.0-qt4.5.patch:
+  Clean unneeded patches
 
   14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -kdm-4.2.3.ebuild:
   Drop KDE 4.2.3
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 63ca1345e7b3..b19da34f42b7 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -3,10 +3,7 @@ Hash: SHA1
 
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-3.5.7-bsd-shutdown.patch 486 RMD160 da3ef89c1783f9eb357a9404f083d696df0e51fa SHA1 df14c32baf6d105ad0b563c493bcf093129c3f1e SHA256 e7b1123b597f260ebbba5337a74648591bce19e332e6aaa61f9ea27f3f0bd8d8
-AUX kdm-3.5.8-login.diff 921 RMD160 d4c0563ef09e17c15ce384dfa30abeff5b4bbdc5 SHA1 946f42fff2e5323e409b543cefa62ce93906c842 SHA256 f7b458f1dff83e2c67e4d696363209c548fb8a2a85029d2f5e1be512286a84ad
 AUX kdm-3.5.9-respect-cflags.patch 669 RMD160 23bace1d034c9051fadf9d29886e824bff57dad3 SHA1 a3fff3c118266f999a91abfb7f4496694c311f5c SHA256 1dd4b590955dafd0484b04102872d0de58c3fd2bf0b6d44362d2ffc2d3244656
-AUX kdm-4.2.0-qt4.5.patch 943 RMD160 1bd94b044360832128a9382fd5943280e37b736e SHA1 516f5ae9377e9f525f8f61d88f8d16fcc84443c8 SHA256 9749ce52f6562a7c7ca0f1f158c7319d55ad3ba344c35b551c9f3507378efb75
-AUX kdm-4.2.0-qt4.5_h.patch 305 RMD160 98b19905480fc3789a5dd9508ec5db2acaf45ba8 SHA1 cfda702b3ac56cfff795c7235f6979b74ecb45d3 SHA256 b5e0899c1c4c368d162a5e1f6af91a777751f4fe03ee7365b754a3da321b588c
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
@@ -15,12 +12,12 @@ DIST kdebase-workspace-4.2.4.tar.bz2 50803339 RMD160 ee817ef97015afa1f0e0eef5381
 EBUILD kdm-3.5.10.ebuild 2234 RMD160 0617f01b2cf06adac9b4b0ec12c99ebef1c413df SHA1 11ca1c207f1cce3141e160ff6a0afcc6182eccf3 SHA256 d71110731b66a8701417573f575726b5048b3cca4273862bb10fdafc34473cb4
 EBUILD kdm-3.5.9.ebuild 2287 RMD160 bc60955051cf5c95e98814b8972c069cb7e512f0 SHA1 2043b37e057e887e5e2798c555481444f504796d SHA256 4732b7906c42f0b28f3fd2d27c7ca9713e3d2104d711ac530472afb809430cc1
 EBUILD kdm-4.2.4.ebuild 2492 RMD160 422fd2676797812034efb3dc9d8c416e46d0cbbd SHA1 b866eae428f3497890c29db3f16e71247033029b SHA256 0a6ced554851157eddb2f7162346467435901fbcc536742519ed7d6b0d51f313
-MISC ChangeLog 22352 RMD160 a597e31a1b78635d0582f9699d983e8abc38f01d SHA1 54514dc0b9b76297ee0b078e711f15af1bae6dc3 SHA256 b741d6d45c2bede56fb3ee4d4b4d0c9d71f855f5973209f62f5cdacfea11eaf9
+MISC ChangeLog 22524 RMD160 c19e163e64e54032054d5d6d3057815e38388c72 SHA1 dd4a5e3117615a2c4dc98f1261c9aa3a8ca937ad SHA256 969d814f760122b86532b581312b732bbe7ea932f31a4d608f40a648280e3a1e
 MISC metadata.xml 252 RMD160 56180702ee9874bd7c3f227e7540c87ef0430e73 SHA1 1939a904e27c21473c94ffcdd38223c1125e61dd SHA256 5f5286d82a444e6a5d5c934c256ce2696bfbb118f059e0ae6dcf15c4bbdb7a01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko016UACgkQ5BmOA85PVLi/EACePfMCYQz7xZzKNDgtJceBEB+Y
-wIwAoJz1uKWy55C276eb32hDfhNiS271
-=3K0l
+iEYEARECAAYFAko09gcACgkQ5BmOA85PVLiQ9ACgha0L01ilvgRe9d42qa30fw5r
+zyUAn20BYIVxSHYYAtad86bOe7LusVOo
+=49zU
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/kdm-3.5.8-login.diff b/kde-base/kdm/files/kdm-3.5.8-login.diff
deleted file mode 100644
index 790987adfdb4..000000000000
--- a/kde-base/kdm/files/kdm-3.5.8-login.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- kdm/backend/inifile.c
-+++ kdm/backend/inifile.c
-@@ -37,6 +37,7 @@
- #include "dm_error.h"
- 
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -47,17 +48,27 @@
- {
- 	char *data;
- 	int fd, len;
-+	struct stat st;
- 
- 	if ((fd = open( fname, O_RDONLY | O_NONBLOCK )) < 0) {
- 		Debug( "cannot open ini-file %\"s: %m", fname );
- 		return 0;
- 	}
--	len = lseek( fd, 0, SEEK_END );
-+	if (fstat( fd, &st ) || !S_ISREG( st.st_mode )) {
-+		LogWarn( "Ini-file %\"s is no regular file\n", fname );
-+		close( fd );
-+		return 0;
-+	}
-+	if (st.st_size >= 0x10000) {
-+		LogWarn( "Ini-file %\"s is too big\n", fname );
-+		close( fd );
-+		return 0;
-+	}
-+	len = st.st_size;
- 	if (!(data = Malloc( len + 2 ))) {
- 		close( fd );
- 		return 0;
- 	}
--	lseek( fd, 0, SEEK_SET );
- 	if (read( fd, data, len ) != len) {
- 		Debug( "cannot read ini-file %\"s: %m", fname );
- 		free( data );
diff --git a/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch b/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch
deleted file mode 100644
index f452135bfb0b..000000000000
--- a/kde-base/kdm/files/kdm-4.2.0-qt4.5.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kdm/kfrontend/kgapp.cpp	2009/01/06 17:13:38	906699
-+++ kdm/kfrontend/kgapp.cpp	2009/02/07 15:59:44	922805
-@@ -70,7 +70,7 @@
- 
- }
- 
--GreeterApp::GreeterApp( int argc, char **argv ) :
-+GreeterApp::GreeterApp( int &argc, char **argv ) :
- 	inherited( argc, argv ),
- 	regrabPtr( false ), regrabKbd( false ),
- 	dragWidget( 0 )
-@@ -296,13 +296,14 @@
- 	}
- 
- 	static char *fakeArgv[] = { (char *)"kdmgreet", 0 };
-+	static int fakeArgc = as(fakeArgv) - 1;
- 
- 	KCrash::setFlags( KCrash::KeepFDs | KCrash::SaferDialog | KCrash::AlwaysDirectly );
- 	KCrash::setApplicationName( QLatin1String( fakeArgv[0] ) );
- 	KCrash::setCrashHandler( KCrash::defaultCrashHandler );
- 	XSetIOErrorHandler( xIOErr );
- 	KComponentData inst( fakeArgv[0] );
--	GreeterApp app( as(fakeArgv) - 1, fakeArgv );
-+	GreeterApp app( fakeArgc, fakeArgv );
- 	foreach (const QString &dir, KGlobal::dirs()->resourceDirs( "qtplugins" ))
- 		app.addLibraryPath( dir );
- 	initQAppConfig();
diff --git a/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch b/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch
deleted file mode 100644
index c8f4576eef93..000000000000
--- a/kde-base/kdm/files/kdm-4.2.0-qt4.5_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/kgapp.h	2009/01/06 17:13:38	906699
-+++ kdm/kfrontend/kgapp.h	2009/02/07 15:59:44	922805
-@@ -35,7 +35,7 @@
- 	typedef QApplication inherited;
- 
-   public:
--	GreeterApp(int argc, char **argv);
-+	GreeterApp(int &argc, char **argv);
- 	virtual bool x11EventFilter( XEvent * );
- 
-   protected: