gentoo resync : 25.11.2020

4 files changed, 59 insertions, 8 deletions

diff --git a/sys-kernel/raspberrypi-image/Manifest b/sys-kernel/raspberrypi-image/Manifest
index 512f10f50ab4..8767794d0958 100644
--- a/sys-kernel/raspberrypi-image/Manifest
+++ b/sys-kernel/raspberrypi-image/Manifest
@@ -1,8 +1,10 @@
-DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522
 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0
+DIST raspberrypi-firmware-1.20200902.tar.gz 187144306 BLAKE2B 33a9449fd98fffaa80a9c748f8dd246db491b4f5eb1335ffd10bfacdbe4396c2faabfe522129d287663ad5ef0e9322bd7302a74d6d874e9125f165dc50b81d90 SHA512 91d084d2dba99219b72cc03d49d9546e070477d35fa151b42e204ec6b77ee76a8774235cc32cec8c3aa4360b7c1922dd1c65da8489300476290af87e167f0c79
+DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8
 DIST raspberrypi-image-4.14.98_p20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193
 EBUILD raspberrypi-image-4.14.98_p20190215.ebuild 850 BLAKE2B dae8b4af65b42cedec26326ead4b2e9afaed44affe568cc4bf04a09eaebd6bbd10f93f456327eb9f30b6493670e586cb2e09fe7c5306b883a6d8704c5f10d1c5 SHA512 8833a26f7b6521754ac02ef6024140ee9dc3d1dbe836b9accec13bd844a0a7a087730b9794031bc66cc7bd5ca5ef4ec4f1614c6ff6a609ebd4daa511eb636903
-EBUILD raspberrypi-image-4.19.57_p20190709.ebuild 875 BLAKE2B 184a07a596a38b9a6c69042a66fa7bfc2d877b991b72300c187998185cc96bfe444adada85542edb2b03eb3e076da584d5c948bf07d291cefc583854da7d50d4 SHA512 319df6404ac255e209a55d683a05490c7241583d17dda3255ed39a7e3dea8bc0add5de827918c9c71183dea107c0a5d58ba55737b9405aead273d929a8f2fe1e
 EBUILD raspberrypi-image-4.19.75_p20190925.ebuild 1216 BLAKE2B cd69ba78849fe10a42928f4a4bd5857c43ef3f79972a423c8b1d92d3ab1a1aa39c5ac42a00582e22c7c447961ff897d303e14f011bbcc82d886b768a640cc02c SHA512 d9d5032f4fb1518dda3d4d230ccb94df327147f3168992e36dbebe522e09c3033c063287ed5844b09d7129700f61942c196361f32a0700599ab8f5a8f97de904
-EBUILD raspberrypi-image-9999.ebuild 1216 BLAKE2B cd69ba78849fe10a42928f4a4bd5857c43ef3f79972a423c8b1d92d3ab1a1aa39c5ac42a00582e22c7c447961ff897d303e14f011bbcc82d886b768a640cc02c SHA512 d9d5032f4fb1518dda3d4d230ccb94df327147f3168992e36dbebe522e09c3033c063287ed5844b09d7129700f61942c196361f32a0700599ab8f5a8f97de904
+EBUILD raspberrypi-image-5.4.51_p20200902.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
+EBUILD raspberrypi-image-5.4.72_p20201022.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
+EBUILD raspberrypi-image-9999.ebuild 1223 BLAKE2B 7b446c890c1a0549a43b95a17cd3d20637e58e824b0ac715c90df1f6381479a3a87134acf829093a4742959b27a3d8f1383cd5e8cf0a793aea93860f036d7245 SHA512 6d3630742a016e99c1f0d787cf10b6ca7e62ee93e2cbea0894dbb084d2c66c7f5765032f8668909033df7f0a121b9cb522596a00071c434ba133a6e851c1bf83
 MISC metadata.xml 324 BLAKE2B 89413ad14dfe3013cc5fe46bdfb743b947f1385e39dd2504b55d4a6c671fc4a006a721f8e810636275c5d5b4f26a259dd57ea0d1dc46a0db7c8c2e6bfb792efa SHA512 d50c8ad607a73dea23813309dcefb33ea5120771a5db38780ca946350a4de2c93d3a61ef7482479f1065de9de0158597683032d0fbdfa18286e0b4f0bffcce2d
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
index ecd30c095746..dd284762191f 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-4.19.57_p20190709.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.51_p20200902.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,12 @@ LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
 RESTRICT="binchecks strip"
 
-RDEPEND="sys-boot/raspberrypi-firmware"
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -22,7 +27,7 @@ else
 	MY_PV="1.$(ver_cut 5)"
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
 	S="${WORKDIR}/firmware-${MY_PV}"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 fi
 
 src_install() {
@@ -30,4 +35,7 @@ src_install() {
 	doins -r modules/*
 	insinto /boot
 	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
 }
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.72_p20201022.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.72_p20201022.ebuild
new file mode 100644
index 000000000000..dd284762191f
--- /dev/null
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-5.4.72_p20201022.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+DESCRIPTION="Raspberry Pi (all versions) kernel and modules"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+LICENSE="GPL-2 raspberrypi-videocore-bin"
+SLOT="0"
+RESTRICT="binchecks strip"
+
+# Temporary safety measure to prevent ending up with a pair of
+# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware
+# both of which installed device tree files.
+# Restore to simply "sys-boot/raspberrypi-firmware" when the mentioned version
+# and all older ones are deleted.
+RDEPEND=">sys-boot/raspberrypi-firmware-1.20190709"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/raspberrypi/firmware"
+	EGIT_CLONE_TYPE="shallow"
+else
+	[[ "$(ver_cut 4)" == 'p' ]] || die "Unsupported version format, tweak the ebuild."
+	MY_PV="1.$(ver_cut 5)"
+	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
+	S="${WORKDIR}/firmware-${MY_PV}"
+	KEYWORDS="-* ~arm ~arm64"
+fi
+
+src_install() {
+	insinto /lib/modules
+	doins -r modules/*
+	insinto /boot
+	doins boot/*.img
+
+	doins boot/*.dtb
+	doins -r boot/overlays
+}
diff --git a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
index 3a9901ac43da..dd284762191f 100644
--- a/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
+++ b/sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ else
 	MY_PV="1.$(ver_cut 5)"
 	SRC_URI="https://github.com/raspberrypi/firmware/archive/${MY_PV}.tar.gz -> raspberrypi-firmware-${MY_PV}.tar.gz"
 	S="${WORKDIR}/firmware-${MY_PV}"
-	KEYWORDS="-* ~arm"
+	KEYWORDS="-* ~arm ~arm64"
 fi
 
 src_install() {