gentoo resync : 05.12.2021

8 files changed, 35 insertions, 32 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index b26ab6bba121..7c5cd956486b 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest
index 691959d9d680..1364048ed112 100644
--- a/dev-embedded/dfu-programmer/Manifest
+++ b/dev-embedded/dfu-programmer/Manifest
@@ -1,3 +1,3 @@
 DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4
-EBUILD dfu-programmer-0.7.2-r1.ebuild 1265 BLAKE2B f663917a8912917484385029949635025775c230b6cb11419203979b043732dc307b2467b80ab86e6bb9a169dba13ffa3e9d27d7aca33d629d3b701641f177bc SHA512 9c818e7aa9216ff5b3309d0e1f72e91989ab70e3ae74beee66e9b0938e4ba08160664c943dd8110226a5b66c7da88cdd19c7b353b7a8a7b53611c62972144417
+EBUILD dfu-programmer-0.7.2-r1.ebuild 1272 BLAKE2B e396e4aeeda24b974a914dd3bfd4fae76a727845246e17c5c2d0b630b353e384f2bffecd5424e761ba6828d9346b279184ef4c09963a66a55442508eb3fc183b SHA512 dfb3a40db708e16e4e80b10f1fd614f8e0be80ae40335493f2cd900b5f51f6e1ef1aca97803662773b23ebb8fa84d7862db4a67af3622f829a3ce7ec62f3015e
 MISC metadata.xml 336 BLAKE2B c6bd5e8fe7f2fb76d339c89d66edf9dcc29d1230bc5d3310fd9c52d8c6b94e5a50628a301148d41431de3ff73ac0129e1d670e394e688a8f34c5712afd574a1d SHA512 065afd5762bbcff0e406cf6767adb6cb5f34a73f3b96e3cb2ef2aab46b887bbcffc789bc9d9efd3e20f1a73039a1442647d109d1cc87c034241e1a068c2d35eb
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
index ecb096d954cf..fc823eeb789a 100644
--- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
+++ b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm"
+KEYWORDS="amd64 arm ~arm64"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-embedded/lpc21isp/Manifest b/dev-embedded/lpc21isp/Manifest
index 91013b211a8e..9b36d0f7164c 100644
--- a/dev-embedded/lpc21isp/Manifest
+++ b/dev-embedded/lpc21isp/Manifest
@@ -1,3 +1,3 @@
-DIST lpc21isp_185.tar.gz 54735 BLAKE2B 0ba04fca994891ccd68a2d6b6c981bb6e2cf91a70eaa2ba576eccaad328591665b53ad551d349a59c7b86e2636504c09276a16f3f5a34953d643b4f1fa4628ff SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954
-EBUILD lpc21isp-1.85.ebuild 498 BLAKE2B 34c312187a2fb9394c571ab349edea83f5d43e0731ced1b56e4a993521a1f5c8aecb1c87c53a16621a7b06e8917bae3ae509b53ed3804598c9451d49771d4e71 SHA512 83254c1be307b30ae41bf91c3271e26ffa940c59d0e0866be93cd5b68fb3f26c0033b90bf4acdaac1cd5309ea838cedbc1128eeae63877388969ab670b77f62b
+DIST lpc21isp-1.97.tar.gz 62171 BLAKE2B 0c01e35c4006f6b106651629f82a025fa15810e0b809adc8d672d1e8a8bde0e81b897bfd2fab88b770ac5527ded537567c1e8b3eb16f938752c56779f5435aa3 SHA512 bd4644352b9d4f3c24f93d8fe68274e2d238d9c91d3d0d6a0c06b878d31099cada772b35ce94885bccd309f5e2e56bc881a0a5302901349046a51537cfebb795
+EBUILD lpc21isp-1.97.ebuild 650 BLAKE2B 3639baa7f2ed79deab68747d94616d37c922d48bbd7761e83b1dd017c97e30b1e9c9b2e8203ba552581ca1479c1d6db5d91c8802d08fbf5cb3a5885a6cbb31ce SHA512 5bff48c8c7196526236f4c74d878397f03965a46280ad5f363f928fe1cc54bda01d1f7f8aadcb0d6204bac8e8fd3cf531749d44d06e708fbdb43a16e08b082a2
 MISC metadata.xml 429 BLAKE2B 90078e26349fa08b044a46975e2cdf36dec0161218850f286e552e33ca2d4b310452592db548c9ee0fd53ff8ec68797d989055f2f7a9e7c7df5073a583e1089b SHA512 88a89938b6abc3bc76e684497800b96824ef19c483c2e2bc7f0c1e6858e739f8beb79f517a3563b9e2e2029178a85c3f0093e026c08b67c49c525c4e903300a1
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
deleted file mode 100644
index fd08a385c1e2..000000000000
--- a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PN="${PN}_$(delete_all_version_separators)"
-
-DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
-HOMEPAGE="https://sourceforge.net/projects/lpc21isp/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	dobin lpc21isp
-}
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild
new file mode 100644
index 000000000000..081ebfcad4fe
--- /dev/null
+++ b/dev-embedded/lpc21isp/lpc21isp-1.97.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}_$(ver_rs 1- '')"
+
+DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
+HOMEPAGE="https://sourceforge.net/projects/lpc21isp/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	default
+
+	# Upstream makefile has got DOS line endings so using patches there is fragile,
+	# see Bug #827018.
+	sed -i -e 's#^\(CC \?\)=#\1?=#' Makefile || die
+}
+
+src_install() {
+	dobin lpc21isp
+}
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index ae800b279172..fc0bcc29215c 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -4,5 +4,5 @@ DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb
 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
+EBUILD rpi-eeprom-12.5_p1-r1.ebuild 3009 BLAKE2B 29ce9339662f1430deacaf551ae26a0f07373013f2eae4f1b25bcea109d81682ec4434831c8496329bbe7dc483319387263fc8784491d448f2cd0359e48e79f5 SHA512 587810a696f471c952303ea4c6c04191c9dfb3a87a2217180da4b3b8786101dc895c1799e69461829f469ed5c83771a9102c0119a1b644dab5b0927f674438f1
 MISC metadata.xml 596 BLAKE2B 075812117456e8457ad55e184a322ff86f8bc18a8470fcd52d63ec20e88c81db064ff5f6b023e7400d51d603886cb154a0a1485613cb326b8897f99c5c06c330 SHA512 9ebe09182734a60c3ed3a9e30b2cf9b9433f546e1f4cfc9d75b48813e61dc875b71593300e6bc628650cfbae49fc722713cfc88c8e0a387efe0dd6cca991fa2f
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1-r1.ebuild
index 6639badbca69..2de339cb2ba6 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1-r1.ebuild
@@ -24,6 +24,7 @@ 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