gentoo resync : 25.09.2021

7 files changed, 121 insertions, 4 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 3fa873145f34..596518ec5736 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 8b435039adce..624c133314e7 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -5,8 +5,10 @@ AUX aboot-pt_note.patch 8966 BLAKE2B 63918ae7d2e7c1f40dc152a4766b48e35727c81ff91
 AUX aboot-respect-AR.patch 302 BLAKE2B d4c13c57c9f5a508f02048b88423e80d5013b4e9e37aad2bb95eeced7b712c39524d5cd755d27140491bb23a0b338896f0a5c41a23976fa03f7c76d36f2361fc SHA512 0c5288302b11c850abd673aea0c6edf8482d40d8c0189c9291f015cf088a3d39a70b0f562c1eaa27005b8119d095de3b3c052db21c5d6b3406e6a787f389e103
 AUX aboot.conf 295 BLAKE2B 0038c41f8f2e9cc7cedc0e1d0f70ee7b99425ae5bed44e4701abe2bd7c32bc5fcbd521de03ccd6a040748c9f843042317d8c545b4b74268577519dc95e20ec9b SHA512 2dc56371223f6dfa19d13feaa9e33655997f571309ba9158e265051b5b9fe3e2f79ccf66385bde8433cf8b5cd0cb95b3036de43f93392c31a95638039f658e30
 DIST aboot-1.0_pre20040408.tar.bz2 115062 BLAKE2B 49f1b45abcd4726fd036e24709d10bbfea42cee03293e31b2deb3aec383c1c438602aa97d3909516ec9864986dfcf82612fe7644b47e3e2760bdf377313446a0 SHA512 b1fff7ce806336f89efe8239108a8547053f22727cba93cea742995432c4f35133f8dc619588390ba6e0d114e2fd62b80b730443e6c18900aa2a8832ddd4ebfc
+DIST aboot-2.0_pre20210801.tar.gz 173477 BLAKE2B 54c38a98b9e3e956f08b4fcca6a4f3351364d7774a915916aae8af67237982635a2686c1df0628fc28dcc2443da8ad57be822c8530e1580261c60dde73f00519 SHA512 57181897147bba65e8b216af262bf2d2e57cb76bd809d8207439dbfbe84ff550cf9a43c0f10f9925e54ca21660cfe9441c7607743ff3f7613c1e22e219708081
 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 2643 BLAKE2B 42cc709c24a16cc6a1edde9833894159a8f16b3ccd0328148b03dba0fe04e3f42ea66616c999e974fd82c13a0df587ff8fbad8e0ad5d0460e67abd20f7742b90 SHA512 4a86c1b908e70c83ef306c756bab15fe7a36cfb2677b178334deaea6f46cc391b5a743a5b2ab4d5cddaf7675ca7a75645a50ab5f11e4cf3327776848e4df5d89
-EBUILD aboot-9999.ebuild 1918 BLAKE2B 32d15635932447d804c78f47d8f8795cad5a96a6fb3088ffb479a07c90a4b27da48d7a187b09d9b90e668e0b9479d781cd9eddf59d05861b66815efa5a281e16 SHA512 ae87fa7a82b75160bdcbed66aa7d4a751fc261277063d1f6cf24174d62a5960587d7cb4be986b57a3d2ed1ce5a9c8c6b5ab811ed81064ab1ab79a7573608a0f2
+EBUILD aboot-2.0_pre20210801.ebuild 2016 BLAKE2B 6b5bc455c34c8775982dd397f03d6d02684938f7db12464b2db6f3e092bf9f1973f2f8210d5e48bb7241446f4af8dee672f130e9f2473b7bf71a08b7456807d8 SHA512 6a3b7ceb8ec510c55ca49607c136e339439dc81d1bd9133722abf2b42c3e77a3e2b8b2905d5fec93f5896757d6a053204ad3fe901c7fa98902e389a3d91fcef7
+EBUILD aboot-9999.ebuild 1920 BLAKE2B 6eb855d8fc7a8c533017f0a10809cbbd435962a250d562620765eeb988a00fe1a6de7c72143cbaa1a309f3d53fdf431400754a1b2150b144539ad70cb0a55a7e SHA512 86084d7852f4269ebf98abe446e53127f1221aee4f6f53a89af519ea0e9bd50bb8ebce259ec69bfee2780b733fd2c136b18b15fd4036fa67b240a2dc9cae3d00
 MISC metadata.xml 339 BLAKE2B 35e599ad19c953888aa30d498be33e8d5788e8d34da3133d7170d42b5b815127c325dffc40ea38bb383b6d0d6894866b05c2386c97b9a1b248addf8a7be03259 SHA512 d33e65b6f82d8f46c3b9be8b554d3ea5ee1043e3057a3cafc6cf44f2e1b01adf10ce5b34f726d704bf152ee642b68053bce89dad2dcc0bf5434f9b54a037650a
diff --git a/sys-boot/aboot/aboot-2.0_pre20210801.ebuild b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
new file mode 100644
index 000000000000..925430679b65
--- /dev/null
+++ b/sys-boot/aboot/aboot-2.0_pre20210801.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mattst88/${PN}.git"
+	inherit git-r3
+else
+	COMMIT_ID="dde7f7b85f7631668f1da7c0b0ecf7ddbbde004e"
+	SRC_URI="https://github.com/mattst88/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+	KEYWORDS="-* ~alpha"
+fi
+
+DESCRIPTION="Alpha Linux boot loader for SRM"
+HOMEPAGE="https://github.com/mattst88/aboot https://sourceforge.net/projects/aboot/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+BDEPEND="app-text/docbook-sgml-utils"
+
+src_compile() {
+	emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) \
+		all netabootwrap
+
+	einfo "Building man pages"
+	emake -C doc/man
+}
+
+src_install() {
+	dodir /boot /sbin /usr/share/man/man{1,5,8}
+	emake root="${D}" install
+
+	insinto /boot
+	doins net_aboot.nh
+	dobin netabootwrap
+	dodoc ChangeLog INSTALL README TODO aboot.conf
+
+	insinto /etc
+	newins "${FILESDIR}"/aboot.conf aboot.conf.example
+
+}
+
+pkg_postinst() {
+	einfo "To make aboot install a new bootloader on your harddisk follow"
+	einfo "these steps:"
+	einfo ""
+	einfo " - edit the file /etc/aboot.conf"
+	einfo " - cd /boot"
+	einfo " - swriteboot -c2 /dev/sda bootlx"
+	einfo " This will install a new bootsector on /dev/sda and aboot will"
+	einfo " use the second partition on this device to lookup kernel and "
+	einfo " initrd (as described in the aboot.conf file)"
+	einfo ""
+	einfo "IMPORTANT :"
+	einfo ""
+	einfo "The partition table of your boot device has to contain "
+	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
+	einfo "must not be part of a partition as aboot will write its bootloader"
+	einfo "in there and not as with most x86 bootloaders into the "
+	einfo "master boot sector. If your partition table does not reflect this"
+	einfo "you are going to destroy your installation !"
+	einfo "Also note that aboot currently only supports ext2/3 partitions"
+	einfo "to boot from."
+}
diff --git a/sys-boot/aboot/aboot-9999.ebuild b/sys-boot/aboot/aboot-9999.ebuild
index d3e6321ec031..2e29e829936e 100644
--- a/sys-boot/aboot/aboot-9999.ebuild
+++ b/sys-boot/aboot/aboot-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mattst88/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/mattst88/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="-* ~alpha"
 fi
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9c7232350fd7..6346cc8bb3f5 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,11 +1,12 @@
 AUX gfxpayload.patch 1118 BLAKE2B 4104fc696535b1c3feba5876bccc64f9b2e52319ee992c59e7f17b8310cc9addf7545630fff78c73ca3f4b0dcd44e1bf69f4df5264d6f58777f7e5aeae93cbcb SHA512 00324825c369902a0383b792cd21e161853eadccbdc5abe2420f2d443bf6a74f72be6c15243107b936acd38c3547387c3771dc2cb566003c4c754c9260b4aa00
 AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2355 BLAKE2B c120f06d3597a2ff9566778afd69d80a814904726e47766b7582626d182a2703e54fd69ecf00b54bcc5541e22a3d93ff8b85c9cf8d0440623454e8e7da3aaa91 SHA512 23416ac17838f101ed73103af6aa7305609667f47288bfa3bd5ae80d1123da664ba6f9b518451b0bd5f528e069893a51444d203953be0b0644790cea0b4b9cf0
+AUX grub-2.06-binutils-2.36.patch 1894 BLAKE2B 10bfce5c3c05f711a430a6f1c67e840e7ef0adaf2ecb4825c069106ef9e25f7e1f3bbf07b054cc38cf88fb37bcdfd8d4366548385fdd51a3dc4179177c054984 SHA512 8c35663ef72683bd23c18e75134a0ddb1bb9a7c053ed87691e2ac5c9765fdf802761a6ad54f8bdc7999679d9cc5ebea9c01f1c0f615ac90505f7a398129d157b
 AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce0dfe2a301342f1a3bb75d6fcb5d73da9997fb8a93f36dffb43a351f056a1a4db9eed3147b0f3e77c65034b805c64 SHA512 627422377bdad97d0197f178814d6616a0f7ec07357182b00166a455d38ba0c5a60185c5febf4dfb7a11b35f26c7af607508cb5f418acdb7290517240fbd99e4
 AUX grub-2.06-xfs-v4.patch 4440 BLAKE2B 8682d2b9520f96b098160d431906059537a6d09f4af36e4e8453e9fd821f774f49db50b24c16f650eff3ac69848573ed9a988859426829ef5b9f43c7189eead2 SHA512 743203685dca932f2f6c3d6fa85cef8631cfe8dae4afc25e7cfd50de6351e3f5974d4dded5127efb3d7f3b0cf94b60c5435135f05c6c4d9a90eb724b40076dbb
 AUX grub.default-3 2528 BLAKE2B c32de43644eca5fae8d8d727ff443600917a93e015f8a83dde555e3bca7506a817b08a2fc926970eeb5b7f40028f4951c6cdcd281f9fc0b6504f26c8e76bf0c5 SHA512 505960e62b44c70af0a90c7ff486bd57101831d7c6e9d80084013e374070ff02b40f77b0790aebb926e1e0854e375867cba1d4977dbb00c2ba54ebaa9f6a1a0b
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.06-r1.ebuild 7935 BLAKE2B 2af2336941b49f7d4632573d2439f8e7038291f823c5af4230f1ab5182591875c618abbb40aef8c84c5dfcea4fa497081b0de637438ccaa18acb0333634daee5 SHA512 3aeecf1e5917178704e8d9e92e961a3d94de3e7c38f66128585dd8fbcfb4a801fa5624b2088bc9f2d1309bfe57780de53ba730b2867ab9bca1329b38417c1d30
+EBUILD grub-2.06-r1.ebuild 7979 BLAKE2B 738e6a2e6e4cabdf4a80c621c149da151069162ba7b4ea3d81579665af930fa73749f2da16483e335de73f00444da03588ae58b0c874fc20cbdbea54cfcd4849 SHA512 1ea86d04405c6fbf8278da66831d80fc3e54e845b103e67e25886da4c5d78175e735e19ec0411f5dc9fe44ad1b90b252e7adac6c1e4c6732f7df796606b9472c
 EBUILD grub-9999.ebuild 7888 BLAKE2B 5e54984e4ba904de21a31b0c7fdda9a293346bd2bf526bedaa9410d73c85b006d45b6b0568839ca0f7bfbd18acb18d935ac7e9f195e7100e8b9f89fd2e2243b1 SHA512 ee8f50ab17440288afe89b627a498b467be8d45302f6a98f5f7301bd8a00d51fd2063f9c7616e6792ec9eff7ad31929a99783b73d8b8520fe726255f904e8105
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
new file mode 100644
index 000000000000..5cb327003adb
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
@@ -0,0 +1,44 @@
+From 5cea201f288246488e2189c49d969d00ebec2898 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Fri, 19 Feb 2021 17:40:43 +0800
+Subject: [PATCH] Fix build error in binutils 2.36
+
+The build fails in binutils 2.36
+
+[  520s] cat kernel_syms.lst > syminfo.lst.new
+[  520s] /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: section .note.gnu.property VMA [0000000000400158,0000000000400187] overlaps section .bss VMA [000000000000f000,000000000041e1af]
+
+It is caused by assembler now generates the GNU property notes section
+by default. Use the assmbler option -mx86-used-note=no to disable the
+section from being generated to workaround the ensuing linker issue.
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+---
+ configure.ac | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index fa8f74bb9..38ee5f579 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -836,6 +836,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p
+   TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow"
+ fi
+ 
++if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
++  AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [
++    CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++	[grub_cv_cc_mx86_used_note=yes],
++	[grub_cv_cc_mx86_used_note=no])
++  ])
++
++  if test "x$grub_cv_cc_mx86_used_note" = xyes; then
++    TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
++    TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no"
++  fi
++fi
++
+ # GRUB doesn't use float or doubles at all. Yet some toolchains may decide
+ # that floats are a good fit to run instead of what's written in the code.
+ # Given that floating point unit is disabled (if present to begin with)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild b/sys-boot/grub/grub-2.06-r1.ebuild
index d80b215cc471..4224c4f643f1 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -17,10 +17,10 @@ EAPI=7
 # corresponding variable in make.conf or the environment.
 
 if [[ ${PV} == 9999  ]]; then
-	GRUB_AUTORECONF=1
 	GRUB_BOOTSTRAP=1
 fi
 
+GRUB_AUTORECONF=1
 PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
 WANT_LIBTOOL=none
 
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/gfxpayload.patch
 	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
 	"${FILESDIR}"/grub-2.06-test-words.patch
+	"${FILESDIR}"/grub-2.06-binutils-2.36.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37