Version bump. Drop versaloon use flag and merge it to the usb one. Update live ebuild

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

3 files changed, 20 insertions, 17 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 13223b1be3c2..6f13abfda033 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.46 2014/04/06 16:02:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.47 2014/04/26 11:26:17 hwoarang Exp $
+
+*openocd-0.8.0_rc2 (26 Apr 2014)
+
+  26 Apr 2014; Markos Chandras <hwoarang@gentoo.org> +openocd-0.8.0_rc2.ebuild,
+  -openocd-0.8.0_rc1.ebuild, openocd-9999.ebuild:
+  Version bump. Drop versaloon use flag and merge it to the usb one. Update live
+  ebuild
 
 *openocd-0.8.0_rc1 (06 Apr 2014)
 
diff --git a/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
index 1c4fe894cfea..669b130620ba 100644
--- a/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild,v 1.1 2014/04/06 16:02:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.1 2014/04/26 11:26:17 hwoarang Exp $
 
 EAPI="5"
 
@@ -24,22 +24,21 @@ HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io"
+IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# versaloon needs libusb:0 but the rest of the devices need libusb:1
-# Therefore, treat versaloon as a special case and always pull libusb:1
-# so most of the devices are supported by default.
+# Pull both libusb:0 and libusb:1 because some device need the former
+# others need the later etc.
 DEPEND=">=dev-lang/jimtcl-0.73
 	usb? (
-		versaloon? ( virtual/libusb:0 )
+		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )"
+REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
 
 src_prepare() {
 	epatch_user
@@ -129,7 +128,6 @@ src_configure() {
 		$(use_enable parport parport_giveio) \
 		$(use_enable presto presto_libftdi) \
 		$(use_enable segger jlink) \
-		$(use_enable versaloon vsllink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index b29cb8243035..592a7bf44d03 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.32 2014/04/06 16:02:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.33 2014/04/26 11:26:17 hwoarang Exp $
 
 EAPI="5"
 
@@ -24,22 +24,21 @@ HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io"
+IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# versaloon needs libusb:0 but the rest of the devices need libusb:1
-# Therefore, treat versaloon as a special case and always pull libusb:1
-# so most of the devices are supported by default.
+# Pull both libusb:0 and libusb:1 because some device need the former
+# others need the later etc.
 DEPEND=">=dev-lang/jimtcl-0.73
 	usb? (
-		versaloon? ( virtual/libusb:0 )
+		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )"
+REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
 
 src_prepare() {
 	epatch_user
@@ -129,7 +128,6 @@ src_configure() {
 		$(use_enable parport parport_giveio) \
 		$(use_enable presto presto_libftdi) \
 		$(use_enable segger jlink) \
-		$(use_enable versaloon vsllink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }