Numerous updates to support all the features and notes in the 0.25 release notes.

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

4 files changed, 84 insertions, 30 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 328cdf87d197..c912b272c61f 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.359 2012/07/10 04:24:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.360 2012/07/10 05:25:38 cardoe Exp $
+
+  09 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.25.1_p20120708.ebuild, metadata.xml:
+  Numerous updates to support all the features and notes in the 0.25 release
+  notes.
 
   09 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 75f7f07fe467..eb4b7d707ab4 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -19,6 +19,6 @@ DIST mythtv-0.25.1-61e7a0e946.tar.xz 37304 SHA256 8b516be07d3519872f2f74728aebe7
 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 7770 SHA256 1c21ac21f55fe205bb1fc0bb048e11f97119931c6240cf94ee510ccf4af326a0 SHA512 27f5c55db1f44e1076b53dbd5c7dafe40e692a05a44d2d44e1bad6ba224cb76f72aa1553bd70c05337ef1ab0a427e4aab421162b6967c832890f8bd15bffa107 WHIRLPOOL 360d402b59e41ea4e890a75ae30ec9ed6439d6d1f50ce47302cb337247ec9879c68bcb43e7b4daae66b9fed42a05851bace13121b423f2939c3bfe830b1a60ce
-MISC ChangeLog 70931 SHA256 c91bfe619d86ddf94cb79f072ca56355c980f19a6e5dabb45d9cc78100a0e833 SHA512 40518a6bdeef07655cf16066b7dd16f129362ecca8c4cac397c771d48728a918de2f319f71a474fb470cb9d79aea46b15f6df1a595ef19e3558b15673ffb5ccc WHIRLPOOL aa75cfa97b9ece76baeb58221c9d22e6c86b19a21332a77ae56d27e9b158048170f986bb3d46c1f5383565169db3ffb23db541b00b0f16a3612689f157f025e0
-MISC metadata.xml 3289 SHA256 0881602e05462b750278801edb09f48ab3d2feeaedefb52eb68348aa62e55663 SHA512 83fe4be95545f3b18ecdb3438db2035dbc6dddf4cdbe9f136df02031fbf5a406825bb11fbdf147634ecc548213db8724b260e2d3d989a405b415ce5e3d869899 WHIRLPOOL 34511bb8b003ebd9a1413dd2ef01d0ad07ca6440f36c8dc7aa468e6232b41c8d2ba291c9a3cd8e65ac0785c97d5650ad3f33964664bf985d771b2d84a978551a
+EBUILD mythtv-0.25.1_p20120708.ebuild 8494 SHA256 932924ddc0b06b20d84bb1f3ed02874688331b16cc6d33befdac0791ef0c0fb9 SHA512 13c32cc5fb367c7bf36a8f2e20f81bd7062d9737279c4c19e285352a3cd17745b26477310ddf1b5836277150ebc00e5771055eb14ebe166cd745c6002a8944af WHIRLPOOL 0dcd0855ea25f0ae9cdebe61de6e45dd003cff231d45935422b892dff15e628cc3cdfbeeb24aff576a1c42db7b3039dd2456aa25eafe1cfda353676e356de579
+MISC ChangeLog 71116 SHA256 c75d23969eaedc478c1bd721268031cfba7aa12e6c5a79c3d8446c453aa1bdd2 SHA512 fd52fa64a705f2485d9139846c92bf9ea91503552e2aaf56590fd34af30ac7e26e84200f0a1d22fa7cc5172db60bf1b4425ca544ceb3906d05eb283fd1336902 WHIRLPOOL 7dc8564bcee53a5f8a98474597a6b4bf937aaba72150f4ee5830682a4ada11cd8a7ee69465956f1f5be9a1607e4c063d31ac644dba047089cc446e13c05e994a
+MISC metadata.xml 3624 SHA256 28df7a0b436180584d0d6c20ea51ab67501b1c449e3a78c7645d8d46d0bdc5e7 SHA512 1cfb76b5bc418dfc79af5ebefa361a6146c328170e40035c9cc6481c92e43418aafe07ffd971abb56aff49f535ab0d3964079c2d0c72f67a47b39cd1c6ced9a5 WHIRLPOOL a61cf9be8a71b2be1801c7882c9c1bf8dd11e73b726021422a3524f94869639fce69b7d1f374e4001093becb5a643b3f8fd3816c2d2cf60ac42d150a6e689cee
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index ee7d026249a2..9561d28c25ad 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -32,6 +32,8 @@
 	<flag name="dvb">Enables support for Linux DVB cards. These include all
 		cards that work with digital signals such as ATSC, DVB-T, DVB-C, and
 		DVB-S, QAM-64, and QAM-256.</flag>
+	<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
+	<flag name="hls">HTTP Live Streaming support</flag>
 	<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
 		Cable boxes. These are typically found in the United States, where such
 		support is required by law. This will also install Firewire test
@@ -50,12 +52,15 @@
 	<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
 		scripts in Perl to control your MythTV setup or communicate with
 		it.</flag>
-	<flag name="xvmc">Instructs MythTV to use XvMC for its video output. By
-		default, this will use the generic XvMC wrapper unless a specific video
-		card driver is enabled via their VIDEO_CARDS USE flags.</flag>
+	<flag name="raop">Remote Audio Output Protocol (aka AirTunes/AirPlay)</flag>
 	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for
 		hardware decoding</flag>
 	<flag name="vdpau">Enable support of NVIDIA's VDPAU for video
 		playback</flag>
+	<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
+		grabbers for users not using Schedules Direct.</flag>
+	<flag name="xvmc">Instructs MythTV to use XvMC for its video output. By
+		default, this will use the generic XvMC wrapper unless a specific video
+		card driver is enabled via their VIDEO_CARDS USE flags.</flag>
 </use>
 </pkgmetadata>
diff --git a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
index 3fa91c64606c..726ee80bbf9a 100644
--- a/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild
@@ -1,10 +1,10 @@
 # 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_p20120708.ebuild,v 1.5 2012/07/10 04:24:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1_p20120708.ebuild,v 1.6 2012/07/10 05:25:38 cardoe Exp $
 
 EAPI=4
 
-PYTHON_DEPEND="python? 2"
+PYTHON_DEPEND="python? 2:2.6"
 BACKPORTS="61e7a0e946"
 MY_P=${P%_p*}
 
@@ -25,11 +25,10 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-ieee1394 jack lcd lirc perl pulseaudio python xvmc vaapi vdpau \
-${IUSE_INPUT_DEVICES}"
+fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop vaapi \
+vdpau xmltv xvid ${IUSE_INPUT_DEVICES}"
 
 SDEPEND="
-	>=media-sound/lame-3.93.1
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXinerama
@@ -47,28 +46,54 @@ SDEPEND="
 	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 )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.3
-			>=media-libs/libiec61883-1.0.0 )
+	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
+	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 )
+		>=dev-perl/libwww-perl-5
+	)
 	pulseaudio? ( media-sound/pulseaudio )
-	python? (	dev-python/mysql-python
-			dev-python/lxml
-			dev-python/urlgrabber )
+	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 )
-	xvmc? ( x11-libs/libXvMC )
+	xvid? ( >=media-libs/xvid-1.1.0 )
 	!media-tv/mythtv-bindings
 	!x11-themes/mythtv-themes
 	"
@@ -76,14 +101,16 @@ SDEPEND="
 RDEPEND="${SDEPEND}
 	media-fonts/corefonts
 	media-fonts/dejavu
+	media-fonts/liberation-fonts
 	>=media-libs/freetype-2.0
 	x11-apps/xinit
-	|| ( >=net-misc/wget-1.12-r3 >=media-tv/xmltv-0.5.43 )
-	autostart? (	net-dialup/mingetty
-			x11-wm/evilwm
-			x11-apps/xset )
-	bluray? ( media-libs/libbluray )
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
 	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
 	"
 
 DEPEND="${SDEPEND}
@@ -141,10 +168,20 @@ src_configure() {
 	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"
@@ -233,9 +270,16 @@ src_install() {
 		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
 
-	for file in `find "${ED}" -type f -name \*.py`; do chmod a+x "${file}"; done
-	for file in `find "${ED}" -type f -name \*.sh`; do chmod a+x "${file}"; done
-	for file in `find "${ED}" -type f -name \*.pl`; do chmod a+x "${file}"; done
+	# Make Python files executable and ensure they are executed by Python 2
+	for file in `find "${ED}" -type f -name \*.py`; do
+		fperms 0755 "${file}"
+		python_convert_shebangs 2 "${file}"
+	done
+
+	# Make shell & perl scripts executable
+	for file in `find "${ED}" -type f -name \*.sh -o -type f -name \*.pl`; do
+		fperms 0755 "${file}"
+	done
 }
 
 pkg_preinst() {