net-misc/freerdp: fix ffmpeg dependency

virtual/ffmpeg is only for tools usage.

Package-Manager: portage-2.3.2_p13

diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
index c0ba86d9a86d63c78672404fbfdbc40f6cc7341d..f9cb9dbf4d5548f8263fb4ceddb3a6979dfb8557 100644 (file)
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg
+IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg libav
        pulseaudio server smartcard cpu_flags_x86_sse2 test usb X xinerama xv"
 
 RDEPEND="
@@ -48,7 +48,10 @@ RDEPEND="
                )
        )
        directfb? ( dev-libs/DirectFB )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
        gstreamer? (
                media-libs/gstreamer:0.10
                media-libs/gst-plugins-base:0.10

diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
index e914037665a75397f6442a11889872b7cbdfe485..b0a3f9794ab655d16d35e1010f3ac24b0be81005 100644 (file)
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/1.2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav
        libressl neon pulseaudio server smartcard test usb wayland X xinerama xv"
 
 RDEPEND="
@@ -47,7 +47,10 @@ RDEPEND="
                        xv? ( x11-libs/libXv )
                )
        )
-       ffmpeg? ( >=virtual/ffmpeg-9 )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0

diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
index 2a8b741547e67bca4b3c1ead413381f4c57253c0..2d1221cd0f3c19765afece042dc82508c46130a6 100644 (file)
--- a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
        !libressl? ( dev-libs/openssl:0= )
@@ -47,7 +47,10 @@ RDEPEND="
                        xv? ( x11-libs/libXv )
                )
        )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0

diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
index 2df69d8a3a233f4a5e93d9d3faf2283e081d0a55..78307ff451a884d5149fdf618709d25f587d47a8 100644 (file)
--- a/net-misc/freerdp/freerdp-9999.ebuild
+++ b/net-misc/freerdp/freerdp-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv"
 
 RDEPEND="
        !libressl? ( dev-libs/openssl:0= )
@@ -47,7 +47,10 @@ RDEPEND="
                        xv? ( x11-libs/libXv )
                )
        )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
        gstreamer? (
                media-libs/gstreamer:1.0
                media-libs/gst-plugins-base:1.0