Bump for latest upstream fixes (all fixes in video playback). Remove old 0.23 trunk builds

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 24 insertions, 329 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index d43d551598a2..246d479f8b85 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.320 2010/06/13 06:56:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.321 2010/06/13 07:09:23 cardoe Exp $
+
+*mythtv-0.23_p25073 (13 Jun 2010)
+
+  13 Jun 2010; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.23_alpha22834.ebuild, -mythtv-0.23_alpha22857.ebuild,
+  +mythtv-0.23_p25073.ebuild:
+  Bump for latest upstream fixes (all fixes in video playback). Remove old
+  0.23 trunk builds
 
   13 Jun 2010; Doug Goldstein <cardoe@gentoo.org> mythtv-0.23_p25051.ebuild:
   Update blockers to include discontinued MythFlix and MythTV Extra Themes
diff --git a/media-tv/mythtv/mythtv-0.23_alpha22834.ebuild b/media-tv/mythtv/mythtv-0.23_alpha22834.ebuild
deleted file mode 100644
index ae038222cb8c..000000000000
--- a/media-tv/mythtv/mythtv-0.23_alpha22834.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.23_alpha22834.ebuild,v 1.2 2009/11/18 05:37:23 cardoe Exp $
-
-EAPI=2
-inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
-IUSE="alsa altivec autostart +css debug directv dvb \
-fftw ieee1394 jack lcd lirc mmx perl pulseaudio python \
-tiff vdpau 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
-	>=x11-libs/qt-core-4.4:4[qt3support]
-	>=x11-libs/qt-gui-4.4:4[qt3support,tiff?]
-	>=x11-libs/qt-sql-4.4:4[qt3support,mysql]
-	>=x11-libs/qt-opengl-4.4:4[qt3support]
-	>=x11-libs/qt-webkit-4.4:4
-	virtual/mysql
-	virtual/opengl
-	virtual/glu
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	autostart? ( net-dialup/mingetty
-				x11-wm/evilwm
-				x11-apps/xset )
-	css? ( media-libs/libdvdcss )
-	directv? ( virtual/perl-Time-HiRes )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	fftw? ( sci-libs/fftw:3.0 )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.3
-			>=media-libs/libiec61883-1.0.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	perl? ( dev-perl/DBD-mysql )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.7 )
-	python? ( dev-python/mysql-python )
-	vdpau? ( x11-libs/libvdpau )
-	xvmc? ( x11-libs/libXvMC )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	x11-apps/xinit
-	!<media-plugins/mythcontrols-0.22
-	!<x11-themes/mythtv-themes-0.22
-	!<x11-themes/mythtv-themes-extra-0.22"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	if use xvmc && use video_cards_nvidia; then
-		elog
-		elog "For NVIDIA based cards, the XvMC renderer only works on"
-		elog "the NVIDIA 4, 5, 6 & 7 series cards."
-	fi
-
-	# puts the SVN branch name into an environment variable that the build
-	# system reads and embeds into the binaries for version info
-	export URL=${MYTHTV_REPO}
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
-	# puts the SVN revision into a special file that the build system
-	# reads and embeds into the binaries for version info
-	echo "SOURCE_VERSION=${MYTHTV_REV}" > "${S}/VERSION"
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/perl.pro
-
-	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
-}
-
-src_configure() {
-	local myconf="--prefix=/usr
-		--mandir=/usr/share/man
-		--libdir-name=$(get_libdir)"
-	use alsa || myconf="${myconf} --disable-audio-alsa"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use fftw && myconf="${myconf} --enable-libfftw3"
-	use jack || myconf="${myconf} --disable-audio-jack"
-	use vdpau && myconf="${myconf} --enable-vdpau"
-
-	#from bug #220857 and fixed for bug #292481
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw"
-	if use video_cards_via && use xvmc; then
-		myconf="${myconf} --enable-xvmc-vld";
-	else
-		myconf="${myconf} --disable-xvmc-vld";
-	fi
-
-	# according to the Ubuntu guys, this works better being always on
-	myconf="${myconf} --enable-glx-procaddrarb"
-
-	myconf="${myconf}
-		$(use_enable dvb)
-		$(use_enable ieee1394 firewire)
-		$(use_enable lirc)
-		--disable-audio-arts
-		--disable-directfb
-		--dvb-path=/usr/include
-		--enable-opengl-vsync
-		--enable-xrandr
-		--enable-xv
-		--enable-x11"
-
-	if use mmx || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=profile"
-	fi
-
-	## CFLAG cleaning so it compiles
-	MARCH=$(get-flag "march")
-	MTUNE=$(get-flag "mtune")
-	#strip-flags
-	#filter-flags "-march=*" "-mtune=*" "-mcpu=*"
-	#filter-flags "-O" "-O?"
-
-	if [[ -n "${MARCH}" ]]; then
-		myconf="${myconf} --cpu=${MARCH}"
-	fi
-	if [[ -n "${MTUNE}" ]]; then
-		myconf="${myconf} --tune=${MTUNE}"
-	fi
-
-#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
-	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	# let MythTV come up with our CFLAGS. Upstream will support this
-	unset CFLAGS
-	unset CXXFLAGS
-	einfo "Running ./configure ${myconf}"
-	sh ./configure ${myconf} || die "configure died"
-}
-
-src_compile() {
-	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
-	emake || die "emake failed"
-
-	# firewire support should build the tester
-	if use ieee1394; then
-		cd contrib
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester \
-			development/firewire_tester/firewire_tester.c \
-			${LDFLAGS} -liec61883 -lraw1394 || \
-			die "failed to compile firewire_tester"
-
-		cd channel_changers
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch \
-			6200ch/6200ch.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile 6200ch"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch \
-			sa3250ch/sa3250ch.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile sa3250ch"
-	fi
-
-	cd "${S}"/contrib/channel_changers
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye/red_eye.c \
-		${LDFLAGS} || die "failed to compile red_eye"
-}
-
-src_install() {
-
-	einstall INSTALL_ROOT="${D}" || die "install failed"
-	dodoc AUTHORS FAQ UPGRADING  README
-
-	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
-
-	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 -r contrib/*
-
-	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
-
-	if use ieee1394; then
-		dobin firewire_tester || die "failed to install firewire_tester"
-		newdoc contrib/development/firewire_tester/README README.firewire_tester
-
-		dobin 6200ch || die "failed to install 6200ch"
-		newdoc contrib/channel_changers/6200ch/README README.6200ch
-
-		dobin sa3250ch || die "failed to install sa3250ch"
-		newdoc contrib/channel_changers/sa3250ch/README README.sa3250ch
-	fi
-
-	dobin red_eye || die "failed to install red_eye"
-	newdoc contrib/channel_changers/red_eye/README README.red_eye
-
-	if use directv; then
-		dobin contrib/channel_changers/d10control/d10control.pl || die "failed to install d10control"
-		newdoc contrib/channel_changers/d10control/README README.d10control
-	fi
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize $(python_get_sitedir)/MythTV
-
-	elog
-	elog "To always have MythBackend running and available run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
-	ewarn "chown -R mythtv /path/to/store"
-
-	if use xvmc && [[ ! -s "${ROOT}/etc/X11/XvMCConfig" ]]; then
-		ewarn
-		ewarn "No XvMC implementation has been selected yet"
-		ewarn "Use 'eselect xvmc list' for a list of available choices"
-		ewarn "Then use 'eselect xvmc set <choice>' to choose"
-		ewarn "'eselect xvmc set nvidia' for example"
-	fi
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-
-	if use autostart; then
-		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
-
-	elog
-	ewarn "Beware when you change ANY packages on your system that it may"
-	ewarn "break some or all of the MythTV components. MythTV's build system"
-	ewarn "is very fragile and only supports automagic dependencies."
-	ewarn "i.e. It depends on libraries and components it finds at build time"
-	ewarn "We try to mitigate this with RDEPENDs but be prepared to run"
-	ewarn "revdep-rebuild as necessary."
-
-}
-
-pkg_postrm()
-{
-	use python && python_mod_cleanup $(python_get_sitedir)/MythTV
-}
-
-pkg_info() {
-	"${ROOT}"/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."
-	"${ROOT}"/usr/bin/mysql -u root -p < "${ROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.23_alpha22857.ebuild b/media-tv/mythtv/mythtv-0.23_p25073.ebuild
index 9fea4e09699e..61a0fc13c41f 100644
--- a/media-tv/mythtv/mythtv-0.23_alpha22857.ebuild
+++ b/media-tv/mythtv/mythtv-0.23_p25073.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.23_alpha22857.ebuild,v 1.4 2010/03/23 03:43:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.23_p25073.ebuild,v 1.1 2010/06/13 07:09:23 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -10,11 +10,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via"
-IUSE="alsa altivec autostart +css debug directv dvb faad \
+IUSE="alsa altivec autostart +css dbus debug directv dvb faad \
 fftw ieee1394 jack lcd lirc mmx perl pulseaudio python \
 tiff vdpau xvmc ${IUSE_VIDEO_CARDS}"
 
-RDEPEND=">=media-libs/freetype-2.0
+# fonts from bug #296222
+RDEPEND="media-fonts/corefonts
+	media-fonts/dejavu
+	>=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
 	x11-libs/libX11
 	x11-libs/libXext
@@ -23,10 +26,10 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
 	>=x11-libs/qt-core-4.4:4[qt3support]
-	>=x11-libs/qt-gui-4.4:4[qt3support,tiff?]
+	>=x11-libs/qt-gui-4.4:4[dbus?,qt3support,tiff?]
 	>=x11-libs/qt-sql-4.4:4[qt3support,mysql]
 	>=x11-libs/qt-opengl-4.4:4[qt3support]
-	>=x11-libs/qt-webkit-4.4:4
+	>=x11-libs/qt-webkit-4.4:4[dbus?]
 	virtual/mysql
 	virtual/opengl
 	virtual/glu
@@ -36,6 +39,7 @@ RDEPEND=">=media-libs/freetype-2.0
 				x11-wm/evilwm
 				x11-apps/xset )
 	css? ( media-libs/libdvdcss )
+	dbus? ( >=x11-libs/qt-dbus-4.4:4 )
 	directv? ( virtual/perl-Time-HiRes )
 	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
 	faad? ( media-libs/faad2 )
@@ -53,12 +57,14 @@ RDEPEND=">=media-libs/freetype-2.0
 	xvmc? ( x11-libs/libXvMC )"
 
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	x11-proto/xineramaproto
 	x11-proto/xf86vidmodeproto
 	x11-apps/xinit
 	!<media-plugins/mythcontrols-0.22
 	!<x11-themes/mythtv-themes-0.22
-	!<x11-themes/mythtv-themes-extra-0.22"
+	!<x11-themes/mythtv-themes-extra-0.23
+	!<media-plugins/mythflix-0.23"
 
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
@@ -89,9 +95,6 @@ src_prepare() {
 		-i "${S}"/bindings/perl/perl.pro
 
 	epatch "${FILESDIR}/${PN}-0.21-ldconfig-sanxbox-fix.patch"
-
-	# fix for bug #292421 & #279944
-	epatch "${FILESDIR}/${PN}-0.22-x86-no-fpic.patch"
 }
 
 src_configure() {
@@ -105,10 +108,10 @@ src_configure() {
 	use jack || myconf="${myconf} --disable-audio-jack"
 	use vdpau && myconf="${myconf} --enable-vdpau"
 
-	#from bug #220857 and fixed for bug #292481
+	#from bug #220857 and fixed for bug #292481, and bug #299063
 	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw"
 	if use video_cards_via && use xvmc; then
-		myconf="${myconf} --enable-xvmc-vld";
+		myconf="${myconf} --enable-xvmc-vld --enable-xvmc-pro";
 	else
 		myconf="${myconf} --disable-xvmc-vld";
 	fi
@@ -225,7 +228,7 @@ src_install() {
 	fowners -R mythtv "${D}"/var/log/mythtv
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
+	newins "${FILESDIR}"/mythtv.logrotate.d-r1 mythtv
 
 	insinto /usr/share/mythtv/contrib
 	doins -r contrib/*