gentoo resync : 18.11.2019

7 files changed, 25 insertions, 22 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 74ba76d71bc0..c6fdcf686c19 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 3226d5b3ceca..b820575c8293 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -7,5 +7,5 @@ AUX aboot.conf 295 BLAKE2B 0038c41f8f2e9cc7cedc0e1d0f70ee7b99425ae5bed44e4701abe
 DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10bbfea42cee03293e31b2deb3aec383c1c438602aa97d3909516ec9864986dfcf82612fe7644b47e3e2760bdf377313446a0 SHA512 b1fff7ce806336f89efe8239108a8547053f22727cba93cea742995432c4f35133f8dc619588390ba6e0d114e2fd62b80b730443e6c18900aa2a8832ddd4ebfc
 DIST aboot_gentoo.diff.bz2 9527 BLAKE2B 2492b456f7411630b6ecfb19db775969b69a35c0ef31b2146fd353aac78cf4d3c9ef2162cf54ab4ac025c65607219b3a33a74d2105be196e6dda54dd2509c1f8 SHA512 868a73fee56e9bf6d986175a6a4dc321ed12fb78d74dfb8f1a3e35274577ddc9ea0820768b44836403587b3976ad8dacdcf6562a9ce5c45981c752670901155f
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 BLAKE2B a264d7999ed7735e42ea21f8cf96b60ca1bdbfcb76dbdfcba14a849043e1f6a9109cd72bf5b91b9ab877dc3025ce6a9270ea914cf277b8f77cecff703646a7ec SHA512 99849928eede0c4b101ddc9179c0974cac6b4f18803dc98b72dcbe80cea88d3062f709beaa1b890edbed9c147be0dd516065d4cee945164b5d9f19f7a3cf249d
-EBUILD aboot-1.0_pre20040408-r3.ebuild 2666 BLAKE2B a3ba88eec13faff705fcb1297a451c97df553557ba8f0e3c03420a2a7c3617ebc26f24b1bd43c1748d14591caaa8198baed69d61646a5dfa8aa46265944918aa SHA512 af74c4b0d72be1e4d4c4a58b7992072492d225aadc7ccb95928197d9755ea18c17b8a8fe1b181c05e27623d3ad0b7cf72caf605d74b459c26a7e171c8574fdfc
+EBUILD aboot-1.0_pre20040408-r3.ebuild 2671 BLAKE2B df053d2d79701b3fed80019d1c9cd25f3cb1e70367dc6c0022be4aeead16cd6a8110accead72ce0fac40b65ca970f8f6140d7bc3ed28cba029d189d3043acefa SHA512 72871c3d107d2fceaac717356fc665e693217e5347997504bd3f4866031f8372aabe719c7ecd535625528685ef174c271562f54c36b464d5d089591344ca892f
 MISC metadata.xml 338 BLAKE2B 7d68dddf2bf27051683da2c5f6a43ea7b3aa41b7e6bdbb8705d422e0db65b781d181cdc506a58824f4624985e72e82640b3bca51e46e6092cc2fdc047d38dcaa SHA512 2c9c87a850f9900d030fd37a4f59308136f478db254fbfd8e37d4f3c16ab33c74d1ef4119b74f4e0b34310ef066ffb53f89e2a4013cfca4a7b56f690e2aa7faf
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index d6c38443b2c4..cba6251a37af 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit eutils toolchain-funcs
 
@@ -30,18 +30,20 @@ src_unpack() {
 	cd "${S}"/include
 	ln -s asm-alpha asm || die
 	touch linux/config.h || die
-	cd "${S}"
-	epatch "${FILESDIR}/aboot-gcc-3.4.patch"
-	epatch "${FILESDIR}/aboot-pt_note.patch"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/aboot-gcc-3.4.patch"
+	eapply "${FILESDIR}/aboot-pt_note.patch"
 	# Bug 364697
-	epatch "${FILESDIR}/aboot-define_stat_only_in_userspace.patch"
-	epatch "${FILESDIR}"/aboot-respect-AR.patch
-	epatch "${FILESDIR}"/aboot-gnu90.patch
+	eapply "${FILESDIR}/aboot-define_stat_only_in_userspace.patch"
+	eapply "${FILESDIR}"/aboot-respect-AR.patch
+	eapply "${FILESDIR}"/aboot-gnu90.patch
 
 	# Modified patch from Debian to add netboot support
-	epatch "${WORKDIR}"/aboot_gentoo.diff
+	eapply "${WORKDIR}"/aboot_gentoo.diff
 
-	epatch_user
+	eapply_user
 }
 
 src_compile() {
diff --git a/sys-boot/milo/Manifest b/sys-boot/milo/Manifest
index aed727eeec74..cb937b2a52b3 100644
--- a/sys-boot/milo/Manifest
+++ b/sys-boot/milo/Manifest
@@ -9,5 +9,5 @@ DIST linload.exe 7168 BLAKE2B 393696c987b771a75c5c0a04a6f82999189ecb60067464e807
 DIST linux-2.2.20-reiserfs-3.5.35.diff.bz2 154943 BLAKE2B 6226321438bed88bc31fb151a28157dda811a2c7ce6c543564f2ef183489b20f2b7f6df903f63aadaa8196ba10bd54df4c7069e448bb456474bccf64770a666e SHA512 b63d03d605d65cb7a15020ad38b80d77b810963edbdc0b5ccaf1706347de5026e390d8c2a5315f1d2734b793903c1a407b4db4129d11b7d5ff2ad9dc8f2137aa
 DIST linux-2.2.25.tar.bz2 15791211 BLAKE2B 5b4b416c41b2277c4e509e7c0003d1ba0bd26e1bbb03a30bdb9d44f9211f6edb593bbca158379ea565e2f35d01e128590971ea85220baec06c23ae15e3942f1b SHA512 63e83f4f184cdd09f39c24e2023fce3562ea550db7182ae94e36ce30c6b2415bac970306cd60c1d1a89a1a3b54ad957094629557a5782f181939efb219ad41bb
 DIST milo-2.2-18.tar.bz2 1074725 BLAKE2B 7e7cac8ec2ee8246f21f5ea0f1d497dd6234ed67dad0a340e0183abec2f7a4f694b48eb87ba65ef97e967918c55c9fbfdd56e502f21fc47f8d053d0353758f1c SHA512 1ccc86c83d520d07040ba44d14e7e9353cf364bf5b83ba4df14b0560769643ce07f89feeab468144fe17b7bf482beb7480f5dad1a0e9b574e6e6150bb72aae93
-EBUILD milo-2.4.18.ebuild 7768 BLAKE2B bcc70d17eebc89c939ee01e4f9c8218eea907b84fbf3ac2ff5fcfc27834e777b16e879c4f2711c8e58c28db23529432bcdbdc0a832fdb43c26152fb7fc93e6a3 SHA512 6c89552725710f5d6950d41e372d864a0e5b7d917f6371dd6872cadf5208ac3500a7e53b6a9017951d357ca8641ffd19a0100ea29d375663a502bcfa9b6e4dc1
+EBUILD milo-2.4.18.ebuild 7787 BLAKE2B c42f3a97fe111fb90216e906b44eef4d71d71c91fc8be10618b827feffdf03a2fb47b1cf437955d42758fe2cbfeaf6e1314e326b7c1bc9d72e1e2e84ef7b0cd2 SHA512 c2381312bc66c7e83181ad47e46319f67dd9274cd79acc61e7d9092b2a98c34c65316e5cc62d82d47cda49b903c56c49fcc18512eab66cbd07407b2bc1bcfd7a
 MISC metadata.xml 790 BLAKE2B 42f47c69e6f217979fae90801776a4c649167a2033aa378e3abfdc41a379c445324a469e0546ae6b43f19ccf6f1f910da030c32fbce81f9eba9cf2d3b9c0f20f SHA512 513614f6b5be1bdca2676a618b1f1c6b70506ced43da83fe92b75876f88b7439e1a13b83e3a0252cffc1b1de09914f67276ea0cc239ee3c2efca108fb2a1b700
diff --git a/sys-boot/milo/milo-2.4.18.ebuild b/sys-boot/milo/milo-2.4.18.ebuild
index 3902314970fb..e6bee2b3f6c6 100644
--- a/sys-boot/milo/milo-2.4.18.ebuild
+++ b/sys-boot/milo/milo-2.4.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit flag-o-matic eutils
 
@@ -87,12 +87,16 @@ src_unpack() {
 	# unpack everything the kernel and milo sources
 	unpack linux-${kernel_version}.tar.bz2
 	unpack milo-${milo_version}.tar.bz2
+	unpack linux-2.2.20-reiserfs-3.5.35.diff.bz2
+}
 
+src_prepare() {
 	# gcc3 fixes, and some tweaks to get a build, also
 	# reiserfs support for the kernel (and milo).
-	cd ${WORKDIR}/linux; epatch "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
-	cd ${WORKDIR}/linux; epatch "${DISTDIR}"/linux-2.2.20-reiserfs-3.5.35.diff.bz2 || die
-	cd ${S}; epatch "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	cd ${WORKDIR}/linux; eapply "${FILESDIR}"/linux-${kernel_version}-gcc3-milo.diff || die
+	cd ${WORKDIR}/linux; eapply "${WORKDIR}"/linux-2.2.20-reiserfs-3.5.35.diff || die
+	cd ${S}; eapply "${FILESDIR}"/milo-${milo_version}-gcc3-gentoo.diff || die
+	eapply_user
 }
 
 src_compile() {
@@ -149,9 +153,6 @@ src_compile() {
 	einfo "i will use it instead of the default."
 	ewarn
 
-	einfon "continuing in 10 seconds ..."
-	epause 10
-
 	# get kernel configured
 	cp ${custom_milo_kernel_config:-${S}/Documentation/config/linux-2.2.19-SuSE.config} \
 		${WORKDIR}/linux/.config
diff --git a/sys-boot/refind/Manifest b/sys-boot/refind/Manifest
index 601f371cefaf..14562f5300bb 100644
--- a/sys-boot/refind/Manifest
+++ b/sys-boot/refind/Manifest
@@ -6,5 +6,5 @@ DIST refind-src-0.11.4.tar.gz 3812192 BLAKE2B 7219eeffffb63961a7ba8f7617546a1202
 EBUILD refind-0.10.4-r2.ebuild 6185 BLAKE2B 077c7e57eeed02eba132dbae17c7045acfedb62ec282e8af15c28f39bab1668a952656807a8e476230b8a6735d71c930937d4386030cd3fda5e4cd9dbf4c9f94 SHA512 bacd7b2acd10ff4ac50074626364d1a97e53a82fd545669acbb9efd7b2f1da0edb86d41138155340cc0e07f756484a88f57ef7165ab88755526c57629f889138
 EBUILD refind-0.11.2.ebuild 6279 BLAKE2B 209d4d8eda0b18cf10350d2a1ef8cbda5bfa6e3e2e46534e8fcadcc370917202d38b7f7dd344315e8986cf811f5452e72dd0a11d6237eaaa5b531f3e7f5b9624 SHA512 47f9bc81cc441e94615baa06e0e6c797e5f4e7be156b51ffea20d20409dcc5e94053c48ddae1c42bb959e538e29f2bd4a0e0083ae0be584320aa3cb0ae0b5e56
 EBUILD refind-0.11.3.ebuild 6277 BLAKE2B 6253ff1ac6397d2801ea1f5651c8267a391cf40fae9a651e6c4f2a6ec70d91881aaf6aea860a574b0558c1391006d3d021b55ad2cfbc0e8acdaef55b63437161 SHA512 cdf653debe9420a16a295769982931a2d913dab6dbcbd629835134273cdb29bf362c413d07e774423b8bcaffea060ae17a8ec91d0a300a14332910f7607c4284
-EBUILD refind-0.11.4.ebuild 4748 BLAKE2B ce0394ae7a3420ffa843c8952cc8419f19324c694154d1965a155a78fa3640096755731d63092277f1522cd34570681cebe3f4dea0ec5cbc605f7cef6196d5d5 SHA512 744a594cfcce1d219aa2baff784b3db4d288204a07086ce265ff577fea9102d6dfcae7168aa18430d83e1c94052e27b9bb9f40049d09cd92ad7e8ba61d351bb1
+EBUILD refind-0.11.4.ebuild 4746 BLAKE2B 9870720301e1697a91d1380832e1b0205de95e8aa1ad56de1022f17dd1b88e8c9d064f4344abc7b518d0dd0a5c662dfe4ea21cfca6f6cf4e941f6d5fee21ce85 SHA512 137a9af7e7727b2bbc40649ce7d2223f5db62e2b5c8817cb7982ca1dd0e67aa98edb250565cef65bd6bebcf79885b1d66d8a6931e6536f9561dc621b3b4c8f59
 MISC metadata.xml 3821 BLAKE2B dd2985fd4728180562a6c11969c27e1d1af70e80e3c68aa4fe7ce7665b752c6aa4adb6fce27487dd97563821b13f2e97e746b6b6e0c346a212380b9c1b231de4 SHA512 e0a5ebc2757e7584afb0628b5f451458974f8ffc1c94774b0ba0eda67ba582fabe08cf8d17fce2df934bba5bded40605f665da0a236d08a53f19b422afae9336
diff --git a/sys-boot/refind/refind-0.11.4.ebuild b/sys-boot/refind/refind-0.11.4.ebuild
index a45929a31c9c..139bf622501d 100644
--- a/sys-boot/refind/refind-0.11.4.ebuild
+++ b/sys-boot/refind/refind-0.11.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 FS_USE="btrfs +ext2 +ext4 hfs +iso9660 ntfs reiserfs"
 IUSE="${FS_USE} custom-cflags doc gnuefi"