10 files changed, 15 insertions, 660 deletions
diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 707ca5fdad42..3106dd488309 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.53 2008/08/05 22:48:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.54 2008/08/18 16:07:39 chainsaw Exp $
+
+  18 Aug 2008; <chainsaw@gentoo.org>
+  -files/lilo-22.7.3-correct-usage-info.patch,
+  -files/lilo-22.7.3-lvm2-not-partionable.patch,
+  -files/lilo-22.7.3-makefile.patch,
+  -files/lilo-22.7.3-makefile-nodiags.patch, -files/lilo-22.7.3-novga.patch,
+  -lilo-22.7.3-r1.ebuild, -lilo-22.8.ebuild, -lilo-22.8-r1.ebuild,
+  lilo-22.8-r2.ebuild:
+  bin86 is a build-time dependency, not a run-time dependency. Closes bug
+  #221541 by Diego Pettenò <flameeyes@gentoo.org>. Clean up old ebuilds.
 
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch b/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch
deleted file mode 100644
index 7b26b339f93f..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.3-correct-usage-info.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lilo-22.7.ORIG/lilo.c	2005-05-02 01:52:16.000000000 +0100
-+++ lilo-22.7/lilo.c	2005-05-02 01:53:50.000000000 +0100
-@@ -381,7 +381,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.7.3-lvm2-not-partionable.patch b/sys-boot/lilo/files/lilo-22.7.3-lvm2-not-partionable.patch
deleted file mode 100644
index 2eeb5e99a23e..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.3-lvm2-not-partionable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr lilo-22.7.3.ORIG/geometry.c lilo-22.7.3/geometry.c
---- lilo-22.7.3.ORIG/geometry.c	2006-10-11 12:35:15.000000000 +0100
-+++ lilo-22.7.3/geometry.c	2006-10-11 12:37:27.000000000 +0100
-@@ -320,8 +320,7 @@
-   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   /*  Cx   */
-   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
--  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 63,  0	   /*  /dev/md_dXX at 254  */
--								   /* and /dev/dm-0 at 253 */
-+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0	   								   
- /*								   
-   0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
- */
diff --git a/sys-boot/lilo/files/lilo-22.7.3-makefile-nodiags.patch b/sys-boot/lilo/files/lilo-22.7.3-makefile-nodiags.patch
deleted file mode 100644
index 39f504ebeaa3..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.3-makefile-nodiags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.orig	2006-10-02 22:10:39.000000000 +0200
-+++ Makefile	2006-10-02 22:18:13.000000000 +0200
-@@ -153,10 +153,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
diff --git a/sys-boot/lilo/files/lilo-22.7.3-makefile.patch b/sys-boot/lilo/files/lilo-22.7.3-makefile.patch
deleted file mode 100644
index 943e3c437bc0..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.3-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -uNr lilo-22.7.3.ORIG/Makefile lilo-22.7.3/Makefile
---- lilo-22.7.3.ORIG/Makefile	2006-09-25 14:04:00.000000000 +0100
-+++ lilo-22.7.3/Makefile	2006-09-25 14:04:47.000000000 +0100
-@@ -68,16 +68,7 @@
-    -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
-    -DMDPRAID
- 
--# set the following if you wish LILO.COM to be installed
--DOS_DIR=/dosC/boot
--#
--#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/man; fi`
-+MAN_DIR=/usr/share/man
- 
- # set the compiler optimization level
- 
-@@ -419,12 +410,12 @@
- #  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$(SBIN_DIR) ]; then mkdir -p $$ROOT$(SBIN_DIR); fi
-+	if [ ! -d $$ROOT$(CFG_DIR) ]; then mkdir -p $$ROOT$(CFG_DIR); fi
-+	if [ ! -d $$ROOT$(BOOT_DIR) ]; then mkdir -p $$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) ]; then mkdir -p $$ROOT$(MAN_DIR); fi  
- 	if [ ! -d $$ROOT$(MAN_DIR)/man5 ]; then \
- 	  mkdir $$ROOT$(MAN_DIR)/man5; fi  
- 	if [ ! -d $$ROOT$(MAN_DIR)/man8 ]; then \
-@@ -457,7 +448,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
diff --git a/sys-boot/lilo/files/lilo-22.7.3-novga.patch b/sys-boot/lilo/files/lilo-22.7.3-novga.patch
deleted file mode 100644
index 0b145eb29b70..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.3-novga.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr lilo-22.7.2.ORIG/first.S lilo-22.7.2/first.S
---- lilo-22.7.2.ORIG/first.S	2006-07-12 14:14:16.000000000 +0100
-+++ lilo-22.7.2/first.S	2006-07-12 14:14:34.000000000 +0100
-@@ -531,7 +531,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 -uNr lilo-22.7.2.ORIG/second.S lilo-22.7.2/second.S
---- lilo-22.7.2.ORIG/second.S	2006-07-12 14:14:16.000000000 +0100
-+++ lilo-22.7.2/second.S	2006-07-12 14:14:34.000000000 +0100
-@@ -2342,7 +2342,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.7.3-r1.ebuild b/sys-boot/lilo/lilo-22.7.3-r1.ebuild
deleted file mode 100644
index 3bc122dfeb5c..000000000000
--- a/sys-boot/lilo/lilo-22.7.3-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2008 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.7 2008/01/31 13:26:02 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.4"
-IUSE="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"
-
-DEPEND=">=sys-devel/bin86-0.15.5"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-
-	# 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
-	# Do not strip the main binary, it upsets portage, bug #140210
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	# Do not install diag1.img, bug #149887
-	epatch "${FILESDIR}/${P}-makefile-nodiags.patch"
-	# Do not try to read the partition table on LVM2
-	epatch "${FILESDIR}/${P}-lvm2-not-partionable.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
-
-		newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example
-
-		doman manPages/*.[5-8]
-		dodoc CHANGES 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.8-r1.ebuild b/sys-boot/lilo/lilo-22.8-r1.ebuild
deleted file mode 100644
index 1c968e89b239..000000000000
--- a/sys-boot/lilo/lilo-22.8-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r1.ebuild,v 1.4 2008/01/31 13:26:02 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.4"
-IUSE="static minimal pxeserial device-mapper"
-
-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"
-
-DEPEND=">=sys-devel/bin86-0.15.5
-	device-mapper? ( >=sys-fs/device-mapper-1.02.12 )"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-
-	# 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
-	# Do not strip the main binary, it upsets portage, bug #140210
-	# 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
-	# 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"
-	use device-mapper || epatch "${FILESDIR}/${P}-nodevmapper.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
-
-		newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example
-
-		doman manPages/*.[5-8]
-		dodoc CHANGES 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.8-r2.ebuild b/sys-boot/lilo/lilo-22.8-r2.ebuild
index d72fb3dd630c..a4d5a039ee6e 100644
--- a/sys-boot/lilo/lilo-22.8-r2.ebuild
+++ b/sys-boot/lilo/lilo-22.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r2.ebuild,v 1.2 2008/02/15 15:03:42 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8-r2.ebuild,v 1.3 2008/08/18 16:07:39 chainsaw Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -21,8 +21,8 @@ SLOT="0"
 LICENSE="BSD GPL-2"
 KEYWORDS="-* x86 amd64"
 
-DEPEND=">=sys-devel/bin86-0.15.5
-	device-mapper? ( >=sys-fs/device-mapper-1.02.12 )"
+DEPEND=">=sys-devel/bin86-0.15.5"
+RDEPEND="device-mapper? ( >=sys-fs/device-mapper-1.02.12 )"
 
 PROVIDE="virtual/bootloader"
 
@@ -48,7 +48,7 @@ src_unpack() {
 }
 
 src_compile() {
-	# lilo needs this. bug 140209
+	# lilo needs this. bug #140209
 	export LC_ALL=C
 
 	# hardened automatic PIC plus PIE building should be suppressed
diff --git a/sys-boot/lilo/lilo-22.8.ebuild b/sys-boot/lilo/lilo-22.8.ebuild
deleted file mode 100644
index 8ca82185b5ef..000000000000
--- a/sys-boot/lilo/lilo-22.8.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.8.ebuild,v 1.5 2008/01/31 13:26:02 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.4"
-IUSE="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"
-
-DEPEND=">=sys-devel/bin86-0.15.5"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-
-	cd "${S}"
-
-	# 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
-	# Do not strip the main binary, it upsets portage, bug #140210
-	# 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
-	# 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
-
-		newconfd "${S}"/dolilo/dolilo.conf.d dolilo.example
-
-		doman manPages/*.[5-8]
-		dodoc CHANGES 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
-}