Clean up patches.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 24 insertions, 24 deletions

diff --git a/x11-misc/gmrun/ChangeLog b/x11-misc/gmrun/ChangeLog
index 034eb3b95c88..e8012d2dad11 100644
--- a/x11-misc/gmrun/ChangeLog
+++ b/x11-misc/gmrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/gmrun
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.27 2014/03/04 20:24:07 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gmrun/ChangeLog,v 1.28 2014/09/08 08:18:55 jer Exp $
+
+  08 Sep 2014; Jeroen Roovers <jer@gentoo.org> files/gmrun-0.9.2-gcc43.patch,
+  files/gmrun-0.9.2-glibc210.patch, files/gmrun-0.9.2-sysconfdir.patch:
+  Clean up patches.
 
   04 Mar 2014; Vicente Olivert Riera <vincent@gentoo.org> gmrun-0.9.2-r1.ebuild:
   Add ~mips keyword.
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
index 5be392201d6b..e1d4d6d211ac 100644
--- a/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-gcc43.patch
@@ -1,5 +1,5 @@
---- gmrun-0.9.2/src/gtkcompletionline.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ gmrun-0.9.2/src/gtkcompletionline.cc	2008-05-08 08:51:22.000000000 +0200
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
 @@ -29,6 +29,7 @@
  #include <set>
  #include <sstream>
@@ -8,8 +8,8 @@
  #include <vector>
  using namespace std;
  
---- gmrun-0.9.2/src/ci_string.h.orig	2001-05-16 16:39:31.000000000 +0200
-+++ gmrun-0.9.2/src/ci_string.h	2008-05-08 08:51:33.000000000 +0200
+--- a/src/ci_string.h
++++ b/src/ci_string.h
 @@ -7,6 +7,7 @@
  #define __CI_STRING_H__
  
@@ -18,8 +18,8 @@
  #include <ctype.h>
  
  struct ci_char_traits : public std::char_traits<char>
---- gmrun-0.9.2/src/prefs.cc.orig	2002-08-16 12:48:22.000000000 +0200
-+++ gmrun-0.9.2/src/prefs.cc	2008-05-08 08:51:54.000000000 +0200
+--- a/src/prefs.cc
++++ b/src/prefs.cc
 @@ -13,6 +13,7 @@
  #include <fstream>
  #include <iostream>
@@ -28,8 +28,8 @@
  
  #include <list>
  
---- gmrun-0.9.2/src/main.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ gmrun-0.9.2/src/main.cc	2008-05-08 09:03:11.000000000 +0200
+--- a/src/main.cc
++++ b/src/main.cc
 @@ -14,6 +14,7 @@
  #include <gdk/gdkkeysyms.h>
  
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
index 989183b2be46..6e12a56f431d 100644
--- a/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-glibc210.patch
@@ -1,5 +1,5 @@
---- gmrun-0.9.2/src/gtkcompletionline.cc.orig	2009-06-19 22:38:14.000000000 +0400
-+++ gmrun-0.9.2/src/gtkcompletionline.cc	2009-06-19 22:37:14.000000000 +0400
+--- a/src/gtkcompletionline.cc
++++ b/src/gtkcompletionline.cc
 @@ -376,7 +377,7 @@
    return 0;
  }
diff --git a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
index cd6fc1c87577..61599014a6d9 100644
--- a/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
+++ b/x11-misc/gmrun/files/gmrun-0.9.2-sysconfdir.patch
@@ -1,19 +1,17 @@
 http://bugs.gentoo.org/292856
 
-diff -ur gmrun-0.9.2.orig/config/Makefile.am gmrun-0.9.2/config/Makefile.am
---- gmrun-0.9.2.orig/config/Makefile.am	2001-05-17 09:58:07.000000000 +0300
-+++ gmrun-0.9.2/config/Makefile.am	2010-06-06 16:05:16.000000000 +0300
+--- a/config/Makefile.am
++++ b/config/Makefile.am
 @@ -1,6 +1,6 @@
- # $Id: gmrun-0.9.2-sysconfdir.patch,v 1.1 2010/06/06 13:13:11 ssuominen Exp $
+ # $Id: gmrun-0.9.2-sysconfdir.patch,v 1.2 2014/09/08 08:18:55 jer Exp $
  
 -myrcdir = @PACKAGE_DATA_DIR@
 +myrcdir = $(sysconfdir)
  myrc_DATA = gmrunrc
  
  EXTRA_DIST = gmrunrc
-diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in
---- gmrun-0.9.2.orig/config.h.in	2003-11-16 12:47:07.000000000 +0200
-+++ gmrun-0.9.2/config.h.in	2010-06-06 16:07:14.000000000 +0300
+--- a/config.h.in
++++ b/config.h.in
 @@ -10,7 +10,6 @@
  #undef HAVE_STPCPY
  #undef HAVE_LIBSM
@@ -22,18 +20,16 @@ diff -ur gmrun-0.9.2.orig/config.h.in gmrun-0.9.2/config.h.in
  #undef PACKAGE_SOURCE_DIR
  
  /* Define if you have the <dirent.h> header file.  */
-diff -ur gmrun-0.9.2.orig/src/Makefile.am gmrun-0.9.2/src/Makefile.am
---- gmrun-0.9.2.orig/src/Makefile.am	2002-06-05 22:39:18.000000000 +0300
-+++ gmrun-0.9.2/src/Makefile.am	2010-06-06 16:09:11.000000000 +0300
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -15,3 +15,5 @@
  
  gmrun_LDADD = @GTK_LIBS@ @STLPORT_LDFLAGS@
  
 +AM_CPPFLAGS = \
 +	-DPACKAGE_DATA_DIR='"$(datadir)/$(PACKAGE)"' -DPACKAGE_SYSCONF_DIR='"$(sysconfdir)"'
-diff -ur gmrun-0.9.2.orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
---- gmrun-0.9.2.orig/src/prefs.cc	2002-08-16 13:48:22.000000000 +0300
-+++ gmrun-0.9.2/src/prefs.cc	2010-06-06 16:07:14.000000000 +0300
+--- a/src/prefs.cc
++++ b/src/prefs.cc
 @@ -30,7 +30,7 @@
  
  Prefs::Prefs()