diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 16:00:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-05-22 16:00:39 +0000 |
| commit | 3aad92218877ef0e856d1bff835ff71a3028e884 (patch) | |
| tree | 985f88495a4363de7bd6c1b2e4e51b54fb9f6649 /virtual/libusb | |
| parent | Block dev-libs/libusbx:1 and include base-system in metadata.xml (diff) | |
| download | gentoo-2-3aad92218877ef0e856d1bff835ff71a3028e884.tar.gz gentoo-2-3aad92218877ef0e856d1bff835ff71a3028e884.tar.bz2 gentoo-2-3aad92218877ef0e856d1bff835ff71a3028e884.zip | |
Include dev-libs/libusbx:1 as secondary alternative.
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'virtual/libusb')
| -rw-r--r-- | virtual/libusb/ChangeLog | 5 | ||||
| -rw-r--r-- | virtual/libusb/libusb-1.ebuild | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog index 25c8ad4ae144..34e8cc49e48b 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.21 2012/05/06 00:40:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.22 2012/05/22 16:00:39 ssuominen Exp $ + + 22 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild: + Include dev-libs/libusbx:1 as secondary alternative. 06 May 2012; Alexis Ballier <aballier@gentoo.org> libusb-0.ebuild: keyword ~amd64-fbsd diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild index 52b1f40c27d3..df96eab2b1f6 100644 --- a/virtual/libusb/libusb-1.ebuild +++ b/virtual/libusb/libusb-1.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-1.ebuild,v 1.16 2012/04/20 08:44:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.17 2012/05/22 16:00:39 ssuominen Exp $ EAPI=2 @@ -14,4 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86- IUSE="" DEPEND="" -RDEPEND=">=dev-libs/libusb-1.0.9_rc:1" +RDEPEND="|| ( + >=dev-libs/libusb-1.0.9_rc:1 + dev-libs/libusbx:1 + )" |