gentoo auto-resync : 19:12:2022 - 07:47:44

3 files changed, 122 insertions, 16 deletions

diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index a02ffe279222..b61522d0345c 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,4 +1,6 @@
 DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b
+DIST openocd-0.12.0-rc2.tar.gz 8437679 BLAKE2B 3d1ec6fc758ace9d975956ecb2a4152a067e8be9a2e03a4c69c1020b4dbe752d52bb7be626ec78028953ba5d918b4ca9bf0a38ae0d83bf86d06ac12cb29ac5b3 SHA512 1b20f2cc8e511d02beb60b191b0b66d0ef53ab1dfb966773ddd8e72570eddc295768b3b8a340f70c9cc7bb061a25e649061435b844307b3bdd9177866f4e2f4a
 EBUILD openocd-0.11.0.ebuild 2291 BLAKE2B a7cfad0e610c216138a8acd75e5ce5cabfe1552622119f86ac4aa71d42107bc8c2fcee580c2c641318e180bec2645a2f3b77ac7b4d3e9f62de3c147b7cb609b1 SHA512 e26eb55c10595e42cfd5b886d40ad0449dbabfcf7538dfeb61dde7a3a4ebdd1dae7a7c8ae50b46a14d5ed0032fa6f7b4397cf8d24815f4a7ad3374a46e548eb3
-EBUILD openocd-9999.ebuild 2260 BLAKE2B 44cf3ab9eae2f9f7d51df2f8fa25bc640fab54f272216efbec991772cb93f474f568ae7fef3eae8eb61966649d1c3468529d9afda88fe7f790b413d80a1c7771 SHA512 185bf2cba41d1a32ab83302bc1d6a5fb33ffcab513444dd901d22304fad361441689a25fb6bb96eacf769757cf8681f3759ae55d78ec4151ab25288ad8b0d664
+EBUILD openocd-0.12.0_rc2.ebuild 2333 BLAKE2B 34f481009248bdb97fa1e531ac61b4b37236105b3415f8d8add039808b3c894f1495558abca7a781f6981ecd1a6359a24a8cd926f9751f7d9f448e8b7abee2e1 SHA512 0b296fc9a4ca7cab9505e654473efe05a7154ee66d39ea9180bd63b134f27b1e026ddb82350f722a2e90a8f67bb950642330420a451cd7fde5f3c36467711243
+EBUILD openocd-9999.ebuild 2333 BLAKE2B 34f481009248bdb97fa1e531ac61b4b37236105b3415f8d8add039808b3c894f1495558abca7a781f6981ecd1a6359a24a8cd926f9751f7d9f448e8b7abee2e1 SHA512 0b296fc9a4ca7cab9505e654473efe05a7154ee66d39ea9180bd63b134f27b1e026ddb82350f722a2e90a8f67bb950642330420a451cd7fde5f3c36467711243
 MISC metadata.xml 1086 BLAKE2B a44beaaa3151f1c84b11610cdae8e9319b8b6383f84fb4f4db3411b04455f9dd39af81a2804f2ca0113d395e618a2038530bfde97cf8e7546e41b62452c8c120 SHA512 747fca05ad33fc4d459726270f2418eca31e94c0841f57d69a6dc66de6b9dc8a80dcea0390f1e74a9f6262857080e2eebfebc08e79f75d5fd8fd7fc8f1f33c8d
diff --git a/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild
new file mode 100644
index 000000000000..42d4b587893e
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.12.0_rc2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.81:=
+	capstone? ( dev-libs/capstone )
+	cmsis-dap? ( dev-libs/hidapi )
+	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
+	usb? ( 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-am335xgpio
+		--enable-arm-jtag-ew
+		--enable-at91rm9200
+		--enable-bcm2835gpio
+		--enable-buspirate
+		--enable-ep93xx
+		--enable-gw16012
+		--enable-jtag_dpi
+		--enable-sysfsgpio
+		--enable-vdebug
+		--disable-internal-jimtcl
+		--disable-internal-libjaylink
+		--disable-parport-giveio
+		--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() {
+	udev_reload
+
+	elog "To access openocd devices as user you must be in the plugdev group"
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 569c77f75c26..42d4b587893e 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit udev
+inherit autotools udev
 
 if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="	https://repo.or.cz/openocd.git"
 else
 	MY_PV="${PV/_/-}"
@@ -21,46 +21,45 @@ HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+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.80:=
+	>=dev-lang/jimtcl-0.81:=
+	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
+	usb? ( virtual/libusb:1 )
 	ftdi? ( dev-embedded/libftdi:= )"
 
 DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	if [[ ${PV} == *9999 ]] ; then
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
+	AT_NO_RECURSIVE=yes eautoreconf
 }
 
 src_configure() {
 	local myconf=(
 		--enable-amtjtagaccel
+		--enable-am335xgpio
 		--enable-arm-jtag-ew
 		--enable-at91rm9200
 		--enable-bcm2835gpio
 		--enable-buspirate
 		--enable-ep93xx
 		--enable-gw16012
+		--enable-jtag_dpi
 		--enable-sysfsgpio
+		--enable-vdebug
 		--disable-internal-jimtcl
 		--disable-internal-libjaylink
+		--disable-parport-giveio
 		--disable-werror
+		$(use_with capstone)
 		$(use_enable cmsis-dap)
 		$(use_enable dummy)
 		$(use_enable ftdi openjtag)