gentoo resync : 24.06.2021

5 files changed, 98 insertions, 2 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4ca2648a8b7b..a226e59a0113 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 920e02770eab..5dfef36a5572 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -1,5 +1,8 @@
 AUX init.d_rpi-eeprom-update-1 394 BLAKE2B 4a42ba2bca9f1cc646f2b39f33f1752a34b62ee01234a595d7d11c32507b92d2cb6909d739f4deda9381222596278d5e7e4faab60933f43d01a4be0df2f0f3a7 SHA512 1a88b1e73b2a40f644e1b37cc89a1a32d8ef25d0e09ee8b7dc005f0a834ec20a66e029a0a6a7d7d4e8a3066593bb277800a464783c2bf2e5923a71d4416b5eea
 DIST rpi-eeprom_11.0-1.debian.tar.xz 10248 BLAKE2B a83230dc13ce296963ed206725d465a69536f5cd23f52076fda2601ceea06354f365e1f8b2d9a93a4396826b5e9d9ab5ad40fd6336116e693419fd3b4630b5e1 SHA512 939fa16fbd8c21340ca77cc74f3cee22772d25cd6dcb70c178d70c1762ae9b9acb9e7a070b2c3a7f114841712142284c1f2bdb23fb528a229507d8eae6477c84
 DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb13f88948490e14f1e251f6440f3ef31879ea66c0fe94761e1abf40a23924742e8c2f33c49200e710542131091b223b292 SHA512 0ea2971b752a53a4529b2c3d3b814b9e743440397f8c4d21c9a06493561a37bc8cd8c0adaaab389f41b1697584d12641f49d7a93d6541f9dda3bba5d6dd1371c
+DIST rpi-eeprom_12.5-1.debian.tar.xz 11808 BLAKE2B 82eccb61fbac25c9f20343ebccd4571fbc0c3df0c2388b92474f2a9ba042c6da8dc26ed21dffbf2a81be7c10561cffacf8ed80cb63435b28632cba9d505363bf SHA512 33581d017f5817202f7fe62e89f1a09c25ff63b30a11eb61fc08dcba4a512332d9dc32d6431240981e9690625e76d7cb9a3f601ef59cc1a3eba222c4d3c64e81
+DIST rpi-eeprom_12.5.orig.tar.gz 13662998 BLAKE2B 6c3937f4c4a950c6cc78285134bb8ee0b5459e9c9ba39ac020c6cd5e0b0bb6d6647d788c81ff1d639a87dd825d8b5fcaa29318f63823e56f6884ec4ce9a52361 SHA512 82608eee6106380b09657d729013e953f50bba2a45084fb9d38238142505a4f51f1f7c586dbd10a29e79b02d0b82670498f3dae16e368506a8187f1076d790fc
 EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
+EBUILD rpi-eeprom-12.5_p1.ebuild 2990 BLAKE2B 8d64cb3190cc13d7916cb4021b6e92ac1429d83f790d98b11ca2689a3098fc9d16c5e47dfd595c31592059e9c98106d97f1450fe2a8300df1c65c01dfa9002dc SHA512 a7a239e0a2ec984bc8171bc9d291495825381de13edf26a1300ad8f58f2fd1d9036f186f71ec99d52ac539b5c31aeb73141c2266fe7fb8b6fee3003e569a963c
 MISC metadata.xml 595 BLAKE2B 497bb778975ed8fc5025f91053f83cf020427799d260272ba62a307a7750fb0ece92f5cf321c6e836cb1c90e70f528c48ff0c8b703782677837891a9a805abd9 SHA512 7eed8f3099a2ce56f7b7972630876cfd0c9c7fc875d44a91195e243cc11ffbb838f673ac7c7baa60a47597489fcdd6754a1a99e331c9e401b47afd750c99d3e4
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild
new file mode 100644
index 000000000000..6639badbca69
--- /dev/null
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-r1 systemd
+
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
+MY_P="${PN}-$(ver_cut 1-2)"
+MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
+SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
+	${MY_BASE_URL}.orig.tar.gz"
+S="${WORKDIR}"
+
+SLOT="0"
+LICENSE="BSD rpi-eeprom"
+KEYWORDS="~arm ~arm64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/flashrom
+	|| (
+		>=media-libs/raspberrypi-userland-0_pre20201022
+		>=media-libs/raspberrypi-userland-bin-1.20201022
+	)"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
+		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
+	sed -i \
+		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
+		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
+}
+
+src_install() {
+	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
+
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
+
+	dosbin rpi-eeprom-update
+	keepdir /var/lib/raspberrypi/bootloader/backup
+
+	for dir in critical stable beta; do
+		insinto /lib/firmware/raspberrypi/bootloader
+		doins -r firmware/${dir}
+	done
+
+	dodoc firmware/release-notes.md
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
+		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
+			up-to-date and updates the EEPROM" \
+		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
+
+	doman rpi-eeprom-update.1 rpi-eeprom-config.1
+
+	newconfd rpi-eeprom-update-default rpi-eeprom-update
+
+	popd 1>/dev/null || die
+
+	pushd debian 1>/dev/null || die "Cannot change into directory debian"
+
+	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
+	newdoc changelog changelog.Debian
+
+	popd 1>/dev/null || die
+
+	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
+}
+
+pkg_postinst() {
+	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
+	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
+	elog 'or'
+	elog 'rpi-eeprom-update.service (for systemd users)'
+	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
+	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
+	elog 'which release track you get. "critical" is recommended and the default.'
+}
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index a49881228f9a..afe43c5cadb8 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,5 @@
 DIST u-boot-2020.04.tar.bz2 15065656 BLAKE2B 29cf8be6027ce46e3bf3fae9b6736e6aba46dba2904112f845d79f50b52b7c7ff3437c71dac6ab22d112347467fb5baaa3ec421cb842ba3ae9b547e4f8378d03 SHA512 e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
 DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
 EBUILD u-boot-tools-2020.04-r2.ebuild 1474 BLAKE2B 12ad0a7c69c0deff7186d8fdb95dcfd83891586f73cf3644c222fda42580c1b6e15892150178c011818d039d7d9cfc90f32154aa669c9c6731461a8500e4ffb5 SHA512 a1a5abe2b414d75e9570bad5e59b8fc1a45ceaeac8faf93e5994be36001792b7e9bd99b6dff9454c610217dc0b50adabbb0cc0c673232377759d04a5ec741c3e
-EBUILD u-boot-tools-2021.04_rc2.ebuild 1526 BLAKE2B 0c50dbe2e4925049305a9c8a9493de162129a3694a77985ec815f829ff0c1e95016da442b1b5dc147a6d5dd88c8b25d50de01aa7779cb90a3b3ea96c2be58f07 SHA512 2428ab8614ea1a5c8f38ec82fb03c4db7a82b52e94e2ffd22c5d9f5251dd0b1a225992df3048fd17e1d9621a675adb933df829649b508a26afe33baf7e97fd96
+EBUILD u-boot-tools-2021.04_rc2.ebuild 1523 BLAKE2B a79fce96dc4d4749b49b05dff7175e32441e77e47c99293d89f38ccbcd73b09bd39c4184b8bbea02842c1447adeb2d2d6771d68cf48b24cb7246b93a3b5aa6ab SHA512 1e0e465905e6d399cada39542003187ed06cdc6b3efefb1d3a0fb4c7b481fb24e5db6cbc4a90845874bf39240f92a1fa7d36f2dded0115841f8af6e738416c94
 MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
index fe9f799ed944..f7a4a5f731a8 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="dev-libs/openssl:0="