gentoo resync : 15.12.2019

3 files changed, 0 insertions, 60 deletions

diff --git a/sys-boot/elilo/Manifest b/sys-boot/elilo/Manifest
index 91cdeb525edf..675d16625ef0 100644
--- a/sys-boot/elilo/Manifest
+++ b/sys-boot/elilo/Manifest
@@ -2,8 +2,6 @@ AUX elilo-3.16-elilo-loop.patch 299 BLAKE2B 5fe27b5b89d18adace762e2691854140437c
 AUX elilo-3.16-gnu-efi-3.0.6-ia64.patch 3796 BLAKE2B 9008b004b24b390f46d6b05cf9e9ae0627d4ed930b9965d0295e700ea0c7617f2ac3e1da0b583ab931e8a7bffc0bf8452eb19318d7d1d256a5d4781cde4e710e SHA512 c2ec3ba0d2f5ee3447363a44d9d7863eb323095c40f72243241f608437fd9e2b17ee603666a1103f14a0c66cae025e8f9be09c27d8fb57554f480209a02f39e5
 AUX elilo-3.16-strncpy-clash.patch 744 BLAKE2B 421530303406aa819e07883d4b80a27da20844929d0f1749e121b2e05cf8eda2af082ad8c02476cabf864258133964b0fb02ab3ed9969202fe62392718e7e047 SHA512 4cb593ac6b56bbe63b1ff632d00ef1192dc28c9a5af355e740b9ee41697fb48766ccb678636c66ecdb05d7cdf8d16b0a14d99e0347022bbe1cb6ec9be09bfcf8
 AUX elilo.conf.sample 150 BLAKE2B d823113e1fcdaf08398f09b6fe9b4b2284004be2886799a69fd776bfaab194413c51969c65d1d81607c0a46699e84132b88bdd2a82f6f41a65ae6fbb061d9356 SHA512 3f99527724759f5c03a5f244b957bc6d50ca378f2b66cbcb19f73fa721d2fd76119ae90669e4cce045f5bc66a80d46b21e76e8c4895d23b22df23ec69262b0e0
-AUX elilo.sh-chkspace.patch 833 BLAKE2B 72d99e45c6deff5262ea02bc8417e77e9e1158e5ef921d142f6ea941fc2c2da1b9f3624bd1e9ca6f9debe63f174d0ee55536bd295706c59dc197227739c03316 SHA512 063131fd53866e717d87a4ca23e5f4143cb166480d89312bbf9f5be9540e29930794657f1eb2709559435abceb415b7775e049a1f8d410ae5007dc967fbf9224
-AUX elilo.sh-vmm.patch 2099 BLAKE2B 8bfca9c76e9dc5232e3602013103dc3e26bc29f880287f1204d429878b0e13cc95ff005934bbf06c9f848cd8c7d7a0162e52c827e1ceaa8809d28864e16712ca SHA512 2bbeca88b38790b3821e4ba54c46d194fbb776cf56788634e91da91e028fedb81a38928d0dbbb503cdf1a047c281800aea1d56a2eae47953dbc2203d795862cc
 DIST elilo-3.16-all.tar.gz 485844 BLAKE2B 813762ffef32a640c074973a07d886e0de137be10ff08e9375cd894b0d83dd8bc96cc33f80da1e698db49cc9f105a905abb2fa04048eaca394d3d70e79cb8534 SHA512 4289b45f2e40b2a12167f2efd9a482cf97baedb13fc24813f360f375296d0d3f107d6c980b4b31262816f664a2536353fa124e689cbd65093da9b16fdddaf842
 DIST elilo_3.14-3.debian.tar.gz 32179 BLAKE2B 84f8055d3e33b99ce91079768da80a8800c3c2f569ce5619641a983efb943055dfd9a8fb2fda8e5e6d60009ffefbcc1573098f022f06635d4d5304bc3bfddf1e SHA512 b2d5927bf84d61cc432fc916301ddb3be74db16d3e5ba4f13039e2925606b8870991fbb17f837005d8f2b655b7dcd2b2311dfacd7f02183762caf7081ede638f
 EBUILD elilo-3.16-r2.ebuild 2072 BLAKE2B 8f3719a94e45a0e7c49304b1ff2c8bfc1727c8256eaf4b11aa4b5e0dacb4caefe9ddb685da60597e4aa1bd2eaf88e18f2c05380e79b72136ee14cacf3a854fdf SHA512 a6be44876a80bd87401bbab2e69edc53b7dd4c1da05c207c8f9a18240cf5c33cb674ee9017658dc17c4b83f4bec26a30088293d084826b813ed187a5a2a61a01
diff --git a/sys-boot/elilo/files/elilo.sh-chkspace.patch b/sys-boot/elilo/files/elilo.sh-chkspace.patch
deleted file mode 100644
index 710780e8da6c..000000000000
--- a/sys-boot/elilo/files/elilo.sh-chkspace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't count duplicate files twice when summing bytesneeded
-
---- elilo/debian/elilo.sh.chkspace	2006-03-16 07:53:00.000000000 -0500
-+++ elilo/debian/elilo.sh	2006-03-16 07:53:27.000000000 -0500
-@@ -580,7 +580,9 @@
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-     vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
--    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
-+    allfiles=`for f in $imagefiles $initrdfiles $install $bootconf; do \
-+	echo $f; done | sort -u`
-+    bytesneeded=`cat $allfiles 2>/dev/null | wc -c`
-     # convert to KB, allowing 5% overhead
-     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
-     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")
diff --git a/sys-boot/elilo/files/elilo.sh-vmm.patch b/sys-boot/elilo/files/elilo.sh-vmm.patch
deleted file mode 100644
index 294eb03b2226..000000000000
--- a/sys-boot/elilo/files/elilo.sh-vmm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch from Alex Williamson in
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350185 support of vmm= in the
-elilo script
-
---- elilo/debian/elilo.sh.novmm	2006-03-16 07:49:19.000000000 -0500
-+++ elilo/debian/elilo.sh	2006-03-16 07:48:47.000000000 -0500
-@@ -364,6 +364,8 @@
- 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
-     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-+    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
-+		sed 's/.*=[[:space:]]*//' | grep -v ':'`
- 
-     ## Point of no return, removing the old EFI/debian tree
-     rm -rf $TARGET/$EFIROOT
-@@ -398,6 +400,7 @@
- 	-e "s|\t| |g" \
- 	-e "s|\(^image[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
- 	-e "s|\(^[[:space:]]*initrd[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
-+	-e "s|\(^[[:space:]]*vmm[[:space:]]*=[[:space:]]*\)\([^:]*\)$|\1$EFIROOT\2|" \
- 	< "$bootconf" > "$TARGET/$EFIROOT/$CFFILE"
-     if [ $? != 0 ] ; then
- 	echo 1>&2 "$PRG: An error occured while writing to $boot"
-@@ -406,7 +409,7 @@
- 
-     [ "$DEBUG" = 1 ] && echo "----" && cat "$TARGET/$EFIROOT/$CFFILE" && echo "----"
- 
--    for i in $imagefiles $initrdfiles; do
-+    for i in $imagefiles $initrdfiles $vmmfiles; do
- 	[ "$VERBOSE" = 1 ] && echo "$PRG: Installing $i on $boot..."
- 	if [ -f $i ]; then
- 	    mkdir -p `dirname "$TARGET/$EFIROOT/$i"`
-@@ -575,7 +578,9 @@
- 		sed 's/^image[[:space:]]*=[[:space:]]*//' | grep -v ':'`
-     initrdfiles=`grep '^[[:space:]]*initrd[[:space:]]*=' $bootconf | \
- 		sed 's/.*=[[:space:]]*//' | grep -v ':'`
--    bytesneeded=`cat $imagefiles $initrdfiles $install $bootconf 2>/dev/null | wc -c`
-+    vmmfiles=`grep '^[[:space:]]*vmm[[:space:]]*=' $bootconf | \
-+		sed 's/.*=[[:space:]]*//' | grep -v ':'`
-+    bytesneeded=`cat $imagefiles $initrdfiles $vmmfiles 2>/dev/null | wc -c`
-     # convert to KB, allowing 5% overhead
-     kbneeded=$(( bytesneeded / 1024 + bytesneeded / 20480 ))
-     kbavailable=$(df -P -k $TARGET | sed -n "s|^$boot[[:space:]]\+[0-9]\+[[:space:]]\+[0-9]\+[[:space:]]\+\([0-9]\+\).*$|\1|p")