summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-embedded/openocd/ChangeLog6
-rw-r--r--dev-embedded/openocd/openocd-0.3.1-r1.ebuild4
-rw-r--r--dev-embedded/openocd/openocd-0.4.0.ebuild4
-rw-r--r--dev-embedded/openocd/openocd-0.5.0.ebuild4
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild4
5 files changed, 13 insertions, 9 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 9d318462a1ec..7c2861d937fb 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.28 2012/05/22 16:40:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.29 2012/05/25 08:14:30 ssuominen Exp $
+
+ 25 May 2012; Samuli Suominen <ssuominen@gentoo.org> openocd-0.3.1-r1.ebuild,
+ openocd-0.4.0.ebuild, openocd-0.5.0.ebuild, openocd-9999.ebuild:
+ Restrict virtual/libusb to SLOT="0" because libusb-1 is not supported yet.
22 May 2012; Samuli Suominen <ssuominen@gentoo.org> openocd-0.3.1-r1.ebuild,
openocd-0.4.0.ebuild, openocd-0.5.0.ebuild, openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/openocd-0.3.1-r1.ebuild b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
index d743bcf8ac94..420c037eb564 100644
--- a/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.3 2012/05/22 16:28:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.4 2012/05/25 08:14:30 ssuominen Exp $
EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
inherit eutils
@@ -22,7 +22,7 @@ IUSE="ftd2xx ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( virtual/libusb )
+DEPEND="usb? ( =virtual/libusb-0* )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"
diff --git a/dev-embedded/openocd/openocd-0.4.0.ebuild b/dev-embedded/openocd/openocd-0.4.0.ebuild
index bc7e21bda3e4..0370e464f1a4 100644
--- a/dev-embedded/openocd/openocd-0.4.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.3 2012/05/22 16:28:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.4 2012/05/25 08:14:30 ssuominen Exp $
EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
inherit eutils
@@ -22,7 +22,7 @@ IUSE="ftd2xx ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( virtual/libusb )
+DEPEND="usb? ( =virtual/libusb-0* )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
index 30eff5039fb2..7945156981a2 100644
--- a/dev-embedded/openocd/openocd-0.5.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.5.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.6 2012/05/22 16:28:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.7 2012/05/25 08:14:30 ssuominen Exp $
EAPI="4"
@@ -24,7 +24,7 @@ RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="dev-lang/jimtcl
- usb? ( virtual/libusb )
+ usb? ( virtual/libusb:0 )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 5a3863dde427..60ebf6b9392e 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.22 2012/05/22 16:40:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.23 2012/05/25 08:14:30 ssuominen Exp $
EAPI="4"
@@ -24,7 +24,7 @@ RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
DEPEND="dev-lang/jimtcl
- usb? ( virtual/libusb )
+ usb? ( virtual/libusb:0 )
presto? ( dev-embedded/libftd2xx )
ftd2xx? ( dev-embedded/libftd2xx )
ftdi? ( dev-embedded/libftdi )"