Pull in libmodplug #305911 by Michael Lange. Disable the webserver for now #305229...

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 99d64ac8394008b7d32f238b1e529b8f7c018ac5..71ec1a822bceed12e56e2d6088eb3573d802b89d 100644 (file)
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.45 2010/01/25 13:38:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.46 2010/03/07 06:30:51 vapier Exp $
+
+  07 Mar 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Pull in libmodplug #305911 by Michael Lange. Disable the webserver for now
+  #305229 by Jan Vansteenkiste.
 
   25 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r1.ebuild,
   xbmc-9999.ebuild:

diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 8947fa0a8af18f5e7b4009854fd00299e8726027..a256ebc47490660c6bb87fe2fc1ac57008dd942d 100644 (file)
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
 EBUILD xbmc-9.11-r1.ebuild 4921 RMD160 c4cc7ada891b6e1fc385777b5ae4fc9981a02bb2 SHA1 a6038558c468f7274c7b0b48a708e59a467ca1ec SHA256 b61727f34ed385677555a5a1efbd0531d3a1e50fb52f6776a95afdc212c0f97a
 EBUILD xbmc-9.11.ebuild 4890 RMD160 2a8dd1a37a0d97a5d568b84170f27551923a1212 SHA1 06d01a46a475c3c32cf5df0cdcb89e5d94d84962 SHA256 1d3f9e1fb0877d4e113a5437e8f6fbfa3c413db61dbfe82e0e6b663696879737
-EBUILD xbmc-9999.ebuild 4668 RMD160 e6c69e5785f6b8ccc5c0b5c206ced3d03ff48094 SHA1 945e9178ab61932ab7de3335cda7dc50a0a3a6b5 SHA256 0d8825e22bcb29f2eab89665c0272eabab1b853511be7985cb6984003eb9520d
-MISC ChangeLog 7113 RMD160 55350fa422c477d6e445ee76efe481bab8b5fae3 SHA1 95eae317499fe15924ef237062a2b3b7eb85355b SHA256 519c7ee88d49c0f65858bf5facc43735a49133bb78bb0a2a7bb62a39f6f97192
+EBUILD xbmc-9999.ebuild 4712 RMD160 b3083d6aeb490196ed880122a0d63b92bd0fb06a SHA1 751e011b55170bd05f472a32022b5def9510a498 SHA256 bde1ee6af8b40a1ae19b222ad2e12ae98c48c7aa900c688a9b66298661733c18
+MISC ChangeLog 7288 RMD160 760e0b8a216c6e2fdd5e160c632119ee12a2d9ec SHA1 648a8b61160b45914eb163eb8cbee802c5d2be8f SHA256 252b9d78e7b295b073270002efaa1bcbe12e400db21f1fabda53555598b02c68
 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAkuTSCEACgkQTwhj9JtAlp7l4QEAkvZTH3J6ehQYlnpcTWncjLbp
+kjFHbdau9coUHJ41ifIBAIm25b8pXpbP0n+ZiSSXZcCY9W4WiWeAN6N3rGm02rVl
+=XMHt
+-----END PGP SIGNATURE-----

diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 72b8cf05b1b0989923fafe557ccffb21207c40e1..1b8d20314595a1558c0601b50be76a3696484286 100644 (file)
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.48 2010/01/25 13:38:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.49 2010/03/07 06:30:51 vapier Exp $
 
 EAPI="2"
 
@@ -57,6 +57,7 @@ RDEPEND="virtual/opengl
        css? ( media-libs/libdvdcss )
        media-libs/libmad
        media-libs/libmms
+       media-libs/libmodplug
        media-libs/libmpeg2
        media-libs/libogg
        media-libs/libsamplerate
@@ -160,6 +161,7 @@ src_configure() {
                --enable-external-libraries \
                --enable-goom \
                --enable-gl \
+               --disable-webserver \
                $(use_enable avahi) \
                $(use_enable css dvdcss) \
                $(use_enable debug) \