gentoo auto-resync : 17:02:2024 - 05:37:23

5 files changed, 119 insertions, 5 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index cc1d702371b4..c7e38474a4ec 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 41d1200e5f73..51ebe3e70368 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,5 +1,6 @@
 AUX openocd-0.12.0-capstone-includedir.patch 1124 BLAKE2B 08cce4c69a3a36dc836476158474fa75599e45e22b6275d39be48f4fbc8f90985611b64e94945042ee2a35929ff18a66fcf9e783fe4da86b8ae4bfaa7d9ee4fe SHA512 5a3b41d83f7bc3173a6b5431fd9619f3b3f8391641a3fb465d7e0e66d6f6e89637bf2d09288c9e4dd95ec8459f199e7d4d80c036f5bccfae1cb8db99f8b1a81a
 DIST openocd-0.12.0.tar.gz 8445833 BLAKE2B 82616ed1bf51588d2a19c56fab6a6944ac5fa22e07bc5f83962ff8fecd88faeceb33e2104acb3cd08710f7f96d578ccd4ef6282372ae9d206ab469b3ac70fff8 SHA512 2b95d30eb10316b5cf1b329e0214b8d9f3fbf1fda5fa5568acc8cb16cdc25aa58c211f17f9883d8e4b93bcda3f296e511c279b44d24db9303c26e6c6640540b0
 EBUILD openocd-0.12.0-r1.ebuild 2421 BLAKE2B 80e13efeb38cab616cc0b419fffe9f7f92d44912c4380f278cb21b8baa2e2c0a35dfecd9f602d20c41f95810fb05eb1d0db362f99f427e51af9addc608d63efe SHA512 5998dffedc221b08549195183e293971add1d9fb3bf1cbc009ff298a5b3e9d2e0e4ec94c259c3c6438789454faae2caee12034cea8152bc788daba5080d5554b
-EBUILD openocd-9999.ebuild 2356 BLAKE2B 01f1bd16a263d66876c9c5a03753121389ec08146e16c04e81d3dbaa9b7c386f99920740920fc0eec26e58cfd7d8107d277637f10c17c852b24b27f926daf2b8 SHA512 c56b78864dbc9ebfc589075afc922054c823b7b9074633d3c3122b4025adccc5673c1d36ca85cbcd4af6f744b8d5bc66c0b3e7068d201d4ea77ff13c0cbab403
-MISC metadata.xml 1159 BLAKE2B 4e5c175df252b0c3c8b7ed37a03e69773c34c84d43029683d76c400c2ca4087cd57dfc878ba9c08bc1afa278039721849f8df4b327701671211b654e473d5b32 SHA512 fc8a03c2af23ebc0aca7e52cd9f143b15cf116868c0e4a7bcebda90ea555d2c6eb8899ac22014c4733eb2a75579ae6debc62fce96576cefe60f6d5141abbfccb
+EBUILD openocd-0.12.0-r2.ebuild 2473 BLAKE2B 2128ef4213dfa68b87a0cffe3b6eda9b5ebcc1b541fabc207f407e540a29bde803fa30b3ce030af7966aead2cc13e2540903db365ffeeedeff942320f16e1074 SHA512 f8ec446686c8ff5d7b04a82968a624a6de1793a6aac59c3dba31bc9f01b061414dd9311de70069e6ed75eea2f13e165d7e17a74057c9d9a461e43dea4752e761
+EBUILD openocd-9999.ebuild 2406 BLAKE2B de144359221d70c0ce24d45fbf531d3c38e30cf0b999141d80907691be295427ab6d2c8ca50ae8727d7f0d4b919e7a71188193f018ca7ba1179938a9180fa980 SHA512 42ab40ded80e8695717233791e373514fc4197d26adb28008617d580487e14fdfc9f65487cf2ea104e331422c6ff38d84b17788ce2a01351cafe5d7ae1e4c9f9
+MISC metadata.xml 1234 BLAKE2B ef3c48f244f3fa56056fca383e95bf30c3aeff52ef5754d2b5a0745e199ea9a32fb8e80434aba65718704d9621a3fa1c0b51c81f3606890ef0cfa4fc3bcc3c1d SHA512 796f0b5ab9edbb1ffa4f6ef12c43ff46bd3d620ec25d720ae3b3569fb1665cf0a55a304af8dbaabbf4911b7808e12bc5dbaa75f2add759887820f9efc78ea7d9
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index b9dbe67059b7..358a9c0a93c5 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -17,6 +17,7 @@
 		<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="gpiod">Enable Linux GPIO bitbang support via libgpiod</flag>
 		<flag name="jlink"> Build the SEGGER J-Link driver</flag>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 		<flag name="parport">Enable support for parport JTAG devices</flag>
diff --git a/dev-embedded/openocd/openocd-0.12.0-r2.ebuild b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild
new file mode 100644
index 000000000000..698978b49848
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 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="https://openocd.sourceforge.io"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io"
+RESTRICT="strip" # includes non-native binaries
+
+RDEPEND="
+	acct-group/plugdev
+	>=dev-lang/jimtcl-0.81:=
+	gpiod? ( dev-libs/libgpiod:0/2 )
+	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"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch"
+)
+
+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 gpiod linuxgpiod)
+		$(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 669feebd09f8..bf5127f94e2c 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
 	>=dev-lang/jimtcl-0.81:=
-	dev-libs/libgpiod:0/2
+	gpiod? ( dev-libs/libgpiod:0/2 )
 	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
@@ -66,6 +66,7 @@ src_configure() {
 		$(use_enable ftdi openjtag)
 		$(use_enable ftdi presto)
 		$(use_enable ftdi usb-blaster)
+		$(use_enable gpiod linuxgpiod)
 		$(use_enable jlink)
 		$(use_enable parport)
 		$(use_enable parport parport_ppdev)