fix C++ scope error from upstream

Package-Manager: portage-2.1.3.13

4 files changed, 29 insertions, 24 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 0dafe87b00f6..ae753bdc2ed8 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.191 2007/10/12 18:55:18 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.192 2007/10/15 15:06:30 cardoe Exp $
+
+*mythtv-0.20.2_p14680 (15 Oct 2007)
+
+  15 Oct 2007; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.20.2_p14472-r1.ebuild, +mythtv-0.20.2_p14680.ebuild:
+  fix C++ scope error from upstream
 
 *mythtv-0.21_pre14666 (12 Oct 2007)
 *mythtv-0.20.2_p14668 (12 Oct 2007)
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 46e8a045d38a..2552b2eec096 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -55,10 +55,6 @@ EBUILD mythtv-0.20.2_p14324.ebuild 10245 RMD160 9a71065e56533ba7f4fd2848d9822cbe
 MD5 8e3436ca6e16e784a546fc4da204ee44 mythtv-0.20.2_p14324.ebuild 10245
 RMD160 9a71065e56533ba7f4fd2848d9822cbeba5b3f53 mythtv-0.20.2_p14324.ebuild 10245
 SHA256 965ef1516e530398413456a90553147c6b635cea5744aca8c7a39b0556eb6f3b mythtv-0.20.2_p14324.ebuild 10245
-EBUILD mythtv-0.20.2_p14472-r1.ebuild 10283 RMD160 287fc5b377d64e0c073dfead70c178e6989fcf3b SHA1 060d8780c509a90b8b345c88e43a901c62c74193 SHA256 d91626c5d6163449ac1329e45e0879370448502995673561dfaac361add07218
-MD5 a4434619b234f22614d70cb13fd6d8a8 mythtv-0.20.2_p14472-r1.ebuild 10283
-RMD160 287fc5b377d64e0c073dfead70c178e6989fcf3b mythtv-0.20.2_p14472-r1.ebuild 10283
-SHA256 d91626c5d6163449ac1329e45e0879370448502995673561dfaac361add07218 mythtv-0.20.2_p14472-r1.ebuild 10283
 EBUILD mythtv-0.20.2_p14498.ebuild 10259 RMD160 1cc5dfaa4d2b4eb642fbc4273bc255d070a870dd SHA1 f4d2ea1e869006d4fd0a46b4b38495f13cbdb7cb SHA256 9448b343a76743402410b9778e310f84f9df5235fdc3d98aedb7c5bbbdd4cde0
 MD5 43e201ed11c15638a38c2d48925ac0fa mythtv-0.20.2_p14498.ebuild 10259
 RMD160 1cc5dfaa4d2b4eb642fbc4273bc255d070a870dd mythtv-0.20.2_p14498.ebuild 10259
@@ -67,6 +63,10 @@ EBUILD mythtv-0.20.2_p14668.ebuild 10259 RMD160 762513e606093b1cf13f8e2da61fe6af
 MD5 2c3892445b73b5786641a5738a4175ed mythtv-0.20.2_p14668.ebuild 10259
 RMD160 762513e606093b1cf13f8e2da61fe6af006e89b6 mythtv-0.20.2_p14668.ebuild 10259
 SHA256 4f361fe50db7303bbae5f571eff44994b154363e0083de69cc266d47a82dd076 mythtv-0.20.2_p14668.ebuild 10259
+EBUILD mythtv-0.20.2_p14680.ebuild 10267 RMD160 9ad03928c7571d05bb38a5b5c8f7fce5ceee9268 SHA1 1a09e8f2b9fe88e4494e4dfee4dd35bed113bd64 SHA256 71782cfbde6ffb60466cec4da92a334c934ef40a0f88fa1043b27795193f62db
+MD5 aee0962757b39fe763e742177babb52d mythtv-0.20.2_p14680.ebuild 10267
+RMD160 9ad03928c7571d05bb38a5b5c8f7fce5ceee9268 mythtv-0.20.2_p14680.ebuild 10267
+SHA256 71782cfbde6ffb60466cec4da92a334c934ef40a0f88fa1043b27795193f62db mythtv-0.20.2_p14680.ebuild 10267
 EBUILD mythtv-0.21_pre14513.ebuild 9304 RMD160 b2f7ea2c6439839e34e0f1aa8a53cf1e8a0923f8 SHA1 99b6acda9218dc44c8c4548ba11d3b3e0f0410a4 SHA256 a47fdeec2df71dbc369784371130269506afd01d9388d34441d7c89a58d64bf3
 MD5 2a0461daebdc6c4a135b9253fb4c73fb mythtv-0.21_pre14513.ebuild 9304
 RMD160 b2f7ea2c6439839e34e0f1aa8a53cf1e8a0923f8 mythtv-0.21_pre14513.ebuild 9304
@@ -75,10 +75,10 @@ EBUILD mythtv-0.21_pre14666.ebuild 9304 RMD160 a21dd8aa69d077ea3ff70cb72d49fee4d
 MD5 f00237f8b95b57a3e9378aa637bbcb09 mythtv-0.21_pre14666.ebuild 9304
 RMD160 a21dd8aa69d077ea3ff70cb72d49fee4dddf58ab mythtv-0.21_pre14666.ebuild 9304
 SHA256 eb85a08e67882b4c9c230b58dd02a9878fa6760d08d702f84abeba553bd9e4fe mythtv-0.21_pre14666.ebuild 9304
-MISC ChangeLog 36304 RMD160 c02dbd7fd1b5d0287a91ba1a4432c5dfe65a8793 SHA1 6e500a6433f2e9685c3f7ac65f63ea292870b1cf SHA256 a69566ae1944d8c2a995b4a80c08265484ee51e73d07b4ae822dd62a27d80576
-MD5 a1c71cfd73db994650a286c6c8f44bec ChangeLog 36304
-RMD160 c02dbd7fd1b5d0287a91ba1a4432c5dfe65a8793 ChangeLog 36304
-SHA256 a69566ae1944d8c2a995b4a80c08265484ee51e73d07b4ae822dd62a27d80576 ChangeLog 36304
+MISC ChangeLog 36493 RMD160 c5414792b0246f355f00afa7802370c4aa807073 SHA1 860e3647741e7d7d1403637d6bdd1c1061ef094e SHA256 1d19948711b448098fa02a2082361ddba1384a8a047640591672270729b686ba
+MD5 c097af6e3ca56e0cf4594058a44abda0 ChangeLog 36493
+RMD160 c5414792b0246f355f00afa7802370c4aa807073 ChangeLog 36493
+SHA256 1d19948711b448098fa02a2082361ddba1384a8a047640591672270729b686ba ChangeLog 36493
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -92,15 +92,15 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14324 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14324 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14324 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14472-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14472-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14472-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14498 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14498 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14498 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14668 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14668 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14668 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.20.2_p14680 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.20.2_p14680 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.20.2_p14680 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre14513 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre14513 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre14513 0
@@ -110,7 +110,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHD8OxoeSe8B0zEfwRAiQ6AJ98iIzAx3WYbiM2zE0BqRzQgZIyiwCeIgfH
-2eFrkfsLI4lHTlz8I+bEH6s=
-=QM3Q
+iD8DBQFHE4IDoeSe8B0zEfwRAspIAJ4wv9UCoZikzfPoQpaUrO2thBPvigCfc7+k
+yu3G6YLyBJyyZZeKZiOlPcE=
+=9eoJ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14472-r1 b/media-tv/mythtv/files/digest-mythtv-0.20.2_p14680
index e69de29bb2d1..e69de29bb2d1 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.20.2_p14472-r1
+++ b/media-tv/mythtv/files/digest-mythtv-0.20.2_p14680
diff --git a/media-tv/mythtv/mythtv-0.20.2_p14472-r1.ebuild b/media-tv/mythtv/mythtv-0.20.2_p14680.ebuild
index 9c32c503a739..b47406f97fdb 100644
--- a/media-tv/mythtv/mythtv-0.20.2_p14472-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.2_p14680.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_p14472-r1.ebuild,v 1.1 2007/09/20 05:25:15 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.2_p14680.ebuild,v 1.1 2007/10/15 15:06:30 cardoe Exp $
 
 inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
 
@@ -30,10 +30,10 @@ RDEPEND=">=media-libs/freetype-2.0
 	virtual/mysql
 	virtual/opengl
 	virtual/glu
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
 	alsa? ( >=media-libs/alsa-lib-0.9 )
 	dts? ( || ( media-libs/libdca media-libs/libdts ) )
-	dvd? ( 	media-libs/libdvdnav
-		media-libs/libdts )
+	dvd? ( 	media-libs/libdvdnav )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
 	directv? ( virtual/perl-Time-HiRes )
 	ivtv? ( media-tv/ivtv )
@@ -45,7 +45,6 @@ RDEPEND=">=media-libs/freetype-2.0
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
 			>=sys-libs/libavc1394-0.5.0
 			>=media-libs/libiec61883-1.0.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
 	autostart? ( net-dialup/mingetty
 				x11-wm/evilwm
 				x11-apps/xset )"
@@ -229,7 +228,7 @@ src_compile() {
 #			die	"failed to compile firewire_tester"
 	fi
 
-	cd ${S}/contrib/channel_changers
+	cd "${S}"/contrib/channel_changers
 	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
 		die "failed to compile red_eye"
 }
@@ -246,10 +245,10 @@ src_install() {
 		doins database/*
 
 		exeinto /usr/share/mythtv
-		doexe "${FILESDIR}/mythfilldatabase.cron"
+		doexe "${FILESDIR}"/mythfilldatabase.cron
 
-		newinitd ${FILESDIR}/mythbackend-0.18.2.rc mythbackend
-		newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend
+		newinitd "${FILESDIR}"/mythbackend-0.18.2.rc mythbackend
+		newconfd "${FILESDIR}"/mythbackend-0.18.2.conf mythbackend
 	fi
 
 	dodoc keys.txt docs/*.{txt,pdf}
@@ -274,7 +273,7 @@ src_install() {
 
 		if use autostart; then
 			dodir /etc/env.d/
-			echo 'CONFIG_PROTECT="/home/mythtv/"' > ${D}/etc/env.d/95mythtv
+			echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
 
 			insinto /home/mythtv
 			newins "${FILESDIR}"/bash_profile .bash_profile