Simplify the || ( ) dependency string after dev-libs/libusbx removal from tree.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 16 insertions, 12 deletions

diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog
index 2fa2cfcc2c2c..a8cf3b2107a4 100644
--- a/virtual/libusb/ChangeLog
+++ b/virtual/libusb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for virtual/libusb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.50 2014/03/18 20:40:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.51 2014/03/24 17:46:18 ssuominen Exp $
+
+  24 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> libusb-1-r1.ebuild:
+  Simplify the || ( ) dependency string after dev-libs/libusbx removal from
+  tree.
 
   18 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> libusb-1-r1.ebuild:
   Propagate USE="udev" to the virtual, so that eg. sys-power/nut can force
diff --git a/virtual/libusb/Manifest b/virtual/libusb/Manifest
index f1cad0df3685..3343d5a8110c 100644
--- a/virtual/libusb/Manifest
+++ b/virtual/libusb/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 EBUILD libusb-0-r1.ebuild 655 SHA256 901e0d2ddccfb73df7e4c5818f57dbce4d37754f45e23fb47f36d785c7497ed4 SHA512 3c9bac9cdaac36637ea400fd429b4c21b5574d79c7a446f2e3246d676c75fe24c6d360271472c4c0cc9ba814cbb7f3a29f5765358dd79b03294212c5342510cd WHIRLPOOL 23b0781b03debbe5596f10f7df8ec777a7bf69ddc2545bacd041e97ee33e58b30fc892a016879995b35b86db3ef33dc493cfc22293c26f409df984110530749e
-EBUILD libusb-1-r1.ebuild 788 SHA256 2f84d693746cd12ea10fef3351cafbab1e13692626209dfdc945d019a46c9055 SHA512 5113f139285b5313cf7af6052c408a98177c46ca774a12544f0ec1a99fa0ea0683e1da6a7f84cd1b80a73e44e81f0c7b02aca6ea3b9fe836c52d138abeaa137a WHIRLPOOL e03846599ee6fe3859026a239687d9433654215f65b6571ccf510cb74516eb56e9889eaaf76a4f3ad31ec79dcddb8f2dbfad3bd51b69fd360b44fb2cef2ddc2a
-MISC ChangeLog 7142 SHA256 da6d8d7b48a478853b37455f78a572c63aa6557c4100a4abd51c7086f93cf530 SHA512 496579f920d42d573f01c4fe46707c86c9239486ad5b5da444c57fe68f1dfc46f2d77668466525ddbb7499d04ea52d4a63e61d4ece59e7dedefe486b3c26fb51 WHIRLPOOL 9e3248548ab9a71df3d04e8054468d047ed14463933c6766b81e1901198fbc2c91671973d7b28495bee7c3ce080f8e784b0086f79617f56207f14f738ebf1f59
+EBUILD libusb-1-r1.ebuild 681 SHA256 1ecdc17c37abcd8daa43394fc18841a4ce69d5e0d54a2011d4c97ff430ca0ed3 SHA512 72e15dc5c8f6ef09c294b08cd8fd3f3b9b7a4f9426178ae2b47efbf80f68ecb8a478afe4d98508220641158dc859793098d778e25d3ec25cf33cb10d0382b803 WHIRLPOOL 6f45ac792c93bfc69c63b642de877f3c5312a219f9441c418901d6ac1f46c6d5bfb530aee435c3a23d0c508d3288aa2c0a8aa3692769a9405a0344d66dda8a3e
+MISC ChangeLog 7301 SHA256 b27c3a7cececf34290fad84017f64b4871dddf129b5c0886cee0dc00ebb0c61a SHA512 78982fcbe195d7f5dc46db568eb269fc9149830565891fc6d56cec3a28be1f39fd752fb111711d147253bb6694520ca7207504545db7dfb371c000d5848ebb41 WHIRLPOOL 0b12a2dedd835d87591e38a79ae0b23cccf04ac2b7b6844ca1049e2dc07b58b6aa893be7a42a449116f8a95caf0d0e3a60d3eb51fcdd701b1cecda981d44ff71
 MISC metadata.xml 285 SHA256 8f3e4e1f792ef6a6f383ae0aac1627db7f536ff880da423bca1113cea6d06773 SHA512 10fc61b3654c9aee6e9ba9702cf6630928921d2670248b9e1356d417b205dabc959e3672eda071f5fa734b3a001992cecd514a920b6e37376db943266683e75d WHIRLPOOL e26de64dba56ea85587b9e7348a1be056f78a2e2f9f91ffb5faef242b7ced82496b40fe672b18c33491f40a124161ca47af0e80219ebe39a8b24e86557c36db1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTKK5VAAoJEEdUh39IaPFNnegIAJ5zzTJnr6KzHNSDcDpAqML3
-ttmVU6OsZLMXr8GLZhntQf3rkqVAfOi6eCPPhYgIqVDYr6iKdDXb8o080LTABuds
-Faf/5cuiH/L1TwBZfoqTgDX23vC4Ir6TkSoenOUXUj8fipiK3bgTKSZmXPz6Asbd
-ejPQbV/0W68MT02b/3t3y27heDaxLLLqYZC+LBW0zpV/S0Grs5hkcTeedEsBw5bN
-gupDbPZp+8zcNkx3PUtL+bYZom40nmFZ1iml3VWgf0+b1pd5qvCPzOPXVf16rL+G
-UtgGQXH8Z5XoRQyAvRiRtlpbFOjU1gvtEOsA7ZBfSAEpqpk97h+oDTOathiWGnc=
-=/6nB
+iQEcBAEBCAAGBQJTMG5PAAoJEEdUh39IaPFNpHYH/jkCCUf5hZ2p/L7xUxhHffo4
+bc7rGj4yYCcLlTeQZoWfvLOMLmYFAZDtBKe8vx47u36pQQMNeHNA4IxVtYGPCJfT
+m5NfbXQ/jROx29wzBMw4Wurvpugw1Zw/DDarNkvBnizAIn89kIBbtzVy42ImqZqw
+lMm/v1PXwg/CORmPi+b9WGhpOJbMR1zLLRWpUexVHe54pJ/A2fw6LsTfYKiOwHnD
+aTpxZBnkwrLu8MwAvOulQ2APPhA7Esm/5BRx7P9kDbGkexir5/DdYyEIxwBPnRGX
+oeeR++2Oy9dmZhMt6fMsR4204/dIoEyOzg9Pkh++O6v52O/BSJ6/7vYPYlMzM9s=
+=0p5S
 -----END PGP SIGNATURE-----
diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild
index 80f53f5ebf59..7a0a48a84e25 100644
--- a/virtual/libusb/libusb-1-r1.ebuild
+++ b/virtual/libusb/libusb-1-r1.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/virtual/libusb/libusb-1-r1.ebuild,v 1.15 2014/03/18 20:40:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1-r1.ebuild,v 1.16 2014/03/24 17:46:18 ssuominen Exp $
 
 EAPI=5
 inherit multilib-build
@@ -14,5 +14,5 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="udev"
 
-RDEPEND="|| ( >=dev-libs/libusb-1.0.18:1[udev?,${MULTILIB_USEDEP}] >=dev-libs/libusbx-1.0.17:1[udev?,${MULTILIB_USEDEP}] >=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb,${MULTILIB_USEDEP}] )"
+RDEPEND="|| ( >=dev-libs/libusb-1.0.9-r2:1[udev(+)?,${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb,${MULTILIB_USEDEP}] )"
 DEPEND=""