diff options
author | 2014-06-19 13:14:57 +0000 | |
---|---|---|
committer | 2014-06-19 13:14:57 +0000 | |
commit | ce4371595118ca896265558c7e1d0853158d0ce7 (patch) | |
tree | 2ba3ee96ae593a79066583440293f6e0d389e2d6 | |
parent | Fix multilib dependencies to use safe versions, bug #513718. (diff) | |
download | gentoo-2-ce4371595118ca896265558c7e1d0853158d0ce7.tar.gz gentoo-2-ce4371595118ca896265558c7e1d0853158d0ce7.tar.bz2 gentoo-2-ce4371595118ca896265558c7e1d0853158d0ce7.zip |
Fix multilib dependencies to use safe versions, bug #513718.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
-rw-r--r-- | media-video/libav/ChangeLog | 7 | ||||
-rw-r--r-- | media-video/libav/libav-10.1-r1.ebuild | 86 | ||||
-rw-r--r-- | media-video/libav/libav-10.9999.ebuild | 86 | ||||
-rw-r--r-- | media-video/libav/libav-9.13-r1.ebuild | 82 | ||||
-rw-r--r-- | media-video/libav/libav-9.9999.ebuild | 82 | ||||
-rw-r--r-- | media-video/libav/libav-9999.ebuild | 88 |
6 files changed, 218 insertions, 213 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog index 779ae6074c7e..c14d8ace1c75 100644 --- a/media-video/libav/ChangeLog +++ b/media-video/libav/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/libav # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.193 2014/06/18 21:32:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.194 2014/06/19 13:14:57 mgorny Exp $ + + 19 Jun 2014; Michał Górny <mgorny@gentoo.org> libav-10.1-r1.ebuild, + libav-10.9999.ebuild, libav-9.13-r1.ebuild, libav-9.9999.ebuild, + libav-9999.ebuild: + Fix multilib dependencies to use safe versions, bug #513718. 18 Jun 2014; Michał Górny <mgorny@gentoo.org> -libav-0.8.9-r1.ebuild, -libav-9.10-r1.ebuild: diff --git a/media-video/libav/libav-10.1-r1.ebuild b/media-video/libav/libav-10.1-r1.ebuild index 04a88995f57c..837af8c8649a 100644 --- a/media-video/libav/libav-10.1-r1.ebuild +++ b/media-video/libav/libav-10.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.1-r1.ebuild,v 1.3 2014/06/19 13:14:57 mgorny Exp $ EAPI=5 @@ -44,74 +44,74 @@ done RDEPEND=" !media-video/ffmpeg:0 - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( - dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] + >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( - aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) - amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) - faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) - fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) + aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( - media-libs/libvorbis[${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) - wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) - jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( - openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - !openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] ) - vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) + schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " diff --git a/media-video/libav/libav-10.9999.ebuild b/media-video/libav/libav-10.9999.ebuild index d2e045161186..84cb0a05c9fa 100644 --- a/media-video/libav/libav-10.9999.ebuild +++ b/media-video/libav/libav-10.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.5 2014/06/16 22:03:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-10.9999.ebuild,v 1.6 2014/06/19 13:14:57 mgorny Exp $ EAPI=5 @@ -44,74 +44,74 @@ done RDEPEND=" !media-video/ffmpeg:0 - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( - dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] + >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( - aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) - amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) - faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) - fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) + aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( - media-libs/libvorbis[${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) - wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) - jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( - openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - !openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] ) - vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) + schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " diff --git a/media-video/libav/libav-9.13-r1.ebuild b/media-video/libav/libav-9.13-r1.ebuild index 11c584bcf543..d94dcd70d5a6 100644 --- a/media-video/libav/libav-9.13-r1.ebuild +++ b/media-video/libav/libav-9.13-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.2 2014/06/16 22:03:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.13-r1.ebuild,v 1.3 2014/06/19 13:14:57 mgorny Exp $ EAPI=5 @@ -46,72 +46,72 @@ done RDEPEND=" !media-video/ffmpeg:0 - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( - dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] + >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( - aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) - amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) - faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) - fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) + aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( - media-libs/libvorbis[${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) - jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( - openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - !openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] ) - vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) + schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " diff --git a/media-video/libav/libav-9.9999.ebuild b/media-video/libav/libav-9.9999.ebuild index be53e1aae86b..0ae75d96d473 100644 --- a/media-video/libav/libav-9.9999.ebuild +++ b/media-video/libav/libav-9.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.13 2014/06/16 22:03:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.9999.ebuild,v 1.14 2014/06/19 13:14:57 mgorny Exp $ EAPI=5 @@ -46,72 +46,72 @@ done RDEPEND=" !media-video/ffmpeg:0 - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( - dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] + >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( - aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) - amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) - faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) - fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) + aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( - media-libs/libvorbis[${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) - jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( - openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - !openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] ) - vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) + schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild index 14dee05fd51e..5cca166a5037 100644 --- a/media-video/libav/libav-9999.ebuild +++ b/media-video/libav/libav-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.68 2014/06/16 22:03:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.69 2014/06/19 13:14:57 mgorny Exp $ EAPI=5 @@ -42,75 +42,75 @@ done RDEPEND=" !media-video/ffmpeg:0 - alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) - amr? ( media-libs/opencore-amr[${MULTILIB_USEDEP}] ) - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) cdio? ( || ( - dev-libs/libcdio-paranoia[${MULTILIB_USEDEP}] + >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] <dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}] ) ) encode? ( - aac? ( media-libs/vo-aacenc[${MULTILIB_USEDEP}] ) - amr? ( media-libs/vo-amrwbenc[${MULTILIB_USEDEP}] ) - faac? ( media-libs/faac[${MULTILIB_USEDEP}] ) - fdk? ( media-libs/fdk-aac[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/lame-3.98.3[${MULTILIB_USEDEP}] ) + aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] ) + fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vorbis? ( - media-libs/libvorbis[${MULTILIB_USEDEP}] - media-libs/libogg[${MULTILIB_USEDEP}] + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) - webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) - wavpack? ( media-sound/wavpack[${MULTILIB_USEDEP}] ) - x264? ( >=media-libs/x264-0.0.20111017:=[${MULTILIB_USEDEP}] ) - x265? ( >=media-libs/x265-1:=[${MULTILIB_USEDEP}] ) - xvid? ( >=media-libs/xvid-1.1.0[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] ) + wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.0:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) ) frei0r? ( media-plugins/frei0r-plugins ) - gsm? ( >=media-sound/gsm-1.0.12-r1[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) ieee1394? ( - media-libs/libdc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] + >=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] ) - jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0[${MULTILIB_USEDEP}] ) - opus? ( media-libs/opus[${MULTILIB_USEDEP}] ) - pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.2f[${MULTILIB_USEDEP}] ) + jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) ssl? ( - openssl? ( dev-libs/openssl[${MULTILIB_USEDEP}] ) - !openssl? ( net-libs/gnutls[${MULTILIB_USEDEP}] ) + openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] ) + !openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] ) ) - sdl? ( >=media-libs/libsdl-1.2.13-r1[sound,video,${MULTILIB_USEDEP}] ) - schroedinger? ( media-libs/schroedinger[${MULTILIB_USEDEP}] ) - speex? ( >=media-libs/speex-1.2_beta3[${MULTILIB_USEDEP}] ) - truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[${MULTILIB_USEDEP}] ) - vdpau? ( x11-libs/libvdpau[${MULTILIB_USEDEP}] ) - vpx? ( >=media-libs/libvpx-0.9.6[${MULTILIB_USEDEP}] ) + sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] ) + schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} >=sys-devel/make-3.81 doc? ( app-text/texi2html ) - ieee1394? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) mmx? ( dev-lang/yasm ) - rtmp? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - schroedinger? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) - ssl? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) + ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) test? ( sys-devel/bc ) - truetype? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) + truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " |