Fixing bug 24368

5 files changed, 32 insertions, 12 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index ab823cbff440..66eadfb7d98e 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lilo
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.25 2003/07/11 06:24:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.26 2003/07/14 09:12:32 phosphan Exp $
+
+*lilo-22.5.6-r1 (14 Jul 2003)
+
+  14 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.5.6-r1.ebuild,
+  lilo-22.5.6.ebuild, files/dot-b-files.patch:
+  Didn't install all .b files - bug 24368
 
   11 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> lilo-22.5.6.ebuild:
   Added entry with "obsolete" to SRC_URI which should work in the future.
diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest
index ec1eb50e7017..acd4e617b4dc 100644
--- a/sys-apps/lilo/Manifest
+++ b/sys-apps/lilo/Manifest
@@ -1,16 +1,15 @@
 MD5 ce88b98514e48eeb2fc2005bd2e7c6f4 lilo-22.3.3-r1.ebuild 1999
-MD5 22f2052c26d297cf22435733317a00d6 lilo-22.5.6.ebuild 4748
 MD5 858efb42f81f68c6659a13093c77d1bc lilo-22.5.1.ebuild 4528
 MD5 9196bc4123ba28cd71702b2d7b6ba983 lilo-22.3.4.ebuild 2004
-MD5 3e41a9428b784be4bec5b3e691cf1cb7 ChangeLog 4057
+MD5 305bbf46a452687729cd4f36aba93bb7 ChangeLog 4254
 MD5 4ec5fe27915d3d095bcaf8d987d22d0c lilo-22.5.5.ebuild 4615
 MD5 d6daac26992f472c13439776f9262b58 lilo-22.1-r3.ebuild 1583
-MD5 89f9610d8c6a5f297f0dda1862fb6180 lilo-22.5.6-r1.ebuild 4783
+MD5 be9966e2b74ceb5275be76b468a4744a lilo-22.5.6-r1.ebuild 4681
 MD5 00de3473e03e180faad32ed00335cc7b files/digest-lilo-22.1-r3 61
 MD5 93ff7a7535e7c8ff1327db52a3118bef files/digest-lilo-22.3.4 133
 MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63
 MD5 f3c42e3a8ba9c0623ba4554ba22196ac files/digest-lilo-22.5.5 63
-MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6 63
 MD5 0a868ea4abd215e2181c6c756173b618 files/digest-lilo-22.3.3-r1 133
 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r1 63
 MD5 ef895b0a61149eabd239f3e2b8419642 files/lilo.conf 908
+MD5 3f58dc45f348fddbb021df88e3121d37 files/dot-b-files.patch 742
diff --git a/sys-apps/lilo/files/digest-lilo-22.5.6 b/sys-apps/lilo/files/digest-lilo-22.5.6-r1
index 5cd39211f2f0..5cd39211f2f0 100644
--- a/sys-apps/lilo/files/digest-lilo-22.5.6
+++ b/sys-apps/lilo/files/digest-lilo-22.5.6-r1
diff --git a/sys-apps/lilo/files/dot-b-files.patch b/sys-apps/lilo/files/dot-b-files.patch
new file mode 100644
index 000000000000..61e4774d8d49
--- /dev/null
+++ b/sys-apps/lilo/files/dot-b-files.patch
@@ -0,0 +1,16 @@
+--- Makefile	2003-06-30 05:45:19.000000000 +0200
++++ Makefile.new	2003-07-14 11:03:36.000000000 +0200
+@@ -100,11 +100,11 @@
+ HFILES=bdata.h bitmap.h boot.h bsect.h cfg.h common.h config.h device.h \
+   edit.h geometry.h identify.h lilo.h loader.h map.h md-int.h partition.h \
+   probe.h raid.h shs2.h temp.h version.h vesainfo.h
+-#BOOTS=boot-text.b boot-menu.b boot-bmp.b chain.b os2_d.b mbr.b mbr2.b
++BOOTS=boot-text.b boot-menu.b boot-bmp.b chain.b os2_d.b mbr.b mbr2.b
+ 
+ .SUFFIXES:	.img .b .com .S .s
+ 
+-all:	lilo bootsect.b disk.com pseudo.b  # $(BOOTS) edit dparam.com activate
++all:	lilo bootsect.b disk.com pseudo.b  $(BOOTS) # edit dparam.com activate
+ 	if [ -x /usr/bin/bcc -o -x /usr/local/bin/bcc ]; then make diagnostic; fi
+ 
+ #
diff --git a/sys-apps/lilo/lilo-22.5.6.ebuild b/sys-apps/lilo/lilo-22.5.6-r1.ebuild
index 9f2cc78d0dcb..109a0a421a8d 100644
--- a/sys-apps/lilo/lilo-22.5.6.ebuild
+++ b/sys-apps/lilo/lilo-22.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.6.ebuild,v 1.2 2003/07/11 06:24:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.6-r1.ebuild,v 1.1 2003/07/14 09:12:32 phosphan Exp $
 
 inherit mount-boot eutils
 
@@ -23,11 +23,8 @@ PROVIDE="virtual/bootloader"
 src_unpack() {
 	unpack ${P}.tar.gz || die
 	cd ${S}
+	patch -p0 < ${FILESDIR}/dot-b-files.patch || die "patch failed"
 
-	# Get all the loaders to install
-#	cp Makefile Makefile.orig
-#	sed -e 's:# $(BOOTS): $(BOOTS):' Makefile.orig > Makefile
-	
 	# This bootlogo patch is borrowed from SuSE Linux.
 	# You should see Raphaël Quinet's (quinet@gamers.org) website,
 	# http://www.gamers.org/~quinet/lilo/index.html
@@ -38,7 +35,7 @@ src_compile() {
 	[ -z "${CC}" ] && CC="gcc"
 
 	emake CC="${CC}" OPT="-O1" \
-		lilo bootsect.b edit activate \
+		lilo edit activate \
 		$(grep '^BOOTS' Makefile | sed -e 's:^BOOTS=::') || die
 }
 
@@ -175,7 +172,9 @@ pkg_postinst() {
 		if lilocheck
 		then
 			einfo "Running LILO to complete the install ..."
-			/sbin/lilo &> /dev/null
+			# do not redirect to /dev/null because it may display some input
+			# prompt
+			/sbin/lilo 
 			if [ "$?" -ne 0 ]
 			then
 				echo