gentoo auto-resync : 22:04:2023 - 18:05:23

3 files changed, 2 insertions, 109 deletions

diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 7257dbc68c14..343b1c924213 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,7 +1,5 @@
 AUX openocd-0.12.0-capstone-includedir.patch 1124 BLAKE2B 08cce4c69a3a36dc836476158474fa75599e45e22b6275d39be48f4fbc8f90985611b64e94945042ee2a35929ff18a66fcf9e783fe4da86b8ae4bfaa7d9ee4fe SHA512 5a3b41d83f7bc3173a6b5431fd9619f3b3f8391641a3fb465d7e0e66d6f6e89637bf2d09288c9e4dd95ec8459f199e7d4d80c036f5bccfae1cb8db99f8b1a81a
-DIST openocd-0.11.0.tar.gz 7233889 BLAKE2B 272088c261a066d0a99cbbf2ebbc324fc34bc168290bbf0beb4012655b6b54848cc48324f36c65860518160c3fe43abb8c9a5f5b03f0cbaf7cdfb928f8fb8eea SHA512 667c5bea4144653f7c1309457b3aed1e14713f222dab8f2bb67a8e6c69e124a0efc24cd8f76e2b929d4ced045de14517f3587870682d0394ec95ba52e343e19b
 DIST openocd-0.12.0.tar.gz 8445833 BLAKE2B 82616ed1bf51588d2a19c56fab6a6944ac5fa22e07bc5f83962ff8fecd88faeceb33e2104acb3cd08710f7f96d578ccd4ef6282372ae9d206ab469b3ac70fff8 SHA512 2b95d30eb10316b5cf1b329e0214b8d9f3fbf1fda5fa5568acc8cb16cdc25aa58c211f17f9883d8e4b93bcda3f296e511c279b44d24db9303c26e6c6640540b0
-EBUILD openocd-0.11.0.ebuild 2291 BLAKE2B a7cfad0e610c216138a8acd75e5ce5cabfe1552622119f86ac4aa71d42107bc8c2fcee580c2c641318e180bec2645a2f3b77ac7b4d3e9f62de3c147b7cb609b1 SHA512 e26eb55c10595e42cfd5b886d40ad0449dbabfcf7538dfeb61dde7a3a4ebdd1dae7a7c8ae50b46a14d5ed0032fa6f7b4397cf8d24815f4a7ad3374a46e548eb3
-EBUILD openocd-0.12.0.ebuild 2400 BLAKE2B 8180c02ef2365d75ad06d3fd50613b63f35b5167a0c19e864213b377eadee2b2ee35f2e9beacb1a09e72101f125992e10a104e935fd0b7737caeb858990a25f8 SHA512 ad782de3b86c54fc48e8a204bef6cfd570148534c97084f5463e7d43c733a119ad11e38e711c6a522bf1906b8e312a596cc7baa7b871cceed8d25d00c03d5f6e
+EBUILD openocd-0.12.0.ebuild 2398 BLAKE2B c98585e8e39ca5a17d67fb4d9e5a6cc5d9dfa5f01215445c58cc342302472e88ff3d94757395d4e90bbc113dac615f91955794b10f4e64a36e8d27ee3e136faf SHA512 6cc89983408f9022d690e665c204a4c6d4d09045e957b91c63cf390db406cd43763e9888560c4031159e7ed196167da3b578ca772c86377ed5906c914ff4cff4
 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.11.0.ebuild b/dev-embedded/openocd/openocd-0.11.0.ebuild
deleted file mode 100644
index a9c78e5c1ea0..000000000000
--- a/dev-embedded/openocd/openocd-0.11.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 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:=
-	<dev-lang/jimtcl-0.80:=
-	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() {
-	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-0.12.0.ebuild b/dev-embedded/openocd/openocd-0.12.0.ebuild
index aa36f5378531..51b608736e5a 100644
--- a/dev-embedded/openocd/openocd-0.12.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.12.0.ebuild
@@ -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