Clean up patches.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 33 insertions, 33 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/Manifest b/x11-misc/gmrun/Manifest
index dc83cb942be6..6e68bd7626c1 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gmrun-0.9.2-gcc43.patch 1132 SHA256 21619fca99499bcd21f9707990158d3adda17784f2e52ee2b9263604dc4c1390 SHA512 e5261982d692890707122e06f4794d420dd34912825bec6fe4cb5051bfb9c6536cefa76ed529c72fb28bf2327fd1f5276228a77c746f2431071b74ac45426deb WHIRLPOOL 67780be492f52114f8c073201cf7fbf2aeca03387e2421d01aeb9c18fd3416436f97144113a2a5282d6eb92d8b7285c83ee79fa8c1182e800aff0bf1fa4e3754
-AUX gmrun-0.9.2-glibc210.patch 421 SHA256 931efdd02740483b1066366a07378419d8110ba172f33467236ebd2711d4eaef SHA512 94bb9ec698fec0fc0b1375585b0509139cc0348c0285a404f439c26c787f6949a595a4a0731f8beb37f8063a2c661a11878e970342f049c40a9e4766c8bc5728 WHIRLPOOL 203373e830081aed6210573247f3f72a8bcd61822e12ffb30dabb2d142199cb7ba5dce667567ab187e8221adbf363a329063bbab875d03dbd6dfdc9468f425b6
-AUX gmrun-0.9.2-sysconfdir.patch 1594 SHA256 0ca181e99ee651f78c3732bf6afff05b27be3f694683197e7e81672bc8b833b9 SHA512 dd7d78f3aa57ee11430311ce44ea43e690d67e5b6ef08eab22c06c8d71c3511916eab141c3b678ad6e3578439da8fb32639e124010d07533b5df11330593fd6b WHIRLPOOL 3c5e1754dd641dceb80a0a5e51c9c2e8d74fbf806bcd1547114fd750ae736b7f58da1041d03a1476fc6198c81eb7bd382fbac2eaf40c465ee61d0d344d6a63c7
-DIST gmrun-0.9.2.tar.gz 66097 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0
+AUX gmrun-0.9.2-gcc43.patch 744 SHA256 89b50fe01ab40386208de1f5ba32295fb6a33abb3e6fa809c402f26810124aba SHA512 376d0a5425f264044cb0d1635e0c5aaede0ad962fa21fc552cf2ae4145a33520f8035193fd4e9c3108ef5cfdc671aa2fc4922479836d392a0d3d287e810593c5 WHIRLPOOL 9955260f2ecc41f8295e47f2165ba73684019f0aeb98494598776806d187f8961f5a301beac06cea19efec4bf847af3005e4705508887d358ae999e8d77d2ef2
+AUX gmrun-0.9.2-glibc210.patch 324 SHA256 3e3428398cc578e0dd3cea42ba8a4b9d98267e2305c6c307af5acaee82924ccf SHA512 6488186908e33fe27e4e4f6d81fe9dd5fc1bb74e15b2153ebd660788be75432e68dfebb6ee21b17a0711b99d5d1e54eaf0a4384111bfe56134cce817b4bed49d WHIRLPOOL 80c472b0c0722aeafb41f68e8c9abcd9c448c903e93c7d1f243952b0c94ebf514f0723553d147f8fba96374dfdc633f477e7100c625aa912f0c6e5000f27ced7
+AUX gmrun-0.9.2-sysconfdir.patch 928 SHA256 de814c6c42e4f5ef7a00ed43d5eeb732596e389371f49e05d6fcc6308b56f0b0 SHA512 972345f6641ee1a7f0c5653c5df58a7f4d8f2bff2e84a02b8482dd354148ca60366236c6a35828639a109264fd9421a954567a5c4e30afb34b9c75ce43fcae85 WHIRLPOOL e3a08a59dc9f69400088792aff970b36c31960f79b7eaaa62b80defdcd91f1a0b8c22ed309c6128e379650d506f75f2998d34d670245944f1f41fe8236ed200e
+DIST gmrun-0.9.2.tar.gz 66097 SHA256 17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422 WHIRLPOOL d8ea7ddcc4625e64e35f281bb561af4cd94d65b1c6548c3f44f23f3334e31cb1ea96afcb1052c45e4fe01ba73f9863a738c571711ccf3c6dfe5c4f17b085e7d4
 EBUILD gmrun-0.9.2-r1.ebuild 1067 SHA256 cff5a1c1028eb63668f808a4a4ddb70f1d79b66895ecf207c8a7d78b1fe58882 SHA512 025495e4d1a8b766a7a601414eaf8699aa7348b97112fa4526d15b0faa8d0d34fa5b99080f887ba1758f6b564a4f8b1fc47f32812e9904f4106869d88836d3fc WHIRLPOOL 429a64fb56638c6e588a2b651df4ab325990f028675ed77d51e09274edc77d35ef4e55da4966a08bb4cebe2cb58dc2a78a683b212647ea94596df5f10c368759
 EBUILD gmrun-0.9.2.ebuild 1060 SHA256 f856573126a291b7ca944e6d5e496cff07aad6f357a9e65846c7ca1d46282941 SHA512 8e6f96ac06181ba4dd56b92d91554b87ae3134dfa6fde185ef6f9c260027cc93c3dff5209b6a5692baf8712eb2e5ec38d71fad8db9e7b4d30f008e150b4ae1be WHIRLPOOL 0fe9d34116c5fe5b347e8636ee175093ad6cbd02bfec1f4ed41ebd7fb52d065a1a98b683ea0f66b67f716b6d11543c21d40e73390038f130b1876e704ca66e0b
-MISC ChangeLog 3352 SHA256 3f6c051cb6d638b0207ccd21283e1a5ddf73c904642112481208485838ea762e SHA512 cab9c3d78834a0922cb968017323d4749fb97b429a97b4229b967905199e031510b1883df2fb54503050d82997a6bddfacb9d6acc80bb18b5165c0910f5c07ab WHIRLPOOL f2906dd04f12885aa776f6ca7695fb49dbfafa03e84887eb77acea0782969cf6d276341f6974b858da4b53664d1b21badb6e84f0b78dbca0bc991fcbc2cd3b76
+MISC ChangeLog 3519 SHA256 02326910dbb7169d4489d745c134145dbf82b6db2e7b0f1f5b959dba7af86803 SHA512 bfdf4b95fbf3c06d133cea045e40b4c8d3e01f06231a1732efa5ad6de108079971b0c2e88029a5073294a31849740d592c05791b6db3b808c68285f8a799aac5 WHIRLPOOL cadd7498027afd611d6ff3b7bda6428085d95e99093a6b1f746a4b20f661de040e4593b845645e2db2145fe2badd0c30ff4e8687bf70611e07bf1b416458cd26
 MISC metadata.xml 338 SHA256 cd10c5f526519fc51527aaef8af03e72f6bfd18a8e6eadba81a0c5b928843c53 SHA512 6d99074f0570d902141bc1f195a6d0f3ceca6b775e11ae30c9d9e0ffd943637f8e314b7a144a65c9ab199dd0af57cd2762ffeb185e9aced2e909918a44c09482 WHIRLPOOL 4dc039d11a257db054a5997440a7acd90d0d884811c93e32779ae19a1ca7491a5d4dc75f80b50865151ce16cfd85f4d55f51e0affa367920fdcda3a2c44ebdd9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMWNm0ACgkQWunnsum7y6iBVQCeMqTzoQg6P7LgftTmShKWoqca
-XgMAoIL9kJhpFOSL1uUNVcxR+iY6y1jw
-=mzf9
+iEYEAREIAAYFAlQNZnEACgkQVWmRsqeSphMQiwCbBKnLXYb4SJNWlm0hP9yHlgg2
+aLoAnjni05JqhNwZV6amx1wsc0p7M0yb
+=tSEE
 -----END PGP SIGNATURE-----
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()