gentoo resync : 31.05.2021

6 files changed, 1 insertions, 375 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index b2bfe7c6d90b..8ff6f0c355a4 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 7a4c8236dfa6..7f8d4f6b94ce 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,13 +1,8 @@
-AUX lilo-24.0-novga.patch 497 BLAKE2B 429d139b87d1dc581533c09ad6562d42323ac46663198836b0c8339cb99ce5e7442560a15abd089e995a55afdb2ea07c83e3583b7968ceb206acf6736e4574d5 SHA512 f09dbca336c6117592ec24e972c393941ae336f01a03449a455b9694e7e7c62fe24cd9fabab96380c91472fc701633a0ca41277180b73525e92cadbb71459d45
 AUX lilo-24.1-novga.patch 500 BLAKE2B a5ba2f06791812fd7dcafe0882218e6d3884db228f5866604f903972e6914cfdab8379e18eb18f399174581eb72775fda05f1a61df699d39f60564b9a2e337a6 SHA512 067a741086b6df6b5f728ffde3cac949dd9b59cdc11ac1b022f240b69c4a8ef883f5623cc610becd4648f02ad3a243a0d6a939aa8d8c63d9b0158426e6b6f300
 AUX lilo-24.2-add-nvme-support.patch 2779 BLAKE2B 0344624148e31dd9cd99e08f33e777e3a30f2bfc8321fe163a43329ae8c78e96fdb9a6a062648f06705919f89fd754a69a8cf6a2254d95bf7c5c6c78b9a3948e SHA512 14263591673f7486438416cb394f361593bd94da35fac643ae7938a241634aed41582532dcc7c3854c314c5bc68614d61c8099e12affe27c77a8a9a7473352bd
 AUX lilo-24.x-fix-gcc-10.patch 1020 BLAKE2B d434248d3f4ed4d591ada4d507e5ab80486228bfb4bd99d7597267355d2dfc70252b9f6a93e34f850f67a27698f94a70e0803310c81ffbc4c9d4f439f8155ae6 SHA512 0ef0ab379e787767bcee2c77eeb7bc5acce908850077dcc14a1d71f3a78761946e8e252089fecb441c26cbbee66c868021d42a300d05579d083e654026cf8682
 AUX lilo.conf 1613 BLAKE2B 746e05ed4a38f553d8534087d3889e3c136531752aa39f5de9404e58dcd520925f369a4300e9d16ba779b9cef0ae0ecfdde9221f064f42e6a5c812ee7effbbaf SHA512 be59f5b97cbf8eda744e8a7a281526b3262c80af7d3c61e5476697e1569e6e419c4055a8e7deaa4f65688769d941466043af81e159367bf893a88b77eb3732d5
 DIST dolilo-0.6.tar.bz2 3817 BLAKE2B 35c41f5eac8e02d4381db517a9b230d037da184f9ae409bc76307e689ad6b82928ea3794db54c3137afe6c770db86ba0cde78c33d89e775ddea464905070bfd6 SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936
-DIST lilo-24.0.tar.gz 768631 BLAKE2B 09f6520e16a90eab5f44af440f1e2c2d05abb56e954dbb0237700d8e99f017bab279fa8a5c535114ec58be7416123ea51e91311255ed3036199f3565eec5a3f7 SHA512 4158a0f7ab085da063938df2bc77356f9536aa78208a902561f9e61ec478fb17f204f68407f6809638aea9d2e0c88ffc701548291c1635ab40f5b18a7be6bae7
-DIST lilo-24.1.tar.gz 773223 BLAKE2B ceaeaf6696b7b15d95cc6c90c6de63ad731f4d0f6d9e42fea4a245219d446cbecdb7d372ef4cb31dce26c7e149723779244f0319939343edf971ac1a19ba5063 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883
 DIST lilo-24.2.tar.gz 777400 BLAKE2B 71c74235d5df10eed65b67dc1ce2af21163651c752d799da419077025304abf9352535a70f3fb60d086609d8a1c25bf394e29453c338ab022cb2be3cb21af75f SHA512 4437cae21345f483194a5dc95f686f3f3cb2beec78faae3fba959db25eae29fe2c56732e055c05f1d101682c5d442cdc9561fae8074f61f5537dde0413204c54
-EBUILD lilo-24.0-r1.ebuild 3919 BLAKE2B cf48734483741f43757dc2bedd7849b86b8524a93c09563ef6e845b03da9c48b134e4d6d8e58945c2b129e4086e472715ec6d86b5845a72d3661fe6b540c65eb SHA512 5cbfd95e3385b83d6f9e6313092cd91c943858c5ad39d55f62be6e4a8281ce0bd68cd1803bee97719ed14b17994e9fded3063a4aeb1952e0c941b47ea50cbb1b
-EBUILD lilo-24.1.ebuild 4132 BLAKE2B 86754e0375689f0487a0f3d0ce92501d345cc7dbac409835f7d07747a9f6b80fbb940e29d95d593e36e6dd93f36a352092da01a27b6cf4102bb64bbd9e8ff937 SHA512 330ab1a3917c8e69bdf590444dc6c8249d7ee80a16c47bffbcf8f3727d180b2511b1a4c49886360ff78256a3cd5d803d033bf0725690ca54e804450bd1207ea5
 EBUILD lilo-24.2.ebuild 4192 BLAKE2B 4d24ee4142c76361435f4b73d756d3526fdeb7aca9ba3a61178b2475a27aea05f3ef0ff3d4d374c0c6576e78a88e103c46b3ec14006a183a645b67bc1d390679 SHA512 a15815bb166ec8e6b1592ce1f225f0a1cc8f19c17e86d1c2ada81c4fb563006ae6829a17519d87df763fc4fc788b3bdc9a09e27e3ae569ff8ad083f1a7559628
-MISC metadata.xml 582 BLAKE2B 3eff61a72e8828178013f444fafad385ca14c91d9a9a989646b5b1a9a1485598b537c2bf7f49b6d7301e45f7266e1dc866c0c3fffe74843a0d44ce94fa982825 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04
+MISC metadata.xml 505 BLAKE2B 5d4b29183307771e55dccfb9cad3434385842837a3c14ebea714f92c21e14c3935239a864c1e8c3397392c6a6392a7f49079bb07b75e9abf5150712047a98d7c SHA512 8eefe8d0c150fadb739fdeca238a2ceac18ec7fff9611021980e742787ea40842bae40c31bf6c0624207e96d1829ea2bde3337f1a6a7b29764bcc19c4a16becc
diff --git a/sys-boot/lilo/files/lilo-24.0-novga.patch b/sys-boot/lilo/files/lilo-24.0-novga.patch
deleted file mode 100644
index ebb06b486818..000000000000
--- a/sys-boot/lilo/files/lilo-24.0-novga.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-r1.ebuild b/sys-boot/lilo/lilo-24.0-r1.ebuild
deleted file mode 100644
index a724cf74ade2..000000000000
--- a/sys-boot/lilo/lilo-24.0-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic toolchain-funcs
-
-DOLILO_V="0.6"
-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
-
-	# 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}" ${target}
-}
-
-src_install() {
-	keepdir /boot
-	emake DESTDIR="${D}" install
-
-	if ! use minimal; then
-		into /
-		dosbin "${WORKDIR}"/dolilo/dolilo
-
-		into /usr
-		dosbin keytab-lilo.pl
-
-		insinto /etc
-		newins "${FILESDIR}"/lilo.conf lilo.conf.example
-
-		newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example
-
-		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
-}
diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
deleted file mode 100644
index 4627ce7347c4..000000000000
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DOLILO_V="0.6"
-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() {
-	default
-
-	# 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 && eapply "${FILESDIR}/${P}-novga.patch"
-
-	eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.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
-
-	# 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}" ${target}
-}
-
-src_install() {
-	keepdir /boot
-	emake DESTDIR="${D}" install
-
-	if use !minimal; then
-		into /
-		dosbin "${WORKDIR}"/dolilo/dolilo
-
-		into /usr
-		dosbin keytab-lilo.pl
-
-		insinto /etc
-		newins "${FILESDIR}"/lilo.conf lilo.conf.example
-
-		newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example
-
-		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
-	ebegin "Checking whether LILO can be safely updated"
-
-	if [ "$(whoami)" != "root" ]
-	then
-		eend 1
-		eerror "Only root can check for LILO"
-		return 1
-	fi
-
-	if [ -z "${rootpart}" ]
-	then
-		eend 1
-		eerror "Could not determine root partition"
-		return 1
-	fi
-
-	if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
-	then
-		eend 1
-		eerror "No LILO configuration in place"
-		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
-		eend 1
-		eerror "No LILO signature on ${bootpart}"
-		ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
-		return 1
-	fi
-
-	if grep -q "^[[:space:]]*password[[:space:]]*=[[:space:]]*\"\"" /etc/lilo.conf
-	then
-		eend 1
-		eerror "Interactive password entry configured"
-		ewarn "Run /sbin/lilo -p by hand."
-		return 1
-	fi
-
-	einfo "LILO on ${bootpart} is safe to update"
-	eend 0
-	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
-				eerror "You must manually configure and run LILO"
-			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, "
-		einfo "edit /etc/conf.d/dolilo to harness its full potential."
-		echo
-	fi
-}
diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index 0deb765df79f..443ccb2afb4e 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>chainsaw@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>