diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:37:54 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 18:37:54 +0000 |
| commit | bc6090b8d3880acc734fc24c9691088b340e3d9f (patch) | |
| tree | 05ae32bdc062db2b4ef30c24c2ca735b12f3090a /virtual | |
| parent | old (diff) | |
| download | gentoo-2-bc6090b8d3880acc734fc24c9691088b340e3d9f.tar.gz gentoo-2-bc6090b8d3880acc734fc24c9691088b340e3d9f.tar.bz2 gentoo-2-bc6090b8d3880acc734fc24c9691088b340e3d9f.zip | |
Change order of || ( ) to list dev-libs/libusb-compat first wrt #417135
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/libusb/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/libusb/libusb-0.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog index 34e8cc49e48b..0b42b4b39257 100644 --- a/virtual/libusb/ChangeLog +++ b/virtual/libusb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for virtual/libusb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.22 2012/05/22 16:00:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.23 2012/05/22 18:37:54 ssuominen Exp $ + + 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-0.ebuild: + Change order of || ( ) to list dev-libs/libusb-compat first wrt #417135 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild: Include dev-libs/libusbx:1 as secondary alternative. diff --git a/virtual/libusb/libusb-0.ebuild b/virtual/libusb/libusb-0.ebuild index cbf3ffa6ec9e..347cc9a04a2e 100644 --- a/virtual/libusb/libusb-0.ebuild +++ b/virtual/libusb/libusb-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/virtual/libusb/libusb-0.ebuild,v 1.10 2012/05/06 00:40:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-0.ebuild,v 1.11 2012/05/22 18:37:54 ssuominen Exp $ EAPI=2 @@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd6 IUSE="" DEPEND="" -RDEPEND="|| ( >=dev-libs/libusb-0.1.12-r1:0 dev-libs/libusb-compat >=sys-freebsd/freebsd-lib-8.0[usb] )" +RDEPEND="|| ( >=dev-libs/libusb-compat-0.1.4 >=dev-libs/libusb-0.1.12-r7:0 >=sys-freebsd/freebsd-lib-8.0[usb] )" |