diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-07-13 22:15:31 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-07-13 22:15:31 +0000 |
| commit | f56dcc26564602ea6c49be7892346c2372a8f7e6 (patch) | |
| tree | f94f7f341d16dce1cc87b47af3c867316a65db90 /media-libs | |
| parent | initial import (diff) | |
| download | gentoo-2-f56dcc26564602ea6c49be7892346c2372a8f7e6.tar.gz gentoo-2-f56dcc26564602ea6c49be7892346c2372a8f7e6.tar.bz2 gentoo-2-f56dcc26564602ea6c49be7892346c2372a8f7e6.zip | |
Add abi_x86_32 blockers for emul-linux.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libv4l/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/libv4l/libv4l-0.9.5-r1.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog index 7f14a250342c..6309ecff2fea 100644 --- a/media-libs/libv4l/ChangeLog +++ b/media-libs/libv4l/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libv4l # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.90 2013/05/05 01:16:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.91 2013/07/13 22:15:31 mgorny Exp $ + + 13 Jul 2013; Michał Górny <mgorny@gentoo.org> libv4l-0.9.5-r1.ebuild: + Add abi_x86_32 blockers for emul-linux. 05 May 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5.ebuild, libv4l-0.9.5-r1.ebuild: diff --git a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild b/media-libs/libv4l/libv4l-0.9.5-r1.ebuild index 8929e6604481..d72ad13d6014 100644 --- a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild +++ b/media-libs/libv4l/libv4l-0.9.5-r1.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/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.3 2013/05/05 01:16:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.4 2013/07/13 22:15:31 mgorny Exp $ EAPI=5 inherit eutils linux-info udev multilib-minimal @@ -23,7 +23,9 @@ RDEPEND="virtual/jpeg:= x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 - amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) )" + amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs[development] ) ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} sys-devel/gettext virtual/os-headers |