New upstream release. 22.7.3-r1 now stable on amd64, ack'ed by malc on IRC. Cleaned up old ebuilds.

(Portage version: 2.1.2.2)

14 files changed, 104 insertions, 639 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index e81e70014ecd..3abe524d16b2 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.45 2007/01/15 15:23:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.46 2007/03/20 10:46:25 chainsaw Exp $
+
+*lilo-22.8 (20 Mar 2007)
+
+  20 Mar 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/lilo-22.8-correct-usage-info.patch,
+  +files/lilo-22.8-makefile.patch, +files/lilo-22.8-novga.patch,
+  -lilo-22.7.ebuild, -lilo-22.7-r1.ebuild, -lilo-22.7.1.ebuild,
+  -lilo-22.7.2-r2.ebuild, lilo-22.7.3-r1.ebuild, +lilo-22.8.ebuild:
+  New upstream release. 22.7.3-r1 now stable on amd64, ack'ed by malc on IRC.
+  Cleaned up old ebuilds.
 
   15 Jan 2007; Tony Vroon <chainsaw@gentoo.org> lilo-22.7.3-r1.ebuild:
   Mark stable on X86.
diff --git a/sys-boot/lilo/files/digest-lilo-22.7 b/sys-boot/lilo/files/digest-lilo-22.7
deleted file mode 100644
index 95f373867419..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
-RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba dolilo-0.3.tar.bz2 3554
-SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed dolilo-0.3.tar.bz2 3554
-MD5 565cda4cd5e7c740403ed91e0bdf15f6 lilo-22.7.src.tar.gz 428600
-RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 lilo-22.7.src.tar.gz 428600
-SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 lilo-22.7.src.tar.gz 428600
diff --git a/sys-boot/lilo/files/digest-lilo-22.7-r1 b/sys-boot/lilo/files/digest-lilo-22.7-r1
deleted file mode 100644
index 6971dbd0002e..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753
-RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753
-SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753
-MD5 565cda4cd5e7c740403ed91e0bdf15f6 lilo-22.7.src.tar.gz 428600
-RMD160 76fcc2551bef7ded3d3b1c833bc76fbf1cb8c9a7 lilo-22.7.src.tar.gz 428600
-SHA256 d6372f8823243bc0d09308477f454004ad3fdb45fdef609ddeb9648995e3c063 lilo-22.7.src.tar.gz 428600
diff --git a/sys-boot/lilo/files/digest-lilo-22.7.1 b/sys-boot/lilo/files/digest-lilo-22.7.1
deleted file mode 100644
index 420e3633800d..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
-RMD160 b9ae32021767b3548d6fdfe6b71d9100d81ed2ba dolilo-0.3.tar.bz2 3554
-SHA256 33ecd4f54f06067e937f442d1fd7b219f82dbcb7934311d3d20fe070cc2a30ed dolilo-0.3.tar.bz2 3554
-MD5 1f3855c6f2c7b2beaa8a90bf9975a289 lilo-22.7.1.src.tar.gz 429373
-RMD160 7be56fb510ada6a54ae7da948efc6e342d04140c lilo-22.7.1.src.tar.gz 429373
-SHA256 7fa192588910e42d0e544967e050b15e3c32acb7fdecad53c3283cbc3560a756 lilo-22.7.1.src.tar.gz 429373
diff --git a/sys-boot/lilo/files/digest-lilo-22.7.2-r2 b/sys-boot/lilo/files/digest-lilo-22.7.2-r2
deleted file mode 100644
index c844e713f234..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753
-RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753
-SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753
-MD5 2bf1eb08c449a28ebadcf66c48a26567 lilo-22.7.2.src.tar.gz 433625
-RMD160 03fe32839751b3497dc9f06490dc2cd3bff6b805 lilo-22.7.2.src.tar.gz 433625
-SHA256 3fae019ee67a63f8fc35aade5e7f61a1dd01a210af1b46c6df4b9862597547da lilo-22.7.2.src.tar.gz 433625
diff --git a/sys-boot/lilo/files/digest-lilo-22.8 b/sys-boot/lilo/files/digest-lilo-22.8
new file mode 100644
index 000000000000..84eb7c6deec8
--- /dev/null
+++ b/sys-boot/lilo/files/digest-lilo-22.8
@@ -0,0 +1,6 @@
+MD5 08243e46598d6f457e8e4135f1fa8d52 dolilo-0.4.tar.bz2 3753
+RMD160 e63d7d258461346620d012d8e89b22b3f969b089 dolilo-0.4.tar.bz2 3753
+SHA256 812f7cb7a9c93eade7afaa8f12955723c4bdaede1c61f90162390dedfc37bd2e dolilo-0.4.tar.bz2 3753
+MD5 72765f2aafd20e23ecf07ebd22baeec7 lilo-22.8.src.tar.gz 437555
+RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 lilo-22.8.src.tar.gz 437555
+SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb lilo-22.8.src.tar.gz 437555
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
new file mode 100644
index 000000000000..ecc1994d46a7
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.8-correct-usage-info.patch
@@ -0,0 +1,13 @@
+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
+@@ -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);
+ #endif /* !__MSDOS__ */
+-    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.8-makefile.patch b/sys-boot/lilo/files/lilo-22.8-makefile.patch
new file mode 100644
index 000000000000..eb2e86977512
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.8-makefile.patch
@@ -0,0 +1,49 @@
+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
+@@ -69,18 +69,7 @@
+    -DMDPRAID -DDEVMAPPER
+    
+ 
+-# set the following if you wish LILO.COM to be installed
+-DOS_DIR=/dosC/boot
+-#
+-# select one of the following to place the man pages in the right place
+-#MAN_DIR=`if [ -z "$(whereis lilo | grep 'lilo.8')" ]; then \
+-#	whereis lilo | sed -e "sX.* /usrX/usrX" -e "sX/man8/lilo.8.*XX" ; \
+-#	elif [ -f /usr/bin/manpath ]; then \
+-#  manpath | sed "s/:.*//"; else echo /usr/man; fi`
+-#
+-MAN_DIR=`if [ -f /usr/bin/manpath ]; then \
+-	manpath | sed "s/:.*//"; else echo /usr/share/man; fi`
+-#MAN_DIR=/usr/share/man
++MAN_DIR=/usr/share/man
+ 
+ # set the compiler optimization level
+ 
+@@ -165,10 +154,7 @@
+ #
+ # everything needed to run, just short of installation
+ #
+-all:	lilo bootsect.b diag1.img # OBSOLETE:  $(BOOTS) edit dparam.com activate
+-	if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then \
+-		make diagnostic; \
+-		make dosexe; fi
++all:	lilo
+ 
+ #
+ # everything above plus the statically linked version
+@@ -452,7 +438,6 @@
+ 	  rm -f $$ROOT$(BOOT_DIR)/boot.b; fi
+ 	cp mkrescue $$ROOT$(SBIN_DIR)
+ 	cp lilo $$ROOT$(SBIN_DIR)
+-	strip $$ROOT$(SBIN_DIR)/lilo
+ 	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
new file mode 100644
index 000000000000..d15ce2d8f8eb
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-22.8-novga.patch
@@ -0,0 +1,18 @@
+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
+@@ -66,7 +66,7 @@
+ 
+ CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
+    -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
+-   -DMDPRAID -DDEVMAPPER
++   -DMDPRAID -DDEVMAPPER -DNOVGA
+    
+ 
+ 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/lilo-22.7-r1.ebuild b/sys-boot/lilo/lilo-22.7-r1.ebuild
deleted file mode 100644
index 21d87d9ec402..000000000000
--- a/sys-boot/lilo/lilo-22.7-r1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7-r1.ebuild,v 1.2 2006/10/20 08:50:47 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.4"
-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 ~amd64"
-
-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
-
-	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
-	# Install manpages to correct location, do not rely on incorrect manpath output, bug #117135
-	epatch ${FILESDIR}/${P}-manpath.patch
-	# Do not strip the main binary, it upsets portage, bug #140210
-	epatch ${FILESDIR}/${P}-install-nostrip.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}/${P}-novga.patch
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# lilo needs this. bug 140209
-	export LC_ALL=C
-
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test-flags-CC -fno-pic -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="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
-
-	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.7.1.ebuild b/sys-boot/lilo/lilo-22.7.1.ebuild
deleted file mode 100644
index 53d57b29199f..000000000000
--- a/sys-boot/lilo/lilo-22.7.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.1.ebuild,v 1.2 2006/07/17 20:40:09 solar 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 ~amd64"
-
-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 build with DOS support
-	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
-	sed -i -e 's|DOS_DIR=/dosC/boot||' ${S}/Makefile
-
-	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
-	# Install manpages to correct location, do not rely on incorrect manpath output, bug #117135
-	epatch ${FILESDIR}/${P}-manpath.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}/${P}-novga.patch
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# lilo needs this. bug 140209
-	export LC_ALL=C
-
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test-flags-CC -fno-pic -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="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
-
-	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.7.3-r1.ebuild b/sys-boot/lilo/lilo-22.7.3-r1.ebuild
index fb6acf250039..68bbbb3fbc48 100644
--- a/sys-boot/lilo/lilo-22.7.3-r1.ebuild
+++ b/sys-boot/lilo/lilo-22.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.3-r1.ebuild,v 1.2 2007/01/15 15:23:05 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.3-r1.ebuild,v 1.3 2007/03/20 10:46:25 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"
 
 DEPEND=">=sys-devel/bin86-0.15.5"
 
diff --git a/sys-boot/lilo/lilo-22.7.ebuild b/sys-boot/lilo/lilo-22.7.ebuild
deleted file mode 100644
index 5ff8c6d12168..000000000000
--- a/sys-boot/lilo/lilo-22.7.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2006 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.6 2006/07/17 20:40:09 solar 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 amd64"
-
-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}/${P}-novga.patch
-
-	# Get the manpage path right
-	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
-
-	unpack ${DOLILO_TAR}
-}
-
-src_compile() {
-	# lilo needs this. bug 140209
-	export LC_ALL=C
-
-	# hardened automatic PIC plus PIE building should be suppressed
-	# because of assembler instructions that cannot be compiled PIC
-	HARDENED_CFLAGS="`test-flags-CC -fno-pic -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="$(mount | grep -v "tmpfs" | grep -v "rootfs" | grep "on / " | cut -f1 -d " ")"
-
-	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.7.2-r2.ebuild b/sys-boot/lilo/lilo-22.8.ebuild
index 490432e881f9..faaae85b4e1e 100644
--- a/sys-boot/lilo/lilo-22.7.2-r2.ebuild
+++ b/sys-boot/lilo/lilo-22.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.7.2-r2.ebuild,v 1.1 2006/09/05 11:26:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8.ebuild,v 1.1 2007/03/20 10:46:25 chainsaw Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DOLILO_V="0.4"
-IUSE="devmap static minimal pxeserial"
+IUSE="static minimal pxeserial"
 
 DESCRIPTION="Standard Linux boot loader"
 HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
@@ -21,34 +21,20 @@ SLOT="0"
 LICENSE="BSD GPL-2"
 KEYWORDS="-* ~x86 ~amd64"
 
-RDEPEND="devmap? ( >=sys-fs/device-mapper-1.00.08 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bin86-0.15.5"
+DEPEND=">=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
 
-	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
 	# Install manpages to correct location, do not rely on incorrect manpath output, bug #117135
-	epatch ${FILESDIR}/${P}-manpath.patch
 	# Do not strip the main binary, it upsets portage, bug #140210
-	epatch ${FILESDIR}/${P}-install-nostrip.patch
-	# Do not build diagnostics when bcc is present; bug #141777
+	# Do not install diag1.img, bug #149887
 	epatch ${FILESDIR}/${P}-makefile.patch
 
 	# this patch is needed when booting PXE and the device you're using