gentoo resync : 06.04.2022

8 files changed, 86 insertions, 7 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 12758fc84761..e11ac8a66cc7 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest
index bc29e472f3cf..b6f4308f139f 100644
--- a/sys-boot/arcload/Manifest
+++ b/sys-boot/arcload/Manifest
@@ -1,5 +1,5 @@
 AUX arcload.8 2068 BLAKE2B 3a0f5cb2ad182a37f07ac42fbb0b5ae8d9fd830f68dfe1a27eef5f7f1a4e6d9a00703dfedbde3979bf2a90dfb73085e16bad7c7b4778533772717dbca972f1eb SHA512 1b62e8116174d6909e947d88ef1a0ad0214b988c48f579eb9310984ad4e73b7c686e644be2b09dbab7dc2053fc36b1d80d272765c168dd8a662a6420e5ffcd75
 DIST arcload-0.5.tar.bz2 47690 BLAKE2B c58318f2f1eb71c4ad36c50e2f7e1f3fc2bf12a459336cf2aa27984700f10d135eea97e2e853b37de3e1c8d80b267d3232a3c24439473844acc9bce78b9e1e7f SHA512 b4f7186a6e75baa0cde06451a8011769f200d4cc353495dbfeb9c9ffe3ac09b8bbba357e83441e1fe2344c651068fafda7881864d8bf09f221ddae8170cc7b2e
 DIST arcload-0.50-patches-v1.tar.xz 10320 BLAKE2B 854d82ae850f31ae8585b3c37416380457526de236ce70cc5f7280ecde46e1d8b33bb3f57cf551e7862a17618d71b60073d3df65a7aa97bf6bac07bef639ded9 SHA512 7687b08bc70a96f8db9a620976b466ff4bb70c8ed77b0c241d060feb8dcab6019d753ac3b182a74139331c9d33f27e090897a0c7c41c1663e16575fef6e21bdf
-EBUILD arcload-0.50-r3.ebuild 3719 BLAKE2B 2bdbb455648d35da0940bd44f018054f0b9ab9996686c4e38836859eb9d733ca4d93212cfeab7a5125ce13ad9debfdbcba24609c0aefa408ea368ee2db71ad3d SHA512 42f71b1a71e78504ba3284d8e9355598260d0b99afa4bf47c685dc89f209b65b19052b3432d1206ba3c649c978973b35d4df70cf1dacfbd43a6b0acad18c8db5
+EBUILD arcload-0.50-r3.ebuild 3721 BLAKE2B cb006ec19a7886736e7f9853867aeaa5cdeb213dacd86e0eac502ae1d14beaa9d4394c362aae80d3b27085ad46d28d22ec29218e70fc0e81abf3ea139c3cec4c SHA512 36657385ac168e15c7fbf719f34d63a720c2be0490c892e6bb1ce55dbe82d711a3c35da3722c469ca0c942abfd425c3366ce6f157633140675f9305823cde888
 MISC metadata.xml 249 BLAKE2B 3f33f67e954e049d1e649d8926d04712c7cdcf3c8f861a8a0d9784a62152eca30e81806592f010ef7ea608679fbe3910984e8eb82834efdaa355ee44c732ada8 SHA512 560b9a6c8db2a1ad572cfae9b4911877a415789012e5acbb9fc3ba71111749a6c6369c235bda8a54a93cd5cc555b70a6845287dfe87c8843c401d2760ca9fbc4
diff --git a/sys-boot/arcload/arcload-0.50-r3.ebuild b/sys-boot/arcload/arcload-0.50-r3.ebuild
index 3646caa62a10..5374983af6f3 100644
--- a/sys-boot/arcload/arcload-0.50-r3.ebuild
+++ b/sys-boot/arcload/arcload-0.50-r3.ebuild
@@ -62,7 +62,7 @@ src_compile() {
 	# on the offchance that we're cross-compiling.
 	echo -e ""
 	einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..."
-	emake CC=$(tc-getBUILD_CC) tools_clean tools
+	emake CC="$(tc-getBUILD_CC)" tools_clean tools
 
 	# 32bit copy (sashARCS for IP22/IP32)
 	echo -e ""
diff --git a/sys-boot/dvhtool/Manifest b/sys-boot/dvhtool/Manifest
index 55faeaa6515b..9592cb873dc0 100644
--- a/sys-boot/dvhtool/Manifest
+++ b/sys-boot/dvhtool/Manifest
@@ -3,5 +3,5 @@ AUX dvhtool-1.0.1-debian-warn_type_guess.diff 296 BLAKE2B 294ee95edf5b4c853287d1
 AUX dvhtool-1.0.1-debian-xopen_source.diff 208 BLAKE2B 825bf31d2ca44127b77caa7f011b2f7306bc5c8bbc88c6ca7ca4221d5f418148ece4157723ed4ed3ebb28737caa9fb811f66eb64292e0aece3ebcfbb62f695a0 SHA512 500a25a70f94af2911387729cc7fc4320904049f15c437b85030b3bb8694d798dd55a839df141823947b53758888a8e47eb02d24643209401406e50d68196ab1
 AUX dvhtool-1.0.1-debian.diff 4724 BLAKE2B dd170f76faadff4dd575eb2bac62cdb86874807bf4a6c92bf0a85df00db6cfde99c92904580d1002833be8485dffb735ebdcdb7e0292be283230e35a1e2cbede SHA512 e495f03249b9b026cee2caa68653630216e7884bd7cb441d7d3939f9cf1d9a48892bad15416cdd205c5e28e6d0a31442aba888cf1cc4900b2c098decdce5ac14
 DIST dvhtool_1.0.1.orig.tar.gz 53283 BLAKE2B 7268d3bda57988ab9432d88c3c220a450a4726fd5b2560315e731b50d9088f66821a2629f7d0059305c880e429b77f40f609ea0798d362fb7b5831002a453967 SHA512 e81c4427f98a7aa79b9e8cee6fad35822d5fa48fda17f656407d1d6de50658ff2c8b6c3a890ae07afafebf126b5388c98ebf63af4a93bf1091161a27ea09d140
-EBUILD dvhtool-1.0.1-r2.ebuild 890 BLAKE2B 11e2e772ef869c7e327cfe2375b4e3a024558c7caf5f4f8d542e83177710929ad055abaaf37e0d2b6369e9759d9d3fa3ec089a04a70dad850fb8a49aec82864f SHA512 6e2b751c6c0d002bcdd8e43d25678268f5f31c59a3f44a7dd994f0e5fb292096af45084b054f3bb9d3be50db7fded00ff571b8cbf1bab7defa7a2c4559f35b97
+EBUILD dvhtool-1.0.1-r2.ebuild 898 BLAKE2B 750572d8fcfb1f43b7ac71df17259760889a43d3b4015b5519645fe8f54e14b6682333e4c8ba7af9e2bbcc25f2b5c06e6f3c3ec008934f5a178a959c6ab23a93 SHA512 d07ba938954f8763e404a2fc2477388a78389de4834268a5f5879de3ff085bf767cf5fedd3aa291db37d4e66ba1d6ba11d3888926cf4f62cda1b945cfdd85ebe
 MISC metadata.xml 245 BLAKE2B 2a60828fec4b5490b15d1cc8d83189aec23ca1b7d895ae2cf9f358768d8e135d77a1eb419512e510de0f09c3a917da677a269463af149f64ac5ff953f77025b0 SHA512 667f2a4419f524911285d89d006086d3131484306f4f3cd87ae8d80aaa2a2f3b5423f842fd7ca3c37deeaa460ec6ff58a7b1270e8f911137f8a9c3893dc6ccc5
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
index 01c70dd3d890..6e23f2cb51d4 100644
--- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,11 +37,11 @@ src_prepare() {
 }
 
 src_configure() {
-	CC=$(tc-getCC) LD=$(tc-getLD) \
+	CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		econf
 }
 
 src_compile() {
-	CC=$(tc-getCC) LD=$(tc-getLD) \
+	CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		emake
 }
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 4999fd880b85..f9e5d6b0e150 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -4,8 +4,10 @@ AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b
 DIST raspberrypi-firmware-1.20210527.tar.gz 192247084 BLAKE2B 329707dfb2905b36926a3f0ecf1a8e3bc2b52e1a376f98ca7cfe9ec7b69d0fb370d8e23907f5bbd9ea75cf7fed5babd6fe54934919995dec6914e888d95e5fbe SHA512 5a48d1fae768c30528359a14371f59564447d2fb8a145cafa89d7d29352095c5b7ac33bfcbc8da494284c9d41e7dbafe4e863e8efd963a17ea6b6b9699b814a7
 DIST raspberrypi-firmware-1.20211029.tar.gz 193543221 BLAKE2B 308206d6bdfbe15bfe5f39cd230e6d4857f460744aafcbcc9eee6a74f05a3a9dc861e7c3e36baea46fdb1d1d1dc28b5edebf70bce3a3c085228b2ea321ef7a85 SHA512 7a1fe3b1645006c35fa49e842b9ece53b386ece42b8db99649de8d4bc0c19e34b0807767290e26422528606c5847843533aaa0edd0716e9f9f9dcae340a4dce0
 DIST raspberrypi-firmware-1.20211118.tar.gz 193544570 BLAKE2B db6c7c2e247f668b02210fb181305c3244f3d8a30f923656bf15cf418cb26822844df5b39af62b483e9e49405e13a60e57d6826aa0f3c3698920e8fc568656e2 SHA512 54881fc31ca0c9de8d8ca41ad6418e9d149975fbadbc0409f4136d4a31e70d743d55a16d4c0942305077d463c952edaa48be56d22d015983ab672dcaf5f134e2
+DIST raspberrypi-firmware-1.20220328.tar.gz 195699471 BLAKE2B e39ae746b46eb4f63aa2043df9fb60ce23b966d172e2c2c311942425e62896fb8ef171689c420bf2545065514a331e46c3bfb4d028eab8eea251357ee4c947f3 SHA512 b9e8676a94dce4621af25b8ba563a2dbd93f6fad61f5c5fb8b57b0ff5262151ff61598ce56a5f952f99f6e37f7c9ebf801a51849ee45ee328a168ca88e2522f3
 EBUILD raspberrypi-firmware-1.20210527.ebuild 1889 BLAKE2B 9c3cc2d75c0f119a18ac174ed0bf5ca0228917e66a61bbd4a03a340693f31965c513b4de54b6d2dfba12372b387de79034943b96037dc2ecbe987f0f59fc48ae SHA512 cb9b623cece6312cfe8a22af7398ac7f1e5ce187581f7dbb4b7a878c1b9234194d7129faeb59bf34e3456b7a6e6e949bac3dcdf8d22560d262765f46b3a9a39f
 EBUILD raspberrypi-firmware-1.20211029.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
 EBUILD raspberrypi-firmware-1.20211118.ebuild 1891 BLAKE2B 7051be955ead1ba29ec0c2de098c25f32468f42abad95eb376d0f6dff75e08fa788f474d202ccbbfa92a515b6048b88ab3ff031dcb205202b0a34490d4ec06a8 SHA512 1a5dd283c6bb7cda32b1c1e60b752de399ba34e202c0916fd8f310a4087d87b707e4c7422e3600f34908f7dbd480afa6fec1b94c648d2932576be6d2e1550e73
+EBUILD raspberrypi-firmware-1.20220328.ebuild 1891 BLAKE2B ca43f4e2533f2938e1cac56e303ee91ae643b5d76cc2654846ff4d59fc4f1f57690d0effa252c98646f53d6a2c9dc6c43ef2bffeb335438616d4deb0c3f41f84 SHA512 c4cfff21db5ec5d502fd3883a13c82be2c9af1fc08163ce1ce9bd2c903894977526f8ff55bba7ce73876c8328d015e7cf46120117246aa1887af2f5aa9679634
 EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a
-MISC metadata.xml 325 BLAKE2B 4f9cf3610ce1a44da9fc78b78b9df541c76d2b76da0e040f666579bce00f5ab5cf8aec4ee4921b50d5a3cd249ee857faa39d9f780e8fd42a57506c5f6dde3dbe SHA512 529fe413c16257c123c53c2e09cdc457b9481acc1b85cb76458a6b34fa1424cfa76807d72a298beba20d99349c1a9e224bd8f29af96ec9d14cabe6029dc82c44
+MISC metadata.xml 505 BLAKE2B 79f9a89cea4ce9658dfc203b6dbcd5251973f747c25996457a0556fed4d21c9482aef195759453ad1e7f5631308b5e2b089a55ff7cd617f168b604bf9c3620fe SHA512 9e2432add5a42ae97e2dc4e09a638786256ca76d22b93c2073c929a79ee216784b9ae284d268025883f00b6ddb1d682a9a1cd20bfe579feee7e8dface013eba4
diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index ec9b51cbe4e3..8dc8059c3a3d 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -5,7 +5,12 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>expeditioneer@gentoo.org</email>
+		<name>Dennis Lamm</name>
+	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/raspberrypi/firmware/issues</bugs-to>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220328.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220328.ebuild
new file mode 100644
index 000000000000..595de0624e7e
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20220328.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot readme.gentoo-r1
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="-* ~arm ~arm64"
+	S="${WORKDIR}/firmware-${PV}"
+fi
+
+DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die
+
+	if use arm64; then
+		# Force selection of the 64-bit kernel8.img to match our userland
+		echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die
+	fi
+}
+
+src_install() {
+	insinto /boot
+	cd boot || die
+	doins bootcode.bin fixup*.dat start*elf
+	newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt
+	newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt
+	newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN}
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		local msg=""
+
+		if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then
+			msg+="/boot/cmdline.txt "
+		fi
+
+		if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then
+			msg+="/boot/config.txt "
+		fi
+
+		if [[ -n "${msg}" ]] ; then
+			msg="This package installs following files: ${msg}."
+			msg="${msg} Please remove (backup) your copies during install"
+			msg="${msg} and merge settings afterwards."
+			msg="${msg} Further updates will be CONFIG_PROTECTed."
+			die "${msg}"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}