commit: d888a61effcc5c76dd6bdc00eb5884387fe458d5 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Sat Apr 25 18:39:43 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Sat Apr 25 18:39:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d888a61e
net-misc/freerdp: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> net-misc/freerdp/freerdp-2.0.0-r1.ebuild | 7 ++----- net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 7 ++----- net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild | 9 +++------ net-misc/freerdp/freerdp-2.9999.ebuild | 7 ++----- net-misc/freerdp/freerdp-9999.ebuild | 7 ++----- 5 files changed, 11 insertions(+), 26 deletions(-) diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild index 2ea42012517..d4c577fb18e 100644 --- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"; LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -45,10 +45,7 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild index 5bd7f37650e..862fb22e38c 100644 --- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="http://www.freerdp.com/"; LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -47,10 +47,7 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( 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_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild index 4ef50289d0b..81fe15dcd97 100644 --- a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2019 Gentoo Authors +# Copyright 2011-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"; LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -45,10 +45,7 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild index 48ee51c9277..b541ab6af7c 100644 --- a/net-misc/freerdp/freerdp-2.9999.ebuild +++ b/net-misc/freerdp/freerdp-2.9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"; LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -48,10 +48,7 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= ) diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 48ee51c9277..b541ab6af7c 100644 --- 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_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv" RESTRICT="!test? ( test )" RDEPEND=" @@ -48,10 +48,7 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) !ffmpeg? ( x11-libs/cairo:0= )
