gentoo resync : 25.11.2020

4 files changed, 62 insertions, 5 deletions

diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 17125fee6965..9eccb3aa77da 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,12 +1,13 @@
 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 3921 BLAKE2B 56587aa63fe2a54d3db921fd752da3763ef1d82fbf83929059a1bc0fae713f47175c9ba08a5397dad82bc7f4dd26e3a9f3fb013ae37a3a6212fda7f254116427 SHA512 a62668152070bc9a3cf8057766ec1c5f258beca54cd8a689f12f51958e803664970864049fa36fb1faef65e57400fd826500217635bdf541277c62013f91e66c
-EBUILD lilo-24.1.ebuild 4074 BLAKE2B 9b07d907188b47766df49dbac63d80ebff53ac28d551a03fd5b3e398fbcb47a45620f8fa2cb4001e04ca9469b808db7958cb1374b61cc0435931749993e92430 SHA512 04f1506462d1b697dcd4ede9a97e5278d1f96016d6dbc0b49f6eca140bee3758214e4eb5fcf9591ef7e37a9e5376d8a205660295a2ab3c922ce2495f425fbecb
-EBUILD lilo-24.2.ebuild 4144 BLAKE2B 67e67f4cd33f533d41d3f96b4fd24c8cf4adb257ac26207b11ae2927f752d1f1705d65885f47366ff69fa6f8b137bb8f91ecf6a2559b372634d938830a8cfc46 SHA512 5c5694bb6cabca07dce75f753e607398ac4dbed9ed966f36a3ee68eb6accee8ec236896a6cb1174ada8cd701ad495a76ca7bb51094c972b052939a16aa401b4f
+EBUILD lilo-24.1.ebuild 4132 BLAKE2B 86754e0375689f0487a0f3d0ce92501d345cc7dbac409835f7d07747a9f6b80fbb940e29d95d593e36e6dd93f36a352092da01a27b6cf4102bb64bbd9e8ff937 SHA512 330ab1a3917c8e69bdf590444dc6c8249d7ee80a16c47bffbcf8f3727d180b2511b1a4c49886360ff78256a3cd5d803d033bf0725690ca54e804450bd1207ea5
+EBUILD lilo-24.2.ebuild 4194 BLAKE2B d48497168288767bddadbe95856f9f822bb52e757d1299b9e44805aabaa209b2c928ed4d53f931d8152a252b5662f0fe19df8d9cc100d7f0871160be90232c78 SHA512 0ef8f8260829e81ad8d9e529d7c6a76ae086f0a4447bc894ca7f77f0efe9fd633a799aa19075969f6ad85fe4d8ec4fa8da5d42d880503b9fcea2e39d51871fbd
 MISC metadata.xml 582 BLAKE2B 3eff61a72e8828178013f444fafad385ca14c91d9a9a989646b5b1a9a1485598b537c2bf7f49b6d7301e45f7266e1dc866c0c3fffe74843a0d44ce94fa982825 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04
diff --git a/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
new file mode 100644
index 000000000000..c46b9eebdea0
--- /dev/null
+++ b/sys-boot/lilo/files/lilo-24.x-fix-gcc-10.patch
@@ -0,0 +1,51 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Ryan Finnie <ryan@finnie.org>
+Bug-Debian: https://bugs.debian.org/957490
+Forwarded: no
+
+---
+
+--- a/src/raid.h
++++ b/src/raid.h
+@@ -8,7 +8,7 @@
+  * in the source directory.
+  */
+ 
+-int do_md_install, ndisk, md_bios;
++extern int ndisk, md_bios;
+ 
+ int raid_setup(void);
+ void raid_final(void);
+--- a/src/bsect.c
++++ b/src/bsect.c
+@@ -54,8 +54,6 @@
+ #endif
+ 
+ 
+-int boot_dev_nr;
+-
+ static BOOT_SECTOR bsect,bsect_orig;
+ static MENUTABLE menuparams;
+ static DESCR_SECTORS descrs;
+--- a/src/identify.c
++++ b/src/identify.c
+@@ -19,7 +19,6 @@
+ #include "common.h"
+ #include "cfg.h"
+ 
+-char *identify;
+ static char *opt;
+ static char *first, *dflt;
+ static int idefault;
+--- a/src/raid.c
++++ b/src/raid.c
+@@ -41,7 +41,7 @@
+ static int raid_bios[MAX_RAID+1];
+ static int device;
+ enum {MD_NULL=0, MD_PARALLEL, MD_MIXED, MD_SKEWED};
+-int do_md_install, ndisk, md_bios;
++int ndisk, md_bios;
+ static char *raid_list[MAX_RAID];
+ static int list_index[MAX_RAID];
+ static int nlist, faulty;
diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild
index aa4787b06c10..4627ce7347c4 100644
--- a/sys-boot/lilo/lilo-24.1.ebuild
+++ b/sys-boot/lilo/lilo-24.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -25,10 +25,14 @@ 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 && epatch "${FILESDIR}/${P}-novga.patch"
+	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
diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild
index 73f9ea6efbb4..66ac79f03145 100644
--- a/sys-boot/lilo/lilo-24.2.ebuild
+++ b/sys-boot/lilo/lilo-24.2.ebuild
@@ -33,6 +33,7 @@ src_prepare() {
 	use pxeserial && eapply "${FILESDIR}/${PN}-24.1-novga.patch"
 
 	eapply "${FILESDIR}/${PN}-24.2-add-nvme-support.patch"
+	eapply "${FILESDIR}/${PN}-24.x-fix-gcc-10.patch"
 
 	# Do not strip and have parallel make
 	# FIXME: images/Makefile does weird stuff