Clean up patches.

(Portage version: 2.2.0_alpha19/cvs/Linux i686)

5 files changed, 15 insertions, 25 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index eefe8304c6b0..4298f5e444c8 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/lilo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.60 2010/11/05 05:48:55 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.61 2011/01/22 17:38:20 jer Exp $
+
+  22 Jan 2011; Jeroen Roovers <jer@gentoo.org>
+  files/lilo-22.8-correct-usage-info.patch, files/lilo-22.8-makefile.patch,
+  files/lilo-22.8-novga.patch, files/lilo-23.0-make.patch:
+  Clean up patches.
 
 *lilo-23.1 (05 Nov 2010)
 
diff --git a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
index ecc1994d46a7..87ea4b20ce9e 100644
--- a/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
+++ b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
@@ -1,6 +1,5 @@
-diff -u lilo-22.8.ORIG/lilo.c lilo-22.8/lilo.c
---- lilo-22.8.ORIG/lilo.c	2007-03-20 10:13:06.000000000 +0000
-+++ lilo-22.8/lilo.c	2007-03-20 10:13:33.000000000 +0000
+--- a/lilo.c
++++ b/lilo.c
 @@ -548,7 +548,8 @@
      fprintf(errstd,"%7s%s -T help \t\t\tlist additional options\n", "", name);
      fprintf(errstd,"%7s%s -X\t\t\t\tinternal compile-time options\n", "", name);
diff --git a/sys-boot/lilo/files/lilo-22.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch
index eb2e86977512..d2a34bbded1d 100644
--- a/sys-boot/lilo/files/lilo-22.8-makefile.patch
+++ b/sys-boot/lilo/files/lilo-22.8-makefile.patch
@@ -1,9 +1,5 @@
-Common subdirectories: lilo-22.8.ORIG/diagnose and lilo-22.8/diagnose
-Common subdirectories: lilo-22.8.ORIG/doc and lilo-22.8/doc
-Common subdirectories: lilo-22.8.ORIG/dos and lilo-22.8/dos
-diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile
---- lilo-22.8.ORIG/Makefile	2007-03-20 10:15:59.000000000 +0000
-+++ lilo-22.8/Makefile	2007-03-20 10:22:19.000000000 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -69,18 +69,7 @@
     -DMDPRAID -DDEVMAPPER
     
@@ -44,6 +40,3 @@ diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile
  	cp keytab-lilo.pl $$ROOT$(USRSBIN_DIR)
  	cp manPages/lilo.8 $$ROOT$(MAN_DIR)/man8
  	cp manPages/mkrescue.8 $$ROOT$(MAN_DIR)/man8
-Only in lilo-22.8: Makefile.orig
-Common subdirectories: lilo-22.8.ORIG/manPages and lilo-22.8/manPages
-Common subdirectories: lilo-22.8.ORIG/sample and lilo-22.8/sample
diff --git a/sys-boot/lilo/files/lilo-22.8-novga.patch b/sys-boot/lilo/files/lilo-22.8-novga.patch
index d15ce2d8f8eb..939998fe9d4e 100644
--- a/sys-boot/lilo/files/lilo-22.8-novga.patch
+++ b/sys-boot/lilo/files/lilo-22.8-novga.patch
@@ -1,10 +1,5 @@
-Common subdirectories: lilo-22.8.ORIG/diagnose and lilo-22.8/diagnose
-Common subdirectories: lilo-22.8.ORIG/doc and lilo-22.8/doc
-Common subdirectories: lilo-22.8.ORIG/dolilo and lilo-22.8/dolilo
-Common subdirectories: lilo-22.8.ORIG/dos and lilo-22.8/dos
-diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile
---- lilo-22.8.ORIG/Makefile	2007-03-20 10:29:42.000000000 +0000
-+++ lilo-22.8/Makefile	2007-03-20 10:30:07.000000000 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -66,7 +66,7 @@
  
  CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
@@ -14,5 +9,3 @@ diff -u lilo-22.8.ORIG/Makefile lilo-22.8/Makefile
     
  
  MAN_DIR=/usr/share/man
-Common subdirectories: lilo-22.8.ORIG/manPages and lilo-22.8/manPages
-Common subdirectories: lilo-22.8.ORIG/sample and lilo-22.8/sample
diff --git a/sys-boot/lilo/files/lilo-23.0-make.patch b/sys-boot/lilo/files/lilo-23.0-make.patch
index 39bc514dd61b..00b15c52ca07 100644
--- a/sys-boot/lilo/files/lilo-23.0-make.patch
+++ b/sys-boot/lilo/files/lilo-23.0-make.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-06-18 19:17:48.000000000 +0200
-+++ Makefile	2010-07-20 02:00:18.000000000 +0200
+--- a/Makefile	2010-06-18 19:17:48.000000000 +0200
++++ b/Makefile	2010-07-20 02:00:18.000000000 +0200
 @@ -26,19 +26,19 @@
  # everything needed to run, just short of installation
  #