--- a/xbmc-12.2-r1.ebuild	2013-08-12 01:01:24.000000000 +0200
+++ b/xbmc-12.2-r1.ebuild	2013-08-14 09:36:16.000000000 +0200
@@ -9,7 +9,7 @@
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-single-r1 multiprocessing autotools
+inherit eutils python-single-r1 multiprocessing autotools flag-o-matic
 
 BACKPORTS_VERSION=1
 
@@ -39,10 +39,11 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec +crystalhd css debug external-ffmpeg gles goom java joystick midi mysql neon nfs non-free -omxplayer +opengl +openmax optical-drive optimizations profile +projectm pulseaudio pvr -raspberrypi +rsxs rtmp +samba +sdl sse sse2 sftp udev upnp +usb vaapi +vdadecoder vdpau +vtbdecoder webserver +X +xrandr"
+
+
 REQUIRED_USE="
 	pvr? ( mysql )
-	rsxs? ( X )
 	X? ( sdl )
 	xrandr? ( X )
 "
@@ -134,7 +135,10 @@
 	X? ( x11-proto/xineramaproto )
 	dev-util/cmake
 	x86? ( dev-lang/nasm )
-	java? ( virtual/jre )"
+	java? ( virtual/jre )
+	raspberrypi? ( media-libs/raspberrypi-userland
+		       media-libs/libsdl
+		       media-libs/sdl-image )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -195,6 +199,18 @@
 
 	# Tweak autotool timestamps to avoid regeneration
 	find . -type f -print0 | xargs -0 touch -r configure
+
+	if use raspberrypi ; then
+	   sed -i -e 's/USE_BUILDROOT=1/USE_BUILDROOT=0/' \
+		-e 's/sudo //g' \
+		-e 's/\/opt\//${S}\/opt\//g' tools/rbp/setup-sdk.sh 
+	   sed -i 's/TOOLCHAIN=\/usr\/local\/bcm-gcc/TOOLCHAIN=\/usr/' tools/rbp/setup-sdk.sh
+	   sed -i 's/cd $(SOURCE); $(CONFIGURE)/#cd $(SOURCE); $(CONFIGURE)/' tools/rbp/depends/xbmc/Makefile
+	   ln -s ${S}/xbmc/guilib ${S}/lib/libsquish ${S}/xbmc/linux/PlatformDefs.h ${S}/xbmc/config.h ${S}/xbmc/utils ${S}/tools/TexturePacker/
+	   ln -s ${S}/xbmc/config.h ${S}/xbmc/utils/
+	   sh tools/rbp/setup-sdk.sh
+	   make -C tools/rbp/depends/xbmc/
+	fi
 }
 
 src_configure() {
@@ -207,19 +223,25 @@
 	# Requiring java is asine #434662
 	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
 
+	if use raspberrypi ; then
+	   append-ldflags -L/opt/vc/lib
+	   append-flags -I/opt/vc/include
+	fi
+
 	econf \
 		--docdir=/usr/share/doc/${PF} \
 		--disable-ccache \
-		--disable-optimizations \
 		--enable-external-libraries \
-		--enable-gl \
 		$(use_enable airplay) \
+		$(use_enable alsa) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \
 		$(use_enable caps libcap) \
 		$(use_enable cec libcec) \
+		$(use_enable crystalhd) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
+		$(use_enable external-ffmpeg) \
 		$(use_enable gles) \
 		$(use_enable goom) \
 		--disable-hal \
@@ -228,11 +250,17 @@
 		$(use_enable mysql) \
 		$(use_enable neon) \
 		$(use_enable nfs) \
+		$(use_enable non-free) \
+		$(use_enable omxplayer player omxplayer) \
 		$(use_enable opengl gl) \
+		$(use_enable openmax) \
+		$(use_enable optical-drive) \
+		$(use_enable optimizations) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable pvr mythtv) \
+		$(use_with raspberrypi platform raspberry-pi) \
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \
@@ -243,6 +271,8 @@
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
 		$(use_enable webserver) \
+		$(use_enable vdadecoder) \
+		$(use_enable vtbdecoder) \
 		$(use_enable X x11) \
 		$(use_enable xrandr)
 }