fixes + new patch

3 files changed, 88 insertions, 13 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index 3bd859f39d94..074992b9bd17 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for sys-apps/lilo
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.10 2002/09/03 00:08:10 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.11 2002/09/22 21:48:31 woodchip Exp $
+
+*lilo-22.3.3-r1 (22 Sep 2002)
+
+  22 Sep 2002; Donny Davies <woodchip@gentoo.org> :
+  Now using mount-boot.eclass.  Added more docs, added the samples,
+  added the mkrescue and activate programs.  Created new patch for
+  boot animations; http://www.gamers.org/~quinet/lilo/index.html.
 
 *lilo-22.3.3 (3 Sep 2002)
 
-  3 Sep 2002; Martin Schlemmer <azarah@gentoo.org> lilo-22.3.3.ebuild :
+  3 Sep 2002; Martin Schlemmer <azarah@gentoo.org> :
   Updated version.
 
 *lilo-21.7.5-r2 (8 Apr 2002)
@@ -17,7 +24,6 @@
 
   8 Apr 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r2.ebuild,
   lilo-21.7.5-r1.ebuild, lilo-22.1-r2.ebuild :
-
   Sync pkg_setup() with lilo-22.1-r3 and added the sample lilo.conf.
 
   14 Jul 2002; phoen][x <phoenix@gentoo.org> lilo-22.1-r3.ebuild :
@@ -27,19 +33,15 @@
 *lilo-22.1-r3 (5 Apr 2002)
 
   5 Apr 2002; M.Schlemmer <azarah@gentoo.org> lilo-22.1-r3.ebuild :
-
   Fix the /boot issue finally (hopefully :P).  Add $ROOT checking afterwards.
 
-  18 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r1.ebuild :
-  
+  18 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r1.ebuild :  
   ATTN Maintainers:  This lilo has the patches from SuSe for animated boot
-  logos.  Please dont delete it simply because it's older than the lilo-22.1
-  version in portage!
+  logos.
 
 *lilo-22.1-r2 (4 Feb 2002)
 
-  4 Feb 2002; G.Bevin <gbevin@gentoo.org> lilo-22.1-r2.ebuild :
-  
+  4 Feb 2002; G.Bevin <gbevin@gentoo.org> lilo-22.1-r2.ebuild :  
   Added new setup function which detects if /boot is mounted or not, in case
   it's not mounted it will try to do it automatically and in case of a failure
   exit with an error message.
@@ -47,14 +49,12 @@
 *lilo-21.7.5-r1 (2 Feb 2002)
 
   2 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-22.1-r1.ebuild:
-
   Added several patches from SuSE for animated boot logos.
   Get animations at: http://www.gamers.org/~quinet/lilo/index.html.
 
 *lilo-22.1-r1 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/sys-apps/lilo/files/digest-lilo-22.3.3-r1 b/sys-apps/lilo/files/digest-lilo-22.3.3-r1
new file mode 100644
index 000000000000..70d741659230
--- /dev/null
+++ b/sys-apps/lilo/files/digest-lilo-22.3.3-r1
@@ -0,0 +1,2 @@
+MD5 12b729c6cc1aeebff5e94380a2eb64d3 lilo-22.3.3.tar.gz 369359
+MD5 7a89b03728e27f79806c567b49fdb6ef lilo-22.3.3-gentoo.diff.bz2 7851
diff --git a/sys-apps/lilo/lilo-22.3.3-r1.ebuild b/sys-apps/lilo/lilo-22.3.3-r1.ebuild
new file mode 100644
index 000000000000..65d7628ddad3
--- /dev/null
+++ b/sys-apps/lilo/lilo-22.3.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.3-r1.ebuild,v 1.1 2002/09/22 21:48:31 woodchip Exp $
+
+inherit mount-boot
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Standard Linux boot loader"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
+HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
+DEPEND="virtual/glibc dev-lang/nasm >=sys-devel/bin86-0.15.5"
+RDEPEND="virtual/glibc"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+LICENSE="BSD"
+SLOT="0"
+
+src_unpack() {
+	unpack ${P}.tar.gz || die
+	cd ${S} || die
+	# groovy animated bootlogo patch, borrowed from suse and ported a bit
+	# woodchip (sep 22 2002)
+	bzip2 -dc ${DISTDIR}/${P}-gentoo.diff.bz2 | patch -p1 || die
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	into /
+	dosbin lilo activate mkrescue
+	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
+	doman manPages/*.[5-8]
+	dodoc CHANGES COPYING INCOMPAT README*
+	docinto samples ; dodoc sample/*
+	insinto /etc
+	newins ${FILESDIR}/lilo.conf lilo.conf.example
+}
+
+pkg_preinst() {
+	if [ ! -L $ROOT/boot/boot.b -a -f $ROOT/boot/boot.b ]
+	then
+	    einfo "Saving old boot.b..."
+	    mv $ROOT/boot/boot.b $ROOT/boot/boot.old
+	fi
+
+	if [ ! -L $ROOT/boot/chain.b -a -f $ROOT/boot/chain.b ]
+	then
+	    einfo "Saving old chain.b..."
+	    mv $ROOT/boot/chain.b $ROOT/boot/chain.old
+	fi
+
+	if [ ! -L $ROOT/boot/os2_d.b -a -f $ROOT/boot/os2_d.b ]
+	then
+	    einfo "Saving old os2_d.b..."
+	    mv $ROOT/boot/os2_d.b $ROOT/boot/os2_d.old
+	fi
+}
+
+pkg_postinst() {
+	einfo "Activating boot-menu..."
+	ln -sf boot-menu.b $ROOT/boot/boot.b
+
+	einfo
+	einfo "You can get some animations at:"
+	einfo "http://www.gamers.org/~quinet/lilo/index.html"
+	einfo
+}