summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2016-01-23 09:21:55 +0000
committerSven Wegener <swegener@gentoo.org>2016-01-24 23:03:56 +0000
commitd66ee667c04958ab7e7222bf8983880ebe729bce (patch)
treedb08b36d41dc5f23cc226585c2c539ae0e8aa631
parentmedia-tv/tvheadend: Remove iconv patch and USE flag (diff)
downloadgentoo-d66ee667c04958ab7e7222bf8983880ebe729bce.tar.gz
gentoo-d66ee667c04958ab7e7222bf8983880ebe729bce.tar.bz2
gentoo-d66ee667c04958ab7e7222bf8983880ebe729bce.zip
media-tv/tvheadend: Remove ccache USE flag
We have the ccache portage feature for that. Also the USE flag didn't do anything, because we are forcing CC during make, overriding the ccache command the configure script added to CC. Signed-off-by: Sven Wegener <swegener@gentoo.org>
-rw-r--r--media-tv/tvheadend/metadata.xml1
-rw-r--r--media-tv/tvheadend/tvheadend-4.0.6.ebuild5
-rw-r--r--media-tv/tvheadend/tvheadend-9999.ebuild7
3 files changed, 5 insertions, 8 deletions
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 154ca4bfa5de..99ac1c4a1728 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -17,7 +17,6 @@
<flag name="satip">Enable support for IP-based Satellite TV</flag>
<flag name="timeshift">Enable TimeShift support</flag>
<flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
- <flag name="ccache">Use <pkg>dev-util/ccache</pkg></flag>
<flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
<flag name="imagecache">Enable support for image caching</flag>
<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 5512e71899ba..030b89065d9a 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,13 +17,12 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
RDEPEND="dev-libs/openssl:=
virtual/libiconv
avahi? ( net-dns/avahi )
capmt? ( virtual/linuxtv-dvb-headers )
- ccache? ( dev-util/ccache sys-libs/zlib )
dbus? ( sys-apps/dbus )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? (
@@ -70,8 +69,8 @@ src_prepare() {
src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
+ --disable-ccache \
$(use_enable avahi) \
- $(use_enable ccache) \
$(use_enable capmt) \
$(use_enable constcw) \
$(use_enable cwc) \
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 184366eff323..7cbcfded400e 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -14,12 +14,11 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
+IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
DEPEND="dev-libs/openssl:0=
virtual/libiconv
avahi? ( net-dns/avahi )
- ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
uriparser? ( dev-libs/uriparser )
@@ -46,9 +45,9 @@ src_prepare() {
src_configure() {
econf --prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}"/usr/share \
- $(use_enable avahi) \
- $(use_enable ccache) \
+ --disable-ccache \
--disable-dvbscan \
+ $(use_enable avahi) \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \
$(use_enable imagecache) \