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 <[email protected]>
johu · Jan 24, 2016 · d66ee66 · d66ee66
1 parent a728d85
commit d66ee66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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) \