version bump. fixes bug #269222, bug #283798, bug #299063

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

3 files changed, 357 insertions, 7 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 4f2925afcca1..a418a205166a 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.307 2009/11/19 06:51:28 cardoe Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.308 2010/01/04 05:24:30 cardoe Exp $
+
+*mythtv-0.22_p23069 (04 Jan 2010)
+
+  04 Jan 2010; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.22_p23069.ebuild:
+  version bump. fixes bug #269222, bug #283798, bug #299063
 
 *mythtv-0.23_alpha22857 (19 Nov 2009)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 55ae170e537c..07477870e000 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -20,6 +20,7 @@ DIST mythtv-0.22_p22778.zip 26490383 RMD160 03e582a51ca244dbfdab6ae3c927240fc621
 DIST mythtv-0.22_p22811.zip 26490542 RMD160 62148be0e29b8912ec6a35dcce8b5c15365cf15e SHA1 1c9a6d64cc6bcd073b9aadb1ec0fab8a8fc9f29d SHA256 42e36f4d93f96a655189dc330af98fa8f46ab305cdc01302fd5fd1bf332f190d
 DIST mythtv-0.22_p22824.zip 26490593 RMD160 b723476162161903a0d82a0a3df9a0d2c949c0a1 SHA1 ef2cd8acb847823b523e2100183439bf2fc53677 SHA256 e65f886bd675fa9906d84363b56a685c82ec4b1ff5b3a6b6b44ff03ef6d2df2d
 DIST mythtv-0.22_p22860.zip 26490372 RMD160 e8f287e8ee398a077a66b4ab55fc79fe4b725f10 SHA1 c25b223dff5947612d4f7d0ee5a4553e94e3b891 SHA256 fc8c99252fcf5d14992e5781ec9f6f322994b77652dfe88f82684926014340ab
+DIST mythtv-0.22_p23069.zip 26492928 RMD160 5fcbe5a29303b44b19d1e4e71795ec91c4e16e97 SHA1 1e4af5e4bf865baa8af1c9b94b5a7c3ac1e5ecc1 SHA256 be7da741a906b94f5fc387d965ef500416423dd885e4d554879a6a7b9a32a7dd
 DIST mythtv-0.23_alpha22834.zip 29883175 RMD160 4055557ee494c204d45f56eed663ac8639902734 SHA1 6e8ecb88dc3a3155460bdec5234ac7370169a605 SHA256 b934904ba18f80355b51f65783675507b6a390af2aa115f406a5a02afddefea9
 DIST mythtv-0.23_alpha22857.zip 29863996 RMD160 5ad7f22c2ee7a748d55227447b2aab93c1feb5c5 SHA1 452ec398498ab01852a7afc46a5ee3ce1a34c21d SHA256 75c79d6e9418f10c8a79a71e3e79e62bcdf63c064beb06ff64d84968d39080a3
 EBUILD mythtv-0.21_p19961-r2.ebuild 8813 RMD160 74d39518eded6dbe685e7bf4729570b403452b23 SHA1 8174b4ad25571256fb9b363668ac8b1b0c29b435 SHA256 63c39a57f8b85290aa6abb9e700bbd053ef5a15f112765977bcd9aaa94320eb6
@@ -29,14 +30,15 @@ EBUILD mythtv-0.22_p22811.ebuild 9440 RMD160 018ece45f6b1a8bda4a478e1efc556ed472
 EBUILD mythtv-0.22_p22824-r1.ebuild 10125 RMD160 ed7c30533ab76a19e19c9767e9d9f3914822841a SHA1 4604fef29f107aee65f86e107eae3ee09b142f1f SHA256 254e56be7da7c92c03deec0e290a8c1651938bdac835611c4abde9dd1c2885d5
 EBUILD mythtv-0.22_p22824.ebuild 9650 RMD160 8b6ef5d94a895402aa59fa5229de47385bc2f77b SHA1 dbfaee1ea083d18286db6df28a9534b72d22eb9b SHA256 14cf50fbd7db2a664b7b47824bddb5157640a71b01e5f31987bb0e1339979f49
 EBUILD mythtv-0.22_p22860.ebuild 10206 RMD160 244a79b13644c52b941f4c01760b108dc23a9121 SHA1 4fca4029a6a3d25d7e777e5d32f66a3bdf4043aa SHA256 86093f3917dc16a9819ecc86fd9d85e5888a51e88c69e321556b93f06d238af7
+EBUILD mythtv-0.22_p23069.ebuild 10325 RMD160 0eecf1cb0eaa398851c90fd7d6cbd29a0a29db70 SHA1 48482a63c034de6124ff81c7aca4bb4042872192 SHA256 37b9e1fb91f9bcfc48ef3e16beaae7fc25d75edc52ac70027a7fdd6931424213
 EBUILD mythtv-0.23_alpha22834.ebuild 9444 RMD160 ae94aba7e9a6bab9d8eb4bacd481137fa766405d SHA1 ae6a83242cf8b5d6c565244c3aea76e58a60bb77 SHA256 5c70be430948815282e006a5f065177448704f37e38c88b433d5544931242e79
 EBUILD mythtv-0.23_alpha22857.ebuild 10210 RMD160 12b4a34053cbd686b4f49c1fa37839277bf55224 SHA1 3472c465d2f37d945b6950f58ee35bd6db575aac SHA256 62440abb3940e44aa75e9010e413d4df2877ba2ce94dd9769e95338da8c52db2
-MISC ChangeLog 60973 RMD160 67271d07d6c213fa49dbe0ca8100e629deaf0e32 SHA1 a5331309c8b9c9864ed49c8d47f37a63d8fb13c4 SHA256 b3654b56e0fa1257090e28fea460422d7ebc556c6a092625303ecb3f59c96824
+MISC ChangeLog 61149 RMD160 c91a51ccb3641718f68a4abe821d43f314ea44b0 SHA1 e590f08804961b2a02e8a6c25d5da37ff248cb56 SHA256 e9b141d50c8ee40486fd0e44faa733c773f226dddb20d88d94daeb75e9ede3da
 MISC metadata.xml 3409 RMD160 eebf522c9fc3e6220fdbfa1b1c521c5ca6e55b2e SHA1 b1b314ab2f5234d6766b2ccb0d4bf4d4a9256582 SHA256 876a429b0dc799b1ddd39c42bf334602106f8db0640ce3d340e66a19ea0ab0ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksE6wIACgkQoeSe8B0zEfz2zQCcCx2sx82XoMjMR4W0Q52V3Voq
-9/kAnjghR4FdgKWfKbT3+OXduupxA/SX
-=OCQr
+iEYEARECAAYFAktBe/kACgkQoeSe8B0zEfy7/ACgh10gLO+Vg2kcWtAM2aYyYmIw
+rSQAnRWh45qxPyo1WmyqvrpP5Nb3RV3o
+=BM33
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_p23069.ebuild b/media-tv/mythtv/mythtv-0.22_p23069.ebuild
new file mode 100644
index 000000000000..f060344800f6
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.22_p23069.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.22_p23069.ebuild,v 1.1 2010/01/04 05:24: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 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[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 )
+	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.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"
+
+	# fix for bug #292421 & #279944
+	epatch "${FILESDIR}/${PN}-0.22-x86-no-fpic.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-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
+	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 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.png \
+		"AudioVideo;TV;;" "/etc/mythtv/"
+	make_desktop_entry /usr/bin/mythtv-setup "MythTV Setup" mythtv.png \
+		"AudioVideo;TV;;" "/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/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
+}