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

Package-Manager: portage-2.1.3.6

4 files changed, 42 insertions, 25 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/Manifest b/media-tv/mythtv/Manifest
index 985f222d6f3a..3c7c21eea418 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -56,10 +56,10 @@ EBUILD mythtv-0.20.1_p14146.ebuild 9690 RMD160 d41581b03be8587b487e429a4933cc7ce
 MD5 d9d03c99a666767d98006be81d60c141 mythtv-0.20.1_p14146.ebuild 9690
 RMD160 d41581b03be8587b487e429a4933cc7ce41ca714 mythtv-0.20.1_p14146.ebuild 9690
 SHA256 b1b010446fa8e0c723953cf435bf842cacbb1b120ac777e5d9c092e0e48ac129 mythtv-0.20.1_p14146.ebuild 9690
-EBUILD mythtv-0.20.2_p14282.ebuild 10028 RMD160 b880b234c5fbcb2946baa4e0839154b9daa0adb1 SHA1 e60780d29c445041640cba35b768795509da6967 SHA256 b9da4d01794576834568ae0526f011c25c760bf51c4a24eb78b493f2008bed7e
-MD5 2c49d458b895764670c2f83988131513 mythtv-0.20.2_p14282.ebuild 10028
-RMD160 b880b234c5fbcb2946baa4e0839154b9daa0adb1 mythtv-0.20.2_p14282.ebuild 10028
-SHA256 b9da4d01794576834568ae0526f011c25c760bf51c4a24eb78b493f2008bed7e mythtv-0.20.2_p14282.ebuild 10028
+EBUILD mythtv-0.20.2_p14282.ebuild 10237 RMD160 fbdd8d494d9452195fdef18ea699719295d418fe SHA1 e429082070ebe06cb0faa384ef770798b381b28a SHA256 eff5f8800e40f2fc03263013471a153b66f66a169a463cf4dc5bb36b9de1e12c
+MD5 b652f601343bb41f1bc83316df23c408 mythtv-0.20.2_p14282.ebuild 10237
+RMD160 fbdd8d494d9452195fdef18ea699719295d418fe mythtv-0.20.2_p14282.ebuild 10237
+SHA256 eff5f8800e40f2fc03263013471a153b66f66a169a463cf4dc5bb36b9de1e12c mythtv-0.20.2_p14282.ebuild 10237
 EBUILD mythtv-0.21_pre14153.ebuild 8895 RMD160 c83116fb2a9ba284d8d0635995deb2091df5edaa SHA1 c9757136aa8ffe22c12ed3d4ed618033f14b1c28 SHA256 be6e3c07751f88509a425c3ec9c6276b16876f7609984c372fe29b66406c13ba
 MD5 6f39ccb29c85400f0bb7dd0d7c384f53 mythtv-0.21_pre14153.ebuild 8895
 RMD160 c83116fb2a9ba284d8d0635995deb2091df5edaa mythtv-0.21_pre14153.ebuild 8895
@@ -68,14 +68,14 @@ EBUILD mythtv-0.21_pre14251.ebuild 8894 RMD160 61ec9023697220488bd66063bda550f7c
 MD5 676dddc486b0b1f8dd10ef844c35054a mythtv-0.21_pre14251.ebuild 8894
 RMD160 61ec9023697220488bd66063bda550f7ca6c4620 mythtv-0.21_pre14251.ebuild 8894
 SHA256 56e4d61adb4931aa155227a464f65855a80213b65812258badc81c8ce6e2fcde mythtv-0.21_pre14251.ebuild 8894
-EBUILD mythtv-0.21_pre14278.ebuild 8894 RMD160 aca103d56428bb4bab38a9ca9cc7c3cd848b4996 SHA1 7cb7287214c1d1d675a8546f0a6a1907e42188fd SHA256 1e85474b495828e0a3f63302cc2be7e8a55decc0dac3c5ad3bbf461241ace45f
-MD5 fdd03d4e2027aa404c8a6243b330987d mythtv-0.21_pre14278.ebuild 8894
-RMD160 aca103d56428bb4bab38a9ca9cc7c3cd848b4996 mythtv-0.21_pre14278.ebuild 8894
-SHA256 1e85474b495828e0a3f63302cc2be7e8a55decc0dac3c5ad3bbf461241ace45f mythtv-0.21_pre14278.ebuild 8894
-MISC ChangeLog 32314 RMD160 65320a1e2ed75bfd25fdfdf1d5baaec826101c43 SHA1 8e151b5f27da1ab754a218855953e2c1cf7d245a SHA256 f8844890829ddd980f86bf373c1d5cdc13bfaedf48befff60ec4ee09b9afcc01
-MD5 b0820f9b9a528eadf5eecb41f6c2da23 ChangeLog 32314
-RMD160 65320a1e2ed75bfd25fdfdf1d5baaec826101c43 ChangeLog 32314
-SHA256 f8844890829ddd980f86bf373c1d5cdc13bfaedf48befff60ec4ee09b9afcc01 ChangeLog 32314
+EBUILD mythtv-0.21_pre14278.ebuild 9257 RMD160 78721711c1d93878d82801fecdfd4f568cc93ee7 SHA1 c9e5cf6c23fee477133953a2d1ff15f5486f9aad SHA256 9fc2829433a6670efc20108a883193c699bf0f420f4b9c5a124f7489da46a18a
+MD5 cc3ef8cbbbd6aa887aef8a978f8df647 mythtv-0.21_pre14278.ebuild 9257
+RMD160 78721711c1d93878d82801fecdfd4f568cc93ee7 mythtv-0.21_pre14278.ebuild 9257
+SHA256 9fc2829433a6670efc20108a883193c699bf0f420f4b9c5a124f7489da46a18a mythtv-0.21_pre14278.ebuild 9257
+MISC ChangeLog 32493 RMD160 34b754c50097298612fb7a08d63aef6513412a49 SHA1 afe91d0229fc74c658098de298d8633acae01477 SHA256 fc478474630ba9d15cf651773a755a465427ad4fa01a2cd72b2a555f83fa025d
+MD5 536cd1b2fb6731cc23191f4be15b58ae ChangeLog 32493
+RMD160 34b754c50097298612fb7a08d63aef6513412a49 ChangeLog 32493
+SHA256 fc478474630ba9d15cf651773a755a465427ad4fa01a2cd72b2a555f83fa025d ChangeLog 32493
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -104,7 +104,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGzt1voeSe8B0zEfwRAkpkAJ4wVjW5aVx1nU4tChNTc/ib7k/+LgCZARMJ
-Z3UiWkpQEocph7yIn4XL728=
-=HoRN
+iD8DBQFGzwRmoeSe8B0zEfwRAka4AJ9S/vkkm7t2eQyU+0S3g4FFJp7emQCdGjzO
+ec6vRhwHU3Ulee5QxdfxfM0=
+=GPJX
 -----END PGP SIGNATURE-----
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() {