updated 9999 ebuild. Partially fixes #403841. EAPI5, enable most of the adapters by default

(Portage version: 2.1.12.1/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

3 files changed, 24 insertions, 4 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 8d174f0844e3..bb716bdafef8 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.37 2013/05/24 19:31:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.38 2013/05/24 22:19:59 hwoarang Exp $
+
+  24 May 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
+  openocd-0.6.1.ebuild, openocd-9999.ebuild:
+  updated 9999 ebuild. Partially fixes #403841. EAPI5, enable most of the
+  adapters by default
 
   24 May 2013; Markos Chandras <hwoarang@gentoo.org> openocd-9999.ebuild:
   Switch to new git repo
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 05669d68a170..73a97bfce98e 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -11,6 +11,8 @@
   <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 JTAB and USB messages</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 66e572d79d98..8467f5f96eb3 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.28 2013/05/24 19:31:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.29 2013/05/24 22:19:59 hwoarang Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils multilib flag-o-matic toolchain-funcs
+
+# One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-2
 	KEYWORDS=""
@@ -19,7 +21,7 @@ HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon"
+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.
@@ -68,6 +70,11 @@ src_configure() {
 		--enable-at91rm9200
 		--enable-gw16012
 		--enable-oocd_trace
+		--enable-ulink
+		--enable-arm-jtag-ew
+		--enable-ti-icdi
+		--enable-osbdm
+		--enable-opendous
 	)
 
 	if use usb; then
@@ -77,6 +84,8 @@ src_configure() {
 			--enable-rlink
 			--enable-vsllink
 			--enable-arm-jtag-ew
+			$(use_enable verbose-io verbose-usb-io)
+			$(use_enable verbose-io verbose_usb_comms)
 		)
 	fi
 
@@ -93,9 +102,13 @@ src_configure() {
 		$(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 stlink) \
 		$(use_enable versaloon vsllink) \
+		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }