Version bump, as requested by Tomasz Golinski in bug #473366. Rediffed "novga" patch by Ben Kohler closes bug #452862. Upstream changelog confirms that this fixes the GCC 4.8 build failure reported by nzqr in bug #471274.

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

4 files changed, 205 insertions, 10 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index b3138286311c..1a041550ccf5 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.75 2013/04/09 10:05:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.76 2013/09/23 12:21:11 chainsaw Exp $
+
+*lilo-24.0 (23 Sep 2013)
+
+  23 Sep 2013; Tony Vroon <chainsaw@gentoo.org> +lilo-24.0.ebuild,
+  +files/lilo-24.0-novga.patch:
+  Version bump, as requested by Tomasz Golinski in bug #473366. Rediffed
+  "novga" patch by Ben Kohler closes bug #452862. Upstream changelog confirms
+  that this fixes the GCC 4.8 build failure reported by nzqr in bug #471274.
 
   09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> lilo-22.8-r2.ebuild,
   lilo-23.2-r1.ebuild, lilo-23.2-r2.ebuild, metadata.xml:
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 0f53f0f28965..62c723434416 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -6,23 +6,22 @@ AUX lilo-22.8-makefile.patch 1273 SHA256 d481f4452bee0ec839830a3a3c572394bf9d7e5
 AUX lilo-22.8-nodevmapper.patch 437 SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6 SHA512 401132c02ccfd554b247c62eea778e025591f94b79a82e41b061b7aae5e52f3c3cbebaef96cf56fdc8b4858f1af6202b7ed75881e8a633668bb53bdb26e3e702 WHIRLPOOL 346863230433b6511763a0a6d7d36438bd2b2d174ef1f0052b52c3167937eba53832047a635f3f4c9b3d291e6c6d3f471d18b08cdf2f144c468b98f0d5f445bc
 AUX lilo-22.8-novga.patch 295 SHA256 f4fc887a0950a32262dc4f36d84fe2b5ec6df2ae67d1dd0110fdfe1aadf65d9c SHA512 ee619280265191f80f07429ed0abe9434219cc00b31d204b613138de449ae9de83f8eb80110c3af36ac52156f3a2b52b8d0795abc8dd8a4ad3df15b654cf71e6 WHIRLPOOL e4e1db110f4247f1a3232e967a2969324f63307738bb28e58c53148d98b4e464b1e65f4107c5988a6ca2dde5e1f233a232db7ec7c3ed87f7dd6fe41a1c8b8c36
 AUX lilo-23.0-make.patch 2147 SHA256 4561fb4be2ebcef1ab5bc5b371a2c2e8a7fb4d65764c3aa77f71b63dc11d6488 SHA512 3efb1aa109762bc80654a421a218c74bd6b82c39a1e14ea93f1da55414ece59575586f18d652559c7d57adde8c2aa9a5aabeddfafb369a3092687e18c48f194b WHIRLPOOL 10c95f202ff327ae7ff0f4a7a94659d9d82a37f53129dba3cf75a3f1655322470c8439363e9f0b4d0676f23e53e7b422076252a6ffc823ce524ab1703d82717f
+AUX lilo-24.0-novga.patch 497 SHA256 fe9df228f7a9c8585182e6dc457b784b60ed7f357e22a52b0ec629d53a305cf2 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45 WHIRLPOOL 7c5ac6f8ffde38dc104d6196832728326f357ff0e0c0aa69816f1648bb470ae9b3b570facaeaad1c73812da3ce4601d053bc28b48cb9a2b8944c9a8ba05a63a3
 AUX lilo.conf 1722 SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1bb7fb8371d0 SHA512 3e456b950d6f6fa9d1a223e11d60b1679105d97007617f648da5719a1cc9944cb1277849f642faee58038005057c2ed3af1bd635c5c87ec35505cd464e340f49 WHIRLPOOL d6d3749971c7cceba79feef2ed130a0250ecb6961e161aa8850ad99f2272d8cf94dbf2d952abd6b67843040c9623df6b7346d32eb12a9d6586d4c54d1ea875a9
 DIST dolilo-0.5.tar.bz2 3777 SHA256 9b6994ec6416cdfb0205665a58dc2e6a1d6e36272a3cab94315daea1c55605f1 SHA512 6bfd0181d922f01903c8c0cdc67fc087c74091d7ffec0ddfb263c18b3a2247fcfbd201995f1724f26f4eb21b91147f209fd7ed485a05c6b9e9f583ea2456baa9 WHIRLPOOL 4cae4563097b646aa4d689861793712dc44d6a32db850842c88556f32e59765ad5d6c7594c7a157d063503c9e70473774448f6692ba72b7c53c057c038ed3960
 DIST lilo-22.8.src.tar.gz 437555 SHA256 bad5907c212c0b2b15de5e852787a1ad2129a702f113b26345eec1c917c4edcb SHA512 b8a22c73b5f6a0c7ddde7c7af6511f9e85d43bae98603bfa0656dfa0685018b3ed713cfd9932bfac33017b83f807c66a3e25d78a16ea9a15bbfddd0e806714cc WHIRLPOOL 712fdf98b28e0ac717c0667fb5d4d7e734d963f0c4b3997d690c543d8d505ad3e6449933a854a8c1ce008d5c7f1b40a013398d36455fa433498f2583677f2d7c
 DIST lilo-23.2.tar.gz 580758 SHA256 0245e300494c0700411d518ffd81a15a00450face7922fb3b08cec7d16984030 SHA512 fe6789d3643751128afcb2c9761623329e84ab05ec84d75d6b13eff991d10a6671617b65f4ab5ef414a6ca4bc530bcf33b96ddeee3f5dce78bb69b8db740f9c5 WHIRLPOOL f12c44fc48ba74a57ed83174b44966a4330ad3a96714bf52afea6e4d1c4a01c2881d447e563c0b363f602fa0e15d6012633734fb962cf2adba4ec62c7481519a
+DIST lilo-24.0.tar.gz 768631 SHA256 3d40c0af1d60a0adbe3696cd6cb8d7e892694351ff225371d871b6b479d82152 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7 WHIRLPOOL 598e915ddb08b3b8383fb08a1b3dbb75f9340fbb052c4ceed88309274c33b8a5965502a95b99997aba7af2d3ec9da737c13b85784afd8f371ad96b69942069a2
 EBUILD lilo-22.8-r2.ebuild 4610 SHA256 695785303c5e56fad7939a993f36a4dbaded0d9e0f8f828637e7ce2d2fabc0f8 SHA512 efa755ff85b3e0f00b3daa4b47d5a0e6943938de397ed9fd9223d48ad84450a5c13f831c96bbfb0ed3415c88e97e504263ca12c1ac34fea519b6a261f2f371f3 WHIRLPOOL 700a06dd906eff275582666859cab94847c27461178dc83f60edafdaa956b7444dfd5d4330b57e20d4d42bba8d3e46dcd9c95c09aad5e73832fe0251eb7999a1
 EBUILD lilo-23.2-r1.ebuild 4247 SHA256 a552c43d7ab144ea42df4ff8359637609f95d9014acf49504d677adcc4bc0965 SHA512 3e059d6ecfb7a54140fd0dfee3c4496aced9f6d23c7b0dc13f1bfd753d25d7277cad2f55106a85ad44258d0d2170329eb18bde6afd95d74b818c1d7e41c96ddd WHIRLPOOL 206e2a21ba1532a9c1b9962c52ac3698fe3cdcd5739bf654db221fa23d69fc81d47718df5b28a4522fba246a34442dcc89c6d1fcde523e365effccd097fbd1b8
 EBUILD lilo-23.2-r2.ebuild 4325 SHA256 bdce7ce4748b7baf17f3de3078362df2ae51fcd90bc66657ea4dc07bfe75a6cb SHA512 485852be156c1f67584a5a13dce251e79b3e714ebee561dccd069bb34694729ec38e71e0aa20825b3d0d0d81536eb523c4063fb3084c9fbd22cf87cac8b6b57c WHIRLPOOL 66e1f838f5f19d032b150981622b53520e06a2917c21e1ca8041a1c6eadae57c80ec7ff796dbeb62e251bb2d9366471ad1a9275f6609c06ba4573353bb8aa45e
-MISC ChangeLog 13607 SHA256 75ee7f92c19774854247fb2f7b1c3b9b9471a0ca628cef2a2218ebe82387b96b SHA512 cc2d6c707b049eaf9ae393d212564be220d935b61a403ce150a6fd23de8bd27405a35027943513439cfa985e131d6339b77724ce5a7e44aaaf2ba7759c15d273 WHIRLPOOL e9930337fed7ad29a7eec2d5fb12377a3510151ae66faa2cc2d51d77cbd5dec264a32abec17e6d1429d47ce14772c58e0ac11e48aaa6c4803d7ac9783c4ebcf0
+EBUILD lilo-24.0.ebuild 4272 SHA256 dba3bee1dc72626b76effb5ae7404a74f84b7c9a6f8acb5557ccf4d1e5e1e36b SHA512 5df8c43206d5ec67a2351cd62e3194bdc9203ce9064c2c4145d80dcdedc61ffbe271a00602abfb47971c60e3e4931e566fe17b5503fc2ef8f55d2acba380c9bc WHIRLPOOL bbc1cc5c520a940574c0e437cec946ab3fe9c01f4e3429035691e83300d320275d12c81d238563dbeb990ba61c4d10379da843c064ad113852f76cc9e0dfe54b
+MISC ChangeLog 13960 SHA256 76c188396a2b838714c291f898e7f6b2f51bef5d8c045f0f55e817d56fcf6060 SHA512 ce4c2cbcde4c045079dfce116c09afa3b4c91df9ee1212afa07ddede57e4bc632e8863cb02299992db09e947141fae756806245b04fa3ccabe2c17b96ff505d1 WHIRLPOOL cfd9826d34f76ea3f6c45b5e84920a7b7696d5c4f38e1e508f8b26edba7c49e078262fb45c65c7de63c55dbe36fa4925f58389e61f4fc69a2f5661f6e6e79035
 MISC metadata.xml 416 SHA256 ef43c3c3d27fbd6360d08d0feecc284967a9b70897548e2a78c726a94ed53679 SHA512 0a22c23afdbb28d149137da2b76722e3d16cf70a5081e0ec7343b71af9bf64a554ad664a7ac7417cafa0f0367fa29b31218ee874c7154d326209cc0f30adfd72 WHIRLPOOL d3d09151ae2fd24f05102a1b9378c4f31e2c721a335e20cfbf3b2fd88e8b5b7ff6ca32eff739234e078a8db5f7fb0274234f5eb58c2fd67fd8a7f7b6f2b1da65
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRY+ffAAoJEEdUh39IaPFN5+kH/2f4g3qtFGFQKp/dI8DC9J+A
-SBjhdyQJCreciCbE4dGTCu78aIC4mSZLluBZxTYfyFeU0L2iuTa0K+QVXtwSpaTs
-9kQajVV3jMlAQ9Pj5kFeiQR9Qw/2ZelS8Q4AHGvYJ0Kui3kL+5/JUslOLuhAjy4k
-g9N7uu1ylqEo/+89Qo2aH57h6EBKH+nt9GmhpAiqVA4H73UTuCrpIPHlec2Vrsj9
-gbaKi/JQ3sYSKTABVxpg3Odvi6vPCMPlH8IoFzhGpPOaMtyf4/1UtGNyxzyEMTcW
-Pc+y4WnIxIcXnguLDFX/nkio7oyDqf1t3d71/nQ2us4Fvi8DzxJYAitkQBbhd48=
-=rBDl
+iEYEAREIAAYFAlJAMj4ACgkQp5vW4rUFj5qi4wCfQa7Uj0iPMG7fWhFNhKoInZ9C
+QjgAoL+mwteZqbGKZ5I3tLL7vGIqtpev
+=iR42
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/files/lilo-24.0-novga.patch b/sys-boot/lilo/files/lilo-24.0-novga.patch
new file mode 100644
index 000000000000..ebb06b486818
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.0-novga.patch
@@ -0,0 +1,12 @@
+diff -ur lilo-23.2/make.vars lilo-23.2.new/make.vars
+--- lilo-23.2/make.vars	2013-01-18 11:33:02.438628138 -0600
++++ lilo-23.2.new/make.vars	2013-01-18 11:34:03.960697091 -0600
+@@ -71,7 +71,7 @@
+ 
+ CONFIG=-DBDATA -DDSECS=3 -DEVMS -DIGNORECASE -DLVM -DNOKEYBOARD -DONE_SHOT \
+     -DPASS160 -DREISERFS -DREWRITE_TABLE -DSOLO_CHAIN -DVERSION -DVIRTUAL \
+-    -DMDPRAID -DDEVMAPPER
++    -DMDPRAID -DDEVMAPPER -DNOVGA
+    
+ # set the following if you wish LILO.COM to be installed
+ DOS_DIR=/dosC/boot
diff --git a/sys-boot/lilo/lilo-24.0.ebuild b/sys-boot/lilo/lilo-24.0.ebuild
new file mode 100644
index 000000000000..364206d8c319
--- /dev/null
+++ b/sys-boot/lilo/lilo-24.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-24.0.ebuild,v 1.1 2013/09/23 12:21:12 chainsaw Exp $
+
+EAPI="5"
+
+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="
+	http://lilo.alioth.debian.org/ftp/sources/${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 )"
+
+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}/${P}-novga.patch"
+
+	# Do not strip and have parallel make
+	# FIXME: images/Makefile does weird stuff
+	sed -i Makefile src/Makefile \
+		-e '/strip/d;s|^	make|	$(MAKE)|g' \
+		-e '/images install/d' \
+		-e '/images all/d' \
+		|| die "sed strip failed"
+}
+
+src_configure() {
+	if ! use device-mapper; then
+		sed -i make.vars -e 's|-DDEVMAPPER||g' || die
+	fi
+}
+
+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
+		local target=alles
+	else
+		local target=all
+	fi
+
+	emake CC="$(tc-getCC) ${LDFLAGS} ${HARDENED_CFLAGS}" ${target} || die
+}
+
+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
+
+		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
+				eerror "Running /sbin/dolilo failed!  Please check what the problem is"
+				eerror "before your next reboot."
+			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."
+		echo
+	fi
+}