Version bump. Fix HOMEPAGE and SRC_URI (bug #304655). Add myself as maint.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 189 insertions, 4 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 20b225ebc21e..253516a2fd86 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/lilo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.55 2009/04/10 16:31:20 caleb Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.56 2010/07/15 17:09:03 jer Exp $
+
+*lilo-23.0 (15 Jul 2010)
+
+  15 Jul 2010; Jeroen Roovers <jer@gentoo.org> +lilo-23.0.ebuild,
+  metadata.xml:
+  Version bump. Fix HOMEPAGE and SRC_URI (bug #304655). Add myself as maint.
 
   10 Apr 2009; Caleb Tennis <caleb@gentoo.org> lilo-22.8-r2.ebuild:
   fix device-mapper dep for lvm2, see #265599
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 0a21a6736ce0..b7c77727a61b 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -5,6 +5,8 @@ AUX lilo-22.8-novga.patch 831 RMD160 b48d96a16e2be1e4c26372d27fd41a3830293947 SH
 AUX lilo.conf 1722 RMD160 8f4c152ae448cd4ae46c379884a2fe4adbf64d4b SHA1 75c7374359acb94955026a1f626c5355d70829cd SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0
 DIST dolilo-0.5.tar.bz2 3777 RMD160 10a060878ee3fc50ba109c8d2decdd6b409bed2e SHA1 9617479e3736c24d3c06628c540a5eaeb184d849 SHA256 9b6994ec6416cdfb0205665a58dc2e6a1d6e36272a3cab94315daea1c55605f1
 DIST lilo-22.8.src.tar.gz 437555 RMD160 b452f4821cbc917b29cf168587652a6f1efd33e1 SHA1 59852eab59b93dcea63b39eef1db7963b7268b0d SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb
+DIST lilo-23.0.tar.gz 449621 RMD160 c2c63aeaa810a95f8bdade857e0881c97a7d07f2 SHA1 2465f359f1c298d9bbf17843127cffc14e352e39 SHA256 2c180ea2947e2e7f18afba93a5f2bfed2f28c1604445c663820195ae42e55910
 EBUILD lilo-22.8-r2.ebuild 4676 RMD160 ecc77fbc276cc2ecda9096bf45391ef05a972e9f SHA1 11b4217c77432cc47de7fe83bd2d987e2457157a SHA256 de983ed421a87c33d77779ddaeb4d510c03ed0e778b99ee2af8e3434d576fb5b
-MISC ChangeLog 10522 RMD160 84bf94f4988d2af2bceccb68a986df69cfd802d0 SHA1 e12898cff26d4112b6144e36f52155c4e694aed0 SHA256 4b8d292b7d7095f397bb58e92f53f9876534c6cf722d7ea7568d0599f0757102
-MISC metadata.xml 433 RMD160 0cdcb09c81bc08f00242e29ec9c6ca3147758268 SHA1 5b95309115281152235ed831285ad364325a3962 SHA256 fd16fe2b69f46f8966c35db99dafa92456172d360a876f5244b068bd0865032d
+EBUILD lilo-23.0.ebuild 4202 RMD160 38ba6061f6cfd8f500a27875db4383138e28f5bb SHA1 3a46e00d1ec88f3b628d8aa62d3de9f8cff4beb6 SHA256 0ea0c1f608698d91c1dcd22d1c4f4449647cd1de83e58ae0b8b6df6a04abb513
+MISC ChangeLog 10706 RMD160 ac46e7150a4488f900fba1f685aa304cc3d1b945 SHA1 4c8d72a4216020355c59fcd26f3de3632f9c84ae SHA256 d536ad3c4fdc49fc80e651239621927a4d8f9fbb166483c53b4c33f69657d6f9
+MISC metadata.xml 522 RMD160 9c4f3c0f6aceed93fa4fe295784994fa2a48e5e2 SHA1 2c2a255573c6431b3198748cb8fc51b6d5608704 SHA256 52f357c0a361c837bf7b569033bd44667f2c32a857bf7ec64dabfb34bb4d5026
diff --git a/sys-boot/lilo/lilo-23.0.ebuild b/sys-boot/lilo/lilo-23.0.ebuild
new file mode 100644
index 000000000000..7a061e4abde7
--- /dev/null
+++ b/sys-boot/lilo/lilo-23.0.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.0.ebuild,v 1.1 2010/07/15 17:09:03 jer Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DOLILO_V="0.5"
+IUSE="static minimal pxeserial device-mapper"
+
+DESCRIPTION="Standard Linux boot loader"
+HOMEPAGE="https://alioth.debian.org/projects/lilo/"
+DOLILO_TAR="dolilo-${DOLILO_V}.tar.bz2"
+
+SRC_URI="
+	https://alioth.debian.org/frs/download.php/3315/${P}.tar.gz
+	mirror://gentoo/${DOLILO_TAR}
+"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=">=sys-devel/bin86-0.15.5"
+RDEPEND="device-mapper? ( || (
+	>=sys-fs/lvm2-2.02.45
+	>=sys-fs/device-mapper-1.02.12 ) )"
+
+PROVIDE="virtual/bootloader"
+
+src_prepare() {
+	# 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}/${PN}-22.8-novga.patch"
+
+	# Do not strip
+	sed -i src/Makefile -e 's| -s | |g' -e '/strip/d' || die "sed strip failed"
+}
+
+src_compile() {
+	# lilo needs this. bug #140209
+	export LC_ALL=C
+
+	# 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) ${LDFLAGS} ${HARDENED_CFLAGS}" alles || die
+	else
+		emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" all || die
+	fi
+}
+
+src_install() {
+	keepdir /boot
+	emake DESTDIR="${D}" install || die
+
+	if use !minimal; then
+		into /
+		dosbin "${WORKDIR}"/dolilo/dolilo || die
+
+		into /usr
+		dosbin keytab-lilo.pl || die
+
+		insinto /etc
+		newins "${FILESDIR}"/lilo.conf lilo.conf.example || die
+
+		newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die
+
+		doman manPages/*.[5-8]
+		dodoc CHANGELOG* readme/README.* readme/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
+}
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index 6471ad71ebd6..35b72ca24b6e 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -6,6 +6,10 @@
   <email>chainsaw@gentoo.org</email>
   <name>Tony Vroon</name>
 </maintainer>
+<maintainer>
+  <email>jer@gentoo.org</email>
+  <name>Jeroen Roovers</name>
+</maintainer>
 <use>
   <flag name='device-mapper'>Enable support for
     <pkg>sys-fs/device-mapper</pkg></flag>