commit: 49c9d9c482554ffea6bb85a2b93e71bb606c11eb
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 15:21:01 2016 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 20:22:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c9d9c4
media-tv/tvheadend: Merge ffmpeg atoms
Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
media-tv/tvheadend/tvheadend-3.4.27.ebuild | 5 +----
media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 +----
media-tv/tvheadend/tvheadend-4.0.8.ebuild | 5 +----
media-tv/tvheadend/tvheadend-4.0.9.ebuild | 5 +----
4 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 541c1b0..e999669 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 88ebb51..b8a73e9 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 88ebb51..b8a73e9 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 770aa5f..939aac7 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 )