recursively copy contrib directory. Always build red_eye changer. build 6200ch, sa3250ch and firewire_tester when USE=ieee1394

Package-Manager: portage-2.1.3.6

5 files changed, 153 insertions, 32 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 6dff26757655..5ca8e6a38b96 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.167 2007/08/21 20:44:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.168 2007/08/22 15:01:20 cardoe Exp $
+
+  22 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.20.1_p14146.ebuild, mythtv-0.21_pre14153.ebuild,
+  mythtv-0.21_pre14241.ebuild:
+  recursively copy contrib directory. Always build red_eye changer. build
+  6200ch, sa3250ch and firewire_tester when USE=ieee1394
 
   21 Aug 2007; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.21_pre14153.ebuild, mythtv-0.21_pre14241.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 69e09614feb9..31e82043a6b6 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -52,10 +52,10 @@ EBUILD mythtv-0.20.1_p13783.ebuild 8183 RMD160 5c740088aa35743968a132727c8be13b1
 MD5 dbbc6b6b827f5a457e55ccca391bc2f9 mythtv-0.20.1_p13783.ebuild 8183
 RMD160 5c740088aa35743968a132727c8be13b13094d16 mythtv-0.20.1_p13783.ebuild 8183
 SHA256 f7a0888137db3463d9025081e7913565686f5b968f9d45618ee5e16bf0b63d3d mythtv-0.20.1_p13783.ebuild 8183
-EBUILD mythtv-0.20.1_p14146.ebuild 8128 RMD160 a192e6b591a45889ca3ea537a18389365aeacc88 SHA1 11961d7277307288f025d36a49835a4e3785f876 SHA256 a2fe4b2340e5b807a15e46c7e0af3cbdc46f2ce901ce8a80896ddeea3cca5296
-MD5 2b78dce17d5d4a1732c4c43eff396d09 mythtv-0.20.1_p14146.ebuild 8128
-RMD160 a192e6b591a45889ca3ea537a18389365aeacc88 mythtv-0.20.1_p14146.ebuild 8128
-SHA256 a2fe4b2340e5b807a15e46c7e0af3cbdc46f2ce901ce8a80896ddeea3cca5296 mythtv-0.20.1_p14146.ebuild 8128
+EBUILD mythtv-0.20.1_p14146.ebuild 9690 RMD160 d41581b03be8587b487e429a4933cc7ce41ca714 SHA1 b67521c9da0110fa390b648c568e82865ab3289a SHA256 b1b010446fa8e0c723953cf435bf842cacbb1b120ac777e5d9c092e0e48ac129
+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.21_pre13285.ebuild 7243 RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 SHA1 a026fedbe1d2cfeccd87d8f5a355ca1a42430c0b SHA256 a62c28e4622edddac483434a7dc78b7c8a4244be70da4ebb8b6b24017f3f732c
 MD5 d2fb98ee05600d3d3175d195b5369041 mythtv-0.21_pre13285.ebuild 7243
 RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 mythtv-0.21_pre13285.ebuild 7243
@@ -64,18 +64,18 @@ EBUILD mythtv-0.21_pre13775.ebuild 7247 RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02
 MD5 f5e4311b740fa6ac5dfc72050e0034e7 mythtv-0.21_pre13775.ebuild 7247
 RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02441a0be mythtv-0.21_pre13775.ebuild 7247
 SHA256 a0550434c82157b8bfb877db79ab21cbbc8fc80a38977d5c051e444471e49b32 mythtv-0.21_pre13775.ebuild 7247
-EBUILD mythtv-0.21_pre14153.ebuild 7611 RMD160 96baf453858c9ebc160cd6cacff73c5d2c577882 SHA1 8b169db3b11b935cd7a5a5ca6cf5ba26fa2bb799 SHA256 080804e67aa4a5145019b83bff5b8d16d88b024f90aa6b884588e876fee6121c
-MD5 88e4e507959d4d31ab723ae6da86cee8 mythtv-0.21_pre14153.ebuild 7611
-RMD160 96baf453858c9ebc160cd6cacff73c5d2c577882 mythtv-0.21_pre14153.ebuild 7611
-SHA256 080804e67aa4a5145019b83bff5b8d16d88b024f90aa6b884588e876fee6121c mythtv-0.21_pre14153.ebuild 7611
-EBUILD mythtv-0.21_pre14241.ebuild 7611 RMD160 97e0f0641ed66a35c38ab774bfb70c18afea9a99 SHA1 c559bf193a3279fb54f2efc583c584838ca37727 SHA256 f533934dc6f0188978f5a9b90d7886d2f26dc4593fdf8fe16d29f62c4cfea168
-MD5 d0749559f9c4dfe17266c23db5280d40 mythtv-0.21_pre14241.ebuild 7611
-RMD160 97e0f0641ed66a35c38ab774bfb70c18afea9a99 mythtv-0.21_pre14241.ebuild 7611
-SHA256 f533934dc6f0188978f5a9b90d7886d2f26dc4593fdf8fe16d29f62c4cfea168 mythtv-0.21_pre14241.ebuild 7611
-MISC ChangeLog 30725 RMD160 4dce579a504fdcc095f760e3e540caa5fa1cfffb SHA1 17c7df052a701e62f1311c8aefd4e2aeab06f241 SHA256 e6d99f97aabc7c1f557ad5694743fdf9c16e68ec3ac86b7d5fd03220b1e155fd
-MD5 86f9c3908423d72d41958237e3549c10 ChangeLog 30725
-RMD160 4dce579a504fdcc095f760e3e540caa5fa1cfffb ChangeLog 30725
-SHA256 e6d99f97aabc7c1f557ad5694743fdf9c16e68ec3ac86b7d5fd03220b1e155fd ChangeLog 30725
+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
+SHA256 be6e3c07751f88509a425c3ec9c6276b16876f7609984c372fe29b66406c13ba mythtv-0.21_pre14153.ebuild 8895
+EBUILD mythtv-0.21_pre14241.ebuild 8894 RMD160 5244490dcafd852657dfe5bd921f8becbfa9020b SHA1 371d5d159385d489e30300e069cc019aa602dcce SHA256 e31334f7aeb12582bac04fa476fa10a40d6e0450d21e3662a4d95aba5e996000
+MD5 e34aafb8d4e8f5f2257fe153b91e9872 mythtv-0.21_pre14241.ebuild 8894
+RMD160 5244490dcafd852657dfe5bd921f8becbfa9020b mythtv-0.21_pre14241.ebuild 8894
+SHA256 e31334f7aeb12582bac04fa476fa10a40d6e0450d21e3662a4d95aba5e996000 mythtv-0.21_pre14241.ebuild 8894
+MISC ChangeLog 30998 RMD160 6e912ec044520b8360a8cb164a993618e2007522 SHA1 8f3a8b36f97bca0e20b64fdcde1db9360f4f9b38 SHA256 c5936560caadcdefa5602e12170f7b0979978b1cebe89a617c4a345316d40933
+MD5 91cc39398c678657367f68da64759d61 ChangeLog 30998
+RMD160 6e912ec044520b8360a8cb164a993618e2007522 ChangeLog 30998
+SHA256 c5936560caadcdefa5602e12170f7b0979978b1cebe89a617c4a345316d40933 ChangeLog 30998
 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)
 
-iD8DBQFGy065oeSe8B0zEfwRAsr4AJ42kHoTWSTs3OJ2bpM6YgKMFTkiyACdFehn
-9Qerh4xPxO+zhyJBVrJVPKw=
-=41xr
+iD8DBQFGzE/PoeSe8B0zEfwRAoJxAJsGum4s+ZzxIPxmwu6iLFodlBRYXwCfde0d
+HowQc1GGheGtZk+YvfdanBc=
+=UTVe
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.20.1_p14146.ebuild b/media-tv/mythtv/mythtv-0.20.1_p14146.ebuild
index 427cd00843a6..46ef0c2cff96 100644
--- a/media-tv/mythtv/mythtv-0.20.1_p14146.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.1_p14146.ebuild
@@ -1,8 +1,8 @@
 # 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.1_p14146.ebuild,v 1.2 2007/08/10 15:02:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p14146.ebuild,v 1.3 2007/08/22 15:01:20 cardoe Exp $
 
-inherit mythtv flag-o-matic multilib eutils qt3 subversion
+inherit mythtv flag-o-matic multilib eutils qt3 subversion toolchain-funcs
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
@@ -202,6 +202,27 @@ src_compile() {
 	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../6200ch 6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+#		LDLIBS="-liec61883 -lraw1394" CC=$(tc-getCC) emake firewire_tester || \
+#			die	"failed to compile firewire_tester"
+	fi
+
+	cd ${S}/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
+		die "failed to compile red_eye"
 }
 
 src_install() {
@@ -234,7 +255,7 @@ src_install() {
 	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
 
 	insinto /usr/share/mythtv/contrib
-	doins contrib/*
+	doins -r contrib/*
 
 	insinto /usr/share/mythtv/configfiles
 	doins configfiles/*
@@ -251,6 +272,20 @@ src_install() {
 			newins "${FILESDIR}"/xinitrc .xinitrc
 		fi
 	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		dodoc contrib/firewire_tester-README
+
+		dobin 6200ch || die "failed to install 6200ch"
+		dodoc contrib/channel_changers/6200ch-README
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		dodoc contrib/channel_changers/sa3250ch-README
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	dodoc contrib/channel_changers/red_eye-README
 }
 
 pkg_preinst() {
@@ -269,19 +304,29 @@ pkg_postinst() {
 	fi
 
 	if ! use frontendonly; then
-		echo
+		elog
 		elog "To always have MythBackend running and available run the following:"
 		elog "rc-update add mythbackend default"
-		echo
+		elog
 		ewarn "Your recordings folder must be owned by the user 'mythtv' now"
 		ewarn "chown -R mythtv /path/to/store"
 	fi
 
 	if use autostart; then
-		echo
+		elog
 		elog "Please add the following to your /etc/inittab file at the end of"
 		elog "the TERMINALS section"
 		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
 	fi
 
 }
+
+pkg_info() {
+	/usr/bin/mythfrontend --version
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	/usr/bin/mysql -u root -p < /usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/mythtv/mythtv-0.21_pre14153.ebuild b/media-tv/mythtv/mythtv-0.21_pre14153.ebuild
index f0d5a510072c..8a772617708a 100644
--- a/media-tv/mythtv/mythtv-0.21_pre14153.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre14153.ebuild
@@ -1,8 +1,8 @@
 # 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_pre14153.ebuild,v 1.3 2007/08/21 20:44:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14153.ebuild,v 1.4 2007/08/22 15:01:20 cardoe Exp $
 
-inherit flag-o-matic multilib eutils qt3 mythtv subversion
+inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
@@ -180,6 +180,27 @@ src_compile() {
 	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../6200ch 6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+#		LDLIBS="-liec61883 -lraw1394" CC=$(tc-getCC) emake firewire_tester || \
+#			die	"failed to compile firewire_tester"
+	fi
+
+	cd ${S}/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c  ${LDFLAGS} || \
+		die "failed to compile red_eye"
 }
 
 src_install() {
@@ -210,7 +231,7 @@ src_install() {
 	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
 
 	insinto /usr/share/mythtv/contrib
-	doins contrib/*
+	doins -r contrib/*
 
 	insinto /usr/share/mythtv/configfiles
 	doins configfiles/*
@@ -225,6 +246,20 @@ src_install() {
 		newins "${FILESDIR}"/bash_profile .bash_profile
 		newins "${FILESDIR}"/xinitrc .xinitrc
 	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		dodoc contrib/firewire_tester-README
+
+		dobin 6200ch || die "failed to install 6200ch"
+		dodoc contrib/channel_changers/6200ch-README
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		dodoc contrib/channel_changers/sa3250ch-README
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	dodoc contrib/channel_changers/red_eye-README
 }
 
 pkg_preinst() {
diff --git a/media-tv/mythtv/mythtv-0.21_pre14241.ebuild b/media-tv/mythtv/mythtv-0.21_pre14241.ebuild
index 619197b333a4..2ff1b79c8902 100644
--- a/media-tv/mythtv/mythtv-0.21_pre14241.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre14241.ebuild
@@ -1,8 +1,8 @@
 # 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_pre14241.ebuild,v 1.2 2007/08/21 20:44:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre14241.ebuild,v 1.3 2007/08/22 15:01:19 cardoe Exp $
 
-inherit flag-o-matic multilib eutils qt3 mythtv subversion
+inherit flag-o-matic multilib eutils qt3 mythtv subversion toolchain-funcs
 
 DESCRIPTION="Homebrew PVR project"
 SLOT="0"
@@ -180,6 +180,27 @@ src_compile() {
 	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
 	emake || die "emake failed"
 
+	# firewire support should build the tester
+	if use ieee1394; then
+		cd contrib
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester firewire_tester.c \
+			${LDFLAGS} -liec61883 -lraw1394 || \
+			die "failed to compile firewire_tester"
+
+		cd channel_changers
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../6200ch 6200ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile 6200ch"
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch sa3250ch.c \
+			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
+			die "failed to compile sa3250ch"
+#		LDLIBS="-liec61883 -lraw1394" CC=$(tc-getCC) emake firewire_tester || \
+#			die	"failed to compile firewire_tester"
+	fi
+
+	cd ${S}/contrib/channel_changers
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye.c ${LDFLAGS} || \
+		die "failed to compile red_eye"
 }
 
 src_install() {
@@ -210,7 +231,7 @@ src_install() {
 	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
 
 	insinto /usr/share/mythtv/contrib
-	doins contrib/*
+	doins -r contrib/*
 
 	insinto /usr/share/mythtv/configfiles
 	doins configfiles/*
@@ -225,6 +246,20 @@ src_install() {
 		newins "${FILESDIR}"/bash_profile .bash_profile
 		newins "${FILESDIR}"/xinitrc .xinitrc
 	fi
+
+	if use ieee1394; then
+		dobin firewire_tester || die "failed to install firewire_tester"
+		dodoc contrib/firewire_tester-README
+
+		dobin 6200ch || die "failed to install 6200ch"
+		dodoc contrib/channel_changers/6200ch-README
+
+		dobin sa3250ch || die "failed to install sa3250ch"
+		dodoc contrib/channel_changers/sa3250ch-README
+	fi
+
+	dobin red_eye || die "failed to install red_eye"
+	dodoc contrib/channel_changers/red_eye-README
 }
 
 pkg_preinst() {