Disable support for USE=-opengl #298529 by Diego E. Pettenò.

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

4 files changed, 19 insertions, 15 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 327f2ec60f52..67712e72ec39 100644
--- 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.43 2010/01/17 21:29:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.44 2010/01/18 04:34:39 vapier Exp $
+
+  18 Jan 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r1.ebuild,
+  xbmc-9999.ebuild:
+  Disable support for USE=-opengl #298529 by Diego E. Pettenò.
 
 *xbmc-9.11-r1 (17 Jan 2010)
 
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 25b80b0009f5..cc7fb6fc4bd9 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -4,15 +4,15 @@ 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 4947 RMD160 c77f00c34f68a8baf241379570c0d57e70ef7364 SHA1 1eaeb7840949663b964c81be2ba0160d709aa38b SHA256 8fa87a8b2b08e863d85a6af1100eeb1e982da223985ec3df2a3e8f594dea1e66
+EBUILD xbmc-9.11-r1.ebuild 4916 RMD160 f0a733c19ef8de0d6e7e79cdf04e30769bed36e0 SHA1 1ebd8a5d141805e7426c3dd1264d2ddbaf520ec6 SHA256 c8f21e70ec1c8536ea18d82adaaa6c2ab50985d899db45f4cc2025ea391b0a0f
 EBUILD xbmc-9.11.ebuild 4890 RMD160 2a8dd1a37a0d97a5d568b84170f27551923a1212 SHA1 06d01a46a475c3c32cf5df0cdcb89e5d94d84962 SHA256 1d3f9e1fb0877d4e113a5437e8f6fbfa3c413db61dbfe82e0e6b663696879737
-EBUILD xbmc-9999.ebuild 4694 RMD160 ee53e1635e9351f8ac0af0300c36a2f927d0b039 SHA1 5b85cf80e642ea7df052a60581f083028c43f7a5 SHA256 e3091664862a5e3c82fb84cc4cd3dbf287469f351ada947978e893ef36c91b6f
-MISC ChangeLog 6807 RMD160 7767faef1dbb9700ad0a821d99f7db36ded9b5d4 SHA1 43cafa75d2a37d2723bf9339bf597f1758aeb883 SHA256 3a54310eb3b1fa6348e440e1948df38df813da8fc53174500985ab4583aef871
+EBUILD xbmc-9999.ebuild 4663 RMD160 363b5fae709f64a03c9187a4896e174f5c2d683d SHA1 997e908f9c39098e90db7118fe9aaa0503650342 SHA256 8e0b53a6d4afaf95ce36b649bbb7894f4268527f99c738ae051581aa4bfc48bd
+MISC ChangeLog 6963 RMD160 00c6ab8426a53384da24fec452c1ffdd6d9e0da4 SHA1 107444e1f84e7f8557d5788c3657ff6a71672480 SHA256 4a4bfcabd56315322097efc1739efd0390ca3319cfa01680ff2711e003e40d27
 MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAktTgVkACgkQTwhj9JtAlp5CRwD6A0UV0HQ+tm5igzcNtxgRDmF9
-cuBLse0UlG7CDhuOX18BAIDRkeFA7jjFDmFLbThbOvp6hdFLceZyolMbrR2xy4uc
-=FTDJ
+iF4EAREIAAYFAktT5OkACgkQTwhj9JtAlp6PRwD/evuf5SDFU/NyXJcLovIpdfam
+0qqJpOomWsN80Mc02JsA/imbVwynjD4o2Nivf/U9TEfa0oJeM+2+QbtxDMxqGP1f
+=6mxD
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9.11-r1.ebuild b/media-tv/xbmc/xbmc-9.11-r1.ebuild
index 3272415ee454..7237b06e0edb 100644
--- a/media-tv/xbmc/xbmc-9.11-r1.ebuild
+++ b/media-tv/xbmc/xbmc-9.11-r1.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-9.11-r1.ebuild,v 1.1 2010/01/17 21:29:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r1.ebuild,v 1.2 2010/01/18 04:34:39 vapier Exp $
 
 EAPI="2"
 
@@ -26,9 +26,9 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa altivec avahi css debug joystick midi opengl profile pulseaudio sse sse2 vdpau xrandr"
+IUSE="aac alsa altivec avahi css debug joystick midi profile pulseaudio sse sse2 vdpau xrandr"
 
-RDEPEND="opengl? ( virtual/opengl )
+RDEPEND="virtual/opengl
 	app-arch/bzip2
 	|| ( app-arch/unrar app-arch/unrar-gpl )
 	app-arch/unzip
@@ -166,13 +166,13 @@ src_configure() {
 		--disable-optimizations \
 		--enable-external-libraries \
 		--enable-goom \
+		--enable-gl \
 		$(use_enable avahi) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
 		$(use_enable aac faac) \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
-		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vdpau) \
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 0d621f8f2c05..d24b775f14b0 100644
--- 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.46 2010/01/17 21:26:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.47 2010/01/18 04:34:39 vapier Exp $
 
 EAPI="2"
 
@@ -26,9 +26,9 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa altivec avahi css debug joystick midi opengl profile pulseaudio sse sse2 vdpau xrandr"
+IUSE="aac alsa altivec avahi css debug joystick midi profile pulseaudio sse sse2 vdpau xrandr"
 
-RDEPEND="opengl? ( virtual/opengl )
+RDEPEND="virtual/opengl
 	app-arch/bzip2
 	|| ( app-arch/unrar app-arch/unrar-gpl )
 	app-arch/unzip
@@ -159,13 +159,13 @@ src_configure() {
 		--disable-optimizations \
 		--enable-external-libraries \
 		--enable-goom \
+		--enable-gl \
 		$(use_enable avahi) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
 		$(use_enable aac faac) \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
-		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable vdpau) \