diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-19 07:09:36 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-19 07:09:36 +0000 |
| commit | fce7a2c2b1bad03c4b69919742810e058a75d56a (patch) | |
| tree | f87b0fd107b3122536ff5b36fc27ef58aab2b93b /virtual | |
| parent | Stable for ia64, wrt bug #463030 (diff) | |
| download | gentoo-2-fce7a2c2b1bad03c4b69919742810e058a75d56a.tar.gz gentoo-2-fce7a2c2b1bad03c4b69919742810e058a75d56a.tar.bz2 gentoo-2-fce7a2c2b1bad03c4b69919742810e058a75d56a.zip | |
Force more recent libusbx to prevent bMaxPower vs. MaxPower declaration conflict.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/libusb/ChangeLog | 6 | ||||
| -rw-r--r-- | virtual/libusb/libusb-1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog index f6c3d6ad0565..81469c82b1aa 100644 --- a/virtual/libusb/ChangeLog +++ b/virtual/libusb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for virtual/libusb # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.28 2013/02/18 03:14:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.29 2013/04/19 07:09:36 ssuominen Exp $ + + 19 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild: + Force more recent libusbx to prevent bMaxPower vs. MaxPower declaration + conflict. 18 Feb 2013; Zac Medico <zmedico@gentoo.org> libusb-1.ebuild: Add ~arm-linux keyword. diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild index b61228809ab2..3424f0604994 100644 --- a/virtual/libusb/libusb-1.ebuild +++ b/virtual/libusb/libusb-1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.22 2013/02/18 03:14:47 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.23 2013/04/19 07:09:36 ssuominen Exp $ EAPI=2 @@ -14,4 +14,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86- IUSE="" DEPEND="" -RDEPEND="|| ( >=dev-libs/libusbx-1.0.13:1 >=dev-libs/libusb-1.0.9:1 >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb] )" +RDEPEND="|| ( >=dev-libs/libusbx-1.0.15:1 >=dev-libs/libusb-1.0.9:1 >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb] )" |