--- /usr/portage/media-tv/xbmc/xbmc-9999.ebuild	2012-01-24 03:01:19.000000000 +0000
+++ /usr/local/portage/media-tv/xbmc/xbmc-11.0_beta2.ebuild	2012-01-28 17:01:12.807555292 +0000
@@ -1,18 +1,24 @@
 # Copyright 1999-2012 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.95 2012/01/24 02:45:07 vapier Exp $
+# $Header: $
 
 EAPI="2"
 
-inherit eutils python
+inherit autotools eutils python
 
 EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-2 autotools
+	inherit git-2
+else
+	if [[ ${PV} == *beta* ]] ; then
+		inherit versionator
+		CODENAME="Eden"
+		MY_PV=`get_version_component_range 1-2`-${CODENAME}_`get_version_component_range 3`
+		MY_P="${PN}-${MY_PV}"
 else
-	inherit autotools
 	MY_P=${P/_/-}
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+	fi
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
@@ -22,20 +28,19 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
 
-COMMON_DEPEND="virtual/opengl
+COMMON_DEPEND="
 	app-arch/bzip2
 	app-arch/unzip
 	app-arch/zip
 	app-i18n/enca
-	airplay? ( app-pda/libplist )
 	>=dev-lang/python-2.4
 	dev-libs/boost
 	dev-libs/fribidi
 	dev-libs/libcdio[-minimal]
 	dev-libs/libpcre[cxx]
-	>=dev-libs/lzo-2.04
+	dev-libs/lzo
 	dev-libs/yajl
 	>=dev-python/pysqlite-2
 	dev-python/simplejson
@@ -43,49 +48,53 @@
 	media-libs/flac
 	media-libs/fontconfig
 	media-libs/freetype
-	>=media-libs/glew-1.5.6
+	media-libs/glew
 	media-libs/jasper
 	media-libs/jbigkit
-	virtual/jpeg
-	>=media-libs/libass-0.9.7
-	bluray? ( media-libs/libbluray )
-	css? ( media-libs/libdvdcss )
+	media-libs/libass
 	media-libs/libmad
 	media-libs/libmodplug
 	media-libs/libmpeg2
 	media-libs/libogg
 	media-libs/libpng
-	projectm? ( media-libs/libprojectm )
 	media-libs/libsamplerate
 	media-libs/libsdl[audio,opengl,video,X]
-	alsa? ( media-libs/libsdl[alsa] )
 	media-libs/libvorbis
 	media-libs/sdl-gfx
-	>=media-libs/sdl-image-1.2.10[gif,jpeg,png]
+	media-libs/sdl-image[gif,jpeg,png]
 	media-libs/sdl-mixer
 	media-libs/sdl-sound
 	media-libs/tiff
-	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	>=virtual/ffmpeg-0.6
-	rtmp? ( media-video/rtmpdump )
-	avahi? ( net-dns/avahi )
-	webserver? ( net-libs/libmicrohttpd )
+	media-video/ffmpeg
 	net-misc/curl
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	=net-wireless/bluez-4.96
 	sys-apps/dbus
 	sys-libs/zlib
-	pvr? ( virtual/mysql )
+	virtual/jpeg
+	virtual/opengl
+	virtual/mysql
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
+	x11-libs/libXinerama
+	x11-libs/libXrender
+	airplay? ( app-pda/libplist )
+	alsa? ( media-libs/libsdl[alsa] )
+	avahi? ( net-dns/avahi )
+	bluray? ( media-libs/libbluray )
+	css? ( media-libs/libdvdcss )
+	pulseaudio? ( media-sound/pulseaudio )
+	projectm? ( media-libs/libprojectm )
+	rtmp? ( media-video/rtmpdump )
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	vaapi? ( x11-libs/libva )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		virtual/ffmpeg[vdpau]
+		media-video/ffmpeg[vdpau]
 	)
-	x11-libs/libXinerama
-	xrandr? ( x11-libs/libXrandr )
-	x11-libs/libXrender"
+	webserver? ( net-libs/libmicrohttpd )
+	xrandr? ( x11-libs/libXrandr )"
+
 RDEPEND="${COMMON_DEPEND}
 	udev? (	sys-fs/udisks sys-power/upower )"
 DEPEND="${COMMON_DEPEND}
@@ -110,8 +119,6 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomysql.patch
-
 	# some dirs ship generated autotools, some dont
 	local d
 	for d in \
@@ -150,6 +157,8 @@
 		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
 		xbmc/linux/*.cpp || die
 
+	epatch "${FILESDIR}"/xbmc-11.0_beta2-libpng1.5-zenkibou-github.patch || die
+
 	epatch_user #293109
 
 	# Tweak autotool timestamps to avoid regeneration
@@ -180,7 +189,6 @@
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \