8 files changed, 1 insertions, 518 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3af4d8320d2c..fdc552efcc21 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index a2ed914b14c1..069c14c551aa 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,15 +1,6 @@
-AUX openocd-0.8.0-jimtcl-0.75.patch 2267 BLAKE2B 0772472bfaf0dc2c72efed4510e14685f72b1249bbe657ead317a8d88cdbc823c3a343d05d012f28eb2dfb5b1dc039c9b085ffa02696e69a2f4760455e7ad477 SHA512 a8f5a680077711826a0bfa83502b216ae254f1a6ad54f94dec1cac89b3f6fdc43cfabbf589074cb469597c606d35f37a03f1f140dc1b9c5ee6e12e805667e2e7
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
-DIST openocd-0.5.0.tar.bz2 2228655 BLAKE2B e8e12f72471d446be7426c14568d2efea2b002758846413e0319c79dce7cecd29279d022a27a190ce5c70dc65ec724aec854b5eee88e0ab57895139f49f80778 SHA512 8e2e168a35bf3f753683115fd5f4d4c79e54cd0fe5d072921475d43880619e5b4ab60f28d97a4a595d4b77938b9218e689013f66a925ee8007e6499f5b42448c
-DIST openocd-0.6.1.tar.bz2 3431071 BLAKE2B 4dd32fc89b53d62c29c92b7f1b0d1f4c4cd08a717748bc473b2dd750e68c9b9377a879cf7c58bd6ad4b05c712a8e698db4579e384e79ea44a278536b293c9ba8 SHA512 59f35750f761d3f2ce7a32ffdc5028d053fda2bd9424cc4497f528ec628ac1f022662d9f226dd2b04a8cd682a5cd056a09de14d50e1090426a816bb602f98250
-DIST openocd-0.7.0.tar.bz2 3493924 BLAKE2B 23bd079c3610f75ec8c16dac12621b390f2b1d891573dbff59954cba35eea61eff3386701c918121ee38d614738f197963b1406346f14d0528f5a65f633d209d SHA512 bfba267e5cda558b347f6fab1a286353b97d81093c0457ac044667baa369f5cd47a07b3ce6a1ceb66e7992c2e4224765458dd859d0a6fa748ad8e6f80ea541ad
-DIST openocd-0.8.0.tar.gz 4821738 BLAKE2B dff8c951b28c1a61be33f9e540ebe6aa662429b5d522fc169a8bd80b04c63442c8d50aba41c2413436e630afdb65e2da83191128076ba58f7bc96edcb8c2d2aa SHA512 9130b683394c4d99cd4c5365ba2bbe07ca8bdf0d02bdd4504b0f5f376209e787955d725c11d811f8937b7b0fc207c8d02e0b7484607edd2f68b2d00d48250f2c
 DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
 EBUILD openocd-0.10.0.ebuild 2853 BLAKE2B bf48cba6416441f406287d9e477cdb6f10bd4f94f953a589a2dfbbebb1fb9e18180e658bc1dbe308aab62fac2aa9b4fdbfdba76e188d282e3a4ee70d7fa1f0c0 SHA512 6029e1706dd4d5e9ca742d036f8ad56f7b3b0c84f157eaa8f2ae5032ebb61f26bd294cb5ca131cc0d985ab5aff254259dc66a98ce24ff0c83fa51ab284e9887f
-EBUILD openocd-0.5.0.ebuild 2117 BLAKE2B bd9e719cf270d62823aab611f2e1579be4b1b4075dc3adc603064aac83eeaab70af172a74237747a564244283b2474347f9b56f0eb97814ce6bec4e3410fec76 SHA512 cec2bec7b592837f545e29a8acdb67b91ef7daa1c6548c37591f23eb8e4aa900212829482e2388816ba6d34f05845285998cd3a36429c26857c285cae6b1612d
-EBUILD openocd-0.6.1.ebuild 2606 BLAKE2B 8a711cdfd97208e7f4d4175c23f241c54ca2980d06a1350fb1807b996ce199123aad92babee29828f0cd7ce33635071df9d775d00b610f0d2865beb2f471e2b2 SHA512 084f4ace8452b040cb9f3a49aa3f54250b1f387ada3128720b9f5973c6ade4698f2e7ad25adbcacb76dab06bdfe52bb81902ab07b70101fbd3314fe021c902cc
-EBUILD openocd-0.7.0-r1.ebuild 2997 BLAKE2B b193be3975e46fdcf0c4f888650ce3399e8c569377283ac71cad93815626700aeb4ae7390e185327e9d832c880f32ca0a784839af5b1bde217ad0609c0874cf9 SHA512 e3765412c6dbacbb382938e1af9d0525bdeb7c08b5185e9333fd77f99ec190e94e14bd0b8e54d204eb7bc8e63d6813c5654fa798c66ff990a03bbc341c72d071
-EBUILD openocd-0.8.0.ebuild 2852 BLAKE2B eeba5c3aea9d0cc629385ccb38d344b8ee4a9b791a49c972a279a32b728ee92b98c101d75f450e790989fd9bfd3bd1134eb76d48a37c393e089d6d7a65deb55e SHA512 0d21993182cf2c1bc41e0e1323970a2f64de22bae2718245a4572b35524d957bc55284e35862b7a655cd93070cc5e0076461b2288f96dbefa33131690a7f41b2
 EBUILD openocd-0.9.0.ebuild 2712 BLAKE2B b3e38d7e98d3ee97e532a1ce04698469eb5dc3d1cfd9b83c040f1a2b4d8d327ed5b8777f0e8ffbef184bf5a91397c05242e170c76c1434fcd413af15ace7af0a SHA512 f3d3cf97d72977fd9eeebe13c8b99bceaafdf757a5ba94d316e49b9e9d216c92d057b707d6f46c750bc6204fb87b71bcf0c6d07979a3b8763f16c12b0f23bb06
 EBUILD openocd-9999.ebuild 2853 BLAKE2B bf48cba6416441f406287d9e477cdb6f10bd4f94f953a589a2dfbbebb1fb9e18180e658bc1dbe308aab62fac2aa9b4fdbfdba76e188d282e3a4ee70d7fa1f0c0 SHA512 6029e1706dd4d5e9ca742d036f8ad56f7b3b0c84f157eaa8f2ae5032ebb61f26bd294cb5ca131cc0d985ab5aff254259dc66a98ce24ff0c83fa51ab284e9887f
-MISC metadata.xml 1481 BLAKE2B c8500a2b56bc0673541ddaa55a47fb1cf0dfdf48b5504897800ceaff40878c775e44882df5b99cb8b605333d7e03c0a007b2cd4061da276a5626b878fd738d1b SHA512 f5dddd2349dbfc950a276f6226f082cd2c5b93bfb478803b88f90cd7c2bd925158ef606062c99aceb9c8f71a98b8bc9dc446795d06e07fbf37daca952bcb388f
+MISC metadata.xml 944 BLAKE2B 7521583dbbd0769dd139c15e6a954ad4ff0be3cff1d5e2db71a44b5ab791d044c3356f1f92f25b79096ced93c50cb1c617099b6d4dac746cc08ea8968c166681 SHA512 d5a406a685a223dfd1ce83cce53702b60b2c1efdca3e1c54d9752b4e1226b510a7fe0c36fa55f16aef98afb814ea3149f3e7e2ec936614d2946951fb8ac2df23
diff --git a/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch b/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch
deleted file mode 100644
index 1791cabc66fb..000000000000
--- a/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Apply upstream patch for jimtcl-0.75 compatibility
-
-X-Gentoo-Bug: 509902
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=509902
-Link: http://repo.or.cz/w/openocd.git/commitdiff/92ea548aafee840e1507306a3ffb38625f427ec5
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-From 92ea548aafee840e1507306a3ffb38625f427ec5 Mon Sep 17 00:00:00 2001
-From: Paul Fertser <fercerpav@gmail.com>
-Date: Mon, 28 Apr 2014 14:34:47 +0400
-Subject: [PATCH] Update to the current Jim Tcl
-
-This is a post-release version but hopefully some fixes that went in
-are worth it; also the changes here make OpenOCD compatible with stock
-0.75 version if a distro maintainer decides to use it.
-
-Change-Id: I7ad1814c7c4868198475cdca4750c3d0ee4f5f8b
-Signed-off-by: Paul Fertser <fercerpav@gmail.com>
-Reviewed-on: http://openocd.zylin.com/2121
-Tested-by: jenkins
-Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
----
- jimtcl               |    2 +-
- src/helper/command.c |    2 +-
- src/helper/command.h |    4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/helper/command.c b/src/helper/command.c
-index 21362a6..137ac7e 100644
---- a/src/helper/command.c
-+++ b/src/helper/command.c
-@@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
- 
- 	LOG_DEBUG("registering '%s'...", ocd_name);
- 
--	Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
-+	Jim_CmdProc *func = c->handler ? &script_command : &command_unknown;
- 	int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
- 	free(ocd_name);
- 	if (JIM_OK != retval)
-diff --git a/src/helper/command.h b/src/helper/command.h
-index 0f0edbb..0eda5b5 100644
---- a/src/helper/command.h
-+++ b/src/helper/command.h
-@@ -168,7 +168,7 @@ struct command {
- 	struct command *parent;
- 	struct command *children;
- 	command_handler_t handler;
--	Jim_CmdProc jim_handler;
-+	Jim_CmdProc *jim_handler;
- 	void *jim_handler_data;
- 	enum command_mode mode;
- 	struct command *next;
-@@ -204,7 +204,7 @@ char *command_name(struct command *c, char delim);
- struct command_registration {
- 	const char *name;
- 	command_handler_t handler;
--	Jim_CmdProc jim_handler;
-+	Jim_CmdProc *jim_handler;
- 	void *jim_handler_data;
- 	enum command_mode mode;
- 	const char *help;
--- 
-1.7.6.6.GIT
-
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 78e604f70917..8bf4d21f4182 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -11,18 +11,11 @@
 		<description>Upstream contact. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name="blaster">Enable support for Altera USE-Blaster</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>
-		<flag name="minidriver">Build the dummy minidriver</flag>
-		<flag name="ftd2xx">Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></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>
-		<flag name="presto">Enable support for AXIS PRESTO devices</flag>
-		<flag name="segger">Enable support for the Segger J-Link JTAG</flag>
-		<flag name="stlink">Enable building support for the ST-Link JTAG Programmer</flag>
-		<flag name="versaloon">Enable building support for the Versallon-lInk JTAG</flag>
 		<flag name="verbose-io">Verbose IO and comm JTAG and USB messages</flag>
 	</use>
 	<upstream>
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
deleted file mode 100644
index aae09088d933..000000000000
--- a/dev-embedded/openocd/openocd-0.5.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND="<dev-lang/jimtcl-0.73
-	usb? ( virtual/libusb:0 )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	ftdi? ( dev-embedded/libftdi:0 )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-}
-
-src_configure() {
-	# Here are some defaults
-	myconf="--enable-buspirate --enable-ioutil --disable-werror
-	--disable-internal-jimtcl --enable-amtjtagaccel
-	--enable-ep93xx --enable-at91rm9200 --enable-gw16012
-	--enable-oocd_trace"
-
-	if use usb; then
-		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
-			--enable-vsllink --enable-arm-jtag-ew"
-	fi
-
-	# add explicitely the path to libftd2xx
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
-
-	if use blaster; then
-		use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi"
-		use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx"
-	fi
-	econf \
-		$(use_enable dummy) \
-		$(use_enable ftdi ft2232_libftdi) \
-		$(use_enable ftd2xx ft2232_ftd2xx) \
-		$(use_enable minidriver minidriver-dummy) \
-		$(use_enable parport) \
-		$(use_enable presto presto_ftd2xx) \
-		$(use_enable segger jlink) \
-		$(use_enable versaloon vsllink) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-	prepstrip "${D}"/usr/bin
-}
diff --git a/dev-embedded/openocd/openocd-0.6.1.ebuild b/dev-embedded/openocd/openocd-0.6.1.ebuild
deleted file mode 100644
index d065bac6e8d9..000000000000
--- a/dev-embedded/openocd/openocd-0.6.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib flag-o-matic toolchain-funcs
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger stlink usb versaloon"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND=">=dev-lang/jimtcl-0.73
-	usb? ( virtual/libusb:0 )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
-}
-
-src_configure() {
-	# Here are some defaults
-	local myconf=(
-		--enable-buspirate
-		--enable-ioutil
-		--disable-werror
-		--disable-internal-jimtcl
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-oocd_trace
-	)
-
-	if use usb; then
-		myconf+=(
-			--enable-usbprog
-			--enable-jlink
-			--enable-rlink
-			--enable-vsllink
-			--enable-arm-jtag-ew
-		)
-	fi
-
-	# add explicitely the path to libftd2xx
-	use ftd2xx && append-ldflags -L/opt/$(get_libdir)
-
-	if use blaster; then
-		use ftdi && myconf+=( --enable-usb_blaster_libftdi )
-		use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx )
-	fi
-	econf \
-		$(use_enable dummy) \
-		$(use_enable ftdi ft2232_libftdi) \
-		$(use_enable ftd2xx ft2232_ftd2xx) \
-		$(use_enable minidriver minidriver-dummy) \
-		$(use_enable parport) \
-		$(use_enable presto presto_ftd2xx) \
-		$(use_enable stlink) \
-		$(use_enable segger jlink) \
-		$(use_enable versaloon vsllink) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
-}
diff --git a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild b/dev-embedded/openocd/openocd-0.7.0-r1.ebuild
deleted file mode 100644
index 6ea9209b57f8..000000000000
--- a/dev-embedded/openocd/openocd-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs
-
-# 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
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger stlink usb versaloon verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND=">=dev-lang/jimtcl-0.73
-	usb? ( virtual/libusb:0 )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	ftdi? ( dev-embedded/libftdi:= )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ${PV} == "9999" ]] ; then
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-
-	# Disable craptastic build settings.
-	sed -i \
-		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
-		configure || die
-
-	if use ftdi ; then
-		local pc="libftdi$(has_version dev-embedded/libftdi:1 && echo 1)"
-		# Use libftdi-1 paths #460916
-		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
-		sed -i \
-			-e "s:-lftdi -lusb:${libs}:" \
-			configure src/Makefile.in || die
-		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
-	fi
-}
-
-src_configure() {
-	# Here are some defaults
-	local myconf=(
-		--enable-buspirate
-		--enable-ioutil
-		--disable-werror
-		--disable-internal-jimtcl
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-oocd_trace
-		--enable-ulink
-		--enable-arm-jtag-ew
-		--enable-ti-icdi
-		--enable-osbdm
-		--enable-opendous
-	)
-
-	if use usb; then
-		myconf+=(
-			--enable-usbprog
-			--enable-jlink
-			--enable-rlink
-			--enable-vsllink
-			--enable-arm-jtag-ew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	fi
-
-	# add explicitely the path to libftd2xx
-	use ftd2xx && append-ldflags -L/opt/$(get_libdir)
-
-	if use blaster; then
-		use ftdi && myconf+=( --enable-usb_blaster_libftdi )
-		use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx )
-	fi
-	econf \
-		$(use_enable dummy) \
-		$(use_enable ftdi ft2232_libftdi) \
-		$(use_enable ftdi) \
-		$(use_enable ftd2xx ft2232_ftd2xx) \
-		$(use_enable minidriver minidriver-dummy) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_ftd2xx) \
-		$(use_enable segger jlink) \
-		$(use_enable stlink) \
-		$(use_enable versaloon vsllink) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
-}
diff --git a/dev-embedded/openocd/openocd-0.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild
deleted file mode 100644
index 637aac7abd10..000000000000
--- a/dev-embedded/openocd/openocd-0.8.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
-
-# 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 parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND=">=dev-lang/jimtcl-0.75
-	cmsis-dap? ( dev-libs/hidapi )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	epatch_user
-
-	# jimtcl-0.75 compatibility. Remove it on the
-	# next version bump
-	epatch "${FILESDIR}"/${P}-jimtcl-0.75.patch
-
-	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
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-oocd_trace
-		--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-jlink
-			--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-jlink
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-openjtag_ftdi
-			--enable-presto_libftdi
-		)
-	else
-		myconf+=(
-			--disable-openjtag_ftdi
-			--disable-presto_libftdi
-			--disable-usb_blaster_libftdi
-		)
-	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
-	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
-	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
-}
-
-pkg_postinst() {
-	elog "To access openocd devices as user you must be in the plugdev group"
-}