gentoo (valentine's day) resync : 14.02.2021

17 files changed, 124 insertions, 279 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index d8cff567651d..51c7e75a24bf 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 2bd2de8f1b71..2d2e6b290d0c 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,7 +1,5 @@
 DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a122fd6a0c9964fb189350980557aa85bd6cb8fb2d63c8c7ccdd18e1860b65ca85c8777145ec1da07da886be1 SHA512 14528197e760779f3bf50e2a44d477979675dd42451fa405e2ae87502158b21f999fb94561980c9eb0634d2d1fd3729779b78266403de858ed1d32e8d29604cc
 DIST esptool-3.0.tar.gz 6628258 BLAKE2B 613bdc4c4d0df633c25c83d51a84ff9ca34d5c345f010d2e3e99bc126530d484bb1fb4818b3a10b10a6b9879b161817d5bc6288dab55368f1250a27e2418d641 SHA512 b522d30b11e9ab4e426009116bf1872e587116b7a3b517f841d34d3e860f6454345be89a2e28b8eef5aa5e59318e991504697644a3f4f90d7e63c037025716eb
-EBUILD esptool-2.8-r1.ebuild 1146 BLAKE2B 603b2bdf8edbc6acd0b050e043b0a43c4758f0879bee584de33c1caa76f4db73e9dbe9a833be1ef3be2cd612d5828bb93b50e0c565868ccdc500b2f02b8be2e5 SHA512 647b17089980549814d25c3fd9739cde047d8a386871d908ede3d760d2d3f5f5c69dbc0974fac86db0536099334694f83e00867ee3a09fa2e0fd57156af762d2
 EBUILD esptool-2.8-r2.ebuild 1057 BLAKE2B 6cc687c86fa7851648b135eaaece7de1aac22d7b4d16d298f23e045cc7357f07e0f3b19ce4761522708076b1b9091da7f1f3d3b0384cbc612af47bdbbdd54331 SHA512 797e8b5229af3eed44143042232136a383fe7f3f4e4773fe6fbb6ed45c39d02b9479354f3d966496bbbc94bd8813b1aff33a44b0460b47d0f6d66d2920fe191f
-EBUILD esptool-2.8.ebuild 926 BLAKE2B cd0588e87b1b2c3d059820299e4a42eac82f38fb3b19cdae2d58f8045e06c93f2db715c8503469a3c066bfc2accf8f949c6d22d989344180a4a07bbc145e99e6 SHA512 9696661b1744365b53064f83be2e63c57e2c094725bcfe002c838c3df038a04df2aae11451b9917504bf9aa792ded2581c8b1dce8dbf4e2d485af39f122f60f7
-EBUILD esptool-3.0.ebuild 1241 BLAKE2B 69b4f24ea28eee4e2f924cd67131482a45a90c470f3d716b6e1e0bbabc25b1f17c87880f5f85d4025dd8dff97bc510f674678d78d41cf8c3d376ca599e64e4e8 SHA512 095b96f54b1bb6fc55103632c484727092dd19bc4d43191a02a73fba2f5a95befb469e5ee8ec1a25b250bd22ddcf519cafb71f8a026e249dc5063dfc4b2203a6
+EBUILD esptool-3.0.ebuild 1244 BLAKE2B 90d3f79441a14aaf7f4e9eb1f7f324bff0fbd8904cef54415d0ac13cfb3f85fd43268327583ae2ca0b21d5461743b7dfbff259c18c72c30a5c5484c6e2882fbe SHA512 5dd476ef90c84038c4f5341606cb48ceb891ba4999152819fbec832be460c4fe7d6d6b92b550f1e0102fb18ff42802c23d9723e99f48b93ef5967e130733a2d0
 MISC metadata.xml 473 BLAKE2B 58b09a7777e3c2c04d7932bcfb631a8cbd0322cc81cc35a0871fdc8843f0d3d376b42bb2d7cacd5378f1d7e0f497f0989be1381ee9e8dd3513a899a9ba268199 SHA512 6029394a2639f610b705a820bdc92eab6849087b6964aac46e1aa9a2bd897f06e45919cb32441115081c3ce26097e6a083d9826c43bb7da86b2859855e7f9d67
diff --git a/dev-embedded/esptool/esptool-2.8-r1.ebuild b/dev-embedded/esptool/esptool-2.8-r1.ebuild
deleted file mode 100644
index b5059f85d948..000000000000
--- a/dev-embedded/esptool/esptool-2.8-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} ) # apps work with 3_9 but test depend is not fulfilled
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/ecdsa[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyaes[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyserial-3.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-BDEPEND="
-	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
-"
-
-src_prepare() {
-	rm -rf pyaes/ ecdsa/ || die "unable to remove bundled modules"
-	default
-}
-
-python_test() {
-	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-}
diff --git a/dev-embedded/esptool/esptool-2.8.ebuild b/dev-embedded/esptool/esptool-2.8.ebuild
deleted file mode 100644
index 5bcb03d5fe71..000000000000
--- a/dev-embedded/esptool/esptool-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-}
diff --git a/dev-embedded/esptool/esptool-3.0.ebuild b/dev-embedded/esptool/esptool-3.0.ebuild
index 364678d8edef..6205142a51ff 100644
--- a/dev-embedded/esptool/esptool-3.0.ebuild
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 808a8f8a9c07..427831fa225b 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -7,5 +7,5 @@ DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0e
 EBUILD libftdi-0.20-r1.ebuild 1858 BLAKE2B f8ea4cd9ebc1f264a670c934622396061fe3cb092f646d43f5a5c5fb79b1bed10fab359a33be9a2a4d87c5456076d5f595223984d9c0abc1bc068becf5e9355d SHA512 58ed755709fb7082213f94a6a7c7d2977ff03cfb49b6852176c8a339369dd0e704c22f076fb5ca8819856718523b6d8a61efa262aa599a1b0f34721f1ca38880
 EBUILD libftdi-1.4-r1.ebuild 1670 BLAKE2B ea9034c38431f1fae4f2c9dbbeba20fb2f6d32c4d4647478e0db36e312df74a5c5345b9deaf11b6ac63a314d56cadd0c91c0405f98a8aae5a98c2871f2d3248a SHA512 f9db8c7b9684a31d5f4aab93bad3554923ca163773e5cdec69207f358431e5f4234860ba1326723b4d4e083eed03fcf7758febc60c93b5d3682218aa6e5aed8f
 EBUILD libftdi-1.5-r2.ebuild 2121 BLAKE2B 60c725640b23ece5c99f18d8287ad9f6e39435da5f660027a2b55856af8f0568f586f832f70d6e58e109c0673387cad7c39af9fc62e3391dfff2f42878bebd1e SHA512 e349ed1e56b011843cd0ac33368fee7aef991cb8b83accf959d9578da532f3a8c107e2488a59966f74c338b19da1d55577d6515a07b11aeed532c15811b77db2
-EBUILD libftdi-9999.ebuild 1783 BLAKE2B ffec02a64b3367554c7c02f36a063eb88b6244e32416619aea10e37df34450de840c058970ebfa9eeebb58e0839f2d64950fb5cd3702d8dddfa9e8c0226a15f7 SHA512 2631fe91a03893f1d61ac893f7865c0bac0ead2e509c6249dd2dbde35e466ea7b63ef45a7044224c8b658e208cdf39cc5ca5350824d1b7e5ec72527b24e4d723
+EBUILD libftdi-9999.ebuild 2070 BLAKE2B 24c97c8596fb7dd4679a5f60a510584421bd6a1a1f160f063db8d4faaa0473ffe7a2fe585d75039494795b6c44a33302bb34c2185a9f6d84a6ec227e8999b097 SHA512 28b15aeeb533c9952a2357068500178af2b6019914bf2f2bcba9252bd4e80580c60f8ac0f1bac51357f5d4e24f964c57a7b0c6654f73dec722ba264052c55ec5
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index 028e9c9ad1cb..9b1e30890f4a 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.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
@@ -60,11 +60,19 @@ src_configure() {
 
 src_test() {
 	cd "${BUILD_DIR}/test" || die
-	./test_libftdi1	-l all || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
 }
 
 src_install() {
 	cmake_src_install
+
+	# Fix up pkgconfig files
+	# bug #766818
+	if use cxx ; then
+		sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
+		sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
+	fi
+
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 419092ae10ad..38acaa4a9cd8 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,7 @@
 AUX openocd-0.10.0-fno-common.patch 259 BLAKE2B f209b830242cc2f93faa1000c50805889b2abc7d99634302d48c011adad885137f86774740e4316300440c5c503729a6f6a89e941bf11e98b4f27e17d265bc47 SHA512 bc60476c74599bc6eae2d50dac7ee723732fb693923b487caae83475779bde31c2e71ea8b837fb0ca78b814ee8a2634ac2e887c91c3839425c5d980d61e49c7d
-AUX openocd-0.10.0-gcc10.patch 1224 BLAKE2B 9832211d66104b1a3e6f64f425afe43c9aa8de5f75d95fbec8f358b602d65a8235174962d8759a97800d6e78fefb2637a5eb0382d82e2f1fb8f1272821b79d1a SHA512 d45d4f37c38ca8357bfe6f7f0240d72d8e0ab3549b3f763142a2352d447f6151e9e9979bc3898700d9f3656cbb13a50ab4e85cac67e190f0c3f0dc04f6296d31
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
-EBUILD openocd-0.10.0-r1.ebuild 2282 BLAKE2B 1f91ef471d27179319b81c1b91aac05a8aa6bcec77855d768f9c23c83ad89dd774fcdd1f86ab16249267108a507c81e18bad1e9c7e3612775aca8c8282f3e740 SHA512 7786005fb1db1fd171fb3c2642d94dd4f069956091ec2207f8ba70f24e085253960a9581af432875a37239d8df69beb6f6e2de114ca1137f14e24070db7eadb4
-EBUILD openocd-0.10.0.ebuild 2787 BLAKE2B 33c90c335a3b21eafa6d62eef353fc93f767044f1643d6b75335173dff63a8324a9a740a516a5d640763e46082bf28fe802d055b36d5ab372c936da026f353a7 SHA512 bd33f8487f420ce308c157580ba56604fb37e8f53bca6c37ce28118cfeeec1419ac0d01da6e78afe540634b64fc509c228f1d6ebb764d5672a7ff8c519d8aeb6
+DIST openocd-0.11.0-rc2.tar.gz 7232180 BLAKE2B 7631b9b85d28472a4f445c304091173350bc5084f0a29b22d1ffd9b92f23c5041218c5aa9c19957c6e25f5a516f6e8d579a9d6c4f9c2bad7e3350dee58faba41 SHA512 b49f631272852dec5a45023a702f2a8446aa386c38eb4ba8ae4b4bf6c84fdd69082f8ae09b5beaa176538644b304b61dfbb8f3da31b7053e02228a5c2dbf1714
+EBUILD openocd-0.10.0-r1.ebuild 2235 BLAKE2B 5c3bb924ad4f04172d3a6020c1c0463e9b3a0481b536c620a9217894ee35aede3825b6b9740a5ab8540d5b2c3f36068278d2620c8ae4d8c1351b9b877160f3c7 SHA512 9722e83dd2416b57a4d245d9eb88234efc175ce24d1b72bf2a7775f4973cf5c855f7981f3ccbdc3bc8529896a796f026320030154f9cfdf3b10fddbb1185912d
+EBUILD openocd-0.11.0_rc2.ebuild 2224 BLAKE2B e42a39589aea254e12964b2bfc8e3db5003b142e3d42f441bfcf47ad6b962457be9f7d0f9f52f8c6ba441077f4994911f711e0fbe0dc7655a98636e9bd0b00ed SHA512 ff24e9f4794df158b729178b5143add285a7dc3877fe50c349ba198432175b14578f9bc23cc3959033074bf7c8985db4225285b1bd4578c537fe8f22eb6b0f0c
 EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898
-MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
+MISC metadata.xml 970 BLAKE2B 0833bb355690206b4f9f65f4ad1c4ee74809af3e60ed8dea9ae995cab3d58e0e53ae8892fb99c9ee0b6e6ce4ae4cc9c44240c448b847d80a47ada8b6dd0b82be SHA512 17a37770d2cbea11d804d66e74aee49033c09a2f42a6d9fe84aa6a64735dd2cd1686f022a971cb6e40e3232c80eae0e37061b62c48582ef2c4062cee6ed7b974
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch
deleted file mode 100644
index b7e3ea13bfb0..000000000000
--- a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/722640
-http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696
-From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001
-From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-Date: Fri, 17 Apr 2020 13:49:28 +0200
-Subject: [PATCH] bitbang: Fix FTBFS with GCC 10
-
-GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd
-struct between bitbang drivers due to a missing extern.
-
-Change-Id: I2b4122f7939cec91a72284006748f99a23548324
-Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
-Reviewed-on: http://openocd.zylin.com/5592
-Tested-by: jenkins
-Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
-Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
----
- src/jtag/drivers/bitbang.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
-index edb779c..bbbc693 100644
---- a/src/jtag/drivers/bitbang.h
-+++ b/src/jtag/drivers/bitbang.h
-@@ -56,7 +56,7 @@ struct bitbang_interface {
- 	void (*swdio_drive)(bool on);
- };
- 
--const struct swd_driver bitbang_swd;
-+extern const struct swd_driver bitbang_swd;
- 
- extern bool swd_mode;
- 
--- 
-1.9.1
-
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 13ad31053b9b..2931185a0a90 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Paul Fertser</name>
 	</maintainer>
 	<use>
+		<flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
 		<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
 		<flag name="dummy">Build the dummy port driver</flag>
 		<flag name="jlink"> Build the SEGGER J-Link driver</flag>
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index 14fbf084e901..6c7a9d5bcfa7 100644
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-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=7
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
 fi
 
@@ -40,10 +40,6 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
 src_prepare() {
 	default
 
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
deleted file mode 100644
index 671c16ab48f7..000000000000
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev
-
-# One ebuild to rule them all
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-else
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="amd64 ~arm x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND="
-	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
-
-src_prepare() {
-	epatch_user
-
-	if [[ ${PV} == "9999" ]] ; then
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-}
-
-src_configure() {
-	# Here are some defaults
-	local myconf=(
-		--enable-buspirate
-		--disable-werror
-		--disable-internal-jimtcl
-		--disable-internal-libjaylink
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-arm-jtag-ew
-		--enable-sysfsgpio
-		--enable-bcm2835gpio
-	)
-
-	# Adapters requiring usb/libusb-1.X support
-	if use usb; then
-		myconf+=(
-			--enable-aice
-			--enable-usb-blaster-2
-			--enable-ftdi
-			--enable-ti-icdi
-			--enable-ulink
-			--enable-osbdm
-			--enable-opendous
-			--enable-usbprog
-			--enable-rlink
-			--enable-stlink
-			--enable-vsllink
-			--enable-armjtagew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	else
-		myconf+=(
-			--disable-aice
-			--disable-usb-blaster-2
-			--disable-ftdi
-			--disable-ti-icdi
-			--disable-ulink
-			--disable-osbdm
-			--disable-opendous
-			--disable-usbprog
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use jlink; then
-		myconf+=(
-			--enable-jlink
-		)
-	else
-		myconf+=(
-			--disable-jlink
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb-blaster
-			--enable-openjtag
-			--enable-presto
-		)
-	else
-		myconf+=(
-			--disable-openjtag
-			--disable-presto
-			--disable-usb-blaster
-		)
-	fi
-
-	econf \
-		$(use_enable dummy) \
-		$(use_enable cmsis-dap) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
-}
-
-pkg_postinst() {
-	elog "To access openocd devices as user you must be in the plugdev group"
-}
diff --git a/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild
new file mode 100644
index 000000000000..7f476f17dfe6
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.11.0_rc2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools udev
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="	https://repo.or.cz/openocd.git"
+else
+	MY_PV="${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.sourceforge.net"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+RESTRICT="strip" # includes non-native binaries
+
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.76:0=
+	capstone? ( dev-libs/capstone )
+	cmsis-dap? ( dev-libs/hidapi )
+	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
+	usb? (
+		virtual/libusb:0
+		virtual/libusb:1
+	)
+	ftdi? ( dev-embedded/libftdi:= )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-amtjtagaccel
+		--enable-arm-jtag-ew
+		--enable-at91rm9200
+		--enable-bcm2835gpio
+		--enable-buspirate
+		--enable-ep93xx
+		--enable-gw16012
+		--enable-sysfsgpio
+		--disable-internal-jimtcl
+		--disable-internal-libjaylink
+		--disable-werror
+		$(use_with capstone)
+		$(use_enable cmsis-dap)
+		$(use_enable dummy)
+		$(use_enable ftdi openjtag)
+		$(use_enable ftdi presto)
+		$(use_enable ftdi usb-blaster)
+		$(use_enable jlink)
+		$(use_enable parport)
+		$(use_enable parport parport_ppdev)
+		$(use_enable usb aice)
+		$(use_enable usb armjtagew)
+		$(use_enable usb ftdi)
+		$(use_enable usb osbdm)
+		$(use_enable usb opendous)
+		$(use_enable usb rlink)
+		$(use_enable usb stlink)
+		$(use_enable usb ti-icdi)
+		$(use_enable usb usbprog)
+		$(use_enable usb usb-blaster-2)
+		$(use_enable usb ulink)
+		$(use_enable usb vsllink)
+		$(use_enable verbose-io verbose-jtag-io)
+		$(use_enable verbose-io verbose-usb-io)
+		$(use_enable verbose-io verbose_usb_comms)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dostrip /usr/bin
+	udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules
+}
+
+pkg_postinst() {
+	elog "To access openocd devices as user you must be in the plugdev group"
+}
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 640d665fb16d..89c1d2216a61 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -2,4 +2,4 @@ AUX init.d_rpi-eeprom-update-1 394 BLAKE2B 4a42ba2bca9f1cc646f2b39f33f1752a34b62
 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-11.0_p1.ebuild 2989 BLAKE2B 7c203d49ef924e609b7c13525c47e524651b5511beb91785ccf72506748eefeeccfa8ba33a63c480490dfe108b014afb9ecdb1770916f892c9f0fe8a3479d8b5 SHA512 8e059764c4adea3db587694c989428dc8d378b4d5b45392ccf098de65918a6c24ff854004eca156c071679eedb50f4a4cbf63fe263d5b2e6ab0ec80cc418d8a0
-MISC metadata.xml 566 BLAKE2B cb5076ad252b4c305c8116d6a763c954ad939b2326519db5102bf67f50b8eb7f6713df5173190771fd30caf29762911c5a0da3f1b4cebd74f845b474df9073f8 SHA512 9a82fc89ffff553b2de5037e26151a4da5a54fc13203781d7e6e7048f6e3014a2530c55f6f5d1a73c30e8efdacb22c8d1a76185c1e9ca6dc384f98f86c7dcccc
+MISC metadata.xml 565 BLAKE2B b4395ad5647c8b95ede29673c8eebd9f2b05b0512a0a8375c9f05c98b03f97d37330a2f81ceb2e84c5629989d48de4a29613ebfff1a4715efd642c872373f62d SHA512 6769925d46cfea80d661c5b4a10cb8234c37311b3a3ac1b2aa1f63bcf8de23d384f42b2cf8508144ac33e6adfa0603f62434d06564fbb2862ce3db370400d45b
diff --git a/dev-embedded/rpi-eeprom/metadata.xml b/dev-embedded/rpi-eeprom/metadata.xml
index a9b2bc66ba5f..1dc09f3aafd9 100644
--- a/dev-embedded/rpi-eeprom/metadata.xml
+++ b/dev-embedded/rpi-eeprom/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github"> raspberrypi/rpi-eeprom</remote-id>
+		<remote-id type="github">raspberrypi/rpi-eeprom</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 916bfe6d0e28..7f86e01291fc 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,6 +1,6 @@
 DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
 DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
 EBUILD urjtag-0.10-r1.ebuild 1068 BLAKE2B 5a9566d2fcf63d1cdd3bbabffaf166a3fc76ce1e4d7a0aad82593502c86687e5cac2a7a0ad73f34e37d9124dcd2fc421e5de8ccff404f614ceeaec6b66df31ea SHA512 0cd41fcccf30f89fb310e5a95e86d9fa69538baf5a53658b09fe023b8631c0f203d5f60e9d06cf663416139978bfbd7a907258b1b728ddda01175fd02418fd37
-EBUILD urjtag-2019.12.ebuild 1151 BLAKE2B 1cb35fe5486d0089c73158898afef7945a80c12f3d519bcc0742581fad507b2fe011002841135f361b37b3144e9ad66a24336e7da830908ef106f42ccd9142c2 SHA512 8a09a615645325cc32a1ecf42376133cbbc02d0a9534740b744c25e2c257764299ce060503bd73a566df4d1ebf197fbbb6470b3c56be32017ccdb42e4e5ec043
+EBUILD urjtag-2019.12.ebuild 1149 BLAKE2B 810c4e7825fdd16d5113b3a3b9a567455c17bde66ea8b8d0703fb263b9d5e04001abfa375565866a66f435b94249181ccb22f69375e470d1afe1804d05c5d8da SHA512 177aee381bf3d326f2a46155da06cf99092d78118d0df3a4ab89d088b438780d3179194550267acfaf36aab11d3e4394658f8a7c76883fb984a759587e200a7f
 EBUILD urjtag-9999.ebuild 1081 BLAKE2B af03442b0e29f3e60b73ab4edbea83f258b916b9abc57e555428d2f9a8f307a151703442bacb2c947e0069d15cc34f1ae0818ddcb1dd9609660cb4ca8dc414c5 SHA512 e8171862ad821fd5157b1653267ebfb41ac2a88e733f1e251cd51700356510526d9d8f33a5200473bcf0114cb8fe805e87820b55ca810eb08882818bf82b2217
 MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce
diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild
index 2156d991a75d..d637c76f1b5e 100644
--- a/dev-embedded/urjtag/urjtag-2019.12.ebuild
+++ b/dev-embedded/urjtag/urjtag-2019.12.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~ppc sparc x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"