From: Alexey Shvetsov <alexxy@gentoo.org>
Date: Fri, 14 Sep 2018 14:28:26 +0000 (+0300)
Subject: x11-wm/xpra: Fix deps for x264 x265 encoders
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1fef34d8c5572fc287d8f9b9e591247dd27905ab;p=gentoo.git

x11-wm/xpra: Fix deps for x264 x265 encoders

Package-Manager: Portage-2.3.49, Repoman-2.3.10
---

diff --git a/x11-wm/xpra/xpra-2.2.6.ebuild b/x11-wm/xpra/xpra-2.2.6-r1.ebuild
similarity index 93%
rename from x11-wm/xpra/xpra-2.2.6.ebuild
rename to x11-wm/xpra/xpra-2.2.6-r1.ebuild
index 5dcafddd7a59..12fe5f472783 100644
--- a/x11-wm/xpra/xpra-2.2.6.ebuild
+++ b/x11-wm/xpra/xpra-2.2.6-r1.ebuild
@@ -39,20 +39,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		libav? ( media-video/libav:0= )
 	)
 	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
+		!libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+		libav? ( media-video/libav:0=[x264,x265] )
 	)
 	enc_ffmpeg? (
 		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
 		libav? ( media-video/libav:0= )
 	)
 	enc_x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0= )
-		libav? ( media-video/libav:0= )
+		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
+		libav? ( media-video/libav:0=[x264] )
 	)
 	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= ) )
+		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
+		libav? ( media-video/libav:0=[x264] ) )
 	jpeg? ( media-libs/libjpeg-turbo )
 	opengl? ( dev-python/pygtkglext )
 	pulseaudio? ( media-sound/pulseaudio )