summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-10-19 20:39:58 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-10-19 20:39:58 +0000
commit752b6732adcc506bb0a4ebf4391fae0cb5d26b00 (patch)
tree5c3205425b8428b3303bc9935067898ccb9333b0 /dev-embedded/openocd
parentDepend on correct slot of pygobject. (diff)
downloadgentoo-2-752b6732adcc506bb0a4ebf4391fae0cb5d26b00.tar.gz
gentoo-2-752b6732adcc506bb0a4ebf4391fae0cb5d26b00.tar.bz2
gentoo-2-752b6732adcc506bb0a4ebf4391fae0cb5d26b00.zip
Fix REQUIRED_USE thanks to Ulrich Mueller <ulm@gentoo.org>
(Portage version: 2.2.0_alpha69/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded/openocd')
-rw-r--r--dev-embedded/openocd/ChangeLog6
-rw-r--r--dev-embedded/openocd/openocd-0.5.0.ebuild4
-rw-r--r--dev-embedded/openocd/openocd-9999.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index a5e82fd1a6b6..38ae7ac8cfa6 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-embedded/openocd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.19 2011/10/12 11:22:09 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.20 2011/10/19 20:39:58 hwoarang Exp $
+
+ 19 Oct 2011; Markos Chandras <hwoarang@gentoo.org> openocd-0.5.0.ebuild,
+ openocd-9999.ebuild:
+ Fix REQUIRED_USE thanks to Ulrich Mueller <ulm@gentoo.org>
*openocd-0.5.0 (10 Oct 2011)
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
index 9acc694a37ab..e674a6efcd12 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-2011 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.1 2011/10/10 20:23:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.2 2011/10/19 20:39:58 hwoarang Exp $
EAPI="4"
@@ -30,7 +30,7 @@ DEPEND="dev-lang/jimtcl
ftdi? ( dev-embedded/libftdi )"
RDEPEND="${DEPEND}"
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ^^ ( ftdi ftd2xx )"
+REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
src_configure() {
# Here are some defaults
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index c952df5931d8..c4b08ea1d77f 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.16 2011/10/10 20:23:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.17 2011/10/19 20:39:58 hwoarang Exp $
EAPI="4"
@@ -30,7 +30,7 @@ DEPEND="dev-lang/jimtcl
ftdi? ( dev-embedded/libftdi )"
RDEPEND="${DEPEND}"
-REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ^^ ( ftdi ftd2xx )"
+REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
src_configure() {
# Here are some defaults