Portage may whine about LILO prestripping the chainloader but does not do this properly by itself, as pointed out by Ulrich Mueller <ulm@kph.uni-mainz.de> in bug #140210. People will have to live with the QA warning for now.

(Portage version: 2.1.1_pre2-r8)
 (Signed Manifest commit)

4 files changed, 14 insertions, 231 deletions

diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 6c894cf271d5..dbe20edcd28d 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -53,10 +53,6 @@ AUX lilo-22.7.2-manpath.patch 444 RMD160 8bdbb45e5fe7b6c9249d54657978b59190eba10
 MD5 73796418d202ed39a04f9adbd5ccc12a files/lilo-22.7.2-manpath.patch 444
 RMD160 8bdbb45e5fe7b6c9249d54657978b59190eba104 files/lilo-22.7.2-manpath.patch 444
 SHA256 78ca7d4bfe78103de450de92bd321a0b4233d15f1051df3d0e4206fd061381ea files/lilo-22.7.2-manpath.patch 444
-AUX lilo-22.7.2-nostrip.patch 355 RMD160 ca01d0de5e9f5ef82641310d4bc9676e0991251b SHA1 4040de43d877ddd38ae0ae44491c9431a1bfea16 SHA256 fe429b67fa47ed08c41e51826a5bc5b77dc1b3788718f1192d009676a8c95070
-MD5 4c63d35e293be76db64bb1bce14b2025 files/lilo-22.7.2-nostrip.patch 355
-RMD160 ca01d0de5e9f5ef82641310d4bc9676e0991251b files/lilo-22.7.2-nostrip.patch 355
-SHA256 fe429b67fa47ed08c41e51826a5bc5b77dc1b3788718f1192d009676a8c95070 files/lilo-22.7.2-nostrip.patch 355
 AUX lilo-22.7.2-novga.patch 804 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 SHA1 2bee42b35344ab5b2a63d354c61c7b44aec75627 SHA256 812da9b2afb785a0aca27fe9b0d8a06b982792d60cd6b4b6dda16c7b6a73b297
 MD5 e42ba9cd707df24649879cc297377cf9 files/lilo-22.7.2-novga.patch 804
 RMD160 1b2391b1f92d48c1db5623ec9b4eec34844078d6 files/lilo-22.7.2-novga.patch 804
@@ -73,18 +69,18 @@ EBUILD lilo-22.7.1.ebuild 4884 RMD160 9a2f40e0c33039276dfe7e44cc155d7e3ba1208e S
 MD5 5be5e8c421a4a0540b2deb0dd4fe0e01 lilo-22.7.1.ebuild 4884
 RMD160 9a2f40e0c33039276dfe7e44cc155d7e3ba1208e lilo-22.7.1.ebuild 4884
 SHA256 1392049f2ec386c0ee2fa4cbd544b692f7cf739ead75f8be2ef87a2833a63c39 lilo-22.7.1.ebuild 4884
-EBUILD lilo-22.7.2.ebuild 4977 RMD160 4175227bbf2e77ff5b0d86e8d612b39c26ed05ec SHA1 3edbc67212a3a0de4dc1b72267d22e07b5bbf894 SHA256 91d5c8ed25e88478d278ad9764aa69af90bd6c4bd395758d998d4e85dfde8741
-MD5 9178f5687435ff9d86a5880cee55e465 lilo-22.7.2.ebuild 4977
-RMD160 4175227bbf2e77ff5b0d86e8d612b39c26ed05ec lilo-22.7.2.ebuild 4977
-SHA256 91d5c8ed25e88478d278ad9764aa69af90bd6c4bd395758d998d4e85dfde8741 lilo-22.7.2.ebuild 4977
+EBUILD lilo-22.7.2-r1.ebuild 4887 RMD160 7a99b91dde9765c77b91b6c1eb9cfcb2c802543e SHA1 a0805bba2f9b6fe1ec321e891bfb28f30afebdd9 SHA256 cb7c4a01b3a137bb1239f354e8eadf632b25fa3026f95ffcfce7f9521e367204
+MD5 4dcf298f7c5ef626eb0b37788d24dedb lilo-22.7.2-r1.ebuild 4887
+RMD160 7a99b91dde9765c77b91b6c1eb9cfcb2c802543e lilo-22.7.2-r1.ebuild 4887
+SHA256 cb7c4a01b3a137bb1239f354e8eadf632b25fa3026f95ffcfce7f9521e367204 lilo-22.7.2-r1.ebuild 4887
 EBUILD lilo-22.7.ebuild 5133 RMD160 f72661f7813c1709fd9f4dc439706ac234c448ae SHA1 cf38346699efd02c7f16d14e7b312eea164feaa3 SHA256 7a83d1fa9158d74cd3a9a520e672189a27b693ace8aafc46a02045b9b1440789
 MD5 adfb9ae3ac599e8d6bc0ad95a0217b8e lilo-22.7.ebuild 5133
 RMD160 f72661f7813c1709fd9f4dc439706ac234c448ae lilo-22.7.ebuild 5133
 SHA256 7a83d1fa9158d74cd3a9a520e672189a27b693ace8aafc46a02045b9b1440789 lilo-22.7.ebuild 5133
-MISC ChangeLog 4980 RMD160 f11eaeeedb0b4ad86bdfb67d3e0d4eaa61b88153 SHA1 6135d7a72d45ff92c5764317b53fc8a91a07ba7e SHA256 570a68aa265f6502d1bb2387cb11c52211c642622d95c42092f20df0215333e3
-MD5 a66866d62465d3c8f876577f9c1a32f7 ChangeLog 4980
-RMD160 f11eaeeedb0b4ad86bdfb67d3e0d4eaa61b88153 ChangeLog 4980
-SHA256 570a68aa265f6502d1bb2387cb11c52211c642622d95c42092f20df0215333e3 ChangeLog 4980
+MISC ChangeLog 5376 RMD160 1d072e2cb8c6462a587cad137e25e352411c6092 SHA1 52bb0ee0faef901dcea85f467e684c82483142e7 SHA256 fa018967930edd0f3fb875c494989e37ed890113b49bfc48f9e3022737a4424d
+MD5 66c826116df3ae1753e1d705f529cbd1 ChangeLog 5376
+RMD160 1d072e2cb8c6462a587cad137e25e352411c6092 ChangeLog 5376
+SHA256 fa018967930edd0f3fb875c494989e37ed890113b49bfc48f9e3022737a4424d ChangeLog 5376
 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a metadata.xml 254
@@ -95,13 +91,13 @@ SHA256 8fac88a4abb3e558874f9ec02130e31bf9c92753de4e4378b8619b7c893a3989 files/di
 MD5 fe8123168ae8e37e80ac2904736564e1 files/digest-lilo-22.7.1 476
 RMD160 67f5b5ff08bb983f022ded278d61002422e2ecb0 files/digest-lilo-22.7.1 476
 SHA256 33da193d3a701224e343993cf3a4ba30ea8ebef2b23b3c199175025147d0cbe9 files/digest-lilo-22.7.1 476
-MD5 eca7db7a3387b08e368163767a7c8356 files/digest-lilo-22.7.2 476
-RMD160 fb1914ae68175fec2e914be2cfc520d579979472 files/digest-lilo-22.7.2 476
-SHA256 969fb08b4bd066d52832fb908c90cd3d98405d76a4f5b3db3f0441e1211d5a92 files/digest-lilo-22.7.2 476
+MD5 eca7db7a3387b08e368163767a7c8356 files/digest-lilo-22.7.2-r1 476
+RMD160 fb1914ae68175fec2e914be2cfc520d579979472 files/digest-lilo-22.7.2-r1 476
+SHA256 969fb08b4bd066d52832fb908c90cd3d98405d76a4f5b3db3f0441e1211d5a92 files/digest-lilo-22.7.2-r1 476
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEtP3Gp5vW4rUFj5oRAtyEAJ0R95yy45Ol6fNSCKD5GZRNqUfAggCgpqkj
-b7YWqTlzAq1Q0CLQZaARAf0=
-=+j7e
+iD8DBQFEtjKpp5vW4rUFj5oRAq3wAJ97Rm5wGLMDMimphx4QBIPaETQYiACgtx3M
+pRV158lnnsod/iblfw/X3J0=
+=YV2D
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/files/digest-lilo-22.7.2 b/sys-boot/lilo/files/digest-lilo-22.7.2
deleted file mode 100644
index 84ae9e925068..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.7.2
+++ /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 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/lilo-22.7.2-nostrip.patch b/sys-boot/lilo/files/lilo-22.7.2-nostrip.patch
deleted file mode 100644
index 7942476be9c1..000000000000
--- a/sys-boot/lilo/files/lilo-22.7.2-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr lilo-22.7.2.ORIG/Makefile lilo-22.7.2/Makefile
---- lilo-22.7.2.ORIG/Makefile	2006-07-12 14:33:48.000000000 +0100
-+++ lilo-22.7.2/Makefile	2006-07-12 14:34:40.000000000 +0100
-@@ -238,7 +238,7 @@
- 		$(AS86) -w -l $*.lis -o $*.o $*.s
- 
- .o.img:
--		$(LD86) -s -o $*.img $*.o
-+		$(LD86) -o $*.img $*.o
- 
- .img.b:
- 		dd if=$*.img of=$*.b bs=32 skip=1
diff --git a/sys-boot/lilo/lilo-22.7.2.ebuild b/sys-boot/lilo/lilo-22.7.2.ebuild
deleted file mode 100644
index 5a732952c44a..000000000000
--- a/sys-boot/lilo/lilo-22.7.2.ebuild
+++ /dev/null
@@ -1,195 +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.2.ebuild,v 1.1 2006/07/12 13:49:07 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 ~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
-	# Do not pre-strip the binaries, this upsets portage
-	epatch ${FILESDIR}/${P}-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() {
-	# 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
-}