Clean up patches.

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

4 files changed, 22 insertions, 23 deletions

diff --git a/sys-boot/palo/ChangeLog b/sys-boot/palo/ChangeLog
index 7e3cbe4e7ead..8c02c7687275 100644
--- a/sys-boot/palo/ChangeLog
+++ b/sys-boot/palo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/palo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.28 2011/01/03 11:51:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/palo/ChangeLog,v 1.29 2011/01/22 17:30:34 jer Exp $
+
+  22 Jan 2011; Jeroen Roovers <jer@gentoo.org> files/palo-1.16_p1-build.patch,
+  files/palo-remove-HOME-TERM.patch:
+  Clean up patches.
 
   03 Jan 2011; Jeroen Roovers <jer@gentoo.org> -palo-1.17.ebuild,
   -files/palo-1.17-fortify-source.patch, palo-1.18.ebuild:
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 5f065857e9d2..59d07b487c34 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,7 +1,7 @@
-AUX palo-1.16_p1-build.patch 1045 RMD160 9ceec2a8b8adc2677653f8cd1c0b72cae3f04062 SHA1 bf479b78b9f5ac76e81a6aa712929ca7aa52721b SHA256 6b236237ba2fe3a10bb9f8463b87df69a61a75d546b519151304eb3415bd3598
-AUX palo-remove-HOME-TERM.patch 3605 RMD160 1837ffee8e2268e91d0e7473cfe9d6179727a436 SHA1 b203fdce28f6bcf6bcc8a7739531788a36d8f6d3 SHA256 4e490602078102ed475535be892ab3f3ef535c3f133bb10b926a9ea029acfe8d
+AUX palo-1.16_p1-build.patch 975 RMD160 ed514585fdd3680fb15a84160c8153cffac55a03 SHA1 978d0d6ea14873a5432f3d63b5a61e459a999890 SHA256 0eb0dae5f73ea508f9ce1e2291ae9c2ae868706d3b8bb4dac99e79d2c2a1b23f
+AUX palo-remove-HOME-TERM.patch 3329 RMD160 a5acbcb4f951e0de481c2101b48f3bad16d27476 SHA1 af9a6e696989d6558961caf86ac44e1812e7276e SHA256 a3fe56fc6d0b78c57191bf45ba44f52f53bdf3f8575c258bc49cac4f08040653
 AUX palo.conf 207 RMD160 648432e3819a34cc2034722d8db1438bd5244f24 SHA1 70359b6c8925520a6749b8be3fa3f30d0ae4e5cd SHA256 191d665eee73ff654763d6c4399cb46d86fe24b00140ba1eea0601b339ebb92a
 DIST palo_1.18.tar.gz 107181 RMD160 64ecee0235f51d6bde96816ae482da0db896897e SHA1 3b47f4abadbec4235e3e63ac80a802f44a2c202f SHA256 2b75c5ed02c821c36419201c913f63979a0a5ea2abeee5bd8f7de4e8f9fc2a74
 EBUILD palo-1.18.ebuild 1029 RMD160 5bf2fb999214ee511b5914e70c806ec29034b927 SHA1 b961e4d22eea4b243d6618a2e915e606cd0bb802 SHA256 3a49075a550a248445a5ee20df757d81d6412984e231c1adc9566761c50e6e6b
-MISC ChangeLog 5026 RMD160 75b060ee033a1cc7addb63be24bfe1332993b445 SHA1 b728e19f42a780fe016077ab0e6e4f0ef99f138b SHA256 22ffb9eb09c7a89184aa882b14d3c3535a458c5b266daa7d7ad284f9c6b62aa6
+MISC ChangeLog 5163 RMD160 bfa94b96f0cd5658d813f7a56cd0db6c7e058659 SHA1 5030de074f9ff826f2dc73bdde214021dd17d7be SHA256 aa1f2ae2fad58210dbb73e9699e672b80a07232670dc7c551933fd3560027b6e
 MISC metadata.xml 218 RMD160 7ebffdd97a99332a813fc08c76d8778cbaf6fbb1 SHA1 bf9a67f41e2a502fdd350ad6dc013c6a8610bd3d SHA256 d1a75fab2f73415e8705e229079747d610911988eefba166afeba4a965edeaad
diff --git a/sys-boot/palo/files/palo-1.16_p1-build.patch b/sys-boot/palo/files/palo-1.16_p1-build.patch
index 4bb1f2aaffd6..d1fe3359bb44 100644
--- a/sys-boot/palo/files/palo-1.16_p1-build.patch
+++ b/sys-boot/palo/files/palo-1.16_p1-build.patch
@@ -1,5 +1,5 @@
---- ./palo-1.16+nmu1/ipl/Makefile.orig	2007-09-12 18:12:03.000000000 +0200
-+++ ./palo-1.16+nmu1/ipl/Makefile	2009-05-07 06:16:20.000000000 +0200
+--- a/ipl/Makefile	2007-09-12 18:12:03.000000000 +0200
++++ b/ipl/Makefile	2009-05-07 06:16:20.000000000 +0200
 @@ -11,17 +11,11 @@
  
  MACHINE	:= $(subst 64,,$(shell uname -m))
@@ -20,8 +20,8 @@
  LDFLAGS  = -N --section-start .init=0x60000 -e '$$START$$'
  
  all:	iplelf
---- ./palo-1.16+nmu1/palo/Makefile.orig	2007-09-12 18:12:03.000000000 +0200
-+++ ./palo-1.16+nmu1/palo/Makefile	2009-05-07 06:16:50.000000000 +0200
+--- a/palo/Makefile	2007-09-12 18:12:03.000000000 +0200
++++ b/palo/Makefile	2009-05-07 06:16:50.000000000 +0200
 @@ -10,11 +10,11 @@
  ###############{
  
diff --git a/sys-boot/palo/files/palo-remove-HOME-TERM.patch b/sys-boot/palo/files/palo-remove-HOME-TERM.patch
index 0e5221addb2a..6d157edcd067 100644
--- a/sys-boot/palo/files/palo-remove-HOME-TERM.patch
+++ b/sys-boot/palo/files/palo-remove-HOME-TERM.patch
@@ -1,6 +1,5 @@
-diff -uNr palo.orig/Makefile palo/Makefile
---- palo.orig/Makefile	2004-05-17 13:39:00.431714000 +0200
-+++ palo/Makefile	2004-05-17 13:39:45.221714000 +0200
+--- a/Makefile	2004-05-17 13:39:00.431714000 +0200
++++ b/Makefile	2004-05-17 13:39:45.221714000 +0200
 @@ -56,7 +56,7 @@
      ROOT=root=/dev/nfs nfsroot=${NFSROOT} ip=bootp
  endif
@@ -10,9 +9,8 @@ diff -uNr palo.orig/Makefile palo/Makefile
  
  all: makepalo README palo.conf
  	
-diff -uNr palo.orig/README palo/README
---- palo.orig/README	2004-05-17 13:39:00.431714000 +0200
-+++ palo/README	2004-05-17 13:40:09.341714000 +0200
+--- a/README	2004-05-17 13:39:00.431714000 +0200
++++ b/README	2004-05-17 13:40:09.341714000 +0200
 @@ -42,13 +42,13 @@
         files to it, unmount.
       * Use palo to make the disk bootable:
@@ -29,9 +27,8 @@ diff -uNr palo.orig/README palo/README
     --recoverykernel=/boot/vmlinux
     --init-partitioned=/dev/your-disk
  
-diff -uNr palo.orig/README.html palo/README.html
---- palo.orig/README.html	2004-05-17 13:39:00.431714000 +0200
-+++ palo/README.html	2004-05-17 13:40:27.801714000 +0200
+--- a/README.html	2004-05-17 13:39:00.431714000 +0200
++++ b/README.html	2004-05-17 13:40:27.801714000 +0200
 @@ -52,13 +52,13 @@
      <p><li>Use <i>palo</i> to make the disk bootable:
      <pre>
@@ -48,9 +45,8 @@ diff -uNr palo.orig/README.html palo/README.html
  --recoverykernel=/boot/vmlinux
  --init-partitioned=/dev/your-disk</pre>
  and running <i>palo</i>.
-diff -uNr palo.orig/ipl/ipl.c palo/ipl/ipl.c
---- palo.orig/ipl/ipl.c	2004-05-17 13:39:00.491714000 +0200
-+++ palo/ipl/ipl.c	2004-05-17 13:39:19.681714000 +0200
+--- a/ipl/ipl.c	2004-05-17 13:39:00.491714000 +0200
++++ b/ipl/ipl.c	2004-05-17 13:39:19.681714000 +0200
 @@ -481,9 +481,6 @@
  	        chk_strcat(commandline, "ttyB0", CMDLINELEN, &ok);
              else
@@ -70,9 +66,8 @@ diff -uNr palo.orig/ipl/ipl.c palo/ipl/ipl.c
  	}
      }
  
-diff -uNr palo.orig/palo.conf palo/palo.conf
---- palo.orig/palo.conf	2004-05-17 13:39:00.431714000 +0200
-+++ palo/palo.conf	2004-05-17 13:41:01.541714000 +0200
+--- a/palo.conf	2004-05-17 13:39:00.431714000 +0200
++++ b/palo.conf	2004-05-17 13:41:01.541714000 +0200
 @@ -8,7 +8,7 @@
  # recovery kernel, and the default dynamically-booted kernel.
  # --recoverykernel=/boot/vmlinux