gentoo resync : 25.03.2022

7 files changed, 107 insertions, 85 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 201ae8c49f52..3ef6d15feccc 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index eb8ba14ee3ab..2347cd119736 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,4 +1,3 @@
-DIST platformio-5.2.4.tar.gz 254337 BLAKE2B e29b69a514b5f3bc6faefb15dd4e3195152d74b763961c35c33cd9e44bcd430920dc2f4d553244c2ac1bb83d745c006c67d2d52973fa07562c8b98d8e74a2ac3 SHA512 f90c1f5d9dcada99c610003b26ccaa4e08c214757d0c26daeea3cae006a02179aea1eb0bc656751913d0b2c4161195b1afe9ab0eaab5ad594ff986f6b56728f8
-EBUILD platformio-5.2.4-r1.ebuild 2499 BLAKE2B c44903b8f9b69f5c6056ff3daa9aa6693bf4de3885071c82e35a824c0340d425413c54fe80597c4f7675bf67753716b27c252c1c56d4e00af0412496586bdc7a SHA512 95fe995e292bbc7fc9dcb26e6992d5f4415d7643c5afcccf6735c0467ad6650dd2aa52f493342b446f5a725789d464599171dd4dcf0553c14929d6596d0010d4
-EBUILD platformio-5.2.4.ebuild 2362 BLAKE2B 19f53c899a5ae8af72fc92cea34ca287d011b539e2516ad591b4a3ee7ab7f7c6cab31d84c42972088c05b82a974e72196da564d7798ba010b9e89dd65750ebc8 SHA512 0097bcfe69144912e94599b83cec2cba90c41ae6eed4afb43b11ae4eea8cedbb52878b7d5e9642c4bd2128fbe21a387052dbbcf29e17646840d7c728f4e01d17
+DIST platformio-5.2.5.tar.gz 254813 BLAKE2B 96911a64f8e73567820ef2c7b2297ed9e32c36c65c49572af6037c2666da4072bdf920dc31e8de7e07296eb7f1b407c47191d68a80ed212a9c351dfca604b408 SHA512 cf939254c231bb2cb97ac509175b7235a6a2ba447e55a2d9a59a9fe610656743c190f00cb7bfa1fc2e6b64487be7f02a193e2f270236bbb9200537f19175dc22
+EBUILD platformio-5.2.5.ebuild 2496 BLAKE2B 5f76581a4d3f25b5782111e8ddccf698f2192700817f1d4217fab83d54206ce22db4acce8af731f8ed9d0b47a38ce2ed984f12b23a39f5d52c90e6374e56e74a SHA512 20d19030b8f4373653df4185931bfe71760fbb5ce9fdd8772bd3717d066f7fc9bcd896a002c56d5ce61d642334a02313e66e97fa89b2d5898d75ccf390e43d53
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/platformio-5.2.4.ebuild b/dev-embedded/platformio/platformio-5.2.4.ebuild
deleted file mode 100644
index 29472eceaf9b..000000000000
--- a/dev-embedded/platformio/platformio-5.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 udev
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-core-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/aiofiles-0.8.0[${PYTHON_USEDEP}]
-		dev-python/ajsonrpc[${PYTHON_USEDEP}]
-		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-		>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
-		<dev-python/click-9[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-		<dev-python/pyserial-4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-		<dev-python/requests-3[${PYTHON_USEDEP}]
-		>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
-		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
-		<dev-python/tabulate-1[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
-		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
-		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.17[${PYTHON_USEDEP}]
-		>=dev-python/uvicorn-0.16[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
-		dev-python/zeroconf[${PYTHON_USEDEP}]
-	')
-	virtual/udev"
-DEPEND="virtual/udev"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )"
-
-# This list could be refined a bit to have individual tests which need network
-# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now.
-EPYTEST_IGNORE=(
-	# Requires network access
-	tests/test_builder.py
-	tests/package/test_manager.py
-	tests/package/test_manifest.py
-	tests/commands/test_platform.py
-	tests/commands/test_test.py
-	tests/commands/test_ci.py
-	tests/commands/test_init.py
-	tests/commands/test_lib.py
-	tests/commands/test_lib_complex.py
-	tests/commands/test_boards.py
-	tests/commands/test_check.py
-	tests/test_ino2cpp.py
-	tests/test_maintenance.py
-	tests/test_misc.py
-)
-
-distutils_enable_tests pytest
-
-src_install() {
-	distutils-r1_src_install
-	udev_dorules scripts/99-platformio-udev.rules
-}
diff --git a/dev-embedded/platformio/platformio-5.2.4-r1.ebuild b/dev-embedded/platformio/platformio-5.2.5.ebuild
index 10226f631dec..6d3c7cad5bfd 100644
--- a/dev-embedded/platformio/platformio-5.2.4-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5.ebuild
@@ -19,17 +19,17 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		>=dev-python/aiofiles-0.8.0[${PYTHON_USEDEP}]
+		<dev-python/aiofiles-0.9[${PYTHON_USEDEP}]
 		dev-python/ajsonrpc[${PYTHON_USEDEP}]
 		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-		>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+		>=dev-python/click-8[${PYTHON_USEDEP}]
 		<dev-python/click-9[${PYTHON_USEDEP}]
 		dev-python/colorama[${PYTHON_USEDEP}]
 		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
 		<dev-python/pyserial-4[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
 		<dev-python/requests-3[${PYTHON_USEDEP}]
-		>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
 		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
 		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
 		<dev-python/tabulate-1[${PYTHON_USEDEP}]
@@ -37,9 +37,9 @@ RDEPEND="
 		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
 		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
 		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
-		>=dev-python/starlette-0.17[${PYTHON_USEDEP}]
-		>=dev-python/uvicorn-0.16[${PYTHON_USEDEP}]
-		dev-python/wsproto[${PYTHON_USEDEP}]
+		=dev-python/starlette-0.18*[${PYTHON_USEDEP}]
+		=dev-python/uvicorn-0.17*[${PYTHON_USEDEP}]
+		=dev-python/wsproto-1.0*[${PYTHON_USEDEP}]
 		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
 	')
 	virtual/udev"
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index e6cf781f52f6..352d97a84a17 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -5,7 +5,10 @@ DIST rpi-eeprom_12.5-1.debian.tar.xz 11808 BLAKE2B 82eccb61fbac25c9f20343ebccd45
 DIST rpi-eeprom_12.5.orig.tar.gz 13662998 BLAKE2B 6c3937f4c4a950c6cc78285134bb8ee0b5459e9c9ba39ac020c6cd5e0b0bb6d6647d788c81ff1d639a87dd825d8b5fcaa29318f63823e56f6884ec4ce9a52361 SHA512 82608eee6106380b09657d729013e953f50bba2a45084fb9d38238142505a4f51f1f7c586dbd10a29e79b02d0b82670498f3dae16e368506a8187f1076d790fc
 DIST rpi-eeprom_13.3-1.debian.tar.xz 12768 BLAKE2B 823b1f25cda98cb2888b6b423b6120f5c1474735c58933ac11fe9380fa31fcbef260afb2ebcced423301bee207c171c5ccea3ba9c8cc4dae579c2dba55a60cba SHA512 0b8e15b1c827506dcdf7a6f19acd1ceb32f0901b9c438994af7f1e38a0ced05b7f123225ae8ecca4147ce04e1d7500ddcdfaeddeb90f0342af2dee9e4ffbfe04
 DIST rpi-eeprom_13.3.orig.tar.gz 17497524 BLAKE2B f65fc9b6a98dd3a4d3f4095e03279d832a64d0f12f9edd7e7af2b8afe8b290f4db6ec39e755df9fb5b317930235bf1c7205be4b3f838f6cbbf92e1d80574b342 SHA512 d5885444fd90a5f24c94a3af4f093744f4a63947a119059c851cd6639e572138205a48f7cd126c3deafe104e76985197e1fa36c8aa72a16bb173f11750b85151
+DIST rpi-eeprom_13.8-1.debian.tar.xz 13232 BLAKE2B a5c4a12eca86a5f44c6a18e06c3108a353adca055facd80ced42dfcdd518508358823bd31ef051b29dd47e46c59f056c36dc6628144c192eec26c57fc0658095 SHA512 dba8342af463a9d628a1f71dd30df803699a858873dc618a25aa4be682e5357d090345346ff686cb2c1bde7ad678362bf138f952115f186c841414354066a291
+DIST rpi-eeprom_13.8.orig.tar.gz 19328304 BLAKE2B 0cc9fcb2f30065494d8d4d8fd22930ad0229a38f67f02aa091269a099421c6e2781135c2a71dc10b2992832b443cc44e782f2bda424eb11539d0d6d858635129 SHA512 24675a0cc10f6ffc2e170da24999f5310ade1585618adfaf763b8dc1784639044bfdb5cbe513c3369056bb90c482ee65cd518b4161c54c0641feeb132552b1aa
 EBUILD rpi-eeprom-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
 EBUILD rpi-eeprom-12.5_p1-r1.ebuild 3009 BLAKE2B 29ce9339662f1430deacaf551ae26a0f07373013f2eae4f1b25bcea109d81682ec4434831c8496329bbe7dc483319387263fc8784491d448f2cd0359e48e79f5 SHA512 587810a696f471c952303ea4c6c04191c9dfb3a87a2217180da4b3b8786101dc895c1799e69461829f469ed5c83771a9102c0119a1b644dab5b0927f674438f1
-EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3025 BLAKE2B 3f9190ccf19fc65499d9a1b2837fbe3eb498d6a439a3dabb61d1553a0e7da1bb34e24d64f5bcfd1498fcd0b19bf087de5b6b8901f9a0b9ef2808f5dbd7914e1e SHA512 3a34415f6a4dc3d762f7366428de02a6631a67cf5f607b51c3db75f54b2b0f0b4a3d863df93e38e59453812eb867570dbc5a0ccc548d3240bba1f5010a27e078
+EBUILD rpi-eeprom-13.3_p1-r1.ebuild 3024 BLAKE2B d13f780b30e2151bb399eda15b04cc2c08ce2e6d40c35244e55d78d79bbcd109930cee42debaa6e196e85c4349be529af4bddc6f16cce3f7eaddf18c08ed4018 SHA512 fb0406cce406333c7323808dc57b8140a178f5a657a60c109459807e8e0c374c12a1044e3c6424ea46a309078ede2b34c84dccf3e058cc0501f67fb05c241821
+EBUILD rpi-eeprom-13.8_p1.ebuild 3025 BLAKE2B 3f9190ccf19fc65499d9a1b2837fbe3eb498d6a439a3dabb61d1553a0e7da1bb34e24d64f5bcfd1498fcd0b19bf087de5b6b8901f9a0b9ef2808f5dbd7914e1e SHA512 3a34415f6a4dc3d762f7366428de02a6631a67cf5f607b51c3db75f54b2b0f0b4a3d863df93e38e59453812eb867570dbc5a0ccc548d3240bba1f5010a27e078
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
index 12e3cb37f8e8..17798d332728 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.3_p1-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD rpi-eeprom"
 SLOT="0"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="~arm arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-apps/help2man"
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild
new file mode 100644
index 000000000000..12e3cb37f8e8
--- /dev/null
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-13.8_p1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit python-r1 systemd
+
+MY_P="${PN}-$(ver_cut 1-2)"
+MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
+SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
+	${MY_BASE_URL}.orig.tar.gz"
+S="${WORKDIR}"
+
+LICENSE="BSD rpi-eeprom"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/flashrom
+	sys-apps/pciutils
+	|| (
+		>=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 rpi-eeprom-digest
+	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.'
+}