summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2014-06-22 20:05:06 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2014-06-22 20:05:06 +0000
commit0a604fce21caeded70de26e6ceeb92c42fc2707a (patch)
treea215e6d62084bb958de72339fcf0d90faf3ddc30 /media-tv
parentamd64 stable, bug #512696 (diff)
downloadgentoo-2-0a604fce21caeded70de26e6ceeb92c42fc2707a.tar.gz
gentoo-2-0a604fce21caeded70de26e6ceeb92c42fc2707a.tar.bz2
gentoo-2-0a604fce21caeded70de26e6ceeb92c42fc2707a.zip
fixes, thanks amak79
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/tvheadend/ChangeLog6
-rw-r--r--media-tv/tvheadend/tvheadend-3.4.27.ebuild22
-rw-r--r--media-tv/tvheadend/tvheadend-9999.ebuild13
3 files changed, 17 insertions, 24 deletions
diff --git a/media-tv/tvheadend/ChangeLog b/media-tv/tvheadend/ChangeLog
index ef2666804a7b..b3baf6add6a5 100644
--- a/media-tv/tvheadend/ChangeLog
+++ b/media-tv/tvheadend/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-tv/tvheadend
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/ChangeLog,v 1.5 2014/06/21 21:15:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/ChangeLog,v 1.6 2014/06/22 20:05:06 prometheanfire Exp $
+
+ 22 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+ tvheadend-3.4.27.ebuild, tvheadend-9999.ebuild:
+ fixes, thanks amak79
*tvheadend-3.4.27 (21 Jun 2014)
*tvheadend-9999 (21 Jun 2014)
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index 0e1c837af939..e0c13348e276 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-3.4.27.ebuild,v 1.1 2014/06/21 21:15:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-3.4.27.ebuild,v 1.2 2014/06/22 20:05:06 prometheanfire Exp $
EAPI=5
@@ -16,23 +16,20 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi ccache curl +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
+IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv zlib"
-REQUIRED_USE="
- dvbscan? ( dvb )
- imagecache? ( curl )"
+REQUIRED_USE="dvbscan? ( dvb )"
DEPEND="dev-libs/openssl
avahi? ( net-dns/avahi )
- ccache? ( dev-util/ccache )
- curl? ( net-misc/curl )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
- uriparser? ( dev-libs/uriparser )
- zlib? ( sys-libs/zlib )"
+ imagecache? ( net-misc/curl )
+ zlib? ( sys-libs/zlib )
+ virtual/pkgconfig"
RDEPEND="${DEPEND}
- dvb? ( media-tv/linuxtv-dvb-apps )
+ dvbscan? ( media-tv/linuxtv-dvb-apps )
xmltv? ( media-tv/xmltv )"
S="${WORKDIR}/${PN}-${MY_PV}"
@@ -59,14 +56,11 @@ src_configure() {
--datadir="${EPREFIX}"/usr/share \
--mandir="${EPREFIX}"/usr/share/man/man1 \
$(use_enable avahi) \
- $(use_enable ccache) \
- $(use_enable curl) \
--disable-dvbscan \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \
- $(use_enable imagecache) \
+ $(use_enable curl imagecache) \
$(use_enable inotify) \
- $(use_enable uriparser) \
$(use_enable zlib)
}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index e83e5e5359dd..320d2846ddd2 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-9999.ebuild,v 1.1 2014/06/21 21:15:09 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvheadend/tvheadend-9999.ebuild,v 1.2 2014/06/22 20:05:06 prometheanfire Exp $
EAPI=5
@@ -14,20 +14,16 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="avahi ccache curl +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
-
-REQUIRED_USE="
- dvbscan? ( dvb )
- imagecache? ( curl )"
+IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
DEPEND="dev-libs/openssl
avahi? ( net-dns/avahi )
ccache? ( dev-util/ccache )
- curl? ( net-misc/curl )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
uriparser? ( dev-libs/uriparser )
- zlib? ( sys-libs/zlib )"
+ zlib? ( sys-libs/zlib )
+ virtual/pkgconfig"
RDEPEND="${DEPEND}
dvbscan? ( media-tv/linuxtv-dvb-apps )
@@ -51,7 +47,6 @@ src_configure() {
--datadir="${EPREFIX}"/usr/share \
$(use_enable avahi) \
$(use_enable ccache) \
- $(use_enable curl) \
--disable-dvbscan \
$(use_enable dvb linuxdvb) \
$(use_enable ffmpeg libav) \