dev-embedded/openocd: update live ebuild per upstream and bug #589954

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 305f9c4e2e9f271622a5dea1fa6082d4800451bf..78e604f70917de3e328f9a39ddc2b9afcd3493d6 100644 (file)
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -14,6 +14,7 @@
                <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>

diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 54bd4c2517f1bf2a467943b683b6fe27c3bf9188..f18b1f1d9fd50605673ac84777bad919555d691f 100644 (file)
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -24,12 +24,12 @@ HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
+IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
 RDEPEND=">=dev-lang/jimtcl-0.76
-       dev-embedded/libjaylink
        cmsis-dap? ( dev-libs/hidapi )
+       jlink? ( dev-embedded/libjaylink )
        usb? (
                virtual/libusb:0
                virtual/libusb:1
@@ -63,7 +63,6 @@ src_configure() {
                --enable-ep93xx
                --enable-at91rm9200
                --enable-gw16012
-               --enable-oocd_trace
                --enable-arm-jtag-ew
                --enable-sysfsgpio
                --enable-bcm2835gpio
@@ -80,7 +79,6 @@ src_configure() {
                        --enable-osbdm
                        --enable-opendous
                        --enable-usbprog
-                       --enable-jlink
                        --enable-rlink
                        --enable-stlink
                        --enable-vsllink
@@ -98,7 +96,6 @@ src_configure() {
                        --disable-osbdm
                        --disable-opendous
                        --disable-usbprog
-                       --disable-jlink
                        --disable-rlink
                        --disable-stlink
                        --disable-vsllink
@@ -106,17 +103,27 @@ src_configure() {
                )
        fi
 
+       if use jlink; then
+               myconf+=(
+                       --enable-jlink
+               )
+       else
+               myconf+=(
+                       --disable-jlink
+               )
+       fi
+
        if use ftdi; then
                myconf+=(
-                       --enable-usb_blaster_libftdi
-                       --enable-openjtag_ftdi
-                       --enable-presto_libftdi
+                       --enable-usb-blaster
+                       --enable-openjtag
+                       --enable-presto
                )
        else
                myconf+=(
-                       --disable-openjtag_ftdi
-                       --disable-presto_libftdi
-                       --disable-usb_blaster_libftdi
+                       --disable-openjtag
+                       --disable-presto
+                       --disable-usb-blaster
                )
        fi