Add directv USE flag to install d10control. Add to trunk builds.

(Portage version: 2.1.3.6)

3 files changed, 27 insertions, 10 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 487c525f8365..0c11099c32fd 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.174 2007/08/24 13:30:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.175 2007/08/24 16:16:18 cardoe Exp $
+
+  24 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.20.2_p14282.ebuild, mythtv-0.21_pre14278.ebuild:
+  Add directv USE flag to install d10control. Add  to trunk builds.
 
 *mythtv-0.21_pre14278 (24 Aug 2007)
 
diff --git a/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild b/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild
index 40264cf2225a..c0087a887673 100644
--- a/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild,v 1.1 2007/08/24 13:28:40 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14282.ebuild,v 1.2 2007/08/24 16:16:18 cardoe Exp $
 
 inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
 
-IUSE="alsa altivec autostart backendonly crciprec debug dbox2 dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
+IUSE="alsa altivec autostart backendonly crciprec dbox2 debug directv dts dvb dvd freebox frontendonly hdhomerun ieee1394 ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -33,6 +33,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	dvd? ( 	media-libs/libdvdnav
 		media-libs/libdts )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	directv? ( virtual/perl-Time-HiRes )
 	ivtv? ( media-tv/ivtv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lcd? ( app-misc/lcdproc )
@@ -292,6 +293,11 @@ src_install() {
 
 	dobin red_eye || die "failed to install red_eye"
 	dodoc contrib/channel_changers/red_eye-README
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		dodoc contrib/channel_changers/d10control-README
+	fi
 }
 
 pkg_preinst() {
diff --git a/media-tv/mythtv/mythtv-0.21_pre14278.ebuild b/media-tv/mythtv/mythtv-0.21_pre14278.ebuild
index f839cb3ff290..39ecd718eb9d 100644
--- a/media-tv/mythtv/mythtv-0.21_pre14278.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre14278.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14278.ebuild,v 1.1 2007/08/24 13:30:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14278.ebuild,v 1.2 2007/08/24 16:16:18 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs
 
@@ -10,7 +10,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_i810 video_cards_nvidia video_cards_via"
 
-IUSE="alsa altivec autostart debug dbox2 dts dvb dvd hdhomerun ieee1394 iptv ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
+IUSE="alsa altivec autostart dbox2 debug directv dts dvb dvd hdhomerun ieee1394 iptv ivtv jack joystick lcd lirc mmx vorbis opengl perl xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -33,6 +33,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	dvd? ( 	media-libs/libdvdnav
 		media-libs/libdts )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	directv? ( virtual/perl-Time-HiRes )
 	ivtv? ( media-tv/ivtv )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lcd? ( app-misc/lcdproc )
@@ -97,15 +98,16 @@ pkg_setup() {
 src_unpack() {
 	subversion_src_unpack
 
-	# mcpu to march
-	#epatch "${FILESDIR}"/${PN}-trunk-mcpu-march-2.patch
-	# let upstream deal with this.. only so many times I can tell them of the
-	# issue
-
 	# As needed fix since they don't know how to write qmake let alone a real
 	# make system. And they won't accept this upstream since it comes from
 	# Gentoo
 	#epatch "${FILESDIR}"/${PN}-0.20-as-needed.patch
+
+	# upstream wants the revision number in their version.cpp
+	# since the subversion.eclass strips out the .svn directory
+	# svnversion in MythTV's build doesn't work
+	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${SVNREV}:" \
+		-i "${S}"/version.pro || die "svnversion sed failed"
 }
 
 src_compile() {
@@ -260,6 +262,11 @@ src_install() {
 
 	dobin red_eye || die "failed to install red_eye"
 	dodoc contrib/channel_changers/red_eye-README
+
+	if use directv; then
+		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
+		dodoc contrib/channel_changers/d10control-README
+	fi
 }
 
 pkg_preinst() {