dev-embedded/openocd: fix missing user inherit. bump to 0.10.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

5 files changed, 151 insertions, 3 deletions

diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 7a2c63bad17b..fa3d004c7984 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,3 +1,4 @@
+DIST openocd-0.10.0.tar.gz 6124274 SHA256 eda3b03919cc0ffb70e7de9c877092a0311aaaa4e1532937e9f86ac1863fe526 SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a WHIRLPOOL 535fd53cc2a6b9e2f8fe5705806cad39832d3b7911f97a705c968ddf27981d000bfa0f707110645739aa2d792b2fbb46e6adf12dcbff394a07f9fb7376b37259
 DIST openocd-0.5.0.tar.bz2 2228655 SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d SHA512 8e2e168a35bf3f753683115fd5f4d4c79e54cd0fe5d072921475d43880619e5b4ab60f28d97a4a595d4b77938b9218e689013f66a925ee8007e6499f5b42448c WHIRLPOOL 84b6a4a9089542904865400ede82be00c4417519f0c9fc42cbb25ae671f621651e9b27f57c2a1e7f37102d53095bcb8e37601e8ed47ddf1ea82b76676b35e7aa
 DIST openocd-0.6.1.tar.bz2 3431071 SHA256 f4c4cc7445ad79cfba1bb24208e79c66edf9dc0c46b3c8fca391f4e41c942f2b SHA512 59f35750f761d3f2ce7a32ffdc5028d053fda2bd9424cc4497f528ec628ac1f022662d9f226dd2b04a8cd682a5cd056a09de14d50e1090426a816bb602f98250 WHIRLPOOL 81d43ce9866960edb7fdaefc5ec088852aaa79e86add67ea9682f26eb5f5d3e7c7523fde0729e15949af165470b44ded45b9d79662f651db56fd109db5074cad
 DIST openocd-0.7.0.tar.bz2 3493924 SHA256 52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63 SHA512 bfba267e5cda558b347f6fab1a286353b97d81093c0457ac044667baa369f5cd47a07b3ce6a1ceb66e7992c2e4224765458dd859d0a6fa748ad8e6f80ea541ad WHIRLPOOL eb83e201becb22a72ad954bdd5e66e61e587b42856244e4fdce59af5d263a2879cb8e0d89e10bcff515cff199580997c1c6635064601ad31a803b19dd9c99702
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
new file mode 100644
index 000000000000..7c88bdda2c20
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.10.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-2
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	EGIT_PROJECT="${PN}"
+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=">=dev-lang/jimtcl-0.76
+	cmsis-dap? ( dev-libs/hidapi )
+	jlink? ( dev-embedded/libjaylink )
+	usb? (
+		virtual/libusb:0
+		virtual/libusb:1
+	)
+	ftdi? ( dev-embedded/libftdi:= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	epatch_user
+
+	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
+		--disable-internal-libjaylink
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--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-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-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
+		)
+	fi
+
+	if use jlink; then
+		myconf+=(
+			--enable-jlink
+		)
+	else
+		myconf+=(
+			--disable-jlink
+		)
+	fi
+
+	if use ftdi; then
+		myconf+=(
+			--enable-usb-blaster
+			--enable-openjtag
+			--enable-presto
+		)
+	else
+		myconf+=(
+			--disable-openjtag
+			--disable-presto
+			--disable-usb-blaster
+		)
+	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
+	udev_dorules "${D}"/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.8.0.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild
index f6e8edb8706a..2fa14b573b58 100644
--- a/dev-embedded/openocd/openocd-0.8.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev
+inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
index c0d535488ff3..acfe5c045e41 100644
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev
+inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index f18b1f1d9fd5..7c88bdda2c20 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev
+inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then