Clean up patches.

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

6 files changed, 20 insertions, 30 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/Manifest b/sys-boot/lilo/Manifest
index 03d6ba10a590..ff846e211ce5 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,8 +1,8 @@
-AUX lilo-22.8-correct-usage-info.patch 604 RMD160 d7cd1c5521c58ba19b1e0847746b5fe42ed23240 SHA1 96772a4f502876d7ebf3e016280dfa4bea382b35 SHA256 9a73c94e4c923141817def8030e43cc6eebaffa1bbce35ad3d511dc2583d645b
-AUX lilo-22.8-makefile.patch 1776 RMD160 129e056f3592e4e8276acfe03106c3ae9e7ddfff SHA1 346d53bb307d1baa393da1db1fc516b1cc5ebee7 SHA256 4e95ead9648613a4682445f161818e6af875386aaa24f33bdb87c4c3d7cf38d7
+AUX lilo-22.8-correct-usage-info.patch 464 RMD160 6b5b0dc33c496b74ec1c93c592b20647390a19e8 SHA1 fcd973814b817b9e512e151d58436ab441ec18bc SHA256 52d63f53dd5c769d2b42c4f4c2447696394a6e213f0253fcaf2b7501faaef382
+AUX lilo-22.8-makefile.patch 1273 RMD160 51fe4916625ced640a3db752ad7d0fab0645c7b8 SHA1 eea591c4d1055df2dae478fc01f696d7562d5969 SHA256 d481f4452bee0ec839830a3a3c572394bf9d7e5abea99ab87d18a70859730536
 AUX lilo-22.8-nodevmapper.patch 437 RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c SHA1 fa6cae8448c13bd10c68a4ee79bb753f2f8ec4aa SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6
-AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SHA1 6b17310e2c71c605a7a2e816ac2a02b326ee6d28 SHA256 5ff92c00ce2624a070ebb616ab2efede5460cdd229d0e9bc97e4ddc65daa1e8a
-AUX lilo-23.0-make.patch 2148 RMD160 197ebfa2bdd6543dc26dd7f2d80fcc88c7f38be7 SHA1 f1e7bef7ec5a0c7683b6f89139f2b19ec3a64dcf SHA256 21f0608cdf3e701478596d25bf1ebd1617fc7c3fcc97205ed39b8608cd203073
+AUX lilo-22.8-novga.patch 295 RMD160 7aa6485a9c68c3518faa638d52451b40a59fd988 SHA1 d69eb8deb8a480163eac68479f469b71804c9d0b SHA256 f4fc887a0950a32262dc4f36d84fe2b5ec6df2ae67d1dd0110fdfe1aadf65d9c
+AUX lilo-23.0-make.patch 2147 RMD160 611e5fbcd2411b3909da35deaeb71d28dd56667a SHA1 acf1802f57710d4c63464b7eeb368962c85ba907 SHA256 4561fb4be2ebcef1ab5bc5b371a2c2e8a7fb4d65764c3aa77f71b63dc11d6488
 AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0
 DIST dolilo-0.5.tar.bz2 3777 RMD160 10a060878ee3fc50ba109c8d2decdd6b409bed2e SHA1 9617479e3736c24d3c06628c540a5eaeb184d849 SHA256 9b6994ec6416cdfb0205665a58dc2e6a1d6e36272a3cab94315daea1c55605f1
 DIST lilo-22.8.src.tar.gz 437555 RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 SHA1 59852eab59b93dcea63b39eef1db7963b7268b0d SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb
@@ -12,5 +12,5 @@ EBUILD lilo-22.8-r2.ebuild 4676 RMD160 ecc77fbc276cc2ecda9096bf45391ef05a972e9f
 EBUILD lilo-23.0-r1.ebuild 4225 RMD160 755ff5d310d3bb3d6a018d1bc4b87e602a95bdca SHA1 476b5d08f891bb9ad9905bf336fadf397c008d3a SHA256 1a71a9d03e4df8e312ea29525dcdc917f987763fa2b986f49b208adb49e6b7d3
 EBUILD lilo-23.0.ebuild 4186 RMD160 c02bfd4c0867f9769c87a5ad02ef4c002bc8cb28 SHA1 f6439198b5db374e6c86a589da4b7ae826aba387 SHA256 ee771e91be43ac1af552fb79d5a203d59985c02e3545d71906d334d16c7a27b0
 EBUILD lilo-23.1.ebuild 4248 RMD160 35a4092f205f1084ce78dca4ea11324af21981e6 SHA1 dc40ab38f39b8c253fcd9245fe60a79da791448b SHA256 f7cfb471b4af012840c86003f8520447b6f50244bafc6d7060b4696a5e77f340
-MISC ChangeLog 11225 RMD160 093c01914868a2f8d911312d8275386ccc1332b6 SHA1 3fd8e1df1781ea134833995798b85fae6ee2c9f0 SHA256 c3b65cf8ab428b12e8c9355eda3692a166dd1e5a843df603c9b14200d59233f2
+MISC ChangeLog 11428 RMD160 a2291456f04f3e0dfcaa5a1dbf6d22b641b79e3a SHA1 4ca8fbaf3cb519e4cffa89bb9afe0684669d33c3 SHA256 245f85916b533ac69809c62b89b069a1e44df02913b31d631895b8d82a64414c
 MISC metadata.xml 522 RMD160 9c4f3c0f6aceed93fa4fe295784994fa2a48e5e2 SHA1 2c2a255573c6431b3198748cb8fc51b6d5608704 SHA256 52f357c0a361c837bf7b569033bd44667f2c32a857bf7ec64dabfb34bb4d5026
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
  #