summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-09-21 05:13:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-09-21 05:13:33 +0000
commitce85aa5b1cdcb35d0610b5414fe4dc095bdc66fe (patch)
tree59e29a4a654123f0eedf928932cb5f0be4dd02bf
parentdrop old that had issues with namespace collisions (diff)
downloadgentoo-2-ce85aa5b1cdcb35d0610b5414fe4dc095bdc66fe.tar.gz
gentoo-2-ce85aa5b1cdcb35d0610b5414fe4dc095bdc66fe.tar.bz2
gentoo-2-ce85aa5b1cdcb35d0610b5414fe4dc095bdc66fe.zip
Force latest dev-libs/libusbx because <1.0.13 had issues with namespace collision(s) wrt #423135
(Portage version: 2.2.0_alpha128/cvs/Linux x86_64)
-rw-r--r--virtual/libusb/ChangeLog6
-rw-r--r--virtual/libusb/libusb-1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/virtual/libusb/ChangeLog b/virtual/libusb/ChangeLog
index e69672ad46a3..4eb9fd757fd3 100644
--- a/virtual/libusb/ChangeLog
+++ b/virtual/libusb/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/libusb
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.24 2012/05/27 18:05:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/ChangeLog,v 1.25 2012/09/21 05:13:33 ssuominen Exp $
+
+ 21 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild:
+ Force latest dev-libs/libusbx because <1.0.13 had issues with namespace
+ collision(s) wrt #423135
27 May 2012; Samuli Suominen <ssuominen@gentoo.org> libusb-1.ebuild:
Change order of preference for libusbx.
diff --git a/virtual/libusb/libusb-1.ebuild b/virtual/libusb/libusb-1.ebuild
index ea46ee9394d2..09a8d1dec5cd 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.19 2012/05/27 18:05:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/libusb/libusb-1.ebuild,v 1.20 2012/09/21 05:13:33 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 >=dev-libs/libusb-1.0.9_rc:1 )"
+RDEPEND="|| ( >=dev-libs/libusbx-1.0.13:1 >=dev-libs/libusb-1.0.9:1 )"