diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-08-05 09:46:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-08-05 09:46:43 +0000 |
| commit | 2492fd14d269bfc1f051baa2d9d97d5a4a3702cb (patch) | |
| tree | abfa41ba703c7f2e537afd616775aec24576f21d /media-libs | |
| parent | Pull in correct SLOT of libjpeg for headers. (diff) | |
| download | gentoo-2-2492fd14d269bfc1f051baa2d9d97d5a4a3702cb.tar.gz gentoo-2-2492fd14d269bfc1f051baa2d9d97d5a4a3702cb.tar.bz2 gentoo-2-2492fd14d269bfc1f051baa2d9d97d5a4a3702cb.zip | |
Pull in correct SLOT of libjpeg for headers.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libv4l/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libv4l/libv4l-0.9.5-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/libv4l/libv4l-0.9.5.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog index b13a7ae202d0..8c013fb794a4 100644 --- a/media-libs/libv4l/ChangeLog +++ b/media-libs/libv4l/ChangeLog @@ -1,6 +1,10 @@ # 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.94 2013/07/31 16:34:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.95 2013/08/05 09:46:43 ssuominen Exp $ + + 05 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> libv4l-0.9.5-r1.ebuild, + libv4l-0.9.5.ebuild: + Pull in correct SLOT of libjpeg for headers. 31 Jul 2013; Alexis Ballier <aballier@gentoo.org> libv4l-0.9.5-r1.ebuild: add emul blocker so that it is stacked for medialibs -r6 diff --git a/media-libs/libv4l/libv4l-0.9.5-r1.ebuild b/media-libs/libv4l/libv4l-0.9.5-r1.ebuild index 373ff22b8d48..e274ef1c8beb 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.7 2013/07/31 16:34:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5-r1.ebuild,v 1.8 2013/08/05 09:46:43 ssuominen Exp $ EAPI=5 inherit eutils linux-info udev multilib-minimal @@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x IUSE="" # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg. -RDEPEND=">=virtual/jpeg-0-r1:=[${MULTILIB_USEDEP}] +RDEPEND=">=virtual/jpeg-0-r1:0=[${MULTILIB_USEDEP}] virtual/glu virtual/opengl x11-libs/libX11:= diff --git a/media-libs/libv4l/libv4l-0.9.5.ebuild b/media-libs/libv4l/libv4l-0.9.5.ebuild index 1f06969f1d07..cfeed35e993e 100644 --- a/media-libs/libv4l/libv4l-0.9.5.ebuild +++ b/media-libs/libv4l/libv4l-0.9.5.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.ebuild,v 1.3 2013/05/05 01:16:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.9.5.ebuild,v 1.4 2013/08/05 09:46:43 ssuominen Exp $ EAPI=5 inherit eutils linux-info udev @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND="virtual/jpeg:= +RDEPEND="virtual/jpeg:0= virtual/glu virtual/opengl x11-libs/libX11:= |