summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-11-29 21:02:33 +0000
committerMike Frysinger <vapier@gentoo.org>2008-11-29 21:02:33 +0000
commit49ca0406667bf8de46b41a66f1e4bd2475281c66 (patch)
tree23f0e3743c3e58c5953079bed873d6d0aa12f983 /dev-embedded/openocd
parentVersion bump for bug 226143, thanks to René Neumann and Ilya Kashirin. (diff)
downloadhistorical-49ca0406667bf8de46b41a66f1e4bd2475281c66.tar.gz
historical-49ca0406667bf8de46b41a66f1e4bd2475281c66.tar.bz2
historical-49ca0406667bf8de46b41a66f1e4bd2475281c66.zip
Make usb support optional #249211 by Scott.
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27.4 x86_64
Diffstat (limited to 'dev-embedded/openocd')
-rw-r--r--dev-embedded/openocd/ChangeLog5
-rw-r--r--dev-embedded/openocd/Manifest10
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild9
3 files changed, 14 insertions, 10 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 40487fbbf226..611888d421a7 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.4 2008/10/26 20:05:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.5 2008/11/29 21:02:33 vapier Exp $
+
+ 29 Nov 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
+ Make usb support optional #249211 by Scott.
26 Oct 2008; Mike Frysinger <vapier@gentoo.org> openocd-9999.ebuild:
Add support for ft2232 with amd64 multilib by Jason.
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 0880e2e420a6..25d6c0f2b9e4 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD openocd-9999.ebuild 1815 RMD160 284f28d114a9a6bec8cb86a82dbffbdd87d9560e SHA1 458192f85148eff62a7e4cc706e0603d81af62ce SHA256 99775d32f3d1c763b546e1bb819044abf0078e4823c6f693aecde3c25fec3bb6
-MISC ChangeLog 747 RMD160 4ee83cd67f854b68e9b5f3336586e80b2452bb13 SHA1 ffc26716d1537baf4225f6a0b30d1522c3bd0cd4 SHA256 d579879668096db27852b8f2696836ec5ffe8396de9e7e5f4243be14546e0a89
+EBUILD openocd-9999.ebuild 1854 RMD160 9093e091bb921e904ba13863bc6a55ef332c7dc8 SHA1 01984443b54eb31fabeca8c15f6c882ba373047f SHA256 ce01253bff94da5408c89fbe61f4b135f5a5d558c4b3b7b31583e7585d185bf5
+MISC ChangeLog 865 RMD160 549b2d5c7408defb718e29add5bcc377232a0a88 SHA1 e54a3805e1be6066fc8d0b1de8abbc68553b87e1 SHA256 822bdc7e50c9f03f83ee139d713ab3c4a738842c564fdf38ba83e3bcda8f4799
MISC metadata.xml 515 RMD160 dc20f59bb785387a70cfdbd696c6f867ceb8bfe0 SHA1 9c3c91356fd1b1975f59a80c900132e5fd4a92df SHA256 3d98c84abc54e79e0b065416ae199a0bb562bfed1ee3ccf5b5f45158715e6364
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkEza0ACgkQ67wieSYcaxckCwCdH/MKEu16RaJpVI4PtpWfZUjR
-0o8An1gRNAemyHSdEdO7PvSP0e5rkkKE
-=qvhQ
+iEYEARECAAYFAkkxre8ACgkQ67wieSYcaxcPRgCffw3EeGM8+TuNFz+Mubk/qwiZ
+FnMAoKatMKySZ2GwO2jGqZOstqDWYbw7
+=kvv4
-----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index ced43b5b2cf6..ac1cceaec8e0 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.3 2008/10/26 20:05:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.4 2008/11/29 21:02:33 vapier Exp $
ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
inherit eutils subversion autotools multilib
@@ -12,11 +12,12 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="ft2232 ftdi parport presto"
+IUSE="ft2232 ftdi parport presto usb"
RESTRICT="strip" # includes non-native binaries
# libftd2xx is the default because it is reported to work better.
-DEPEND="presto? ( dev-embedded/libftd2xx )
+DEPEND="usb? ( dev-libs/libusb )
+ presto? ( dev-embedded/libftd2xx )
ft2232? ( || ( ftdi? ( dev-embedded/libftdi ) dev-embedded/libftd2xx ) )"
pkg_setup() {
@@ -49,8 +50,8 @@ src_compile() {
--enable-ep93xx \
--enable-at91rm9200 \
--enable-gw16012 \
- --enable-usbprog \
--enable-oocd_trace \
+ $(use_enable usb usbprog) \
$(use_enable parport parport_giveio) \
$(use_enable presto presto_ftd2xx) \
$(use ft2232 && use_enable ftdi ft2232_libftdi) \