From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 426BC13888F for ; Fri, 16 Oct 2015 12:05:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEE75E07F2; Fri, 16 Oct 2015 12:05:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 64721E07F2 for ; Fri, 16 Oct 2015 12:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C5E2340775 for ; Fri, 16 Oct 2015 12:05:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB24710C9 for ; Fri, 16 Oct 2015 12:05:21 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1444997101.17bf1b8ccc41efafe8ba23cf98646c4f9eec45e1.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/tvheadend/tvheadend-4.0.6.ebuild X-VCS-Directories: media-tv/tvheadend/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 17bf1b8ccc41efafe8ba23cf98646c4f9eec45e1 X-VCS-Branch: master Date: Fri, 16 Oct 2015 12:05:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 64908b3c-b8f0-47d5-88b1-4919b3962984 X-Archives-Hash: 2f1d7bc9a372677ebd251ab7a23e11ec commit: 17bf1b8ccc41efafe8ba23cf98646c4f9eec45e1 Author: Alexis Ballier gentoo org> AuthorDate: Fri Oct 16 12:04:52 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Oct 16 12:05:01 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17bf1b8c media-tv/tvheadend: Fix usage of ffmpeg vs libav flags. ffmpeg flag means enable ffmpeg or libav. libav flags means use libav, lack of it use ffmpeg. Package-Manager: portage-2.2.23 media-tv/tvheadend/tvheadend-4.0.6.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild index 512a53d..ec29285 100644 --- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild @@ -23,10 +23,12 @@ RDEPEND="dev-libs/openssl:= ccache? ( dev-util/ccache sys-libs/zlib ) dbus? ( sys-apps/dbus ) dvb? ( virtual/linuxtv-dvb-headers ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + !libav? ( media-video/ffmpeg:0= ) + libav? ( media-video/libav:= ) + ) hdhomerun? ( media-libs/libhdhomerun ) iconv? ( virtual/libiconv ) - libav? ( media-video/libav ) imagecache? ( net-misc/curl ) uriparser? ( dev-libs/uriparser ) zlib? ( sys-libs/zlib ) @@ -80,7 +82,6 @@ src_configure() { --disable-kqueue \ $(use_enable ffmpeg libav) \ $(use_enable hdhomerun hdhomerun_client) \ - $(use_enable libav) \ $(use_enable imagecache) \ $(use_enable inotify) \ $(use_enable iptv) \