diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2016-08-02 15:21:01 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2016-08-02 20:22:05 +0000 |
| commit | 49c9d9c482554ffea6bb85a2b93e71bb606c11eb (patch) | |
| tree | d8919d6187c469e799fd4308d1fa445ca3487b83 /media-tv | |
| parent | net-dns/pdns-recursor: Remove chroot symlink (diff) | |
| download | gentoo-49c9d9c482554ffea6bb85a2b93e71bb606c11eb.tar.gz gentoo-49c9d9c482554ffea6bb85a2b93e71bb606c11eb.tar.bz2 gentoo-49c9d9c482554ffea6bb85a2b93e71bb606c11eb.zip | |
media-tv/tvheadend: Merge ffmpeg atoms
Package-Manager: portage-2.2.28
Signed-off-by: Sven Wegener <swegener@gentoo.org>
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/tvheadend/tvheadend-3.4.27.ebuild | 5 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 | ||||
| -rw-r--r-- | media-tv/tvheadend/tvheadend-4.0.8.ebuild | 5 | ||||
| -rw-r--r-- | 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 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 ) |