gentoo resync : 14.05.2020

3 files changed, 13 insertions, 31 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 5182942acc16..00a2c891d473 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -4,6 +4,6 @@ AUX xpra-3.0.2-ldconfig.patch 1270 BLAKE2B b4eaa81610899c16a43b43c5f11f93335ca48
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-EBUILD xpra-3.0.2.ebuild 4254 BLAKE2B 784a438fe336eefcb73f58ce929df6a57f748cbe6b0647ea160603dccc68b44aa6942215552a2f46838fe9d750f79117790e2a39ce128640517d30a41550d13f SHA512 c7f7d9f54e438a887659163bc1f43a101761398b79b0cbbb4f65775bf9de1d9602993591cea6bcd72ca75ec183d0bf6a7e508bcc50eb0f821ad2b5dbad920c8d
-EBUILD xpra-3.0.5.ebuild 3753 BLAKE2B 5da6b764b8a1b46af7eceb493b6d018abe54f97d531fa724e02d0f79642e4dfe1261bf376b6b2415aa509d58547f4090a4ded062a48f6840365999c88f980f2f SHA512 aebb8edc4960928d06646e656a0ea3ee282afe5f17197b315d6032a02293116b3f0ed26ca644bd7de4f2a79805147272c877e7a936d1343a059dae0b61e986a9
+EBUILD xpra-3.0.2-r1.ebuild 3987 BLAKE2B 4772c5968b01f2ab4e8ec826fa0bd4d6c45a17bee86bdff9ea2248aca4350b04898930ad282e99136346ce8841fffc4082c72f8a73c7e33c127bc3fdcfd6e7a7 SHA512 c5836c2783be02375889e8d10448d076f4ca3bd4ddfb8b5c45b20763ce59048ce836dce0873e6d8f3e4e7e50dec934b7f8803d40db03e495e7ae458e642a3b18
+EBUILD xpra-3.0.5-r1.ebuild 3642 BLAKE2B 99147ccdb77786e829bfc950689ca82cab85e6bff73e660c8ea0a311beb96a8c96552aa5d841abdb703d788977106e9977bcef7659fdd494331ca076efa0f58e SHA512 60113eda0d5688e720d94908025b79c939ce7b40b21b3d0a535d9b71cb742fd6b5c6f9ad95152033a5be59ae1d9a1b579272abd9c0d86ea279fc4b82ad7926d7
 MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
index 1b1afa0b1211..67c37be000fb 100644
--- a/x11-wm/xpra/xpra-3.0.2.ebuild
+++ b/x11-wm/xpra/xpra-3.0.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
@@ -33,32 +33,20 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXtst
 	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!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= )
-	)
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	dec_avcodec2? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+	enc_ffmpeg? ( >=media-video/ffmpeg-3.2.2:0= )
 	enc_x264? ( media-libs/x264
-		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
-		libav? ( media-video/libav:0=[x264] )
-	)
+	>=media-video/ffmpeg-1.0.4:0=[x264] )
 	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
-		libav? ( media-video/libav:0=[x264] ) )
+	>=media-video/ffmpeg-2:0=[x264] )
 	jpeg? ( media-libs/libjpeg-turbo )
 	opengl? ( dev-python/pyopengl )
 	pulseaudio? ( media-sound/pulseaudio )
 	sound? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/xpra/xpra-3.0.5.ebuild b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
index f76f7a9fc36f..ab142fb477a1 100644
--- a/x11-wm/xpra/xpra-3.0.5.ebuild
+++ b/x11-wm/xpra/xpra-3.0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client +clipboard csc cups dbus ffmpeg jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="+client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -32,21 +32,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXrandr
 	x11-libs/libXtst
 	x11-libs/libxkbfile
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
-		libav? ( media-video/libav:0=[x264,x265] )
-	)
+	csc? ( >=media-video/ffmpeg-1.2.2:0= )
+	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
 	jpeg? ( media-libs/libjpeg-turbo )
 	opengl? ( dev-python/pyopengl )
 	pulseaudio? ( media-sound/pulseaudio )
 	sound? ( media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
 		dev-python/gst-python:1.0 )
-	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )
 "
 RDEPEND="${COMMON_DEPEND}