gentoo resync : 12.05.2022

5 files changed, 7 insertions, 120 deletions

diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index eb95cd304f3c..05f2c9823779 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,4 @@
-AUX openocd-0.10.0-fno-common.patch 259 BLAKE2B f209b830242cc2f93faa1000c50805889b2abc7d99634302d48c011adad885137f86774740e4316300440c5c503729a6f6a89e941bf11e98b4f27e17d265bc47 SHA512 bc60476c74599bc6eae2d50dac7ee723732fb693923b487caae83475779bde31c2e71ea8b837fb0ca78b814ee8a2634ac2e887c91c3839425c5d980d61e49c7d
-DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
 DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b
-EBUILD openocd-0.10.0-r1.ebuild 2235 BLAKE2B 5c3bb924ad4f04172d3a6020c1c0463e9b3a0481b536c620a9217894ee35aede3825b6b9740a5ab8540d5b2c3f36068278d2620c8ae4d8c1351b9b877160f3c7 SHA512 9722e83dd2416b57a4d245d9eb88234efc175ce24d1b72bf2a7775f4973cf5c855f7981f3ccbdc3bc8529896a796f026320030154f9cfdf3b10fddbb1185912d
-EBUILD openocd-0.11.0.ebuild 2222 BLAKE2B 2ecc6e3f841a2a69ea7153ad69789ef465da3b9a00fb3cd2379627b1405d1c9eb25d668ed76e4611aa06b12573719ddeda506efaa1ea0708feec0374ecc6b9bd SHA512 5e49528012266d6e1ba2b231e023e3e20d50c8bff389796f471b709b37374619df528dfb8835f75d4e88784e907989fd47eb63784cd3b86e3d390340ea2eda46
-EBUILD openocd-9999.ebuild 2216 BLAKE2B c9963a550d494a58de3577a2d75635ba25234b243cc5ccfb99bbd1886a463c110de03a3eba880a8f9c9c1a99bbeea15b255b2a0a4d0f154b88b6d336bbb46c7b SHA512 ca57152b7c19904a31abd40ce7c3ac122be687d9eb5ce0d262940cf595763260a2485f43db4e2f31bcd9412d26cfcd4f633688604d49f7dc843e62f9eda1b898
+EBUILD openocd-0.11.0.ebuild 2246 BLAKE2B 12ab806fe2fe3c4ac1e659c39fc3fb63e3ce97d5cf99f7ddfc7f30ae5c4f91c2d3849989bbf8545bb5bbbfc32557f35247b37ee2b51c6f41f6831512844bdc97 SHA512 fb2b83dafe1a4b3383291e5542e76dccfadd30c8bc000f4063e48982467a8cfd1f4be79211e33b9e70867c32ae09f43ba71afa88d80c6424ade028834b8380bd
+EBUILD openocd-9999.ebuild 2215 BLAKE2B c836664ec2d196515f12f8bed1c2d1d0a14f43f44ac0e314b2023ca3d50efa10826c182cf73e2a123ce208cbf7a6f53fead6221c328b7cacfdc0faaddb71acf1 SHA512 43e78873a40ba0275e2faaad0b14c054d50cc929320560cb9eaa944a77cda9a589aad5de2110b32b2b19abea6b4cc36a009133ddedeef90fb3c6a7769e997fb9
 MISC metadata.xml 1086 BLAKE2B a44beaaa3151f1c84b11610cdae8e9319b8b6383f84fb4f4db3411b04455f9dd39af81a2804f2ca0113d395e618a2038530bfde97cf8e7546e41b62452c8c120 SHA512 747fca05ad33fc4d459726270f2418eca31e94c0841f57d69a6dc66de6b9dc8a80dcea0390f1e74a9f6262857080e2eebfebc08e79f75d5fd8fd7fc8f1f33c8d
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
deleted file mode 100644
index c924b2f8fec0..000000000000
--- a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/jtag/drivers/bitbang.h
-+++ b/src/jtag/drivers/bitbang.h
-@@ -35,7 +35,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;
- 
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
deleted file mode 100644
index 6c7a9d5bcfa7..000000000000
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools 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="+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=
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]] ; then
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-}
-
-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_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/openocd/openocd-0.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild
index 263017ff35fa..1d898dd89d7c 100644
--- a/dev-embedded/openocd/openocd-0.11.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,8 @@ RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76:0=
+	>=dev-lang/jimtcl-0.76:=
+	<dev-lang/jimtcl-0.80:=
 	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index f7d5c4b834cb..4212ec037aeb 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76:0=
+	>=dev-lang/jimtcl-0.80:=
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
 	usb? (