22.6.1 stable on x86, old ebuild cleaned.

5 files changed, 9 insertions, 203 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index a0a1331a40ed..7f34cea35775 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.28 2004/11/18 16:57:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.29 2004/12/17 14:31:02 chainsaw Exp $
+
+  17 Dec 2004; Tony Vroon <chainsaw@gentoo.org> -lilo-22.6-r1.ebuild,
+  lilo-22.6.1.ebuild:
+  22.6.1 stable on x86, old ebuild cleaned.
 
 *lilo-22.6.1 (18 Nov 2004)
 
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index e08e7f1fa8e7..a72c7a4223e1 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,10 +1,8 @@
-MD5 c4e8ee6b5c82604f815c22f2f6df74bd lilo-22.6-r1.ebuild 4763
-MD5 1fe18e907866ddab8bc7323b65879110 lilo-22.6.1.ebuild 4790
-MD5 4540670cd64f466afb7f972cd421508a ChangeLog 2534
+MD5 9b045373ccba3534dc69e5dd981fa953 lilo-22.6.1.ebuild 4775
+MD5 94847d12378c68e50148c997b9b33748 ChangeLog 2671
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6.1-devmapper_gentoo.patch 11826
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.6.1-create-install-dirs.patch 970
-MD5 45fc85b5af273bddd66b0056811624ba files/digest-lilo-22.6-r1 122
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.6.1-correct-usage-info.patch 683
 MD5 fff6910b2180128e251d89f31221b683 files/digest-lilo-22.6.1 128
 MD5 42faa8a84fae547fe181da0ad7b67b04 files/lilo-22.6-devmapper_gentoo.patch 11826
diff --git a/sys-boot/lilo/files/digest-lilo-22.6-r1 b/sys-boot/lilo/files/digest-lilo-22.6-r1
deleted file mode 100644
index fe4552e6d35a..000000000000
--- a/sys-boot/lilo/files/digest-lilo-22.6-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ae9665536347d9cc92e0ebd473a9ac6b lilo-22.6.tar.gz 419138
-MD5 88acd6cac12da7e6da02615ba1ca6ddf dolilo-0.3.tar.bz2 3554
diff --git a/sys-boot/lilo/lilo-22.6-r1.ebuild b/sys-boot/lilo/lilo-22.6-r1.ebuild
deleted file mode 100644
index 77c6001a4361..000000000000
--- a/sys-boot/lilo/lilo-22.6-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6-r1.ebuild,v 1.2 2004/11/18 16:57:27 chainsaw Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.3"
-IUSE="devmap static"
-
-DESCRIPTION="Standard Linux boot loader"
-HOMEPAGE="http://lilo.go.dyndns.org/pub/linux/lilo/"
-DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
-SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz
-	ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${P}.tar.gz
-	mirror://gentoo/${DOLILO_TAR}"
-
-SLOT="0"
-LICENSE="BSD GPL-2"
-KEYWORDS="-* x86"
-
-RDEPEND=">=sys-apps/sed-4
-	devmap? ( >=sys-libs/device-mapper-1.00.08 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bin86-0.15.5"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	einfo
-	einfo "If you want to use lilo with device mapper, please enable the"
-	einfo "\"devmap\" USE flag."
-	einfo
-
-	unpack ${P}.tar.gz
-
-	# Do not try and build the dos crap.
-	sed -i -e 's|^all:.*$|all: lilo|' ${S}/Makefile
-
-	# The bootlogo patch from SuSE linux, which was originally in
-	# here, has been dropped because it's no longer compatible
-	# with lilo since the 22.5.x series.
-	# Quequero has done a good attempt to port the patch in bug
-	# #19397, but unfortunately that breaks the timeout at boot.
-	# If you can overcome these problems, a patch is very welcome.
-
-	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
-	# Get the manpage path right
-	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
-
-	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_flag -fno-pic` `test_flag -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
-
-	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/*
-}
-
-# 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="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)"
-
-	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}" = "/" ]
-	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
-
-	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
-}
diff --git a/sys-boot/lilo/lilo-22.6.1.ebuild b/sys-boot/lilo/lilo-22.6.1.ebuild
index 3a775edbc68d..8348b3d86312 100644
--- a/sys-boot/lilo/lilo-22.6.1.ebuild
+++ b/sys-boot/lilo/lilo-22.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.1 2004/11/18 16:57:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.6.1.ebuild,v 1.2 2004/12/17 14:31:02 chainsaw Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -19,7 +19,7 @@ SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD GPL-2"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 
 RDEPEND=">=sys-apps/sed-4
 	devmap? ( >=sys-libs/device-mapper-1.00.08 )"
@@ -29,10 +29,8 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/bootloader"
 
 src_unpack() {
-	einfo
 	einfo "If you want to use lilo with device mapper, please enable the"
 	einfo "\"devmap\" USE flag."
-	einfo
 
 	unpack ${MY_P}.tar.gz