gentoo resync : 06.04.2022

3 files changed, 80 insertions, 1 deletions

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
+}