Clean up patches.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

8 files changed, 32 insertions, 30 deletions

diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index 1d3e8f575be9..ff1ade89e5fd 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/fam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.65 2011/01/06 11:03:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.66 2011/01/24 04:36:58 jer Exp $
+
+  24 Jan 2011; Jeroen Roovers <jer@gentoo.org> files/fam-2.7.0-gcc41.patch,
+  files/fam-2.7.0-gcc43.patch, files/fam-2.7.0-gcc44.patch,
+  files/fam-2.7.0-limits.patch:
+  Clean up patches.
 
   06 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> fam-2.7.0-r5.ebuild,
   fam-2.7.0-r6.ebuild:
diff --git a/app-admin/fam/files/fam-2.7.0-gcc41.patch b/app-admin/fam/files/fam-2.7.0-gcc41.patch
index 09104e5fcbdd..9f060ce06b1f 100644
--- a/app-admin/fam/files/fam-2.7.0-gcc41.patch
+++ b/app-admin/fam/files/fam-2.7.0-gcc41.patch
@@ -1,6 +1,5 @@
-diff -dpruN fam-2.7.0.orig/src/DNotify.h fam-2.7.0/src/DNotify.h
---- fam-2.7.0.orig/src/DNotify.h	2005-11-16 08:49:13.000000000 +0100
-+++ fam-2.7.0/src/DNotify.h	2005-11-16 08:54:04.972188928 +0100
+--- a/src/DNotify.h
++++ b/src/DNotify.h
 @@ -59,8 +59,8 @@ private:
      static int pipe_write_fd;
      static int pipe_read_fd;
diff --git a/app-admin/fam/files/fam-2.7.0-gcc43.patch b/app-admin/fam/files/fam-2.7.0-gcc43.patch
index 3ffeeca77eb3..8592a0bccded 100644
--- a/app-admin/fam/files/fam-2.7.0-gcc43.patch
+++ b/app-admin/fam/files/fam-2.7.0-gcc43.patch
@@ -1,6 +1,5 @@
-diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h
---- fam-2.7.0-orig/include/BTree.h	2003-01-19 22:22:30.000000000 -0600
-+++ fam-2.7.0/include/BTree.h	2008-12-04 17:51:22.000000000 -0600
+--- a/include/BTree.h
++++ b/include/BTree.h
 @@ -24,6 +24,7 @@
  #define BTree_included
  
@@ -9,9 +8,8 @@ diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h
  
  //  This is an in-core B-Tree implementation.
  //
-diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
---- fam-2.7.0-orig/lib/Client.c++	2003-01-18 08:18:12.000000000 -0600
-+++ fam-2.7.0/lib/Client.c++	2008-12-04 17:51:19.000000000 -0600
+--- a/lib/Client.c++
++++ b/lib/Client.c++
 @@ -34,7 +34,7 @@
  #include <syslog.h>
  #include <errno.h>
@@ -21,9 +19,8 @@ diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++
  
  #include "fam.h"
  #include "Client.h"
-diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
---- fam-2.7.0-orig/src/DNotify.c++	2008-12-04 17:50:48.000000000 -0600
-+++ fam-2.7.0/src/DNotify.c++	2008-12-04 17:51:19.000000000 -0600
+--- a/src/DNotify.c++
++++ b/src/DNotify.c++
 @@ -31,6 +31,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -32,9 +29,8 @@ diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
  
  #include "DNotify.h"
  
-diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
---- fam-2.7.0-orig/src/IMon.c++	2003-01-18 08:18:12.000000000 -0600
-+++ fam-2.7.0/src/IMon.c++	2008-12-04 17:51:19.000000000 -0600
+--- a/src/IMon.c++
++++ b/src/IMon.c++
 @@ -40,7 +40,7 @@
  #include "Interest.h"
  #include "Log.h"
@@ -44,9 +40,8 @@ diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++
  
  int		   IMon::imonfd = -2;
  IMon::EventHandler IMon::ehandler = NULL;
-diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h
---- fam-2.7.0-orig/src/Interest.h	2008-12-04 17:50:48.000000000 -0600
-+++ fam-2.7.0/src/Interest.h	2008-12-04 17:51:22.000000000 -0600
+--- a/src/Interest.h
++++ b/src/Interest.h
 @@ -29,6 +29,7 @@
  #include <netinet/in.h>  //  for in_addr
  
diff --git a/app-admin/fam/files/fam-2.7.0-gcc44.patch b/app-admin/fam/files/fam-2.7.0-gcc44.patch
index c9ca0cba679e..8e892000dae6 100644
--- a/app-admin/fam/files/fam-2.7.0-gcc44.patch
+++ b/app-admin/fam/files/fam-2.7.0-gcc44.patch
@@ -1,5 +1,5 @@
---- fam-2.7.0-orig/src/NFSFileSystem.c++	2009-06-03 19:20:51.000000000 +0300
-+++ fam-2.7.0/src/NFSFileSystem.c++	2009-06-03 19:21:57.000000000 +0300
+--- a/src/NFSFileSystem.c++
++++ b/src/NFSFileSystem.c++
 @@ -97,7 +97,7 @@
  
      attr_cache_timeout = ACREGMAX;
diff --git a/app-admin/fam/files/fam-2.7.0-limits.patch b/app-admin/fam/files/fam-2.7.0-limits.patch
index 475d6c0159cd..23358edd77fb 100644
--- a/app-admin/fam/files/fam-2.7.0-limits.patch
+++ b/app-admin/fam/files/fam-2.7.0-limits.patch
@@ -1,5 +1,5 @@
---- include/fam.h.orig	2005-05-06 17:42:40.772797499 +0100
-+++ include/fam.h	2005-05-06 17:36:55.081176093 +0100
+--- a/include/fam.h
++++ b/include/fam.h
 @@ -41,7 +41,7 @@
  *****************************************************************************/
  
diff --git a/app-admin/whowatch/ChangeLog b/app-admin/whowatch/ChangeLog
index e5368d751c20..4a3b4f1bec39 100644
--- a/app-admin/whowatch/ChangeLog
+++ b/app-admin/whowatch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/whowatch
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/ChangeLog,v 1.34 2010/01/09 17:42:12 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/whowatch/ChangeLog,v 1.35 2011/01/24 04:40:35 jer Exp $
+
+  24 Jan 2011; Jeroen Roovers <jer@gentoo.org>
+  files/whowatch-1.6.0-cflags.patch, files/whowatch-1.6.0-submenus.patch:
+  Clean up patches.
 
 *whowatch-1.6.0-r1 (09 Jan 2010)
 
diff --git a/app-admin/whowatch/files/whowatch-1.6.0-cflags.patch b/app-admin/whowatch/files/whowatch-1.6.0-cflags.patch
index 14569e5bccdf..813a3c0f3b61 100644
--- a/app-admin/whowatch/files/whowatch-1.6.0-cflags.patch
+++ b/app-admin/whowatch/files/whowatch-1.6.0-cflags.patch
@@ -1,5 +1,5 @@
---- whowatch-1.6.0/src/Makefile.in.orig	2001-04-25 02:57:37.000000000 +0200
-+++ whowatch-1.6.0/src/Makefile.in	2008-11-15 15:54:22.000000000 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -60,7 +60,7 @@
  whowatch_LDADD = $(LDADD)
  whowatch_DEPENDENCIES = 
diff --git a/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch b/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch
index d9fef88ee1d2..ffd4a942633e 100644
--- a/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch
+++ b/app-admin/whowatch/files/whowatch-1.6.0-submenus.patch
@@ -1,6 +1,5 @@
-diff -ur whowatch-1.6.0.org/src/menu.c whowatch-1.6.0/src/menu.c
---- whowatch-1.6.0.org/src/menu.c	2010-01-09 18:19:35.000000000 +0100
-+++ whowatch-1.6.0/src/menu.c	2010-01-09 18:23:47.000000000 +0100
+--- a/src/menu.c
++++ b/src/menu.c
 @@ -37,7 +37,7 @@
  static unsigned short item_cursor;