media-tv/tvheadend: Merge ffmpeg atoms

Package-Manager: portage-2.2.28 Signed-off-by: Sven Wegener <[email protected]>
hanetzer · Aug 2, 2016 · 49c9d9c · 49c9d9c
1 parent 27b14ec
commit 49c9d9c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 )