diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-08 12:41:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-08 12:41:08 +0000 |
| commit | 61caa8a7a07e32713260abd28653c1a3c768894b (patch) | |
| tree | 522bbb8a60a878163f584454e1de743fa8250682 /dev-libs/libusbx | |
| parent | Block revision of emul-linux-x86-baselibs that dropped the colliding files. (diff) | |
| download | gentoo-2-61caa8a7a07e32713260abd28653c1a3c768894b.tar.gz gentoo-2-61caa8a7a07e32713260abd28653c1a3c768894b.tar.bz2 gentoo-2-61caa8a7a07e32713260abd28653c1a3c768894b.zip | |
Block revision of emul-linux-x86-baselibs that dropped the colliding files.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'dev-libs/libusbx')
| -rw-r--r-- | dev-libs/libusbx/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libusbx/libusbx-1.0.16-r3.ebuild | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/dev-libs/libusbx/ChangeLog b/dev-libs/libusbx/ChangeLog index 2b7a86253e3c..d230e856e239 100644 --- a/dev-libs/libusbx/ChangeLog +++ b/dev-libs/libusbx/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libusbx # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusbx/ChangeLog,v 1.18 2013/08/07 18:25:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusbx/ChangeLog,v 1.19 2013/08/08 12:41:08 ssuominen Exp $ + + 08 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libusbx-1.0.16-r3.ebuild: + Block revision of emul-linux-x86-baselibs that dropped the colliding files. 07 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libusbx-1.0.16-r3.ebuild: Insert missing MULTILIB_USEDEP to the virtual/udev dependency. diff --git a/dev-libs/libusbx/libusbx-1.0.16-r3.ebuild b/dev-libs/libusbx/libusbx-1.0.16-r3.ebuild index 38d2ec2a695d..f4541d835268 100644 --- a/dev-libs/libusbx/libusbx-1.0.16-r3.ebuild +++ b/dev-libs/libusbx/libusbx-1.0.16-r3.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/libusbx/libusbx-1.0.16-r3.ebuild,v 1.2 2013/08/07 18:25:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusbx/libusbx-1.0.16-r3.ebuild,v 1.3 2013/08/08 12:41:08 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 doc examples static-libs test udev" RDEPEND="udev? ( >=virtual/udev-200[${MULTILIB_USEDEP}] ) - !dev-libs/libusb:1" -# abi_x86_32? ( -# !<=app-emulation/emul-linux-x86-baselibs-2013 -# !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] -# )" + !dev-libs/libusb:1 + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen ) !udev? ( virtual/os-headers )" |