Clean up patches.

Package-Manager: portage-2.2_rc88/cvs/Linux i686

7 files changed, 25 insertions, 19 deletions

diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog
index 58b57795736f..8b668f05e4d3 100644
--- a/app-text/pinfo/ChangeLog
+++ b/app-text/pinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pinfo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.41 2010/06/18 14:37:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.42 2010/10/06 16:42:08 jer Exp $
+
+  06 Oct 2010; Jeroen Roovers <jer@gentoo.org>
+  files/pinfo-0.6.9-FTPVIEWER.patch, files/pinfo-0.6.9-GROFF_NO_SGR.patch,
+  files/pinfo-0.6.9-as-needed.patch, files/pinfo-0.6.9-lzma-xz.patch,
+  files/pinfo-0.6.9-version.patch:
+  Clean up patches.
 
 *pinfo-0.6.9-r1 (18 Jun 2010)
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index e4f51be38201..0c09d3e34cda 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,10 +1,10 @@
-AUX pinfo-0.6.9-FTPVIEWER.patch 298 RMD160 00e28a844ef4a829487a3cca8f343aeb84b4fd7b SHA1 8312639f7fce642528c4702a0179a3c2f63c226a SHA256 bfc15e7f62f79ce6cebc541354c3260d28cf98678dd2ce599d9cfb821a0a88c2
-AUX pinfo-0.6.9-GROFF_NO_SGR.patch 260 RMD160 468e5c3244223ab7938344bc15fad24647802012 SHA1 ad2743c02ceee4ba13a41a4bc3ac92e7ac2465b0 SHA256 1b962a4a1a319009feb1331710fc24fbdcf1d8cd0852b07e5f5e3e656532dc1c
-AUX pinfo-0.6.9-as-needed.patch 534 RMD160 3e69e705111fa6355716222ff99605c39b6b63b6 SHA1 25eb180f28a7856ba56c4f040c10f9a96fbd1d7a SHA256 ff74358048ad59946f906484fd0d9c9f67a936b851bc50ee2248f2d27c17e425
-AUX pinfo-0.6.9-lzma-xz.patch 610 RMD160 8763552e912f4d6bc4297a00603b3f304c66f3fa SHA1 565269e430a296e67beaa3d1f5120e035ed3dfc2 SHA256 c934b7c17a719675ec79135e91721787d60c188863cd21246668815d5e15bfe5
-AUX pinfo-0.6.9-version.patch 1034 RMD160 2cf168bb5d4d35a383f33350378980dff60ea6b5 SHA1 fa576f84535b8a056c172b4ae320493289b3f0ba SHA256 4b180bdb5b646249f051817a2d8bac5a9a7a43e61a8f5e045170edd35e542b7c
+AUX pinfo-0.6.9-FTPVIEWER.patch 302 RMD160 829b3f5ea876530d73d1fd55ec3c61b563c7c46e SHA1 86219c50bf4f5a96bd3256b3003b7494abe3c078 SHA256 2c8bc439725f6f64ba014a84c55f39a37e7560029b13d8bc1f0d5393a8c9731e
+AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 RMD160 d4bf73dd5c9c88999ed3d44095cfb0896b5de457 SHA1 c56869d251b897a76c362b82d7325faaf5edb73c SHA256 4ce70f8db368b69785fe28a9574dd2267a69e33ef6d98922c513080ea860211b
+AUX pinfo-0.6.9-as-needed.patch 457 RMD160 548ed804fce4797c6f13c2ac1176e94475283098 SHA1 2ed1c6d1bfce11fabff5e466274b9742fb82d6da SHA256 b3e6fa18a7e3a9a1938c44ebd43184983b32adf1df24fd556cb9675b480600de
+AUX pinfo-0.6.9-lzma-xz.patch 614 RMD160 0806fff795e87baa7177b266e8a3b7be2f16a4af SHA1 82eab4b84d6f9244a6d7c4727039b8023cc464d3 SHA256 5c8923ee6dce84a114ad27aefaa2a3ced2a98b971958c56eefdabe26ed0fb804
+AUX pinfo-0.6.9-version.patch 1032 RMD160 787c8ac8404301e7145aa6e172127e4fd35a435e SHA1 0204e320bdc1e10d2e7a76dcf9d1fcea7442f4bb SHA256 ab2f755c004053622e4377e55cd85e28148c0537a31d0393104dd05118aecda1
 DIST pinfo-0.6.9.tar.bz2 448469 RMD160 e67582e0839d431c48b9849c477a2cd6917e568e SHA1 3ecee057169c1cffb328b861641e30fdff18b06c SHA256 03037330e7626932adb31c54d6c5e71b667bcde4854fd75357e67b7b7cf87ae5
 EBUILD pinfo-0.6.9-r1.ebuild 1096 RMD160 a5d149858e828056e836200148f4110543edbe39 SHA1 c6fa25915097a2ef0008d018149151a994d3c3ca SHA256 536b39c252659707bcaf549a9060a3d857cec69a5d2287a89573fab94a102d63
 EBUILD pinfo-0.6.9.ebuild 995 RMD160 47f1ec36540395a60594174e56d43804662fd6db SHA1 56759560a72c92c8505de0b08bbcb5d410012c4f SHA256 1dc1593335726b3eb026ca6a2f6db78769e7529f8a713c03e82a24576369be2b
-MISC ChangeLog 5529 RMD160 2439e07b42332824aeae7e41eb3b35c16e545f64 SHA1 10215dbbc6009009cd49272925a5d7376cd31e8a SHA256 d37597119ea87031220b8ae053699eede5a408202a8b615752f0abec63cb4861
+MISC ChangeLog 5777 RMD160 9d9869ac3caaaa2e5f6b6b80f4ac1f062231ed36 SHA1 18d3edb5886b53b3a3a168706d800d83f262c8b4 SHA256 6ce9e324ea09c388316ed245a0ec81e5baac0b8e0020577a559b65413298cd67
 MISC metadata.xml 217 RMD160 0d94a6fc560097772d4c2e86e653554bd05c25d4 SHA1 0d2cb1ef66cc2caa1b1e6905019402cddb355105 SHA256 6dc63d55b31ccafd1b88efc0808f669d4df575f9115872c574ffc1596851a4f8
diff --git a/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch b/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
index 52dbe0cbd097..0ab17f6008b0 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
@@ -1,5 +1,5 @@
-+++ src/parse_config.c	2006-03-09 20:44:51.000000000 +0100
---- src/parse_config.c	2006-06-23 14:16:02.000000000 +0200
++++ b/src/parse_config.c	2006-03-09 20:44:51.000000000 +0100
+--- a/src/parse_config.c	2006-06-23 14:16:02.000000000 +0200
 @@ -601,7 +601,7 @@
  		else
  			return 1;
diff --git a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
index 7aa7b3e87b33..dc902c0cae0a 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
@@ -1,5 +1,5 @@
---- src/manual.c.orig	2006-03-16 15:14:30.000000000 +0100
-+++ src/manual.c	2010-06-03 19:47:11.000000000 +0200
+--- a/src/manual.c	2006-03-16 15:14:30.000000000 +0100
++++ b/src/manual.c	2010-06-03 19:47:11.000000000 +0200
 @@ -261,6 +261,7 @@
  		xfree(tmpfilename1);
  	}
diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
index e2c005099b8f..85a80e6f2602 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
@@ -1,5 +1,5 @@
---- ./macros/curses.m4.orig	2006-06-26 22:29:10.000000000 +0200
-+++ ./macros/curses.m4	2006-06-26 22:31:16.000000000 +0200
+--- a/macros/curses.m4
++++ b/macros/curses.m4
 @@ -257,8 +257,8 @@
  	dnl save CFLAGS and LDFLAGS and set new ones
  	CFLAGS_OLD=$CFLAGS
diff --git a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
index 3e738c888205..6ae0766fb803 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
@@ -1,5 +1,5 @@
---- src/filehandling_functions.c
-+++ src/filehandling_functions.c
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
 @@ -41,14 +41,16 @@
   * you dump the file through `gunzip -d -c', etc.                              *
   ******************************************************************************/
diff --git a/app-text/pinfo/files/pinfo-0.6.9-version.patch b/app-text/pinfo/files/pinfo-0.6.9-version.patch
index a2960e780338..fd8b75e4279d 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-version.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-version.patch
@@ -1,5 +1,5 @@
---- doc/pinfo.info.orig	2006-03-16 17:28:00.000000000 +0100
-+++ doc/pinfo.info	2010-06-18 16:20:24.000000000 +0200
+--- a/doc/pinfo.info	2006-03-16 17:28:00.000000000 +0100
++++ b/doc/pinfo.info	2010-06-18 16:20:24.000000000 +0200
 @@ -1,6 +1,6 @@
  This is pinfo.info, produced by makeinfo version 4.8 from pinfo.texi.
  
@@ -17,8 +17,8 @@
  
     Original manpage written on 21 Mar 1999 by Przemek Borys,
  <pborys@dione.ids.pl>, `http://zeus.polsl.gliwice.pl/~pborys/'.
---- doc/pinfo.texi.orig	2006-03-16 16:40:41.000000000 +0100
-+++ doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
+--- a/doc/pinfo.texi	2006-03-16 16:40:41.000000000 +0100
++++ b/doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
 @@ -5,7 +5,7 @@
  @c %**end of header