Upstream version bump. Fix compilation with Qt 4.7 (bug #338613)

Package-Manager: portage-2.1.9.12/cvs/Linux x86_64

3 files changed, 352 insertions, 2 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 0cbd9f8340d6..53273e88d6c7 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.328 2010/07/30 16:48:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.329 2010/10/01 03:18:30 cardoe Exp $
+
+*mythtv-0.23.1_p26437 (01 Oct 2010)
+
+  01 Oct 2010; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.23.1_p26437.ebuild:
+  Upstream version bump. Fix compilation with Qt 4.7 (bug #338613)
 
 *mythtv-0.23.1_p25496 (30 Jul 2010)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index e6b6e2555d9d..e2c39ae7a78f 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -14,6 +14,7 @@ DIST mythtv-0.22_p24255.zip 26493973 RMD160 0b369385f61f4a5f3b63ae42b4c4876bf5cb
 DIST mythtv-0.23.1_p25423.zip 32270383 RMD160 010e550352809f5e015557fcb9708f8c45d835c7 SHA1 8566f22865eba59ef74e687f090792b81bb948c5 SHA256 43ab12e4c488d4e5c9690a3b072bdb4a33248b7136c6c27ad5ce3d50000d69cf
 DIST mythtv-0.23.1_p25427.zip 32270525 RMD160 ae85646d5ffcda7e274e5b87d847f2c8830ffe37 SHA1 cee1bb83d1dff76579cbf9ec4511d5fc67e90896 SHA256 d61a967a8aaa3511ff2c1fa2c6b8975fcee957720df62693be3dc6aac14050df
 DIST mythtv-0.23.1_p25496.zip 32270586 RMD160 2db1edf2103c0ae7dc41068c6bddd49ed2e93b0c SHA1 fab05230f3979c258fde3278dbce840bfa3e6153 SHA256 045e44348ed7649beede2eb9a9991b8f570ac337d2f2e2166bca22d155685c7e
+DIST mythtv-0.23.1_p26437.zip 32267085 RMD160 a02c12135f8d5ed7d495f20489d332a34d6eb69f SHA1 2c7c3ed33d6e6c93388df62c400538888a04da7b SHA256 3d4809ae02c53a30c346ec5c0b3ca19f8aa295c824bf614ddeafa027f194f2fd
 DIST mythtv-0.23_p25051.zip 32268543 RMD160 c41c8058c534da7951b392b377d5bd0f88e808ea SHA1 2e4ebb0385e9cd6bf274d234e5a002879415305a SHA256 40eb50495d438515ef1e5ed18e5d3ad3f3044e0fda1b64f762e139d2b8a3c16b
 DIST mythtv-0.23_p25073.zip 32268588 RMD160 9bd1492bc6c544ca76ccfd4eea746fc29b68ad18 SHA1 4eb382b6dc27e60ef834ac4fa9a9f542453136ad SHA256 9275e2b08218b37cb323f2d1ca1aa49679d7d571f133c0f181016a6977e662ca
 EBUILD mythtv-0.22_p23069.ebuild 10325 RMD160 e7210638c7935c275944eda00ac5c6cbddc4121a SHA1 7621ac8b88ab1bcef04fad00c8f4dffa11eff01a SHA256 e9369ecb7521fec0ccf26b774724f9af1ba1d1f034024389e9cc3e1deb8264b6
@@ -21,7 +22,8 @@ EBUILD mythtv-0.22_p24255.ebuild 10360 RMD160 e4d7c7bfdffee503c88b847f26c429faeb
 EBUILD mythtv-0.23.1_p25423.ebuild 10405 RMD160 6017256bd3f2ad639fa5ea2b468a68fde46cbfea SHA1 eb789a125110561560b80c1ed5ac1364b21179ee SHA256 9b6e0676eaa5b16160a6edaf6bff8ce9f8df9bc8bbd1fce2e06b0a26373d4e89
 EBUILD mythtv-0.23.1_p25427.ebuild 10405 RMD160 ff463a067cddb56c5fc7615a0dc6ccb4a9848790 SHA1 17dbcbb5b54164aa5970cf502405ab9fd2936c85 SHA256 863eef76be729889505671981f3a2ffe4ac3f9ee5b5e20cba8c272c44aca1c16
 EBUILD mythtv-0.23.1_p25496.ebuild 10405 RMD160 ebaeb03bf48a53aca027beeb756137e5ec93254e SHA1 5888b12d96e2a4b408f58c3c84beb54390c5bfdb SHA256 419d72f318aa5b16355c3513f11680893baf6287007a1e8f6d738728f2bb065e
+EBUILD mythtv-0.23.1_p26437.ebuild 10405 RMD160 e139c99335ac8eb1d4fde7cc68f8c7be744eb823 SHA1 850e2056469c7986540722c141591eec862658d6 SHA256 3fa15b8bb1b173d9e9a181ca12a8266b4f2383e6e0e949e183916c4694b96b28
 EBUILD mythtv-0.23_p25051.ebuild 10305 RMD160 20332342fbcdc97fb77e81d907aecb102cd82253 SHA1 d59ec808f8e50df4c7a7e5ea39a4380d3a2932e5 SHA256 624ef21768e9a5bd06eda6e3141965f0d5b3f7b3d822275ec5036a62fd63d238
 EBUILD mythtv-0.23_p25073.ebuild 10305 RMD160 ee6dce2d5747d52f65e98845d712c7a4e6f8ea23 SHA1 7f2abca86a48840f801af630c89c48ad0c32f019 SHA256 5b3d034b02ce3489ef36cd5fdcb246cbb7e1b8390875df60da7fc316d9680810
-MISC ChangeLog 64804 RMD160 9c6a6b2529f1b0c861d59f25c25e9f7e72de0c8b SHA1 c0eaac8b4265671d9cc60fc054d3f8031dfb0da4 SHA256 712d95899ba5431021fa914f6f51750bf51dfd87f093bc11204938341c1679a3
+MISC ChangeLog 64991 RMD160 53099cac4f2360fff502095b094d9810a2a2829a SHA1 89e3e52b301af18c9cc6f33ca580bee333e04e99 SHA256 9608a0e3e428a1eee085ab5062ccfc4b6d1495e19188af47f49224fd75afec60
 MISC metadata.xml 3277 RMD160 46cdf33001f42c1fa6bc6f4321011078918c9081 SHA1 2adadd184fc16a93be980999c5410130a949e570 SHA256 6fa2b5e0529887435076607cd779290b7a21707e6b08e594cc368c21f05ac702
diff --git a/media-tv/mythtv/mythtv-0.23.1_p26437.ebuild b/media-tv/mythtv/mythtv-0.23.1_p26437.ebuild
new file mode 100644
index 000000000000..20b7a7405c8c
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.23.1_p26437.ebuild
@@ -0,0 +1,342 @@
+# 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.1_p26437.ebuild,v 1.1 2010/10/01 03:18:30 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 dbus debug directv dvb faad \
+fftw ieee1394 jack lcd lirc mmx perl pulseaudio python \
+tiff vdpau xvmc ${IUSE_VIDEO_CARDS}"
+
+# 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
+	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[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[dbus?]
+	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 )
+	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 )
+	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}
+	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.23
+	!<media-plugins/mythflix-0.23"
+
+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"
+	echo "SVNREPOPATH=${MYTHTV_REPO}" >> "${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 faad && myconf="${myconf} --enable-libfaad"
+	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, and bug #299063
+	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw"
+	if use video_cards_via && use xvmc; then
+		myconf="${myconf} --enable-xvmc-vld --enable-xvmc-pro";
+	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-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
+	fowners -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	fowners -R mythtv "${D}"/var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r1 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	dobin "${FILESDIR}"/runmythfe
+
+	# add icon from MythTV's website (scaled to 32x32)
+	# for desktop entry
+	insinto /usr/share/pixmaps
+	doins "${FILESDIR}"/mythtv.png
+
+	# create desktop entry for mythfrontend
+	make_desktop_entry /usr/bin/mythfrontend "MythFrontend" mythtv \
+		"AudioVideo;TV;" "Path=/etc/mythtv/"
+	make_desktop_entry /usr/bin/mythtv-setup "MythTV Setup" mythtv \
+		"AudioVideo;TV;" "Path=/etc/mythtv/"
+
+	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
+
+	# correct permissions so the scripts are actually usable
+	fperms 755 /usr/share/mythtv/contrib/*/*.pl
+	fperms 755 /usr/share/mythtv/contrib/*/*.py
+	fperms 755 /usr/share/mythtv/mythconverg_backup.pl
+	fperms 755 /usr/share/mythtv/mythconverg_restore.pl
+
+}
+
+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
+}