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 541c1b091c80045a541a7433839c06cbddefa1a5..e9996699007d446fe9f28db68971808596ca7cdf 100644 (file)
--- 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 88ebb51ea1b39641671ba0fd2a3aa9a437f7c64f..b8a73e915615688fea65cb6e512afe1f04be5cd7 100644 (file)
--- 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 88ebb51ea1b39641671ba0fd2a3aa9a437f7c64f..b8a73e915615688fea65cb6e512afe1f04be5cd7 100644 (file)
--- 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 770aa5ffc8eb0bc7d20ffab010bf666f3e5d8faa..939aac745cf8ecb5c94fe9bc77cf3f5d6bbe5e44 100644 (file)
--- 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 )