Cleanup the build again. Fix my BOOTS kludge, and remove the patch.

4 files changed, 39 insertions, 73 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index 66eadfb7d98e..a6bcd95ee3dd 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,6 +1,9 @@
 # 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.26 2003/07/14 09:12:32 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.27 2003/07/16 22:00:00 azarah Exp $
+
+  16 Jul 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r1.ebuild:
+  Cleanup the build again.  Fix my BOOTS kludge, and remove the patch.
 
 *lilo-22.5.6-r1 (14 Jul 2003)
 
diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest
index 498c851c6312..22ec301fbb44 100644
--- a/sys-apps/lilo/Manifest
+++ b/sys-apps/lilo/Manifest
@@ -1,15 +1,14 @@
-MD5 305bbf46a452687729cd4f36aba93bb7 ChangeLog 4254
+MD5 83edae3aab3208d18ea1307538aa00f7 ChangeLog 4399
 MD5 d6daac26992f472c13439776f9262b58 lilo-22.1-r3.ebuild 1583
 MD5 ce88b98514e48eeb2fc2005bd2e7c6f4 lilo-22.3.3-r1.ebuild 1999
 MD5 9196bc4123ba28cd71702b2d7b6ba983 lilo-22.3.4.ebuild 2004
-MD5 4245de72490b9ab5e6921430280995b7 lilo-22.5.1.ebuild 4533
 MD5 4ec5fe27915d3d095bcaf8d987d22d0c lilo-22.5.5.ebuild 4615
-MD5 be9966e2b74ceb5275be76b468a4744a lilo-22.5.6-r1.ebuild 4681
+MD5 4245de72490b9ab5e6921430280995b7 lilo-22.5.1.ebuild 4533
+MD5 1d3b0333514cd06f5d53992c773c42cf lilo-22.5.6-r1.ebuild 4159
 MD5 00de3473e03e180faad32ed00335cc7b files/digest-lilo-22.1-r3 61
 MD5 0a868ea4abd215e2181c6c756173b618 files/digest-lilo-22.3.3-r1 133
+MD5 ef895b0a61149eabd239f3e2b8419642 files/lilo.conf 908
 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-r1 63
-MD5 3f58dc45f348fddbb021df88e3121d37 files/dot-b-files.patch 742
-MD5 ef895b0a61149eabd239f3e2b8419642 files/lilo.conf 908
+MD5 8e75fea24b47485fd4185b9962745117 files/digest-lilo-22.5.1 63
diff --git a/sys-apps/lilo/files/dot-b-files.patch b/sys-apps/lilo/files/dot-b-files.patch
deleted file mode 100644
index 61e4774d8d49..000000000000
--- a/sys-apps/lilo/files/dot-b-files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-r1.ebuild b/sys-apps/lilo/lilo-22.5.6-r1.ebuild
index 109a0a421a8d..bf0c300a2845 100644
--- a/sys-apps/lilo/lilo-22.5.6-r1.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-r1.ebuild,v 1.1 2003/07/14 09:12:32 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.6-r1.ebuild,v 1.2 2003/07/16 22:00:00 azarah Exp $
 
 inherit mount-boot eutils
 
@@ -20,10 +20,12 @@ DEPEND="dev-lang/nasm
 
 PROVIDE="virtual/bootloader"
 
+# Some local variables
+LILO_SBIN_BINARIES="lilo activate edit mkrescue"
+LILO_GET_BOOTS="egrep '^(#?)BOOTS' Makefile | sed -e 's:^#*BOOTS=::'"
+
 src_unpack() {
 	unpack ${P}.tar.gz || die
-	cd ${S}
-	patch -p0 < ${FILESDIR}/dot-b-files.patch || die "patch failed"
 
 	# This bootlogo patch is borrowed from SuSE Linux.
 	# You should see Raphaël Quinet's (quinet@gamers.org) website,
@@ -32,22 +34,28 @@ src_unpack() {
 }
 
 src_compile() {
-	[ -z "${CC}" ] && CC="gcc"
-
 	emake CC="${CC}" OPT="-O1" \
-		lilo edit activate \
-		$(grep '^BOOTS' Makefile | sed -e 's:^BOOTS=::') || die
+		${LILO_SBIN_BINARIES} \
+		$(eval ${LILO_GET_BOOTS}) || die
 }
 
 src_install() {
 	into /
-	dosbin lilo activate mkrescue
+	dosbin ${LILO_SBIN_BINARIES}
+	mv ${D}/sbin/edit ${D}/sbin/ledit
 	into /usr
 	dosbin keytab-lilo.pl
 	
 	dodir /boot
 	insinto /boot
-	doins boot-text.b boot-menu.b boot-bmp.b chain.b mbr.b os2_d.b
+	doins $(eval ${LILO_GET_BOOTS})
+
+	# Sanity check in case things change ...
+	if [ "$(ls -1 "${D}"/boot/boot-*.b | wc -l)" -lt 3 ]
+	then
+		eerror "Did not install all the bootsectors, please report!"
+		die "Did not install all the bootsectors!"
+	fi
 
 	insinto /etc
 	newins ${FILESDIR}/lilo.conf lilo.conf.example
@@ -60,47 +68,19 @@ src_install() {
 pkg_preinst() {
 	mount-boot_mount_boot_partition
 
-	if [ ! -L ${ROOT}/boot/boot.b -a -f ${ROOT}/boot/boot.b ]
-	then
-		einfo "Saving old boot.b..."
-		mv -f ${ROOT}/boot/boot.b ${ROOT}/boot/boot.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/boot-text.b -a -f ${ROOT}/boot/boot-text.b ]
-	then
-		einfo "Saving old boot-text.b..."
-		mv -f ${ROOT}/boot/boot-text.b ${ROOT}/boot/boot-text.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/boot-menu.b -a -f ${ROOT}/boot/boot-menu.b ]
-	then
-		einfo "Saving old boot-menu.b..."
-		mv -f ${ROOT}/boot/boot-menu.b ${ROOT}/boot/boot-menu.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/boot-bmp.b -a -f ${ROOT}/boot/boot-bmp.b ]
-	then
-		einfo "Saving old boot-bmp.b..."
-		mv -f ${ROOT}/boot/boot-bmp.b ${ROOT}/boot/boot-bmp.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/chain.b -a -f ${ROOT}/boot/chain.b ]
-	then
-		einfo "Saving old chain.b..."
-		mv -f ${ROOT}/boot/chain.b ${ROOT}/boot/chain.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/mbr.b -a -f ${ROOT}/boot/mbr.b ]
-	then
-		einfo "Saving old mbr.b..."
-		mv -f ${ROOT}/boot/mbr.b ${ROOT}/boot/mbr.old
-	fi
-
-	if [ ! -L ${ROOT}/boot/os2_d.b -a -f ${ROOT}/boot/os2_d.b ]
-	then
-		einfo "Saving old os2_d.b..."
-		mv -f ${ROOT}/boot/os2_d.b ${ROOT}/boot/os2_d.old
-	fi
+	for x in ${ROOT}/boot/*.b
+	do
+		if [ ! -L "${x}" -a -f "${x}" ] && \
+		   [ -f "${D}/${x}" -o \
+		     -n "$(grep "/boot/${x##*/}" "${BUILDDIR}"/*/CONTENTS 2>/dev/null)" ]
+		     # Check if installed to $D, or if a binary package,
+		     # it in CONTENTS ...
+		then
+			x="$(echo "${x}" | sed -e 's://:/:g')"
+			einfo "Saving old ${x}..."
+			mv -f ${x} ${x}.old
+		fi
+	done
 }
 
 # Check whether LILO is installed