Fix REQUIRED_USE thanks to Ulrich Mueller <ulm@gentoo.org>

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

4 files changed, 26 insertions, 12 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/Manifest b/dev-embedded/openocd/Manifest
index e70c0b089626..38d3edc1027c 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST openocd-0.3.1.tar.gz 1584527 RMD160 fba1c2db055cce7652afa28773be3162b46eb204 SHA1 ccc543d44a65e9d5e6ae44145c6dca8c59b43f2e SHA256 d88be375e346c6b19f23ca82ae20497bdb1bf88a05eba3e6ed7d2cff8c1916b4
 DIST openocd-0.4.0.tar.gz 1705028 RMD160 69ce61cec0aebce1300f44af029bf644194ebce9 SHA1 890171d6ffbfc4cfb45040548ffe1422cc07ae6b SHA256 fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194
 DIST openocd-0.5.0.tar.bz2 2228655 RMD160 f831b5406e7dd3a25ebaa2ceabb1de80d12bd7cf SHA1 807e4214b005029dccd1ed8af36f3897a5c6f49b SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d
 EBUILD openocd-0.3.1-r1.ebuild 1902 RMD160 9e49c935c369ce47384ece428f8d9c27876d165f SHA1 616553a77b24a03a8ded109ea2949c8af704985d SHA256 a1144accef62d68079e5d4cb28d179af9713dcbffc7b4f8fc6e5cdcd651db20d
 EBUILD openocd-0.4.0.ebuild 2015 RMD160 6290fd5e6fa1441c4e3bc40c2d2f321b9c3d197d SHA1 aa4e980b319dddcad2c2f1600749649ea35c8e60 SHA256 ae7be6d5a28d085ee1fc0b7409d0b031e4239b32c2e8c45df7b2dbc10c6d5a06
-EBUILD openocd-0.5.0.ebuild 2069 RMD160 2ba1e83d73c4683b53a105d159a5e936eb2aeb15 SHA1 9ddfa665b51b3c28be63c5461ea46b365fbc1ed3 SHA256 74db94bce5cdf91057ee03e02b98b1fd8eb04f6b5423991a17f51dc849b14173
-EBUILD openocd-9999.ebuild 2069 RMD160 7d9bc6c2a5a616a96c0bc22e60bc9a9aeb00d6f1 SHA1 82b2e15ee28ba35c05747f8bfd9356a26e0523a0 SHA256 2f879cb219a1e75bf65f88cc22bbe810553e522ea65992069dd4c83ad104da3a
-MISC ChangeLog 3475 RMD160 c59af51eca8a2467bde8017c27ecec5e4c25a474 SHA1 f84273311c95a403f90238c97651be1a27267529 SHA256 7b3a11646665272815db32aeee0726d27c09f55bf25efcccb75ecc9c1b7a64ea
+EBUILD openocd-0.5.0.ebuild 2068 RMD160 b872763a61253afdce08b068ad70879ee47a6752 SHA1 fb9fe6ca2f6e3bcee76acdf3172a89f162e1ca65 SHA256 81590a1a2ad22db5ad5061f7b91d505a883842dde9eb7f7cf71fd3308c1a21f5
+EBUILD openocd-9999.ebuild 2068 RMD160 46c5e0e1fb6494c28ed265c224445a53919b841d SHA1 fccd917fc1b584f8aa2a88f9cc7410eee10f9265 SHA256 c0dbccef3be5c57b87261909608f5e2e7521ed8d0b29debba5d3dd5b61b72e24
+MISC ChangeLog 3639 RMD160 958792ea78f77d0e8973ef9e09d6a5ac56dcbd8b SHA1 4a64c7c82af073db7c548756b89e18bd04ca9636 SHA256 5206316c9c7bd667e0351585f52b422f59bede8c96a2f81f616b4b49a99f4392
 MISC metadata.xml 944 RMD160 67e4610bb599540c4258eeed1d9a8dd90925d804 SHA1 29593f4259f4f025f5a7539ab56c4e7a75094be8 SHA256 bb50df9261c8d6d81be4b4abdb715d0b940ef3cc8a70a35222f34968f4a7c5bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk6VeGcACgkQV3J2n04EauzK9wCgrkvJF643youZ6gmxTZwV+4aY
-LK4AoMdROfSV5utWSAjqQDPe1hv1TuWY
-=IZp0
+iQIcBAEBCgAGBQJOnzWeAAoJEPqDWhW0r/LCluAP/1qRXqk5q909bToyF+586C24
+FFULangb7zpd1R2EUvTHjAKzwJZdfy225GljdkZ87/RlGb4lyCpi7IYj4atSSEDb
+IXxBPFU18sm0LJQatVlLs+QqlH1ioNp1gf2v7POZMeJoe/RJuaSq+p7joj0g+WZE
+fNBNITAs6pRNjOH98rKq2Y1DoMcEkd41G9bXBeacpeUi9TK2wS/FmTapbrvCCPxv
+Z0hemr2gt+9dZEde+IsJuzOp76QoM0NFiAswzvS7BDafnlWnVDIAu8Wsj/M43CZy
+GDwmz3ZBHSzxP6Dad0NLQrJnSCXwSw8wgtGkMCNCcz2r4HT1iGLhqO2Sa7xc7Qv4
+srHV316sUZb0gTHoiKm2z7/siuBQXsZasaPaR7z6whBZg4mmSmWrhRLtmiN7+Nl5
+WL8R6tkJ1FnZpU/TRoSkFF5Rz/nc+L4y22Gv01N4ocU8qzeJPOj2+osP8ZHYnObY
+ZGLl16vl1zS/f8R4G2nXReCtr6+G1i+KLUGZGN48q+2fUI+Xmvo8gR6gAdXesqxg
+Z3vzUhKsOSk31Kbd7IoPX8h/F1iv6s9tUqlDFQB1/qU6H65/+4pS0RhQzVF8PZ/x
+whGH2DvWur9spdna3bBiKI6QJ+72qEtpTNOlUKVJvS3NW0sB6QOW36Prblc2P5Pz
+3mDQ64q8MOSRrADejmkc
+=YjG/
 -----END PGP SIGNATURE-----
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