summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libusb-compat/ChangeLog6
-rw-r--r--dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild12
2 files changed, 11 insertions, 7 deletions
diff --git a/dev-libs/libusb-compat/ChangeLog b/dev-libs/libusb-compat/ChangeLog
index 8e707f7cf13a..c000fbd428a1 100644
--- a/dev-libs/libusb-compat/ChangeLog
+++ b/dev-libs/libusb-compat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libusb-compat
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.38 2013/08/07 16:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/ChangeLog,v 1.39 2013/08/08 12:41:49 ssuominen Exp $
+
+ 08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
+ libusb-compat-0.1.5-r2.ebuild:
+ Block revision of emul-linux-x86-baselibs that dropped the colliding files.
07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org>
libusb-compat-0.1.5-r2.ebuild:
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index b1b92b9a52e0..0ce2082f33e4 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.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/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild,v 1.2 2013/08/07 16:12:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild,v 1.3 2013/08/08 12:41:49 ssuominen Exp $
EAPI=5
inherit eutils toolchain-funcs multilib-minimal
@@ -15,11 +15,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
IUSE="debug examples static-libs"
RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
- !dev-libs/libusb:0"
-# abi_x86_32? (
-# !<=app-emulation/emul-linux-x86-baselibs-2013
-# !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-# )"
+ !dev-libs/libusb:0
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
DEPEND="${RDEPEND}
virtual/pkgconfig"