Version bump.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

3 files changed, 193 insertions, 2 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index 61e5358cfdd5..72d8b15490f6 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.62 2011/03/22 16:10:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.63 2011/04/10 20:37:49 jer Exp $
+
+*lilo-23.2 (10 Apr 2011)
+
+  10 Apr 2011; Jeroen Roovers <jer@gentoo.org> +lilo-23.2.ebuild:
+  Version bump.
 
   22 Mar 2011; Jeroen Roovers <jer@gentoo.org> lilo-22.8-r2.ebuild,
   lilo-23.0.ebuild, lilo-23.0-r1.ebuild, lilo-23.1.ebuild:
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 70b97666a4d2..241f533e6ba8 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lilo-22.8-correct-usage-info.patch 464 RMD160 6b5b0dc33c496b74ec1c93c592b20647390a19e8 SHA1 fcd973814b817b9e512e151d58436ab441ec18bc SHA256 52d63f53dd5c769d2b42c4f4c2447696394a6e213f0253fcaf2b7501faaef382
 AUX lilo-22.8-makefile.patch 1273 RMD160 51fe4916625ced640a3db752ad7d0fab0645c7b8 SHA1 eea591c4d1055df2dae478fc01f696d7562d5969 SHA256 d481f4452bee0ec839830a3a3c572394bf9d7e5abea99ab87d18a70859730536
 AUX lilo-22.8-nodevmapper.patch 437 RMD160 1c70c8d9b107f0210cbc90e6c005d0a079de040c SHA1 fa6cae8448c13bd10c68a4ee79bb753f2f8ec4aa SHA256 0d9c747650db3afd65a9dc8467af4262073f2a66c9f70490298b37e3d9f9f1a6
@@ -8,9 +11,18 @@ DIST dolilo-0.5.tar.bz2 3777 RMD160 10a060878ee3fc50ba109c8d2decdd6b409bed2e SHA
 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
 DIST lilo-23.1.tar.gz 449621 RMD160 c2c63aeaa810a95f8bdade857e0881c97a7d07f2 SHA1 2465f359f1c298d9bbf17843127cffc14e352e39 SHA256 2c180ea2947e2e7f18afba93a5f2bfed2f28c1604445c663820195ae42e55910
+DIST lilo-23.2.tar.gz 449621 RMD160 c2c63aeaa810a95f8bdade857e0881c97a7d07f2 SHA1 2465f359f1c298d9bbf17843127cffc14e352e39 SHA256 2c180ea2947e2e7f18afba93a5f2bfed2f28c1604445c663820195ae42e55910
 EBUILD lilo-22.8-r2.ebuild 4644 RMD160 497b5ddbbee1f5ea5e624648b665b62aba31da7e SHA1 e8a17207551ccb3579d8de410c58ddd67e1f1ebc SHA256 fb4b0768a487f017159c25f41e1889c86446767cd42fc94c127482305280b978
 EBUILD lilo-23.0-r1.ebuild 4195 RMD160 6c222a5568f9bbc61b1a1229fc844349b39c5c12 SHA1 3eaf45ee1ea95d158f469b59465b1aa53c8a9e36 SHA256 b26c1bb4e0396b58048eb66afeb646af3b564cbc0128127717ebccd9ec6d4e8e
 EBUILD lilo-23.0.ebuild 4156 RMD160 d1df82f641f85388b8bcdf4dd589f2d69e6f5e0b SHA1 6242e8982f7218a0b28c11b2cb04e2af38ada6a8 SHA256 462431277d4d1c02a11f867877182a8a1252cfecde64829bee8635716f44e24f
 EBUILD lilo-23.1.ebuild 4218 RMD160 655602f7362100b669fa60fdcfaee6affc0f1930 SHA1 5844b5fa07792337f31315153bff08b8719a2b5d SHA256 1000ab758bc9cee7d096308ad1810296c6cd1b302fb2d0f5c1b2e6ca965b8bf1
-MISC ChangeLog 11609 RMD160 b5763f51e385ace4357a131192d67c23a5ec1182 SHA1 f9779a8fa67e384e6df339053a7a0e9e3093dddf SHA256 e0c74ca5302d6345a65404f4420a85a0b2287d662b2a095f7851b99223c902df
+EBUILD lilo-23.2.ebuild 4218 RMD160 3bbfd5e34b02c19612d7baacb439c09be79f016b SHA1 0d7340d77911a9b8d58c1311f2fed7558f392fe2 SHA256 1cd3101c8a7bf5a0f9553ecafb9476056b08622ac3a4402ee04e8a09ae63deb6
+MISC ChangeLog 11718 RMD160 c32ce6170b1ffb71513811eb5c4dcfbe78874dfd SHA1 8ec0b21af5120b335b204403f479c21258bad0c9 SHA256 097d6e3a584dccdf5a12458e4568bf36626b588551e6b2f85b37c3cc902c5b5d
 MISC metadata.xml 522 RMD160 9c4f3c0f6aceed93fa4fe295784994fa2a48e5e2 SHA1 2c2a255573c6431b3198748cb8fc51b6d5608704 SHA256 52f357c0a361c837bf7b569033bd44667f2c32a857bf7ec64dabfb34bb4d5026
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2iFWgACgkQVWmRsqeSphP+oACffpoR/aHIiawjiqmWaTTQFKrZ
+cMQAmwcp6Gh6/ixaEgnirTair7uZHHzk
+=xeRN
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/lilo/lilo-23.2.ebuild b/sys-boot/lilo/lilo-23.2.ebuild
new file mode 100644
index 000000000000..8e81bdd150b8
--- /dev/null
+++ b/sys-boot/lilo/lilo-23.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-23.2.ebuild,v 1.1 2011/04/10 20:37:49 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 ) )"
+
+S="${WORKDIR}/${PN}-23.0"
+
+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 and have parallel make
+	sed -i Makefile src/Makefile \
+		-e '/strip/d;s|^	make|	$(MAKE)|g' \
+		|| 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
+
+		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
+}