From: David Seifert <soap@gentoo.org>
Date: Sun, 26 Apr 2020 12:25:21 +0000 (+0200)
Subject: net-misc/pulseaudio-dlna: Remove media-video/libav
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c8d1226376beead2193862217fdd39d2d081173;p=gentoo.git

net-misc/pulseaudio-dlna: Remove media-video/libav

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap@gentoo.org>
---

diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
index b82c8ca45012..74777d29cf6d 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
@@ -37,13 +37,14 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	|| (
 		|| (
 			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
+		(
+			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
 			media-sound/sox
-			media-sound/vorbis-tools )
+			media-sound/vorbis-tools
+		)
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 09bcb5e33204..e40690d4ccb3 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -44,14 +44,16 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	|| (
 		|| (
 			media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
-			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		( media-video/libav[encode,faac,mp3,opus,vorbis] )
-		( media-libs/faac
+			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
+		)
+		(
+			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
 			media-sound/sox
-			media-sound/vorbis-tools )
+			media-sound/vorbis-tools
+		)
 	)"
 
 DEPEND="${RDEPEND}