From: Sven Wegener <swegener@gentoo.org>
Date: Tue, 2 Aug 2016 15:21:01 +0000 (+0000)
Subject: media-tv/tvheadend: Merge ffmpeg atoms
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=49c9d9c482554ffea6bb85a2b93e71bb606c11eb;p=gentoo.git

media-tv/tvheadend: Merge ffmpeg atoms

Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener@gentoo.org>
---

diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 541c1b091c80..e9996699007d 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -25,10 +25,7 @@ REQUIRED_USE="dvbscan? ( dvb )"
 DEPEND="dev-libs/openssl:0=
 	avahi? ( net-dns/avahi )
 	dvb? ( virtual/linuxtv-dvb-headers )
-	ffmpeg? (
-		virtual/ffmpeg
-		<media-video/ffmpeg-3
-	)
+	ffmpeg? ( <media-video/ffmpeg-3:= )
 	imagecache? ( net-misc/curl )
 	zlib? ( sys-libs/zlib )
 	virtual/pkgconfig"
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 88ebb51ea1b3..b8a73e915615 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:=
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	ffmpeg? (
-		!libav? (
-			media-video/ffmpeg:0=
-			<media-video/ffmpeg-3
-		)
+		!libav? ( <media-video/ffmpeg-3:= )
 		libav? ( media-video/libav:= )
 	)
 	hdhomerun? ( media-libs/libhdhomerun )
diff --git a/media-tv/tvheadend/tvheadend-4.0.8.ebuild b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
index 88ebb51ea1b3..b8a73e915615 100644
--- a/media-tv/tvheadend/tvheadend-4.0.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.8.ebuild
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:=
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	ffmpeg? (
-		!libav? (
-			media-video/ffmpeg:0=
-			<media-video/ffmpeg-3
-		)
+		!libav? ( <media-video/ffmpeg-3:= )
 		libav? ( media-video/libav:= )
 	)
 	hdhomerun? ( media-libs/libhdhomerun )
diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
index 770aa5ffc8eb..939aac745cf8 100644
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -26,10 +26,7 @@ RDEPEND="dev-libs/openssl:=
 	avahi? ( net-dns/avahi )
 	dbus? ( sys-apps/dbus )
 	ffmpeg? (
-		!libav? (
-			media-video/ffmpeg:0=
-			<media-video/ffmpeg-3
-		)
+		!libav? ( <media-video/ffmpeg-3:= )
 		libav? ( media-video/libav:= )
 	)
 	hdhomerun? ( media-libs/libhdhomerun )