upstream fixes

Package-Manager: portage-2.1.3_rc6

4 files changed, 322 insertions, 8 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 841306bc5db3..e8aa516ba00a 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.158 2007/06/28 21:49:46 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.159 2007/06/29 18:06:57 cardoe Exp $
+
+*mythtv-0.20.1_p13783 (29 Jun 2007)
+
+  29 Jun 2007; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.20.1_p13783.ebuild:
+  upstream fixes
 
   28 Jun 2007; Doug Goldstein <cardoe@gentoo.org>
   +files/mythtv-trunk-mcpu-march-2.patch, mythtv-0.21_pre13775.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index f3ca4a5d7fe8..6f23703da841 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -43,10 +43,15 @@ RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 files/xinitrc 240
 SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94 files/xinitrc 240
 DIST mythtv-0.20.1.tar.bz2 12429721 RMD160 7aecb245cbd94796ce311543d744042ceacd8e13 SHA1 48848bce345aa2e40d99506d6e98f256d380dd8a SHA256 6990d86ce17c93ff39d24ba27094c09e2a2ec78d044e57b7406216b51145237c
 DIST mythtv-0.20.1_svn13344.patch.bz2 967 RMD160 885bde4753d66202c4bc64777be032939db714ef SHA1 230da6ae663302b225e234b86ff4b6a1f5d68f10 SHA256 af1f5183adcf0354f9bb4412e93abd99cc7ae4e95af2c555c0e066efef993af2
+DIST mythtv-0.20.1_svn13783.patch.bz2 4286 RMD160 21cfef35f92064cf111f84ca13d64642dc6739b7 SHA1 31bfd77d2747c02f56dcdfaf7d64ccdf8441e4b2 SHA256 ff6acd80b23b36cf2c97cf587c05fe90972ee8005f775768479d4d9919e5e225
 EBUILD mythtv-0.20.1_p13344.ebuild 8232 RMD160 191a1cbb15e8e0f1923c2a834f205ba61f0d9ee0 SHA1 8558fd7fc3c2c1cf429818009661a3652e4a850c SHA256 396959295136777dccca60acd25699165c5a1d6cdd0c2fa27fcf2af38a629bf0
 MD5 9f72238ccbe55f1d0cd431473f452485 mythtv-0.20.1_p13344.ebuild 8232
 RMD160 191a1cbb15e8e0f1923c2a834f205ba61f0d9ee0 mythtv-0.20.1_p13344.ebuild 8232
 SHA256 396959295136777dccca60acd25699165c5a1d6cdd0c2fa27fcf2af38a629bf0 mythtv-0.20.1_p13344.ebuild 8232
+EBUILD mythtv-0.20.1_p13783.ebuild 8235 RMD160 03183dd24b4cae33e2d383edc8261b19917beaa9 SHA1 3ed993c97f9ad293f89c0f43bb85be2bbacd1e2e SHA256 73fc7d646b97d723b142c66deb6489ce939ccd913b863b963dacac4ccffbc5cc
+MD5 23400692be389cdab45fdde3e61c776f mythtv-0.20.1_p13783.ebuild 8235
+RMD160 03183dd24b4cae33e2d383edc8261b19917beaa9 mythtv-0.20.1_p13783.ebuild 8235
+SHA256 73fc7d646b97d723b142c66deb6489ce939ccd913b863b963dacac4ccffbc5cc mythtv-0.20.1_p13783.ebuild 8235
 EBUILD mythtv-0.21_pre13285.ebuild 7294 RMD160 9f455d3e28aa3e0f0e2a2105d2a085820af86712 SHA1 db2447b2d412320de059e39f89cb61d91bb0f434 SHA256 f113298b7d49fbfcce2ef6ddab9c74e12a841551f69375c456d2634127968148
 MD5 7f71f8c72c84389d805ca6ea414a22d4 mythtv-0.21_pre13285.ebuild 7294
 RMD160 9f455d3e28aa3e0f0e2a2105d2a085820af86712 mythtv-0.21_pre13285.ebuild 7294
@@ -55,10 +60,10 @@ EBUILD mythtv-0.21_pre13775.ebuild 7298 RMD160 4cef19ad5daf86270d36f931092b3184b
 MD5 77f3f0cf4c0586451a51c8cf73b7ee59 mythtv-0.21_pre13775.ebuild 7298
 RMD160 4cef19ad5daf86270d36f931092b3184b0c624f0 mythtv-0.21_pre13775.ebuild 7298
 SHA256 73de418f472a53c73938a12421c9733292f937d5d8ee352e5c8accda4981f381 mythtv-0.21_pre13775.ebuild 7298
-MISC ChangeLog 29249 RMD160 b2a837f4590291eed15728aec1f3b352e1a6e166 SHA1 e5b5a9dc562d80f1f2c210db0a7c93bd45b8d41f SHA256 43d91f8b46c69022c621fc77300125c57506242e91a7d92f395fa8510b4fd056
-MD5 2eecb2aefad6b01570b1ebde8fcda486 ChangeLog 29249
-RMD160 b2a837f4590291eed15728aec1f3b352e1a6e166 ChangeLog 29249
-SHA256 43d91f8b46c69022c621fc77300125c57506242e91a7d92f395fa8510b4fd056 ChangeLog 29249
+MISC ChangeLog 29386 RMD160 6b41c870728f175697fc0a1d625e81726de5ed30 SHA1 42e3cea32ee79167a0e7e5930d8c192d5d718b7d SHA256 51ba6159b8c1e92f45f508f6ad47f5dc8344711cc931af068832aca45ed16b09
+MD5 386e285f8c8ba298a7f9de09807dec22 ChangeLog 29386
+RMD160 6b41c870728f175697fc0a1d625e81726de5ed30 ChangeLog 29386
+SHA256 51ba6159b8c1e92f45f508f6ad47f5dc8344711cc931af068832aca45ed16b09 ChangeLog 29386
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -66,6 +71,9 @@ SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6 metadata
 MD5 f07477eafcd63be782b14aea85c92049 files/digest-mythtv-0.20.1_p13344 518
 RMD160 79443a93c92f493d09027828311637a6b93809dd files/digest-mythtv-0.20.1_p13344 518
 SHA256 2ede071c1c437e40263f366033d6ffe71696a356d9febfd246091bcfd3248772 files/digest-mythtv-0.20.1_p13344 518
+MD5 23c37100cf978399032025bd8bd27eaa files/digest-mythtv-0.20.1_p13783 521
+RMD160 8f7a71fe8205491e11283d07f2df27396b3cf65b files/digest-mythtv-0.20.1_p13783 521
+SHA256 a52984bdbd8d569ac2ed3dd558c9e1db01c45762d7ebe682d29c307bca37bb5c files/digest-mythtv-0.20.1_p13783 521
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre13285 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre13285 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre13285 0
@@ -75,7 +83,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGhC0EoeSe8B0zEfwRAjT9AJ9b0zrANS0RSPcfnflgMPKt00/sJgCeK0yc
-eteSy1UEhFRAVXJdvgPecyk=
-=eJHW
+iD8DBQFGhUpNoeSe8B0zEfwRArXwAJ9W2DOJbwscTQ7xYkgkXq+jQKQodACcCgB2
+2F8gQGNxFEKe8Inq0VRIAAg=
+=b7Bj
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783 b/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783
new file mode 100644
index 000000000000..800503a1ecb0
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.20.1_p13783
@@ -0,0 +1,6 @@
+MD5 a4ce30a679b8ffa5633750d3f6b06f23 mythtv-0.20.1.tar.bz2 12429721
+RMD160 7aecb245cbd94796ce311543d744042ceacd8e13 mythtv-0.20.1.tar.bz2 12429721
+SHA256 6990d86ce17c93ff39d24ba27094c09e2a2ec78d044e57b7406216b51145237c mythtv-0.20.1.tar.bz2 12429721
+MD5 d4682f3960af872b2ba94ef63a7c722a mythtv-0.20.1_svn13783.patch.bz2 4286
+RMD160 21cfef35f92064cf111f84ca13d64642dc6739b7 mythtv-0.20.1_svn13783.patch.bz2 4286
+SHA256 ff6acd80b23b36cf2c97cf587c05fe90972ee8005f775768479d4d9919e5e225 mythtv-0.20.1_svn13783.patch.bz2 4286
diff --git a/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild b/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
new file mode 100644
index 000000000000..1d86d263f4b7
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
@@ -0,0 +1,294 @@
+# 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_p13783.ebuild,v 1.1 2007/06/29 18:06:57 cardoe Exp $
+
+inherit mythtv flag-o-matic multilib eutils qt3
+
+DESCRIPTION="Homebrew PVR project"
+SLOT="0"
+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}"
+
+RDEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	xvmc? (
+		x11-libs/libXvMC
+		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
+								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_via? ( x11-drivers/xf86-video-via )
+		video_cards_i810? ( x11-drivers/xf86-video-i810 )
+	)
+	$(qt_min_version 3.3)
+	virtual/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	dts? ( media-libs/libdts )
+	dvd? ( 	media-libs/libdvdnav
+		media-libs/libdts )
+	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
+	ivtv? ( media-tv/ivtv )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	vorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	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 )"
+
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	x11-apps/xinit"
+
+PDEPEND="=x11-themes/mythtv-themes-${MY_PV}*"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+
+	local rip=0
+	if ! built_with_use -a =x11-libs/qt-3* mysql opengl ; then
+		echo
+		eerror "MythTV requires Qt to be built with mysql and opengl use flags enabled."
+		eerror "Please re-emerge =x11-libs/qt-3*, after having the use flags set."
+		echo
+		rip=1
+	fi
+
+	if use xvmc && use video_cards_nvidia; then
+		echo
+		ewarn "You enabled the 'xvmc' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	if use xvmc && ! ( use video_cards_i810 || use video_cards_nvidia || use video_cards_via ); then
+		echo
+		eerror "You enabled the XvMC USE flag but did not configure VIDEO_CARDS with either"
+		eerror "an nVidia, Intel i810, or VIA video card."
+		echo
+		rip=1
+	fi
+
+	if use autostart && use backendonly; then
+		echo
+		eerror "You can't have USE=autostart while having USE=backendonly."
+		eerror "USE=autostart is for mythfrontend"
+		echo
+		rip=1
+	fi
+
+	[[ $rip == 1 ]] && die "Please fix the above issues, before continuing."
+
+	echo
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
+	einfo "Only additional CFLAG issues that will be addressed are for binary"
+	einfo "package building."
+	echo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	#Fixes of the bugs found in the release
+	mythtv-fixes_patch
+
+	# As needed fix since they don't know how to write qmake let alone a real
+	# make system
+	epatch "${FILESDIR}"/${PN}-0.20-as-needed.patch
+}
+
+src_compile() {
+	local myconf="--prefix=/usr
+		--mandir=/usr/share/man
+		--libdir-name=$(get_libdir)"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use dts || myconf="${myconf} --disable-dts"
+	use freebox || myconf="${myconf} --disable-freebox"
+	use dbox2 || myconf="${myconf} --disable-dbox2"
+	use hdhomerun || myconf="${myconf} --disable-hdhomerun"
+	use crciprec || myconf="${myconf} --disable-crciprec"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use xvmc && myconf="${myconf} --enable-xvmc"
+	use xvmc && use video_cards_via && myconf="${myconf} --enable-xvmc-pro"
+	use perl && myconf="${myconf} --with-bindings=perl"
+	myconf="${myconf}
+		--disable-audio-arts
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable dvb)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable ieee1394 firewire)
+		--enable-xrandr
+		--enable-xv
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	MCPU=$(get-flag "mcpu")
+	strip-flags
+	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	filter-flags "-O" "-O?"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --arch=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+	if [[ -n "${MCPU}" ]]; then
+		myconf="${myconf} --cpu=${MCPU}"
+	fi
+
+#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	if use frontendonly; then
+		##Backend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the frontend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-backend"
+	fi
+
+	if use backendonly; then
+		##Frontend Removal
+		ewarn
+		ewarn "You are using the experimental feature for only installing the backend."
+		ewarn "You will not get Gentoo support nor support from MythTV upstream for this."
+		ewarn "If this breaks, you own both pieces."
+		ewarn
+		myconf="${myconf} --disable-frontend"
+	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	if ! use frontendonly; then
+		insinto /usr/share/mythtv/database
+		doins database/*
+
+		exeinto /usr/share/mythtv
+		doexe "${FILESDIR}/mythfilldatabase.cron"
+
+		newinitd ${FILESDIR}/mythbackend-0.18.2.rc mythbackend
+		newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend
+	fi
+
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins contrib/*
+
+	insinto /usr/share/mythtv/configfiles
+	doins configfiles/*
+
+	if ! use backendonly; then
+		dobin "${FILESDIR}"/runmythfe
+
+		if use autostart; then
+			dodir /etc/env.d/
+			echo 'CONFIG_PROTECT="/home/mythtv/"' > ${D}/etc/env.d/95mythtv
+
+			insinto /home/mythtv
+			newins "${FILESDIR}"/bash_profile .bash_profile
+			newins "${FILESDIR}"/xinitrc .xinitrc
+		fi
+	fi
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	if ! use backendonly; then
+		echo
+		elog "Want mythfrontend to start automatically?"
+		elog "Set USE=autostart. Details can be found at:"
+		elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	fi
+
+	if ! use frontendonly; then
+		echo
+		elog "To always have MythBackend running and available run the following:"
+		elog "rc-update add mythbackend default"
+		echo
+		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 "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
+
+}
+