gentoo resync : 29.01.2021

4 files changed, 3 insertions, 195 deletions

diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index f6ac6cf298e4..4e614948ff8b 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -1,11 +1,5 @@
 AUX init.d_rpi-eeprom-update-1 394 BLAKE2B 4a42ba2bca9f1cc646f2b39f33f1752a34b62ee01234a595d7d11c32507b92d2cb6909d739f4deda9381222596278d5e7e4faab60933f43d01a4be0df2f0f3a7 SHA512 1a88b1e73b2a40f644e1b37cc89a1a32d8ef25d0e09ee8b7dc005f0a834ec20a66e029a0a6a7d7d4e8a3066593bb277800a464783c2bf2e5923a71d4416b5eea
-DIST rpi-eeprom_10.2-1.debian.tar.xz 7360 BLAKE2B e7959c4de4f3675632f0897b6f8abc811c80daa102ad3fcca672a0e0f9ce4b4da80fd616de7aa8896f0f5fe889a10a52d32eba34627858a173186292175f3bf9 SHA512 cf401c5f761fc8c5b463630d192c8af9da2ae2e55e178857d9c09198437f162f96af23836d20adda6054243c6b613b7cc5c90a70975b96bad574dc3b328caa22
-DIST rpi-eeprom_10.2.orig.tar.gz 7415652 BLAKE2B b1f56263c0037b2ba3bac2aecd9b5736736cf599bc68a743c065c853a20f56f18984816fdfb402bb499c3aa911dbe72376cec4647d87406cce2f4328b04cc2b1 SHA512 ea76a157ed57984fb0667e9171e3fbf7dba180e014faa9352b0c1904531dca9528b0e3204645a4af2b550670a52354b6b1be6af27e190d4523d8044f3349aa73
-DIST rpi-eeprom_10.3-1.debian.tar.xz 10188 BLAKE2B 284a5465f2b5bc28c95135b8869218e83cbea9d0667b165de954f5c73549dfc190ddc838d956eec4c569c579e95ffc157054c6ed4bbd45e8ae88f786675cb164 SHA512 ead6b6c51d03493479c242e757edfc33bfdba4627f7501d90d0a181e8adc68f1503e0dac900b9b253a7286523f84d0e9afd8460d72f30b3ee8ee75b2f76811ab
-DIST rpi-eeprom_10.3.orig.tar.gz 7635402 BLAKE2B 3153eda08eada4c9e4f05d7a68ac4661413591314c4980e16ee876d49e756e2e13a101765b579adbe51e0e3b88cdfe419b71a58da858250781e0f292220dc397 SHA512 ea5a6ae47be5052b4793161d891a1e3a72dda951c95f15797d7baf68d475fcec1250638e4c43a32578ceef10563ebce052e746bc8fc60f8cf8d90780d5a7e8a7
 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
-EBUILD rpi-eeprom-10.2_p1.ebuild 2991 BLAKE2B bf77188c5c04b9db3a6d34474b8fc4cab9874eaef84011818dbd84532d8978eabdbde0264a27bad30425062e723061558b65bf0361189b25b4040435e2774108 SHA512 ababceb54335943aceb1ce2d99aa39b741252d9dd094652f467ace73b3bfd4a4acb039d859ef864ef6ae8827d4fb6f695206362d925f404a56be9d957d3a8d26
-EBUILD rpi-eeprom-10.3_p1.ebuild 2992 BLAKE2B bbfb9fc1bc996fe9b1f20fcbcdcfdae5c2e18845f50d163a2c5f127885d98a70724b94cd0f45e1e502799cca8a5a2a2d929d287486bee7bd6d134e80c47a232a SHA512 ecc9382bb1aa8988a039e3bdf119d71aa19c0f33333bd5a02acee0b9c5e8635dc00f55e7a49917f44d370b7602a35683c3a0eeb4decbf176bd9ede03c5c6d92d
-EBUILD rpi-eeprom-11.0_p1.ebuild 2992 BLAKE2B bbfb9fc1bc996fe9b1f20fcbcdcfdae5c2e18845f50d163a2c5f127885d98a70724b94cd0f45e1e502799cca8a5a2a2d929d287486bee7bd6d134e80c47a232a SHA512 ecc9382bb1aa8988a039e3bdf119d71aa19c0f33333bd5a02acee0b9c5e8635dc00f55e7a49917f44d370b7602a35683c3a0eeb4decbf176bd9ede03c5c6d92d
+EBUILD rpi-eeprom-11.0_p1.ebuild 2991 BLAKE2B 5c7898bb0acd8e97606022ea044596744f60f8c52826fca80a5640fb55e5d2bf84edc337c4e20da4c7003b1e9eae6636b85d734f4ad4989b517b74becb6c7a78 SHA512 37641d94251dab0cc3b122f34dfd4bce92794ff6f67f6241adfb1619279baa16f0a083988bd540bb70d45c56841dab24e09c9f393520400f213b5b861b4860a0
 MISC metadata.xml 566 BLAKE2B cb5076ad252b4c305c8116d6a763c954ad939b2326519db5102bf67f50b8eb7f6713df5173190771fd30caf29762911c5a0da3f1b4cebd74f845b474df9073f8 SHA512 9a82fc89ffff553b2de5037e26151a4da5a54fc13203781d7e6e7048f6e3014a2530c55f6f5d1a73c30e8efdacb22c8d1a76185c1e9ca6dc384f98f86c7dcccc
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
deleted file mode 100644
index adbb4090266a..000000000000
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild
deleted file mode 100644
index c34a558630a7..000000000000
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-10.3_p1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
index c34a558630a7..da82af022728 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}"
 
 SLOT="0"
 LICENSE="BSD rpi-eeprom"
-KEYWORDS="~arm ~arm64"
+KEYWORDS="~arm arm64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-apps/help2man"