--- /usr/portage/dev-embedded/openocd/openocd-9999.ebuild	2011-11-15 23:12:38.000000000 +0200
+++ /home/espeer/projects/openocd/openocd-9999.ebuild	2012-02-15 10:41:57.621502561 +0200
@@ -19,18 +19,28 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon"
+IUSE="blaster buspirate dummy ftd2xx ftdi keil minidriver olimex parport \
+	presto raisonance segger stlink usbprog verbose versaloon zylin"
 RESTRICT="strip" # includes non-native binaries
 
 # libftd2xx is the default because it is reported to work better.
-DEPEND="dev-lang/jimtcl
-	usb? ( dev-libs/libusb )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
+DEPEND="dev-lang/jimtcl 
+	blaster? ( dev-libs/libusb )  
+	buspirate? ( dev-libs/libusb ) 
+	keil? ( dev-libs/libusb ) 
+	olimex? ( dev-libs/libusb ) 
+	presto? ( dev-libs/libusb ) 
+    raisonance? ( dev-libs/libusb ) 
+    segger? ( dev-libs/libusb ) 
+    stlink? ( dev-libs/libusb ) 
+    usbprog? ( dev-libs/libusb ) 
+	versaloon? ( dev-libs/libusb ) 
+	ftd2xx? ( dev-embedded/libftd2xx ) 
 	ftdi? ( dev-embedded/libftdi )"
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
+REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) presto? ( || ( ftdi ftd2xx ) )
+ftdi? ( !ftd2xx ) ftd2xx? ( !ftdi ) zylin? ( !minidriver ) minidriver? ( !zylin )"
 
 src_prepare() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -41,32 +51,49 @@
 
 src_configure() {
 	# Here are some defaults
-	myconf="--enable-buspirate --enable-ioutil --disable-werror
-	--disable-internal-jimtcl --enable-amtjtagaccel
-	--enable-ep93xx --enable-at91rm9200 --enable-gw16012
+	myconf="--enable-ioutil \
+	--disable-werror \
+	--disable-internal-jimtcl \
+	--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} --use_blaster_libftdi"
-		use ftd2xx && myconf="${myconf} --use_blaster_ftd2xx"
+		use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi"
+		use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx"
+	fi
+	if use presto; then
+		use ftdi && myconf="${myconf} --enable-presto_libftdi"
+		use ftd2xx && myconf="${myconf} --enable-presto_ftd2xx"
+	fi
+
+	if use verbose; then
+		myconf="${myconf} --enable-verbose --enable-verbose-jtag-io \
+		--enable-verbose-usb-io --enable-verbose-usb-comms"
+	fi
+
+	if use parport; then
+		myconf="${myconf} --enable-parport --enable-amtjtagaccel"
 	fi
+
 	econf \
+		$(use_enable buspirate) \
 		$(use_enable dummy) \
 		$(use_enable ftdi ft2232_libftdi) \
 		$(use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable keil ulink) \
 		$(use_enable minidriver minidriver-dummy) \
-		$(use_enable parport) \
-		$(use_enable presto presto_ftd2xx) \
+		$(use_enable olimex arm-jtag-ew) \
+		$(use_enable raisonance rlink) \
 		$(use_enable segger jlink) \
+		$(use_enable stlink) \
+		$(use_enable usbprog) \
 		$(use_enable versaloon vsllink) \
+		$(use_enable zylin zy1000) \
 		${myconf}
 }