diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-02-02 10:00:33 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-02-02 10:00:33 +0000 |
commit | d6d3970ae7711917b8b63bb0dbd2721a6927715f (patch) | |
tree | 0b44bfcd7b1e9c43013d5086442e4d2e03fe50e8 /virtual/libusb | |
parent | Drop unnecessary masks now and clean up old masks in the process (diff) | |
download | gentoo-2-d6d3970ae7711917b8b63bb0dbd2721a6927715f.tar.gz gentoo-2-d6d3970ae7711917b8b63bb0dbd2721a6927715f.tar.bz2 gentoo-2-d6d3970ae7711917b8b63bb0dbd2721a6927715f.zip |
List libusb-1.0.18 as first provider despite it causing double-listing of libusb (to avoid downgrade from 1.0.17 to 1.0.9 since 1.0.18 is not stable yet) wrt #500038
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'virtual/libusb')
-rw-r--r-- | virtual/libusb/ChangeLog | 7 | ||||
-rw-r--r-- | virtual/libusb/libusb-1-r1.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog index 3127ce8f0772..7ff2ba638aaa 100644 --- a/virtual/libusb/ChangeLog +++ b/virtual/libusb/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for virtual/libusb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.46 2014/01/17 05:49:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.47 2014/02/02 10:00:33 ssuominen Exp $ + + 02 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> libusb-1-r1.ebuild: + List libusb-1.0.18 as first provider despite it causing double-listing of + libusb (to avoid downgrade from 1.0.17 to 1.0.9 since 1.0.18 is not stable + yet) wrt #500038 17 Jan 2014; Mike Frysinger <vapier@gentoo.org> libusb-0-r1.ebuild, libusb-1-r1.ebuild: diff --git a/virtual/libusb/libusb-1-r1.ebuild b/virtual/libusb/libusb-1-r1.ebuild index 9269f722a4ca..01dbfff52a0f 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.12 2014/01/17 05:49:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1-r1.ebuild,v 1.13 2014/02/02 10:00:33 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="" -RDEPEND="|| ( >=dev-libs/libusbx-1.0.16-r3:1[${MULTILIB_USEDEP}] >=dev-libs/libusb-1.0.9-r2:1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb,${MULTILIB_USEDEP}] )" +RDEPEND="|| ( >=dev-libs/libusb-1.0.18:1[${MULTILIB_USEDEP}] >=dev-libs/libusbx-1.0.17:1[${MULTILIB_USEDEP}] >=dev-libs/libusb-1.0.9-r2:1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-9.1_rc3-r1[usb,${MULTILIB_USEDEP}] )" DEPEND="" |