Remove unneeded patches.

(Portage version: 2.1.2-r7)

7 files changed, 8 insertions, 214 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 98e75a313b83..4deb54a12582 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.89 2007/02/04 02:21:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.90 2007/02/05 11:42:38 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/kdebase-3.4.3-noimake.patch, -files/kdebase-3.4.3-xdmcp.patch,
+  -files/post-3.5.0-kdebase-kdm.diff,
+  -files/kdm-3.5.3-strict-aliasing.patch, -files/kdm-3.5.4-grub-patch.diff,
+  -files/kdm-3.5.4-strict-aliasing.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -kdm-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/kdm/files/kdebase-3.4.3-noimake.patch b/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
deleted file mode 100644
index 4718f1587a3f..000000000000
--- a/kde-base/kdm/files/kdebase-3.4.3-noimake.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nur kdebase-3.4.3.orig/kdm/configure.in.in kdebase-3.4.3/kdm/configure.in.in
---- kdebase-3.4.3.orig/kdm/configure.in.in	2005-10-05 15:39:13.000000000 +0200
-+++ kdebase-3.4.3/kdm/configure.in.in	2005-10-19 11:26:29.000000000 +0200
-@@ -1,42 +1,22 @@
- 
- dnl this is for kdm:
- 
--KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
-+AC_MSG_CHECKING([X paths for KDM])
- 
--dnl ask imake about various X settings
--AC_MSG_CHECKING([X paths])
--imkv=8
--test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
--AC_CACHE_VAL(kde_cv_defines_imake, [
--  rm -fr conftestdir
--  if mkdir conftestdir; then
--    cd conftestdir
--    cat > Imakefile <<'EOF'[
--
--acimake:
--	@echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
--
--]EOF
--    if $XMKMF >&5 2>&1 && test -f Makefile; then
--	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
--	kde_cv_defines_imake_version=$imkv
--    else
--        AC_MSG_RESULT([failed])
--	AC_MSG_ERROR([$XMKMF (imake) failed.
--Make sure you have all necessary X development packages installed.
--On some systems a missing /lib/cpp symlink is at fault.])
--    fi
--    cd ..
--    rm -fr conftestdir
--  else
--    AC_MSG_RESULT([failed])
--    AC_MSG_ERROR([cannot create temporary directory])
--  fi
--])
--AC_MSG_RESULT([done])
--eval "$kde_cv_defines_imake"
--AC_DEFINE_UNQUOTED(XBINDIR, "$XBINDIR", [X binaries directory])
--AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [X libraries directory])
-+AC_ARG_WITH(x-binaries-dir,
-+	[AS_HELP_STRING(--with-x-binaries-dir=DIR,
-+		[set the location of X binaries for KDM])],
-+	[], [with_x_binaries_dir=`echo $kde_x_libraries | sed -e 's,/lib.*,/bin,'`])
-+
-+AC_ARG_WITH(x-libraries-dir,
-+	[AS_HELP_STRING(--with-x-libraries-dir=DIR,
-+		[set the location of X libraries for KDM])],
-+	[], [with_x_libraries_dir=$kde_x_libraries])
-+
-+AC_MSG_RESULT([binaries in $with_x_binaries_dir, libraries in $with_x_libraries_dir])
-+
-+AC_DEFINE_UNQUOTED(XBINDIR, "$with_x_binaries_dir", [X binaries directory])
-+AC_DEFINE_UNQUOTED(XLIBDIR, "$with_x_libraries_dir", [X libraries directory])
- 
- if test -f /etc/ttys; then
-   AC_DEFINE(BSD_INIT, 1, [Define if the system uses a BSD-style init])
diff --git a/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch b/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
deleted file mode 100644
index 96b666902ae7..000000000000
--- a/kde-base/kdm/files/kdebase-3.4.3-xdmcp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nur kdebase-3.4.3.orig/kdm/backend/xdmcp.c kdebase-3.4.3/kdm/backend/xdmcp.c
---- kdebase-3.4.3.orig/kdm/backend/xdmcp.c	2005-10-05 15:39:11.000000000 +0200
-+++ kdebase-3.4.3/kdm/backend/xdmcp.c	2005-10-18 15:30:05.000000000 +0200
-@@ -940,7 +940,12 @@
- 			}
- 			DisposeProtoDisplay( pdpy );
- 			Debug( "starting display %s,%s\n", d->name, d->class2 );
--			StartDisplay( d );
-+			if (LoadDisplayResources( d ) < 0) {
-+				LogError( "Unable to read configuration for display %s; "
-+				          "stopping it.\n", d->name );
-+				StopDisplay( d );
-+			} else
-+				StartDisplay( d );
- 			CloseGetter();
- 		}
- 	}
diff --git a/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
deleted file mode 100644
index fcdb060f5d25..000000000000
--- a/kde-base/kdm/files/kdm-3.5.3-strict-aliasing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
-     access.c \
-     auth.c \
-Index: kdebase-3.5.3/kdm/backend/xdmcp.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/xdmcp.c
-+++ kdebase-3.5.3/kdm/backend/xdmcp.c
-@@ -160,7 +160,7 @@ all_query_respond( struct sockaddr *from
- 	int family;
- 	int length;
- 
--	family = ConvertAddr( (XdmcpNetaddr)from, &length, (char **)&(addr.data) );
-+	family = ConvertAddr( (XdmcpNetaddr)from, &length, &(addr.data) );
- 	addr.length = length; /* convert int to short */
- 	Debug( "all_query_respond: conntype=%d, addr=%02[*:hhx\n",
- 	       family, addr.length, addr.data );
-Index: kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-===================================================================
---- kdebase-3.5.3.orig/kdm/kfrontend/kdm_config.c
-+++ kdebase-3.5.3/kdm/kfrontend/kdm_config.c
-@@ -733,7 +733,7 @@ CvtValue( Ent *et, Value *retval, int va
- 				}
- 			}
- 			retval->ptr = 0;
--			if (sscanf( buf, "%li", (long *)&retval->ptr ) != 1)
-+			if (sscanf( buf, "%li", &retval->ptr ) != 1)
- 				return "integer";
- 			return 0;
- 		case C_TYPE_STR:
diff --git a/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
deleted file mode 100644
index 6fd004931d4a..000000000000
--- a/kde-base/kdm/files/kdm-3.5.4-grub-patch.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -U 4 -H -b -w -B -E -d -i -r kdm-3.5.4-orig/kdm/backend/bootman.c kdm-3.5.4/kdm/backend/bootman.c
---- kdm-3.5.4-orig/kdm/backend/bootman.c	2006-08-30 17:41:12.000000000 +0200
-+++ kdm-3.5.4/kdm/backend/bootman.c	2006-08-30 17:50:20.000000000 +0200
-@@ -77,28 +77,30 @@
- static int
- getGrub( char ***opts, int *def, int *cur )
- {
- 	FILE *f;
--	char *ptr;
-+	char *ptr, *linp;
- 	int len;
- 	char line[1000];
- 
--	if (!grub && !(grub = locate( "grub" )))
-+	if (!grub && !(grub = locate( "grub-set-default" )))
- 		return BO_NOMAN;
- 
- 	*def = 0;
- 	*cur = -1;
- 	*opts = initStrArr( 0 );
- 
- 	if (!(f = fopen( GRUB_MENU, "r" )))
- 		return errno == ENOENT ? BO_NOMAN : BO_IO;
--	while ((len = fGets( line, sizeof(line), f )) != -1)
--		if ((ptr = match( line, &len, "default", 7 )))
-+	while ((len = fGets( line, sizeof(line), f )) != -1) {
-+		for (linp = line; isspace(*linp); linp++, len--);
-+		if ((ptr = match( linp, &len, "default", 7 )))
- 			*def = atoi( ptr );
--		else if ((ptr = match( line, &len, "title", 5 ))) {
-+		else if ((ptr = match( linp, &len, "title", 5 ))) {
- 			for (; isspace( ptr[len - 1] ); len--);
- 			*opts = addStrArr( *opts, ptr, len );
- 		}
-+	}
- 	fclose( f );
- 
- 	return BO_OK;
- }
-@@ -129,21 +131,16 @@
- 
- 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.4-strict-aliasing.patch b/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
deleted file mode 100644
index f732c7024b5e..000000000000
--- a/kde-base/kdm/files/kdm-3.5.4-strict-aliasing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kdebase-3.5.3/kdm/backend/Makefile.am
-===================================================================
---- kdebase-3.5.3.orig/kdm/backend/Makefile.am
-+++ kdebase-3.5.3/kdm/backend/Makefile.am
-@@ -7,6 +7,7 @@ LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(P
-     $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
- 
- bin_PROGRAMS = kdm
-+kdm_CFLAGS = -fno-strict-aliasing
- kdm_SOURCES = \
-     access.c \
-     auth.c \
diff --git a/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff b/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
deleted file mode 100644
index 129a10594be4..000000000000
--- a/kde-base/kdm/files/post-3.5.0-kdebase-kdm.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: kdm/backend/client.c
-===================================================================
---- kdm/backend/client.c	(revision 547560)
-+++ kdm/backend/client.c	(working copy)
-@@ -1537,16 +1542,6 @@ ReadDmrc()
- 
- 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
- 		return GE_Error;
--	if ((curdmrc = iniLoad( fname ))) {
--		free( fname );
--		return GE_Ok;
--	}
--
--	if (errno != EACCES) {
--		free( fname );
--		return GE_NoFile;
--	}
--
- 	if (pipe( pfd ))
- 		return GE_Error;
- 	if ((pid = Fork()) < 0) {