Version bump for latest upstream fixes.

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

3 files changed, 327 insertions, 3 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index bfe08081f579..05bbe2792f69 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.364 2012/07/12 03:03:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.365 2012/07/15 22:40:09 cardoe Exp $
+
+*mythtv-0.25.1_p20120715 (15 Jul 2012)
+
+  15 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  +mythtv-0.25.1_p20120715.ebuild:
+  Version bump for latest upstream fixes.
 
   11 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.25.1_p20120708.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b94120e39561..6f2a47aba034 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -15,11 +15,13 @@ AUX runmythfe 186 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6
 AUX runmythfe-r1 167 SHA256 93e5c0e63a12e68f8fd6d114309620add21e7ba34a5a607a141ffa4fd376a695 SHA512 c63665884457df4b999a2b07276137d614e0ef46bba1da7c33ca7c8820ab7640f473bd61c917c910df41b67826483a33612b9cd66e83707d4aa5f7de497c4bce WHIRLPOOL 0698e3b26d26539606dcd0e2341b4e3ca5192e241b7cd5501d53dd9ebb4e31a8435bff990a4fd304050402e3fc3c9074e886d3e687634b29839d68d1e9735e27
 AUX xinitrc 240 SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94 SHA512 177219aaa83392c4508a8c4b8a6d3b1c45ddd3ef97e308885f9026d46181fedce06421a34588d05a6ea173635e0bbca77b99b262fda4913adec507f11103694b WHIRLPOOL 66bb81c0c8b3e7c90bb05b5d5e106469643ce97f683eb84b3c7feff02f5d1a1e45ebb14a065cb7e88419f96da311dca29b8bd5f2409fb3135c166c2509d40c72
 AUX xinitrc-r1 234 SHA256 0b335cc6d1e22d71f61bacfdcfed6cc450fecf7ff10bdb4bad50fd085bd7b2db SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188 WHIRLPOOL 6796d4d83ff200bd36cc02e3765222efd77dd7baa69ed9d6845b7ecb836fcd0b110f7ce644af1e2c4af3f76c4c924f7e69499b0b4f9f511ace31f3f9cc804240
-DIST mythtv-0.24.1_p20110524.tar.gz 69756131 SHA256 ea3e37258f8596c9186865289ffd8f9ece9fc80d28a2ded80bd008544138a863
+DIST mythtv-0.24.1_p20110524.tar.gz 69756131 SHA256 ea3e37258f8596c9186865289ffd8f9ece9fc80d28a2ded80bd008544138a863 SHA512 5d675a9dcd83e5e5e8b15c4559a69a134c1d349567d19b06051d37b3d98b19aba905edae09664e4e25e0ade42248e33761c0f5a97345e126b774f1e8c99ade23 WHIRLPOOL 925dba3f116165da3ff3312022676bbcc956c50157a792040786a61b71f2062d36b5dc66ec5a006876a6e98c09b0bc5ee14c00c42d9b00ace4ab26dc52ca429f
+DIST mythtv-0.25.1-4f6ac2a60b.tar.xz 41012 SHA256 b1916606d1569184d07503b21316a7f00c7f8e9bafca723dfeaf91ec59652046 SHA512 dd67b41c8ecf8d1fb7521dc9827586733b8de912bf693db0f20099b7922223d4053f22e2b028118950c26ebf49eedcdc7d5d34aa4b8d831b6ab8fe64f3aec5bc WHIRLPOOL 7fbd087694e523e07e1ee57f0559e53000911cc9c901af3b07f9acd94ee7965a549acbeeea6fccc3066537f0da9246a191ed6e1b64284da97ccfd38181f40bbf
 DIST mythtv-0.25.1-61e7a0e946.tar.xz 37304 SHA256 8b516be07d3519872f2f74728aebe7020b4162cdfd600cbf6397c3cbc8d9ddda SHA512 9feeb85c3894c6aec4c0ac804eae1e0e7aed8c95eed57b68ef6bf1990c15740402f24a586734546d4d014f4667616b4bff496ad42aae4fdd70d9867d0d45c24f WHIRLPOOL a283005ee808d6c4602146e9913a9cbb74aea200e74dd6ac96837821da0777471962af29b610a2ab634b809249b233c2c66015e18966de6e628fe1bb17c4a943
 DIST mythtv-0.25.1.tar.bz2 31827158 SHA256 7638ffc547b62f2d6dd031c6f164ccb993387a7b4b6d9218cdd37594c1cca508 SHA512 ea3d3746fd14a602638026d8cd7f373cd36ad5175ac33e0718ab61a9dee2f199fa9226253e126c78cbbf253705006fc3b05ab408495a905bad468f0a863f7567 WHIRLPOOL 4c214e5ca794d2ddf3a0c542ad23245064cd986cdc7d3cb7036c57b2c50bed851bbd701965709f5fdbafb05f9eef45133b77958e8ba0aa59908265e6d4db0514
 EBUILD mythtv-0.24.1_p20110524.ebuild 9230 SHA256 d5c246f523e234fa8e5202930448db67b91a808d5bb8c4a014ee9f182eed8402 SHA512 7cf1c76ba2a6895d38a11555cdca43f61a17f6dac5948271b4261a22dc3497fd954efa5a85ca1a85e770e9395f49c723c9e39678e6537acbcd7502107e4a2235 WHIRLPOOL a5f96507b775ccdf2fbb7285b4aa5e263c0a97964ff904940d4b1fc08ae05934b64ec1bac7fdda596343e36ca1f04ead454bb76eb4feb7ced78ab909c1b35c98
 EBUILD mythtv-0.25.1.ebuild 7289 SHA256 b68a260a5b82f034ce21e5260f2b0b3c0d10133d0ce093036735b7cedf267e3b SHA512 708e61b42f70bceb8702a92ea8ae98b15fee63395b9479ab127764ecb1bd0d6cb32655beda18e8618212eb14083007a97f8e41009035cdf88899e2e970881c82 WHIRLPOOL ceae49c69fc9ce7269cb880fff13aef2f206ccfaaf1bde8a405e42589d66a7997fab42b610b3c07aebfd1ccaac7d3398160a996ee9ac1d90e256f8f68a3d10f0
 EBUILD mythtv-0.25.1_p20120708.ebuild 8528 SHA256 433e042e7cb005d30c57a16cd5825d71ee9b4db12a7d017f96ca91d444ec39ec SHA512 5bf0afa8e88254ef7947b4702f3a9cde42326febb723b50e2d562d29c8689c5bf9b220e7b63345cd2e44e3d86e9c98ec0e21d1227b61981d505629f203ac69c6 WHIRLPOOL 9a6c0f3d2307de8ec41c9c7b760f3e03109ec9daf94e3ab4df7d6664d9c5add84da8123c8ba83b6c2815724f688cafbea419e840e6d761de47d0a63fd740c732
-MISC ChangeLog 71769 SHA256 3d010b885d23446db1f765f62a68b18037b14916fa807c18b7a57848bf04954f SHA512 117545aee948abe74067deef76e8746f9491a930d589c2f472f4433e23224ec298d74995c94644ca18059da7cd037ad4e2c8103bd1870cd14ccce9b4dc249c27 WHIRLPOOL 358295ef5bbff4dd251b523ff583e4dabc675143bc1180a6a6f434e746ba07a3f5b7624f02b809ce403533975879158187a418695d4574071041f14f0fe46f37
+EBUILD mythtv-0.25.1_p20120715.ebuild 8462 SHA256 4c1d0452b946028903ab8ebd9efc5508d61319260ee3d384bca3e259bc9eb579 SHA512 a819b5de07d00f65662c27696eb18f0fd563ad6452b892e8411061489882ef0d9e642850591592718067512c5c599a463143e9ede13fd97d447d73678cce0b52 WHIRLPOOL e2993ed35ac89231df79c9837918afd46bde3c9ba2d473b1042a8240ab7dbe686d4bdeb3c81bf49af14e919104f75a71cb3936963717862b0c419f214e243ae2
+MISC ChangeLog 71937 SHA256 bcd68cca18b831edecd17ea248c2140d7518bf10383cd2b26c129409bbf0f630 SHA512 9dd7749e6602928a60e89263d123e56d519efc0fa9f7a0ef36be35dd9601356d5036b826b25a0f0272c1382e182856ba8eada256483f9018ecbe54eb28636031 WHIRLPOOL b53f62f7b81c0c9763dc83df7dba7dc7468f291e02f2b579d109cca9fe70df84081d99237ea16cd85e5e8591397bf7a0b1000b2e38e1b0e230d031762103d22c
 MISC metadata.xml 3624 SHA256 28df7a0b436180584d0d6c20ea51ab67501b1c449e3a78c7645d8d46d0bdc5e7 SHA512 1cfb76b5bc418dfc79af5ebefa361a6146c328170e40035c9cc6481c92e43418aafe07ffd971abb56aff49f535ab0d3964079c2d0c72f67a47b39cd1c6ced9a5 WHIRLPOOL a61cf9be8a71b2be1801c7882c9c1bf8dd11e73b726021422a3524f94869639fce69b7d1f374e4001093becb5a643b3f8fd3816c2d2cf60ac42d150a6e689cee
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild
new file mode 100644
index 000000000000..9a693f2a2f4f
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120715.ebuild,v 1.1 2012/07/15 22:40:09 cardoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+BACKPORTS="4f6ac2a60b"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python user
+
+#MYTHTV_VERSION="v${PV}-15-g${MYTHTV_SREV}"
+#MYTHTV_BRANCH="fixes/0.25"
+#MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
+#MYTHTV_SREV="c29d36f"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
+fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop vaapi \
+vdpau xmltv xvid ${IUSE_INPUT_DEVICES}"
+
+SDEPEND="
+	>=media-libs/freetype-2.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXv
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	>=x11-libs/qt-core-4.7.2:4
+	>=x11-libs/qt-dbus-4.7.2
+	>=x11-libs/qt-gui-4.7.2:4
+	>=x11-libs/qt-sql-4.7.2:4[mysql]
+	>=x11-libs/qt-opengl-4.7.2:4
+	>=x11-libs/qt-webkit-4.7.2:4
+	x11-misc/wmctrl
+	virtual/mysql
+	virtual/opengl
+	virtual/glu
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		dev-libs/libcdio
+		>=dev-libs/libxml2-2.6.0
+		media-libs/libbluray
+	)
+	cec? ( dev-libs/libcec )
+	dvb? (
+		media-libs/libdvb
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? ( dev-libs/libcdio )
+	fftw? ( sci-libs/fftw:3.0 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx
+		>=media-libs/x264-0.0.20110426
+		>=media-sound/lame-3.93.1
+	)
+	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 )
+	libass? ( >=media-libs/libass-0.9.11 )
+	lirc? ( app-misc/lirc )
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/Net-UPnP
+		dev-perl/LWP-Protocol-https
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		>=dev-perl/libwww-perl-5
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	raop? (
+		dev-libs/openssl
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	vaapi? ( x11-libs/libva )
+	vdpau? ( x11-libs/libvdpau )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	"
+
+RDEPEND="${SDEPEND}
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+	"
+
+DEPEND="${SDEPEND}
+	dev-lang/yasm
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+# upstream wants the revision number in their version.cpp
+# since the subversion.eclass strips out the .svn directory
+# svnversion in MythTV's build doesn't work
+#	sed -e "s#\${SOURCE_VERSION}#${MYTHTV_VERSION}#g" \
+#		-e "s#\${BRANCH}#${MYTHTV_BRANCH}#g" \
+#		-i "${S}"/version.sh
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# 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/Makefile
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=/usr"
+	myconf="${myconf} --mandir=/usr/share/man"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+
+	myconf="${myconf} --enable-pic"
+	myconf="${myconf} --enable-symbol-visibility"
+
+	use alsa       || myconf="${myconf} --disable-audio-alsa"
+	use altivec    || myconf="${myconf} --disable-altivec"
+	use jack       || myconf="${myconf} --disable-audio-jack"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	use cec || myconf="${myconf} --disable-libcec"
+
+	if use hls; then
+		myconf="${myconf} --enable-libmp3lame"
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=$(PYTHON)"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=profile"
+		myconf="${myconf} --enable-proc-opt"
+	fi
+
+	use vdpau && myconf="${myconf} --enable-vdpau"
+	use vaapi && myconf="${myconf} --enable-vaapi"
+	use crystalhd && myconf="${myconf} --enable-crystalhd"
+
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times
+	myconf="${myconf} --enable-symbol-visibility"
+
+## CFLAG cleaning so it compiles
+	strip-flags
+
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r2 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable and ensure they are executed by Python 2
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+			python_convert_shebangs -q 2 "${file}"
+		fi
+	done
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize MythTV
+
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup MythTV
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+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."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}