Change USE=ass to USE=libass to be consistent with other usages of it in the tree. Fix patch name.

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

4 files changed, 15 insertions, 9 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 132955ab0263..0a16d03a862a 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.345 2012/06/22 04:27:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.346 2012/06/22 13:33:57 cardoe Exp $
+
+  21 Jun 2012; Doug Goldstein <cardoe@gentoo.org> mythtv-0.25.1.ebuild,
+  metadata.xml:
+  Change USE=ass to USE=libass to be consistent with other usages of it in the
+  tree. Fix patch name.
 
   21 Jun 2012; Doug Goldstein <cardoe@gentoo.org> mythtv-0.25.1.ebuild:
   qt3support is no longer necessary for Qt, but dbus and mysql is. Remove the
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b31ff8c9fb98..2927b0025bb3 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,6 +13,6 @@ AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5
 DIST mythtv-0.24.1_p20110524.tar.gz 69756131 RMD160 e42fd2350d2b0199805e4f6e62646c8d835f353b SHA1 db7a91f237cd64c0604e7ee1672b041c37fe5e06 SHA256 ea3e37258f8596c9186865289ffd8f9ece9fc80d28a2ded80bd008544138a863
 DIST mythtv-0.25.1.tar.bz2 31827158 RMD160 88a5ce19b4b04f4b28a08b39bd7265e0a0ddd6d8 SHA1 eae92975c7d4cfa085d819944e454521e2d96c4d SHA256 7638ffc547b62f2d6dd031c6f164ccb993387a7b4b6d9218cdd37594c1cca508
 EBUILD mythtv-0.24.1_p20110524.ebuild 9230 RMD160 936bf295882ef4c8b37f2e46c990380990a17f0d SHA1 2756a2c8bc20a4846360738c91d0bcc7e971bbfa SHA256 d5c246f523e234fa8e5202930448db67b91a808d5bb8c4a014ee9f182eed8402
-EBUILD mythtv-0.25.1.ebuild 7316 RMD160 c8e8b2cb157dad8efac4017d708dea0635bc3d4b SHA1 d48636f42f29bf5c17bff0d1777de2a129323b5b SHA256 ecbb7368da024e05ea87e9b2308d646e96656388f97ddc3ff7c915292dfeb119
-MISC ChangeLog 68289 RMD160 48f6c39099f48c39a78e006f170343f4a37cbd8e SHA1 35bce7de9dcf6b72b3cae5e9c51255959fe95448 SHA256 f778f5f1908869a8fd9f55cfc15f6b9d3976ccde68e6fd0ef9affb68d214fc93
-MISC metadata.xml 3259 RMD160 efebc376333820f60fe8f0d060737d25a4fcab4d SHA1 5457ab31e3856b6f4fd095126375272d789c1060 SHA256 9453b1fa72b7b501f593cc744d5b2a0a83272f3b09f291891d7358998fc4400f
+EBUILD mythtv-0.25.1.ebuild 7328 RMD160 fe048d03720c546e05f906e42077566535bc96ab SHA1 101de36cbe7ca292ceb55c5c8549217a24737095 SHA256 03cb0b6995cf6ac11fe551da3eda73ce14893bfb5c1153f1f599aa14f344d6c7
+MISC ChangeLog 68481 RMD160 08fdb1f5d70c242f6c2f3a48e9675a5f553b65c7 SHA1 9fa6ea1f98021b15442661491240f59a792a987d SHA256 50014e4b553a8130abedd199c95a29561e4cc420fa4e06aaa9879293da8a81c9
+MISC metadata.xml 3289 RMD160 b40c62d7aa34dda6794589d76ea7f94e51fc3722 SHA1 989841d69778564adf4c3388bd6b848a8a187f44 SHA256 0881602e05462b750278801edb09f48ab3d2feeaedefb52eb68348aa62e55663
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index ff02ca12142e..ee7d026249a2 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -15,7 +15,6 @@
 		will only give you /dev/dsp devices in the drop down.</flag>
 	<flag name="altivec">Builds ffmpeg's codec libraries with altivec
 		support.</flag>
-	<flag name="ass">Use the ASS/SSA subtitle render</flag>
 	<flag name="autostart">Uses a custom autostart configuration gleaned from
 		experience with MythTV since its early versions and discussed with
 		other MythTV maintainers and users. Does not rely on KDE being installed
@@ -44,6 +43,8 @@
 		<pkg>app-misc/lcdproc</pkg> configured on your machine and it should
 		output information such as current time, show name, episode name, etc to
 		that LCD.</flag>
+	<flag name="libass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle
+		support</flag>
 	<flag name="lirc">Adds LIRC support directly to MythTV allowing for built in
 		control via a LIRC device.</flag>
 	<flag name="perl">Builds the perl bindings for MythTV. Allows you to write
diff --git a/media-tv/mythtv/mythtv-0.25.1.ebuild b/media-tv/mythtv/mythtv-0.25.1.ebuild
index e26f2cb250f7..ed5940a7f95f 100644
--- a/media-tv/mythtv/mythtv-0.25.1.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2012/06/22 04:27:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1.ebuild,v 1.5 2012/06/22 13:33:58 cardoe Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec ass autostart bluray cec crystalhd debug dvb dvd \
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
 ieee1394 jack lcd lirc perl pulseaudio python xvmc vaapi vdpau \
 ${IUSE_INPUT_DEVICES}"
 
@@ -42,7 +42,6 @@ SDEPEND="
 	virtual/opengl
 	virtual/glu
 	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	ass? ( >=media-libs/libass-0.9.11 )
 	cec? ( dev-libs/libcec )
 	dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
@@ -50,6 +49,7 @@ SDEPEND="
 			>=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
@@ -111,7 +111,7 @@ src_prepare() {
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
 		-i "${S}"/bindings/perl/Makefile
 
-	epatch "${FILESDIR}/fixLdconfSandbox.patch"
+	epatch "${FILESDIR}/fixLdconfSandbox.${PV}.patch"
 
 	epatch_user
 }