22.7 stable on x86. Clean up old ebuilds & patches.

(Portage version: 2.0.51.22-r1)

11 files changed, 17 insertions, 901 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 1a853c218389..058e30053dfd 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.34 2005/05/09 02:12:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.35 2005/06/29 19:52:12 chainsaw Exp $
+
+  29 Jun 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/lilo-22.6.1-correct-usage-info.patch,
+  -files/lilo-22.6.1-create-install-dirs.patch,
+  -files/lilo-22.6.1-devmapper_gentoo.patch, -files/lilo-22.6.1-novga.patch,
+  -lilo-22.6.1.ebuild, -lilo-22.6.1-r1.ebuild, lilo-22.7.ebuild:
+  22.7 stable on x86. Clean up old ebuilds & patches.
 
   09 May 2005; Olivier Crête <tester@gentoo.org> lilo-22.7.ebuild:
   Added ~amd64 keyword (fixes bug #82052)
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 9edcde1746fa..43a1d4d3a46d 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,27 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
-MD5 66f12349ca9414f901d929091e8dfe92 lilo-22.6.1.ebuild 4771
 MD5 0fe46ff76e44ce1479354fa5635a2543 ChangeLog 3755
-MD5 b42e977318d9032045ca4a2f26b373fb lilo-22.6.1-r1.ebuild 5121
-MD5 9d618ecef3e710eedba5448007234558 lilo-22.7.ebuild 5115
+MD5 2b5778242fd7569fd075b7d07b8f53e6 lilo-22.7.ebuild 5114
+MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.7-create-install-dirs.patch 970
+MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6.1-create-install-dirs.patch 970
 MD5 c3e5c4bfabecddb7a57c3cdce9e21c3a files/lilo-22.6.1-devmapper_gentoo.patch 12072
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.6.1-correct-usage-info.patch 683
-MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1 128
-MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6.1-create-install-dirs.patch 970
-MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722
-MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1-r1 128
-MD5 3caa133b51ca935f818fd53102b0b62a files/digest-lilo-22.7 126
-MD5 78f9720430dac90363e7b5120a262a3a files/lilo-22.6.1-novga.patch 936
 MD5 de6a5065fca97cf5df35c8bc9bebfafc files/lilo-22.7-correct-usage-info.patch 557
-MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.7-create-install-dirs.patch 970
-MD5 c3e5c4bfabecddb7a57c3cdce9e21c3a files/lilo-22.7-devmapper_gentoo.patch 12072
 MD5 78f9720430dac90363e7b5120a262a3a files/lilo-22.7-novga.patch 936
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfscHmOfEJZHYOKcRAk9qAKCQiRNKB2NeLPESekQ1zLai6IdfMgCgsBOm
-PXvpjYZ8us9gubsd0NAWqrA=
-=e7zI
------END PGP SIGNATURE-----
+MD5 c3e5c4bfabecddb7a57c3cdce9e21c3a files/lilo-22.7-devmapper_gentoo.patch 12072
+MD5 78f9720430dac90363e7b5120a262a3a files/lilo-22.6.1-novga.patch 936
+MD5 5f2172291cc1252b30f5a60981a51ac4 files/lilo.conf 1722
+MD5 3caa133b51ca935f818fd53102b0b62a files/digest-lilo-22.7 126
diff --git a/sys-boot/lilo/files/digest-lilo-22.6.1 b/sys-boot/lilo/files/digest-lilo-22.6.1
deleted file mode 100644
index edf8246ca993..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.6.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 18473e10859767b8af5d08aa7d9fe1e7 lilo-22.6.1.src.tar.gz 422818
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
diff --git a/sys-boot/lilo/files/digest-lilo-22.6.1-r1 b/sys-boot/lilo/files/digest-lilo-22.6.1-r1
deleted file mode 100644
index edf8246ca993..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.6.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 18473e10859767b8af5d08aa7d9fe1e7 lilo-22.6.1.src.tar.gz 422818
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
diff --git a/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch
deleted file mode 100644
index 3812115fe41d..000000000000
--- a/sys-boot/lilo/files/lilo-22.6.1-correct-usage-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr lilo-22.5.8-ORIG/lilo.c lilo-22.5.8/lilo.c
---- lilo-22.5.8-ORIG/lilo.c	2004-06-07 19:47:58.028442608 +0100
-+++ lilo-22.5.8/lilo.c	2004-06-07 19:50:17.837188448 +0100
-@@ -336,7 +336,8 @@
-     fprintf(errstd,"%7s%s -M /dev/XXX [ mbr | ext ]\tinstall master boot record\n","",name);
-     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);
--    fprintf(errstd,"%7s%s -V [ -v ]\t\t\tversion information\n\n","",name);
-+    fprintf(errstd,"%7s%s -V\t\t\t\tversion information\n","",name);
-+    fprintf(errstd,"%7s%s -v\t\t\t\tverbose mode\n\n","",name);
-     exit(1);
- }
- 
diff --git a/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch b/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch
deleted file mode 100644
index c9e58a2312a5..000000000000
--- a/sys-boot/lilo/files/lilo-22.6.1-create-install-dirs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- lilo-22.5.8/Makefile.bak	2004-02-06 01:41:06.000000000 +0000
-+++ lilo-22.5.8/Makefile	2004-02-06 02:02:57.000000000 +0000
-@@ -302,16 +302,8 @@
- #  normal install, but doesn't make the diagnostic binaries
- #
- install:  all
--	if [ ! -d $$ROOT$(SBIN_DIR) ]; then mkdir $$ROOT$(SBIN_DIR); fi
--	if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir $$ROOT$(CFG_DIR); fi
--	if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir $$ROOT$(BOOT_DIR); fi
--	if [ ! -d $$ROOT$(USRSBIN_DIR) ]; then \
--	  mkdir -p $$ROOT$(USRSBIN_DIR); fi
--	if [ ! -d $$ROOT$(MAN_DIR) ]; then mkdir $$ROOT$(MAN_DIR); fi  
--	if [ ! -d $$ROOT$(MAN_DIR)/man5 ]; then \
--	  mkdir $$ROOT$(MAN_DIR)/man5; fi  
--	if [ ! -d $$ROOT$(MAN_DIR)/man8 ]; then \
--	  mkdir $$ROOT$(MAN_DIR)/man8; fi  
-+	mkdir -p $$ROOT$(SBIN_DIR) $$ROOT$(CFG_DIR) $$ROOT$(BOOT_DIR) \
-+	  $$ROOT$(USRSBIN_DIR) $$ROOT$(MAN_DIR)/man5 $$ROOT$(MAN_DIR)/man8
- 	if [ -f diag1.img ]; then \
- 	  cp -f diag1.img $$ROOT$(BOOT_DIR); fi
- 	if [ -f diag2.img ]; then \
diff --git a/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch b/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch
deleted file mode 100644
index 44325e71ca51..000000000000
--- a/sys-boot/lilo/files/lilo-22.6.1-devmapper_gentoo.patch
+++ /dev/null
@@ -1,413 +0,0 @@
-diff -Nur lilo-22.6.1.orig/geometry.c lilo-22.6.1/geometry.c
---- lilo-22.6.1.orig/geometry.c	2004-11-16 08:11:03.000000000 +0100
-+++ lilo-22.6.1/geometry.c	2005-03-15 00:13:42.761215192 +0100
-@@ -15,6 +15,9 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <stdlib.h>
-+#include <limits.h>
-+#include <ctype.h>
- #include <sys/types.h>
- 
- #ifdef LCF_REISERFS
-@@ -27,6 +30,10 @@
- 
- #include <string.h>
- 
-+#ifdef LCF_DEVMAPPER
-+#include <libdevmapper.h>
-+#endif
-+
- #include "config.h"
- #include "lilo.h"
- #include "common.h"
-@@ -61,6 +68,25 @@
- #endif
- #endif
- 
-+#ifdef LCF_DEVMAPPER
-+typedef struct _dm_target {
-+    struct _dm_target *next;
-+    uint64_t start,length,offset;
-+    int device;
-+} DM_TARGET;
-+
-+typedef struct _dm_table {
-+    struct _dm_table *next;
-+    int device;
-+    struct _dm_target *target;
-+} DM_TABLE;
-+
-+int dm_version_nr = 0;
-+int dm_major_list[16];
-+int dm_major_nr = 0;
-+DM_TABLE *dmtab = NULL;
-+#endif
-+
- #ifdef LCF_LVM
- struct lv_bmap {
-     __u32 lv_block;
-@@ -115,6 +141,12 @@
- {
-     FILE *file;
-     char line[MAX_LINE+1];
-+#ifdef LCF_DEVMAPPER
-+    struct dm_task *dmt;
-+    char major_name[32];
-+    char dm_version[32];
-+    int major;
-+#endif
-     char *here;
-     DT_ENTRY *entry;
-     int disk_section,items;
-@@ -123,29 +155,69 @@
- 	if ((file = fopen(name,"r")) == NULL)
- 	    die("open %s: %s",name,strerror(errno));
-     }
--    else if ((file = fopen(DFL_DISKTAB,"r")) == NULL) return;
--    disk_section = !!disktab;
--    while (fgets(line,MAX_LINE,file)) {
--	here = strchr(line,'\n');
--	if (here) *here = 0;
--	here = strchr(line,'#');
--	if (here) *here = 0;
--	if (strspn(line," \t") != strlen(line)) {
--	    entry = alloc_t(DT_ENTRY);
--	    items = sscanf(line,"0x%x 0x%x %d %d %d %d",&entry->device,
--	      &entry->bios,&entry->sectors,&entry->heads,&entry->cylinders,
--	      &entry->start);
--	    if (items == 5) entry->start = -1;
--	    if (items < 5)
--		die("Invalid line in %s:\n\"%s\"",name ? name : DFL_DISKTAB,
--		  line);
--	    entry->next = disktab;
--	    disktab = entry;
--	    if (disk_section) die("DISKTAB and DISK are mutually exclusive");
--	    old_disktab = 1;
-+    if (name || (file = fopen(DFL_DISKTAB,"r")) != NULL) {
-+	disk_section = !!disktab;
-+	while (fgets(line,MAX_LINE,file)) {
-+	    here = strchr(line,'\n');
-+	    if (here) *here = 0;
-+	    here = strchr(line,'#');
-+	    if (here) *here = 0;
-+	    if (strspn(line," \t") != strlen(line)) {
-+		entry = alloc_t(DT_ENTRY);
-+		items = sscanf(line,"0x%x 0x%x %d %d %d %d",&entry->device,
-+		  &entry->bios,&entry->sectors,&entry->heads,&entry->cylinders,
-+		  &entry->start);
-+		if (items == 5) entry->start = -1;
-+		if (items < 5)
-+		    die("Invalid line in %s:\n\"%s\"",name ? name : DFL_DISKTAB,
-+		      line);
-+		entry->next = disktab;
-+		disktab = entry;
-+		if (disk_section) die("DISKTAB and DISK are mutually exclusive");
-+		old_disktab = 1;
-+	    }
- 	}
-+	(void) fclose(file);
-     }
-+
-+#ifdef LCF_DEVMAPPER
-+    if (!(dmt = dm_task_create(DM_DEVICE_VERSION)))
-+	return;
-+    if (!dm_task_run(dmt))
-+	return;
-+    if (!dm_task_get_driver_version(dmt, dm_version, sizeof dm_version))
-+	return;
-+
-+    /*
-+     * to not confuse returned device number formats %02x:%02x and %d:%d
-+     * we assume here that the %02x:%02x format is only found in the ioctl
-+     * interface version < 4 (this is really getting ugly...)
-+     */
-+    dm_version_nr = atoi(dm_version);
-+
-+    dm_task_destroy(dmt);
-+
-+    dm_major_nr = 0;
-+    file = fopen("/proc/devices", "r");
-+    if (!file) return;
-+
-+    do {
-+	if (!fgets(line, (sizeof line)-1, file)) {
-+	    (void) fclose(file);
-+	    return;
-+	}
-+	line[(sizeof line)-1] = 0;
-+    } while(strncmp(line, "Block", 5) != 0);
-+
-+    while(fgets(line, (sizeof line)-1, file)) {
-+	if (sscanf(line, "%d %31s\n", &major, major_name) != 2) continue;
-+	if (strcmp(major_name, "device-mapper") != 0) continue;
-+	dm_major_list[dm_major_nr] = major;
-+	if (++dm_major_nr > (sizeof dm_major_list)/(sizeof dm_major_list[0])) break;
-+    }
-+
-     (void) fclose(file);
-+#endif
- }
- 
- 
-@@ -777,6 +849,161 @@
- {
-     DT_ENTRY *walk;
-     int inherited,keep_cyls,is_raid=0;
-+#ifdef LCF_DEVMAPPER
-+    int i;
-+
-+    for(i = 0; i < dm_major_nr; i++)
-+	if (MAJOR(device) == dm_major_list[i])
-+	    break;
-+    while (i < dm_major_nr) {
-+	DM_TABLE *dm_table;
-+
-+	for(dm_table = dmtab; dm_table; dm_table = dm_table->next)
-+	    if (dm_table->device == device)
-+		break;
-+
-+	if (dm_table) {
-+	    DM_TARGET *target;
-+
-+	     device = 0;
-+	    for(target = dm_table->target; target; target = target->next)
-+		device = target->device;
-+	} else {
-+	    DEVICE dev;
-+	    struct dm_task *dmt;
-+	    void *next = NULL;
-+	    char dmdev[PATH_MAX+1];
-+	    char buf[PATH_MAX+1];
-+	    char *slash;
-+	    int result;
-+
-+	    dev_open(&dev, device, -1);
-+	    strncpy(dmdev, dev.name, PATH_MAX);
-+	    dmdev[PATH_MAX] = 0;
-+	    do {
-+		memset(buf, 0, PATH_MAX + 1);
-+		if ((result = readlink(dmdev, buf, PATH_MAX)) < 0 && errno != EINVAL)
-+		    die("device-mapper: readlink(\"%s\") failed with: %s",buf,
-+			strerror(errno));
-+		if (result >= 0) {
-+		    if (buf[0] != '/' && (slash = strrchr(dmdev, '/')) != NULL)
-+			slash++;
-+		    else
-+			slash = dmdev;
-+		    strncpy(slash, buf, PATH_MAX - (slash-dmdev));
-+		}
-+		if (realpath(dmdev, buf) == NULL)
-+		    die("device-mapper: realpath(\"%s\") failed with: %s",dmdev,
-+			strerror(errno));
-+		strncpy(dmdev, buf, PATH_MAX);
-+	    } while (result >= 0);
-+	    dmdev[PATH_MAX] = 0;
-+
-+	    if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
-+		die("device-mapper: dm_task_create(DM_DEVICE_TABLE) failed");
-+	    slash = strrchr(dmdev, '/');
-+		if (slash)
-+	    slash++;
-+		else
-+	    slash = dmdev;
-+	    if (!dm_task_set_name(dmt, slash))
-+		die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev);
-+	    if (!dm_task_run(dmt))
-+		die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed");
-+
-+	    dm_table = alloc_t(DM_TABLE);
-+	    dm_table->device = device;
-+	    dm_table->target = NULL;
-+	    dm_table->next = dmtab;
-+	    dmtab = dm_table;
-+
-+	    device = 0;
-+
-+	    do {
-+		DM_TARGET *target;
-+		uint64_t start,length;
-+		int major,minor;
-+		char *target_type,*params;
-+		char *p;
-+
-+		next = dm_get_next_target(dmt, next, &start, &length,
-+		  &target_type, &params);
-+
-+		if (!target_type) continue;
-+
-+		if (strcmp(target_type, "linear") != 0)
-+		    die("device-mapper: only linear boot device supported");
-+
-+		target = alloc_t(DM_TARGET);
-+		target->start = start;
-+		target->length = length;
-+		if (dm_version_nr < 4 &&
-+		    isxdigit(params[0]) &&
-+		    isxdigit(params[1]) &&
-+		    params[2] == ':' &&
-+		    isxdigit(params[3]) &&
-+		    isxdigit(params[4])) { /* old 2.4 format */
-+		    if (sscanf(params, "%02x:%02x %"PRIu64, &major, &minor, &target->offset) != 3)
-+			die("device-mapper: parse error in linear params (\"%s\")", params);
-+		} else if (isdigit(params[0]) &&
-+			   strchr(params, ':')) { /* dm_bdevname/format_dev_t (>= 2.6.0-test4?) format */
-+		    if (sscanf(params, "%u:%u %"PRIu64, &major, &minor, &target->offset) != 3)
-+			die("device-mapper: parse error in linear params (\"%s\")", params);
-+		} else { /* >= 2.5.69 format, this should go away soon */
-+		    struct stat st;
-+		    FILE *file;
-+
-+		    p = strrchr(params, ' ');
-+		    if (p == NULL)
-+			die("device-mapper: parse error in linear params (\"%s\")", params);
-+		    *p = 0;
-+		    sprintf(buf, "/dev/%s", params);	/* let's hope it's there */
-+		    if (stat(buf, &st) == 0) {
-+			if (!S_ISBLK(st.st_mode))
-+			    die("device-mapper: %s is not a valid block device", buf);
-+			major = MAJOR(st.st_rdev);
-+			minor = MINOR(st.st_rdev);
-+		    } else {				/* let's try sysfs */
-+			int dev;
-+			sprintf(buf, "/sys/block/%s/dev", params);
-+			file = fopen(buf, "r");
-+ 			if (!file)
-+			    die("device-mapper: \"%s\" could not be opened. /sys mounted?", buf);
-+			if (!fgets(buf, PATH_MAX, file))
-+			    die("device-mapper: read error from \"/sys/block/%s/dev\"", params);
-+			if (sscanf(buf, "%u:%u", &major, &minor) != 2) {
-+			    if (sscanf(buf, "%x", &dev) != 1)
-+				die("device-mapper: error getting device from \"%s\"", buf);
-+			    major = MAJOR(dev);
-+			    minor = MINOR(dev);
-+			}
-+			(void) fclose(file);
-+		    }
-+		    *p = ' ';
-+		    if (sscanf(p+1, "%"PRIu64, &target->offset) != 1)
-+			die("device-mapper: parse error in linear params (\"%s\")", params);
-+		}
-+		target->device = (major << 8) | minor;
-+		if (!device)
-+		    device = target->device;
-+		target->next = dm_table->target;
-+		dm_table->target = target;
-+	    } while(next);
-+
-+	    dm_task_destroy(dmt);
-+
-+	    dev_close(&dev);
-+	}
-+
-+	if (!device)
-+	    die("device-mapper: Error finding real device");
-+	geo->base_dev = device;
-+
-+	for(i = 0; i < dm_major_nr; i++)
-+	    if (MAJOR(device) == dm_major_list[i])
-+		break;
-+    }
-+#endif
- 
-     if (verbose>=5) printf("geo_get: device %04X, all=%d\n", device, all);
- #ifdef LCF_LVM
-@@ -1154,14 +1381,50 @@
-             die("EVMS boot volume cannot be on multiple disks.\n");
-         sector = ebm.rsector + ((offset/SECTOR_SIZE) % geo->spb) + geo->start;
-     }
--    else {
--        sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb);
--        sector += geo->start;
--    }
--#else
--    sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb);
--    sector += geo->start;
-+    else
-+#endif
-+    {
-+#ifdef LCF_DEVMAPPER 
-+	int dev = geo->dev;
-+	int i;
-+#endif
-+	sector = block*geo->spb+((offset/SECTOR_SIZE) % geo->spb);
-+#ifdef LCF_DEVMAPPER 
-+	for(i = 0; i < dm_major_nr; i++)
-+	    if (MAJOR(dev) == dm_major_list[i])
-+		break;
-+	while (i < dm_major_nr) {
-+	    DM_TABLE *dm_table;
-+	    DM_TARGET *dm_target;
-+
-+	    for(dm_table = dmtab; dm_table; dm_table = dm_table->next)
-+		if (dm_table->device == dev)
-+		    break;
-+	    if (!dm_table)
-+		die("device-mapper: Mapped device suddenly lost? (%d)", dev);
-+
-+	    for(dm_target = dm_table->target; dm_target; dm_target = dm_target->next)
-+		if (dm_target->start <= sector && sector < (dm_target->start+dm_target->length))
-+		    break;
-+	    if (!dm_target)
-+		die("device-mapper: Sector outside mapped device? (%d: %u/%"PRIu64")",
-+		    geo->base_dev, sector, (uint64_t)(dm_table->target ?
-+		      (dm_table->target->start+dm_table->target->length) : 0));
-+
-+	    dev = dm_target->device;
-+	    sector = dm_target->offset+(sector-dm_target->start);
-+
-+	    for(i = 0; i < dm_major_nr; i++)
-+		if (MAJOR(dev) == dm_major_list[i])
-+		    break;
-+	}
-+
-+	if (dev != geo->dev && dev != geo->base_dev)
-+	    die("device-mapper: mapped boot device cannot be on multiple real devices\n");
- #endif
-+	sector += geo->start;
-+    }
-+
-  /*   DON'T always use CHS addressing on floppies:     JRC   */
- /*    if ((geo->device & 0x80) && (linear || lba32)) {	*/
-     if ((linear || lba32)) {
-diff -Nur lilo-22.6.1.orig/Makefile lilo-22.6.1/Makefile
---- lilo-22.6.1.orig/Makefile	2004-11-17 19:41:56.000000000 +0100
-+++ lilo-22.6.1/Makefile	2005-03-15 00:14:28.277295696 +0100
-@@ -59,7 +59,7 @@
- #   XL_SECS=n	  Support for extra large (non-standard) floppies.
- 
- CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DONE_SHOT -DPASS160 \
--   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL
-+   -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL -DDEVMAPPER
- 
- # set the compiler optimization level
- 
-@@ -101,6 +101,8 @@
- LDFLAGS=#-Xlinker -qmagic
- LIBS=
- 
-+DEVMAPPER=-ldevmapper
-+
- OBJS=lilo.o raid.o map.o geometry.o boot.o device.o common.o bsect.o cfg.o \
-   partition.o identify.o probe.o shs2.o edit.o temp.o
- 
-@@ -291,10 +293,18 @@
- 		cp -p dparam.S dparam.s
- 
- lilo:		$(OBJS)
-+ifneq (,$(findstring DEVMAPPER,$(CONFIG)))
-+		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS) $(DEVMAPPER)
-+else
- 		$(CC) -o lilo $(LDFLAGS) $(OBJS) $(LIBS)
-+endif
- 
- lilo-static:	$(OBJS)
-+ifneq (,$(findstring DEVMAPPER,$(CONFIG)))
-+		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS) $(DEVMAPPER)
-+else
- 		$(CC) -o lilo-static -static $(LDFLAGS) $(OBJS) $(LIBS)
-+endif
- 
- boot-text.b:	first.b second.b
- 		(dd if=first.b bs=512 conv=sync; dd if=second.b) >boot-text.b
diff --git a/sys-boot/lilo/files/lilo-22.6.1-novga.patch b/sys-boot/lilo/files/lilo-22.6.1-novga.patch
deleted file mode 100644
index 108b41343d18..000000000000
--- a/sys-boot/lilo/files/lilo-22.6.1-novga.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -u lilo-22.6.1/first.S lilo-22.6.1.novga/first.S
---- lilo-22.6.1/first.S	2004-08-31 12:39:25.000000000 -0700
-+++ lilo-22.6.1.novga/first.S	2004-12-06 14:47:22.000000000 -0800
-@@ -522,7 +522,8 @@
- ; display - write byte in AL to console
- ;	preserves all register contents
- ; 
--display: pusha		! make sure no register is changed
-+display: ret
-+	pusha		! make sure no register is changed
- 	mov	bx,#7		!  BH=0, BL=07
- 	mov	ah,#14
- 	int	0x10
-diff -u lilo-22.6.1/second.S lilo-22.6.1.novga/second.S
---- lilo-22.6.1/second.S	2004-11-15 18:59:35.000000000 -0800
-+++ lilo-22.6.1.novga/second.S	2004-12-06 14:49:03.000000000 -0800
-@@ -2155,7 +2155,7 @@
- 
- ! Display one character on the console
- 
--display:
-+display: 
- 	push	bx		! save BX
- 
- #ifndef LCF_NOSERIAL
-@@ -2219,7 +2219,7 @@
- ;;;	xor	bh,bh		! display on screen
- 	mov	bx,#7		! set color for TEXT interface
- 	mov	ah,#14
--	int	0x10
-+;;	int	0x10
- dispret:
- 	pop	bx		! restore BX
- 	ret
diff --git a/sys-boot/lilo/lilo-22.6.1-r1.ebuild b/sys-boot/lilo/lilo-22.6.1-r1.ebuild
deleted file mode 100644
index a0ede88c7b09..000000000000
--- a/sys-boot/lilo/lilo-22.6.1-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1-r1.ebuild,v 1.4 2005/05/02 00:58:27 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.3"
-IUSE="devmap static minimal pxeserial"
-
-DESCRIPTION="Standard Linux boot loader"
-HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
-DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
-MY_P=${P}.src
-
-SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz
-	mirror://gentoo/${DOLILO_TAR}"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="-* x86"
-
-RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bin86-0.15.5"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	einfo "If you want to use lilo with device mapper, please enable the"
-	einfo "\"devmap\" USE flag."
-
-	unpack ${MY_P}.tar.gz
-
-	# Do not try and build the dos crap.
-	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
-
-	# The bootlogo patch from SuSE linux, which was originally in
-	# here, has been dropped because it's no longer compatible
-	# with lilo since the 22.5.x series.
-	# Quequero has done a good attempt to port the patch in bug
-	# #19397, but unfortunately that breaks the timeout at boot.
-	# If you can overcome these problems, a patch is very welcome.
-
-	if use devmap; then
-		# devmapper-patch (boot on evms/lvm2)
-		cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch
-	fi
-
-	cd ${S}
-
-	# Fix creating install dirs, bug #39405
-	epatch ${FILESDIR}/${P}-create-install-dirs.patch
-	# Correctly document commandline options -v and -V, bug #43554
-	epatch ${FILESDIR}/${P}-correct-usage-info.patch
-
-	# this patch is needed when booting PXE and the device you're using 
-	# emulates vga console via serial console.
-	# IE..  B.B.o.o.o.o.t.t.i.i.n.n.g.g....l.l.i.i.n.n.u.u.x.x and stair stepping.
-	use pxeserial && epatch ${FILESDIR}/lilo-22.6.1-novga.patch
-
-	# Get the manpage path right
-	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie`"
-
-	# we explicitly prevent the custom CFLAGS for stability reasons
-	if use static; then
-		emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo-static || die
-		mv lilo-static lilo || die
-	else
-		emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die
-	fi
-}
-
-src_install() {
-	keepdir /boot
-	make ROOT=${D} install || die
-
-	if use !minimal; then
-		into /
-		dosbin ${S}/dolilo/dolilo
-
-		into /usr
-		dosbin keytab-lilo.pl
-
-		insinto /etc
-		newins ${FILESDIR}/lilo.conf lilo.conf.example
-
-		insinto /etc/conf.d
-		newins ${S}/dolilo/dolilo.conf.d dolilo.example
-
-		doman manPages/*.[5-8]
-		dodoc CHANGES COPYING INCOMPAT README*
-		docinto samples ; dodoc sample/*
-	fi
-}
-
-# Check whether LILO is installed
-# This function is from /usr/sbin/mkboot from debianutils, with copyright:
-#
-#   Debian GNU/Linux
-#   Copyright 1996-1997 Guy Maor <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
-#
-lilocheck () {
-	local bootpart=
-	local rootpart="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)"
-
-	echo
-	einfon "Checking for LILO ..."
-
-	if [ "$(whoami)" != "root" ]
-	then
-		echo; echo
-		eerror "Only root can check for LILO!"
-		return 1
-	fi
-
-	if [ -z "${rootpart}" ]
-	then
-		echo; echo
-		eerror "Could not determine root partition!"
-		return 1
-	fi
-
-	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
-	then
-		echo " No"
-		return 1
-	fi
-
-	bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)"
-
-	if [ -z "${bootpart}" ]
-	then
-		# lilo defaults to current root when 'boot=' is not present
-		bootpart="${rootpart}"
-	fi
-
-	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
-	then
-		echo; echo
-		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
-		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
-		return 1
-	fi
-
-	echo " Yes, on ${bootpart}"
-
-	return 0
-}
-
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ]
-	then
-		[ -f "${ROOT}/boot/boot-menu.b" ] && \
-			ln -snf boot-menu.b ${ROOT}/boot/boot.b
-	fi
-
-	if [ "${ROOT}" = "/" ] && use !minimal;
-	then
-		if lilocheck
-		then
-			einfo "Running DOLILO to complete the install ..."
-			# do not redirect to /dev/null because it may display some input
-			# prompt
-			/sbin/dolilo
-			if [ "$?" -ne 0 ]
-			then
-				echo
-				ewarn "Running /sbin/dolilo failed!  Please check what the problem is"
-				ewarn "before your next reboot."
-
-				ebeep 5
-				epause 5
-			fi
-		fi
-		echo
-	fi
-	if use !minimal; then
-		echo
-		einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
-		einfo "handles mounting and unmounting /boot for you. It can do more then"
-		einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
-		ebeep 5
-		epause 3
-		echo
-	fi
-}
diff --git a/sys-boot/lilo/lilo-22.6.1.ebuild b/sys-boot/lilo/lilo-22.6.1.ebuild
deleted file mode 100644
index 5399a4fc0d1e..000000000000
--- a/sys-boot/lilo/lilo-22.6.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.4 2005/03/01 23:10:59 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.3"
-IUSE="devmap static"
-
-DESCRIPTION="Standard Linux boot loader"
-HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
-DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
-MY_P=${P}.src
-
-SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${MY_P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${MY_P}.tar.gz
-	mirror://gentoo/${DOLILO_TAR}"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="-* x86"
-
-RDEPEND=">=sys-apps/sed-4
-	devmap? ( >=sys-fs/device-mapper-1.00.08 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bin86-0.15.5"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	einfo "If you want to use lilo with device mapper, please enable the"
-	einfo "\"devmap\" USE flag."
-
-	unpack ${MY_P}.tar.gz
-
-	# Do not try and build the dos crap.
-	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
-
-	# The bootlogo patch from SuSE linux, which was originally in
-	# here, has been dropped because it's no longer compatible
-	# with lilo since the 22.5.x series.
-	# Quequero has done a good attempt to port the patch in bug
-	# #19397, but unfortunately that breaks the timeout at boot.
-	# If you can overcome these problems, a patch is very welcome.
-
-	if use devmap; then
-		# devmapper-patch (boot on evms/lvm2)
-		cd ${S}; epatch ${FILESDIR}/${P}-devmapper_gentoo.patch
-	fi
-
-	cd ${S}
-
-	# Fix creating install dirs, bug #39405
-	epatch ${FILESDIR}/${P}-create-install-dirs.patch
-	# Correctly document commandline options -v and -V, bug #43554
-	epatch ${FILESDIR}/${P}-correct-usage-info.patch
-	# Get the manpage path right
-	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test_flag -fno-pic` `test_flag -nopie`"
-
-	# we explicitly prevent the custom CFLAGS for stability reasons
-	if use static; then
-		emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo-static || die
-		mv lilo-static lilo || die
-	else
-		emake CC="$(tc-getCC) ${HARDENED_CFLAGS}" lilo || die
-	fi
-}
-
-src_install() {
-	keepdir /boot
-	make ROOT=${D} install || die
-
-	into /
-	dosbin ${S}/dolilo/dolilo
-
-	into /usr
-	dosbin keytab-lilo.pl
-
-	insinto /etc
-	newins ${FILESDIR}/lilo.conf lilo.conf.example
-
-	insinto /etc/conf.d
-	newins ${S}/dolilo/dolilo.conf.d dolilo.example
-
-	doman manPages/*.[5-8]
-	dodoc CHANGES COPYING INCOMPAT README*
-	docinto samples ; dodoc sample/*
-}
-
-# Check whether LILO is installed
-# This function is from /usr/sbin/mkboot from debianutils, with copyright:
-#
-#   Debian GNU/Linux
-#   Copyright 1996-1997 Guy Maor <maor@debian.org>
-#
-# Modified for Gentoo for use with the lilo ebuild by:
-#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
-#
-lilocheck () {
-	local bootpart=
-	local rootpart="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)"
-
-	echo
-	einfon "Checking for LILO ..."
-
-	if [ "$(whoami)" != "root" ]
-	then
-		echo; echo
-		eerror "Only root can check for LILO!"
-		return 1
-	fi
-
-	if [ -z "${rootpart}" ]
-	then
-		echo; echo
-		eerror "Could not determine root partition!"
-		return 1
-	fi
-
-	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
-	then
-		echo " No"
-		return 1
-	fi
-
-	bootpart="$(sed -n "s:^boot[ ]*=[ ]*\(.*\)[ ]*:\1:p" /etc/lilo.conf)"
-
-	if [ -z "${bootpart}" ]
-	then
-		# lilo defaults to current root when 'boot=' is not present
-		bootpart="${rootpart}"
-	fi
-
-	if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
-	then
-		echo; echo
-		ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
-		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
-		return 1
-	fi
-
-	echo " Yes, on ${bootpart}"
-
-	return 0
-}
-
-
-pkg_postinst() {
-	if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ]
-	then
-		[ -f "${ROOT}/boot/boot-menu.b" ] && \
-			ln -snf boot-menu.b ${ROOT}/boot/boot.b
-	fi
-
-	if [ "${ROOT}" = "/" ]
-	then
-		if lilocheck
-		then
-			einfo "Running DOLILO to complete the install ..."
-			# do not redirect to /dev/null because it may display some input
-			# prompt
-			/sbin/dolilo
-			if [ "$?" -ne 0 ]
-			then
-				echo
-				ewarn "Running /sbin/dolilo failed!  Please check what the problem is"
-				ewarn "before your next reboot."
-
-				ebeep 5
-				epause 5
-			fi
-		fi
-		echo
-	fi
-
-	echo
-	einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
-	einfo "handles mounting and unmounting /boot for you. It can do more then"
-	einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
-	ebeep 5
-	epause 3
-	echo
-}
diff --git a/sys-boot/lilo/lilo-22.7.ebuild b/sys-boot/lilo/lilo-22.7.ebuild
index 21c9447cdb00..1cb3cd7d7b2b 100644
--- a/sys-boot/lilo/lilo-22.7.ebuild
+++ b/sys-boot/lilo/lilo-22.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.ebuild,v 1.2 2005/05/09 02:12:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.ebuild,v 1.3 2005/06/29 19:52:12 chainsaw Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -19,7 +19,7 @@ SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 ~amd64"
 
 RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )"
 DEPEND="${RDEPEND}