Punt deprecated liba52/libdts usage #350360 by hal.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

4 files changed, 18 insertions, 14 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index fef68233696a..bffa0a29e62a 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.74 2011/01/01 21:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.75 2011/01/02 18:05:29 vapier Exp $
+
+  02 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
+  xbmc-9999.ebuild:
+  Punt deprecated liba52/libdts usage #350360 by hal.
 
   01 Jan 2011; Mike Frysinger <vapier@gentoo.org> xbmc-10.0.ebuild,
   +files/xbmc-10.0-python-2.7.patch:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 6564c0922750..885b935cfd19 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -12,15 +12,15 @@ AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a072
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-10.0.tar.gz 130239951 RMD160 dcb94d89c0cb35e8a4cb021a19f6dec23dd59fb6 SHA1 8752c0c26e872b408b3575d2744fdd812d5775ac SHA256 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-10.0.ebuild 5214 RMD160 80c01328ce440afbe8330584c8d7d2cc4ad059b5 SHA1 7faec1c2c8e38bbc7f660377602aa5227fa9a012 SHA256 987412af0d8fbcc906cab0346dc9ebe33c631da300487b4206936635e8dd89a8
+EBUILD xbmc-10.0.ebuild 5218 RMD160 a454d871ab5a70fd548bd77a7d4642a452b9673d SHA1 f5546da725f842927a54e13ca7be353b899fcb8b SHA256 3e827867435be5b1087832387d5a95230bdfd26e58d91e93a297df2bdc7d9512
 EBUILD xbmc-9.11-r5.ebuild 5783 RMD160 a9799026ec29b74cb9cf002c89958274f546f202 SHA1 10ef102e761d16f931731088f27be73e7ff667fe SHA256 eb959e3ab1cbae5f9ed5eeba5a3235b2dab53381d77d0a5d0901b78b7e8be4b0
-EBUILD xbmc-9999.ebuild 5155 RMD160 fa4f0f00256590041bf9b1b89b05739c18404524 SHA1 9f9d342eac3d80fa4f80ccff0862945bfb2aab85 SHA256 fb9db2169d8f391c790cbdeadf8a33de69f92269e73106d96fc2d2b49b7feb71
-MISC ChangeLog 12208 RMD160 7854f1c9a849610c9a0bf4f82069b05c227f975d SHA1 5fbb76762af312b25f01be0469cc2d052df11f0e SHA256 6146593de21fc10ce94bbac80396f844ce7cf5593758d967ff8d2da091e15ea0
+EBUILD xbmc-9999.ebuild 5159 RMD160 051c329c95bca150f52cd1536cb3b1807f977d59 SHA1 c79d3ea1154477d446a0447f311d62b8bca07b23 SHA256 d825aa49d0e13f5821f969a8642ed63fb1892fded37b7dd92b57abe05db92386
+MISC ChangeLog 12351 RMD160 09e5bd64895fe3f340d356447bdb23005ae066c4 SHA1 a1b5169cb82987464e8ac74d983c8e8637942f05 SHA256 7a8c4667c869a9d944560dde4a30bdbf99abcfcac3ad2a9c320a8c9ee3805b22
 MISC metadata.xml 579 RMD160 cf1a05346b2c33147e752be840dfb562726b42dd SHA1 0fabb20c84367962605b88b9030fabf6acf3045d SHA256 f61dd5617b99b9fa5505269e6633d317f90a2c6903108bdcc84370cfb8858afb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0fnRAACgkQaC/OocHi7JYfXwD/WvGjGGW9HGujLHQvY9wr4Ofe
-WKPCYyQ8eWUJVC6m9KYA/1a9JPS2nAaTCIhO/DKomVzlBFF/40PA1TEWaMAdO+td
-=0ANC
+iF4EAREIAAYFAk0gvksACgkQaC/OocHi7JbFLwD/faGQLnzgAggNWshlTSq9Epdy
+mbYF7sLG55cnOEhUcEkA/1KWsM2+qJQI1JGKFTLxh4XkMfAnLdFI2uSWuNLIlli8
+=m0cw
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-10.0.ebuild b/media-tv/xbmc/xbmc-10.0.ebuild
index ca855d56230f..c5ccc343c72f 100644
--- a/media-tv/xbmc/xbmc-10.0.ebuild
+++ b/media-tv/xbmc/xbmc-10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.3 2011/01/01 21:31:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.4 2011/01/02 18:05:29 vapier Exp $
 
 EAPI="2"
 
@@ -39,7 +39,6 @@ RDEPEND="virtual/opengl
 	dev-libs/libpcre[cxx]
 	dev-libs/lzo
 	>=dev-python/pysqlite-2
-	media-libs/a52dec
 	media-libs/alsa-lib
 	media-libs/faad2
 	media-libs/flac
@@ -50,7 +49,6 @@ RDEPEND="virtual/opengl
 	media-libs/jbigkit
 	media-libs/jpeg:0
 	>=media-libs/libass-0.9.7
-	media-libs/libdca
 	css? ( media-libs/libdvdcss )
 	media-libs/libmad
 	media-libs/libmms
@@ -169,6 +167,8 @@ src_configure() {
 		--enable-external-libraries \
 		--enable-goom \
 		--enable-gl \
+		--disable-liba52 \
+		--disable-libdts \
 		$(use_enable avahi) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 04e0f2e54a4c..53a17c62e1b6 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.68 2010/12/31 18:19:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.69 2011/01/02 18:05:29 vapier Exp $
 
 EAPI="2"
 
@@ -41,7 +41,6 @@ COMMON_DEPEND="virtual/opengl
 	dev-libs/libpcre[cxx]
 	dev-libs/lzo
 	>=dev-python/pysqlite-2
-	media-libs/a52dec
 	media-libs/alsa-lib
 	media-libs/faad2
 	media-libs/flac
@@ -52,7 +51,6 @@ COMMON_DEPEND="virtual/opengl
 	media-libs/jbigkit
 	media-libs/jpeg:0
 	>=media-libs/libass-0.9.7
-	media-libs/libdca
 	css? ( media-libs/libdvdcss )
 	media-libs/libmad
 	media-libs/libmms
@@ -170,6 +168,8 @@ src_configure() {
 		--enable-external-libraries \
 		--enable-goom \
 		--enable-gl \
+		--disable-liba52 \
+		--disable-libdts \
 		$(use_enable avahi) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \