Add USE="caps gles opengl sdl usb X" flags to control the now (optional) dependencies.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 96 insertions, 52 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 304e402802d3..a67dd6c91e95 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.176 2013/04/01 05:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.177 2013/04/01 06:35:52 vapier Exp $
+
+  01 Apr 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  xbmc-12.1.ebuild, xbmc-9999.ebuild:
+  Add USE="caps gles opengl sdl usb X" flags to control the now (optional)
+  dependencies.
 
   01 Apr 2013; Mike Frysinger <vapier@gentoo.org> xbmc-12.1.ebuild,
   xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 40b77283ad98..c803e5f1d154 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -20,24 +20,24 @@ DIST xbmc-9999-20121224-generated-addons.tar.xz 51980 SHA256 21284fe7ccee065eee1
 EBUILD xbmc-11.0-r1.ebuild 6507 SHA256 8a061777222215b70be0e356744a733da97bff974afa311c945b33c46938cfc9 SHA512 118a994f758de41de5c1e294d4982750db0e55e15388d219a8bb0b5d703b7662910028effc002eb6923e5c2e8b4a65583ba03974e92b7f5f351d689ab729c65f WHIRLPOOL 198d13ab2449bcb49fcc8ffa3975a340af3ee97d1a9d0e2848977e4fd5809f56c84355b905dbc0fdb433cfa71c4b9f828ffd3fe5a9c06f70685e90d15418a878
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
 EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0cc57b9a2f23f8a9e2b8d3 SHA512 65a1cac4a88b806ecc327cfec1ac3ef90dc73868a82c8ace3a47fcf5eb2b61f125d317646c096b671bc88f7814e08231ace11312e74e595a8c421696bd1982c3 WHIRLPOOL da70651c655c64ca82895236d11e1ae4462cce62809ab0338364b142bcd03c42c6d244c75591df381cc93bc9809d44b6f5f6a9a518fd52e150d4c520a21d2622
-EBUILD xbmc-12.1.ebuild 6511 SHA256 9e17708845c08ef38a93b87d3d6c20300c5644e4f34bbd8b55d845311fa28f71 SHA512 0f5e9253c42e8379a36ccce9b572c1c6e7d01abc2d15e173650c2cf6cfad74b62c6ac18b7a6aa7b8048d800b0a6b5c5fb79fbf6e3ff11bcd31f9c908ed6dc990 WHIRLPOOL d981e88b519a92342c7c6b91cb3f4e7bd9ffca0d203204dadcb67d8a9af9b282c15f105bcf270d410c447264002206bb51bac6b09f01b8752237cf07037669fb
-EBUILD xbmc-9999.ebuild 7463 SHA256 6998c7f350f022aa116bc6693479c51871ffca2dbb4c1a80aaeeee8268cdd5e8 SHA512 d6394ccd1324e8e6df963b0aa70e39613c1eda5493e15152dbb19758ff842cdf9d0dee1c042025e2239b08e60699c8b01ca1c9cfae2851f0938ab4ee596c5db0 WHIRLPOOL 2e7bc42965bb9ea1232b9cb58fd494397e5a24491e19a92090fa42d4b1ccc45b61fda83bf85f3c32cd57b108b7a029d7c68326978a90e20c6ba95b39b4c69a04
-MISC ChangeLog 28279 SHA256 a9a950f21c5816528df86f922413cf97e8b263d246bbc2b90de199bd2c77d17c SHA512 052a221caae778136f5fced87600370fd145897d01aaf5f3942ae27f5c9924bd7c712c26fbd00e0edaec26d0e8fa30e008c44da521d166923241d100dabf2a40 WHIRLPOOL 2125ab35619cf01b0eac509a36256fccdd512db8ded007c6961c1b4ab985a6ff9e45bc4632f197fd5d5101f539a7b17b768a037cf08d08801ea060601666a8b0
-MISC metadata.xml 1090 SHA256 8ec926619d4ed4beef3e8a3b5127906a6ac04132bf598452420969ad59615331 SHA512 d9b3c1fe1c8997434afcde1ea63276e7e8db0ba1a1e962e87e55a3ba106d95c536d9c38654cacb7d9d9da84cdd5236a49029748a4a8a6da061b864ae3db1f692 WHIRLPOOL 516eb5cd2d07536ad97ec71f3f68dcc1a874e9c369bad2f334a1272fb6a3ed795367a6b14cb8c4ed66a9b464bd68b6d11ab7eb195064543bfb102dae069a5791
+EBUILD xbmc-12.1.ebuild 6868 SHA256 9f0c53b808bfdcce7f89e31ec66c520ea5f4163068c8f526de0c44ee3b4ce1e9 SHA512 3d4ad64cdc2c4b19923e9143caf9210d9377c26af4e7bf6a1b22dfc660320ed2493c4617ea7122ef1c84b5d875240458f3d332ae58a649141e64b3571f4d4f99 WHIRLPOOL 6009890ca8b44e18f0348399639734752fe22aaa09d702c4f0c4da14ffb9d8a99828404fcf10f7913052af56c8f5bcbe60490bc060a3a63e71d7ef64a2e5f08f
+EBUILD xbmc-9999.ebuild 7820 SHA256 92afc2c1671e54a91543707ed84af195cd821214ae141d004ad0e5e0f8346b97 SHA512 a11a8c7536f1c6b886b6bc5148aa4026db5a6ad67a211bc72b342ac1d842040bfaa853031f975d1c6d04f9a9e3401c1911b5fafd450ab84b72e2f159192ae992 WHIRLPOOL 7f57b912f676598581092a0c5d25fb3e8f54215185e2514259767fb51dd4f8a3d19cc9d4af24f1a8950887763115b77d47a24abe4a828864dd97e8b2f190bccc
+MISC ChangeLog 28473 SHA256 b1e6bee9dd663a942b01659f97b00cac5745191028b2e29d94c093b922ef84f3 SHA512 2f962cfa0c4ee596dc35da2c25febe79f460a04a029da1f569343aaafc9db1b65afb8c1399e0a20810eb37c03eb21f230bd07f06a1168e0bf1f3afae27664eab WHIRLPOOL 4764639312698785767e9041b50a3431400e67b3e7a3f5932be55e6974d0e770ebee1aa272434de2009225d126b9072da0050b21213cea59263c137d595cfa65
+MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWR2wAAoJELEHsLL7fEFWcsUP/ingbEFSH/K2/4ivKa+29vVP
-qlZjWLWco+bx6jon9WNsS29eQUlkt1h/UNurr4HxZxC4mM/l/nNMYA4bLF2kxS2s
-/L5uatcXJAgb5hUGgnitulEtAFXWFzlC78pyXcLWWxxgtdbnCNkvwDkWxWc2uLQ/
-MV62fqRldzKcp5RTWzqdr3+QcM7watchh9uaCSfJI3Hg8Y8G7O8piXMj4zu8EpWA
-szDA5T2ZxRNcjXntkmNvHFQw+ZnMGgIXA1qfFsNwCc8ek5NIq9pCJQHSAj0y715o
-qUFteEXRGZ+K6OwiHxQ0s1B8Tp3J4r58yYBuyc7GHdugiatezOR48HirbHtkRW1Y
-vw/o7GOEuKnV5BQ4BQxg28D7jte+cGwUm6X8C3OYCvn89vW3xvje0IBo1/i5MDPp
-0bZDAiCCiBgmxyYZtNRddo6CGDQekEbl+MKTOPLu0BXQ2L22THgSomi5+P+XhXHM
-p1ApbkInxkj70UlLXGxvY7sX0hmk53aCpMK6ve4lzsOF7FkcI5DwOt1gUaG2nxjk
-q/pfzfJCKO3ut4CubU8Q6Ge9S6sRu29FNjKfgCf1LVBVgtTL/8ESJ9Rsor5i5kKi
-vqD0HAq5tOzo6xKL2gQfQBiheQHG+kT4ciqGLc/6lmFYdeRDllf0aAKAWelMbA0+
-gn+y87QyceHzsIhOXFxq
-=Ajhr
+iQIcBAEBCAAGBQJRWSrRAAoJELEHsLL7fEFWjXYP/Ak34WOazPB3DCFRn6nCmdht
+Nj8Xcxu8kpgt1XfZeeaJTScL8vfvHjbwRJK3/8vpX0Ev8rrgda/bzz2acI+MfStM
+AGgmtlin0ujtU1xjCY7tbiYuzovRxCC4z/KH6jBZPe1McUfv+V9xMrLYaGbYcmh6
+WyfIrPkYqBy888Osh+Y6sMN/Gj3OzxstyMtyQQz0f6SV34itYdjnAjpOj9ezfHgo
+blSmU5P8brJYjEBVmCD6J3sesIU0GzUveNRPWC7qZo3dW1zL9Mm0/98wIjs7Zoyi
+jf4KWTkv2aT9ZokGVcMgPdGMC6R08Swv7xpAkMl5oqjsR2Fe8HYstUj1vtyLKe5Y
+81+4HB9MaI3wjt0JsloCtTWxp9Kg7PazOLqj1i/kdqkIBM9dCH1tr8Cw6ZEppBq2
++U6q1B9f/tGdH0kFG7ktgbIhislCze8M0fxpMH0MwayY4tGu0Rgnz7cbeepG7toy
+IpMB7Yh2gIzsoJLDqA0eL6pfwWBy16WYRUDytVTWY2lFk7XN2dVHcDOCrbwkOq+T
+Gp3JY4KdZr/MXiDFQFenujjJH9DC4wbEHICM2oL8snC0Kz5qkKJ0Qvf5R+dGoJeg
+wSKUanlqFE9ouE/P3ZHMPYdnAxbvBdR75aUDFXV0s6prk5LK0nqVQZi6oEjAZTwG
+zAbhgnTMCXiSzkJGSHsW
+=Msw9
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 70730191070a..3a1b6087edd9 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -7,6 +7,7 @@
  <flag name='bluray'>Enable playback of Blu-ray filesystems</flag>
  <flag name='cec'>Enable support for HDMI-CEC devices via libcec</flag>
  <flag name='fishbmc'>Enable fishBMC visualization plugin</flag>
+ <flag name='gles'>Enable support for GLES</flag>
  <flag name='goom'>Enable GOOM visualization plugin</flag>
  <flag name='midi'>Support MIDI files</flag>
  <flag name='nfs'>Enable NFS client support</flag>
diff --git a/media-tv/xbmc/xbmc-12.1.ebuild b/media-tv/xbmc/xbmc-12.1.ebuild
index a81282796017..fc730d6e35de 100644
--- a/media-tv/xbmc/xbmc-12.1.ebuild
+++ b/media-tv/xbmc/xbmc-12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1.ebuild,v 1.3 2013/04/01 05:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1.ebuild,v 1.4 2013/04/01 06:35:52 vapier Exp $
 
 EAPI="4"
 
@@ -36,12 +36,14 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom java joystick midi mysql neon nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
-REQUIRED_USE="pvr? ( mysql )"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr"
+REQUIRED_USE="
+	pvr? ( mysql )
+	rsxs? ( X )
+	xrandr? ( X )
+"
 
-COMMON_DEPEND="virtual/glu
-	virtual/opengl
-	app-arch/bzip2
+COMMON_DEPEND="app-arch/bzip2
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca
@@ -73,14 +75,16 @@ COMMON_DEPEND="virtual/glu
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	media-libs/libsdl[audio,opengl,video,X]
+	sdl? ( media-libs/libsdl[audio,opengl,video,X] )
 	alsa? ( media-libs/libsdl[alsa] )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
-	media-libs/sdl-gfx
-	>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
+	sdl? (
+		media-libs/sdl-gfx
+		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+		media-libs/sdl-mixer
+		media-libs/sdl-sound
+	)
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
@@ -95,26 +99,35 @@ COMMON_DEPEND="virtual/glu
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	bluetooth? ( net-wireless/bluez )
 	sys-apps/dbus
+	caps? ( sys-libs/libcap )
 	sys-libs/zlib
 	virtual/jpeg
+	usb? ( virtual/libusb )
 	mysql? ( virtual/mysql )
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gles? ( virtual/opengl )
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
 		virtual/ffmpeg[vdpau]
 	)
-	x11-libs/libXinerama
-	xrandr? ( x11-libs/libXrandr )
-	x11-libs/libXrender"
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		xrandr? ( x11-libs/libXrandr )
+		x11-libs/libXrender
+	)"
 RDEPEND="${COMMON_DEPEND}
 	udev? (	sys-fs/udisks:0 sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	dev-lang/swig
 	dev-util/gperf
-	x11-proto/xineramaproto
+	X? ( x11-proto/xineramaproto )
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
 	java? ( virtual/jre )"
@@ -196,9 +209,11 @@ src_configure() {
 		$(use_enable airplay) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
 		$(use_enable cec libcec) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
+		$(use_enable gles) \
 		$(use_enable goom) \
 		--disable-hal \
 		$(use_enable joystick) \
@@ -206,6 +221,7 @@ src_configure() {
 		$(use_enable mysql) \
 		$(use_enable neon) \
 		$(use_enable nfs) \
+		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
@@ -213,11 +229,14 @@ src_configure() {
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
+		$(use_enable sdl) \
 		$(use_enable sftp ssh) \
+		$(use_enable usb libusb) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
 		$(use_enable webserver) \
+		$(use_enable X x11) \
 		$(use_enable xrandr)
 }
 
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index dbebfc349fb0..4557a11db73d 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.138 2013/04/01 05:39:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.139 2013/04/01 06:35:52 vapier Exp $
 
 EAPI="4"
 
@@ -36,12 +36,14 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug +fishbmc goom java joystick midi mysql neon nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
-REQUIRED_USE="pvr? ( mysql )"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql neon nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi vdpau webserver +X +xrandr"
+REQUIRED_USE="
+	pvr? ( mysql )
+	rsxs? ( X )
+	xrandr? ( X )
+"
 
-COMMON_DEPEND="virtual/glu
-	virtual/opengl
-	app-arch/bzip2
+COMMON_DEPEND="app-arch/bzip2
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca
@@ -75,14 +77,16 @@ COMMON_DEPEND="virtual/glu
 	media-libs/libpng
 	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
-	media-libs/libsdl[audio,opengl,video,X]
+	sdl? ( media-libs/libsdl[audio,opengl,video,X] )
 	alsa? ( media-libs/libsdl[alsa] )
 	>=media-libs/taglib-1.8
 	media-libs/libvorbis
-	media-libs/sdl-gfx
-	>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
+	sdl? (
+		media-libs/sdl-gfx
+		>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+		media-libs/sdl-mixer
+		media-libs/sdl-sound
+	)
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
@@ -97,26 +101,35 @@ COMMON_DEPEND="virtual/glu
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	bluetooth? ( net-wireless/bluez )
 	sys-apps/dbus
+	caps? ( sys-libs/libcap )
 	sys-libs/zlib
 	virtual/jpeg
+	usb? ( virtual/libusb )
 	mysql? ( virtual/mysql )
-	x11-apps/xdpyinfo
-	x11-apps/mesa-progs
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gles? ( virtual/opengl )
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
 		virtual/ffmpeg[vdpau]
 	)
-	x11-libs/libXinerama
-	xrandr? ( x11-libs/libXrandr )
-	x11-libs/libXrender"
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		xrandr? ( x11-libs/libXrandr )
+		x11-libs/libXrender
+	)"
 RDEPEND="${COMMON_DEPEND}
 	udev? (	sys-fs/udisks:0 sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	dev-lang/swig
 	dev-util/gperf
-	x11-proto/xineramaproto
+	X? ( x11-proto/xineramaproto )
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
 	java? ( virtual/jre )"
@@ -198,10 +211,12 @@ src_configure() {
 		$(use_enable airplay) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \
+		$(use_enable caps libcap) \
 		$(use_enable cec libcec) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
 		$(use_enable fishbmc) \
+		$(use_enable gles) \
 		$(use_enable goom) \
 		--disable-hal \
 		$(use_enable joystick) \
@@ -209,6 +224,7 @@ src_configure() {
 		$(use_enable mysql) \
 		$(use_enable neon) \
 		$(use_enable nfs) \
+		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
@@ -216,11 +232,14 @@ src_configure() {
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
+		$(use_enable sdl) \
 		$(use_enable sftp ssh) \
+		$(use_enable usb libusb) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
 		$(use_enable webserver) \
+		$(use_enable X x11) \
 		$(use_enable xrandr)
 }