Version bump #504726.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 344 insertions, 23 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 7864621862b0..634b3bb58a94 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.204 2014/05/09 22:40:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.205 2014/05/11 19:08:33 vapier Exp $
+
+*xbmc-13.0_p2 (11 May 2014)
+
+  11 May 2014; Mike Frysinger <vapier@gentoo.org> +xbmc-13.0_p2.ebuild,
+  xbmc-9999.ebuild:
+  Version bump #504726.
 
   09 May 2014; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Run code generator bootstrap #509592 by Anthony Ryan.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 18bb9626deec..cb0988229483 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -19,28 +19,31 @@ DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7
 DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c SHA512 d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 WHIRLPOOL c3fc97e5f45a38a259bca06af0b171630ac16832034410e45174d900358b1d16b72940b29475dcad72a2198d8722859a229152379ab7784a7d61f961eb261ddb
 DIST xbmc-12.3-generated-addons.tar.xz 52228 SHA256 477f789dea36969149fe118ecac1c4f3d8c3414772cc6c569be4aefb7e3f221e SHA512 2107271445c0cdcc14b348d011e12ffaaee75bbec506496798f64218256ab9e86cc0ada5edc1e70e509ac1ab366695fae4c15e90bd47fa57ccfe723d7e406b85 WHIRLPOOL 3963577539dee04f33dc4b988944f906688d77864d5e6a6b403e4578c9a91f2b77c256e6b4ed234a9722524c1c3acc626a28ff44c6376c09d93f24008abf54cd
 DIST xbmc-12.3.tar.gz 64615159 SHA256 3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73 SHA512 abe5333f940460a2d40b04a4821f932b44c7605e0d4954e48781317aa25ee04e102b051165842094c5804024c637ca30506773dc3319aba7ab6dbfbe1973ccaa WHIRLPOOL 035cf5792c3c9785eb0a5227406c66298591bafc1251889d4e4a2742ffd715c374c0b6e092f5705db181412de9cae6d1eb3e9c370f3390858b4651f4c135fda1
+DIST xbmc-13.0_r2-generated-addons.tar.xz 312524 SHA256 82e2c219a09a758c5cc7a29c4e719c48255523ee79e2ac9fe72d39b45730e32e SHA512 1399b922711424844756d4f56696ea4be34b3ffbeedfc23bb832cb8e0ee9d6831f1c31ebc41d49f20c262f0cbb52601786e33550d5aca5de4de520fcee0f53ec WHIRLPOOL 67f184b241e90c369cee7ceaf3f714c002093a5b4e82614cd1413af35e7c3aef1adb2460d9286c54a40e5a74de37864eff86d5631e0a0ea33a69e3b29082e477
+DIST xbmc-13.0_r2.tar.gz 65616107 SHA256 663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903 SHA512 c56d11959797f4c6c3b1831afeab03332913fe6cc00f2542c45af725fe932ba3b997c2af997a602665734a6bcc061c40b8e876144894fdeab91b56df98958433 WHIRLPOOL 394b76c9d20dd90a0d04306d301d4bb656fe99afab6e7392d6274bd3eb8c9a3083bfe192f3850f6ea7123ed537baa64f658a48b14eee68b8226b4e620a76d199
 DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
 EBUILD xbmc-11.0.ebuild 6299 SHA256 9766e13599ba897a01e1ac279db544fa69c32f79fac20fddbaa42bb0e76f2199 SHA512 2a46985734e6284be47049482e0bc16a49fdaacd20d1fc822870f7b6a22ceaee4a9b176e242be948fd24b155db8854240660fb340a7b724f593345adee5c06d5 WHIRLPOOL 3483f3db0e1803407454dc04513e3be8a30d337a0a68555601b5d63ff7dfbaacaec829ab84156536cc4047eb7f4fc8630e6e24ab3594bbbc5a560feda27c0d43
 EBUILD xbmc-12.1-r1.ebuild 7115 SHA256 47046f45870a9e0e21ee35438ff49c93305235769a1d7ccb689a50ef7d64a11b SHA512 ad7bf1e5febb5fb3a0576622d4b29b37ff0a42843eafc3afe1bf6d04452bdffcb039bdfdb60ab5edcc2f26d15f4de626664268bb8aa8cd78c692c5d860e4022e WHIRLPOOL e9cf6c3758b9568634ad3ddff4ff55b662be6e77e0c3b292be422f252053786fa23147efdbaee37aae8296f40324dedabce4f02522a037524d51b453d2986414
 EBUILD xbmc-12.2-r1.ebuild 7076 SHA256 6118ad038ea8c0232a7c1d6309cafdab8fd61137c56a7a845c03b5df3d64c48c SHA512 9afacd0a3fe260b0cebba05617299bcfb293863e37834a3637072312bb678be76f3e717cfd18beb31c6ded90eec088dfad1fa41d4f92f9bcb050379d5e9b65fa WHIRLPOOL 5dd1213fb8bc6eb064abf3fc5ad155e6edc9f484f272064593587d959592354db680cdf0edcb87f0629e601eaabd0d442e6e7372919563effa2426b0acd7fdcd
 EBUILD xbmc-12.3.ebuild 7176 SHA256 69dacbdfb96fd3618025e041b7c85a0120360d122effb847c232e74493fb86a3 SHA512 4f2dbe184c5c3d7b3db67064ad2fd05a2649ebeef231f411d639d9ff0e7201c94b118ec5700952b4211a0c4b8db751b077f75801294823daf2e5575861b13d70 WHIRLPOOL 759f1813c9d7740f47b7d57db0345865ca353d3932521d4137121923acb7927aaf60c950ae2a3f4bdbfb0b78e4d7cb982a38e25260cceb5749bff8e7b200ce4c
-EBUILD xbmc-9999.ebuild 8917 SHA256 fb71ee3c7ed99c88c8d82a01e72765a586946c3de64e658544401faa37f91e33 SHA512 437ec677a88032401f732f232f58d7f7e01af44fcc7b24b34f4d9ca62c2c47f3447f990f7b6406d2e4c9e3f6bc842c4553a1fda781b31501ebcfbd047625ade5 WHIRLPOOL f1885bc7d99bee494947c941de31b04c43a59cf878ef6b07141cc99b9facd008cb1eec79d37a87e8a6c6e34cf4a19ed5cfdcc55fcd0de033b694770b74366f7d
-MISC ChangeLog 33858 SHA256 3b0ea33fdb954e21b258d26c6d122079da8bd89bae7df995a56cab5ac44ed226 SHA512 cad15f97a8872d0377fc0bbf11ced73c024c61026754d527d27a3be0be864ba91898c8db07003eb1576f7a73d0289d0ec00c95db2037dd99771def4e0e36eb14 WHIRLPOOL 06e9df970c30a070750897950b430ff908902f453a69eb67ce57cf8e8c49de7ca0dd97988a23516c483ff8f9df475417b22a0cfbabdc858762e26d4491fdce48
+EBUILD xbmc-13.0_p2.ebuild 9142 SHA256 c23fefa2a38b6276c3fb7d94962131199b22b8a80cd8d2f30564fabbd609757b SHA512 dc63971e0b901e82b0f5e7d54e329ea324b70439ebd66461320224c6dd1a32037a9c2a2a7ff0cb54851ce5d78ad65bfc40974b2b0a0a45b89ac25b54b8dcef02 WHIRLPOOL 388ef1cb4ea2252c64ec60ebfac5dd319a59a8fdf1cba9c4d2e7869d9076c35e178540d12120f686b0f556b29241c85922e412dc759c3720686fe1afda83a531
+EBUILD xbmc-9999.ebuild 9140 SHA256 d4f5eee43d4b355d4a03eeba9be66848a5f311a8d59396ba41da448df7ceda42 SHA512 e9f8a8cfd8e95543323482c9fcb6fda4caf0528ed2dcfb868c8903938fcc65e89ac2259fef46b61395bf5161b9c1fc430973b0b964d3f5390fef3516367d652c WHIRLPOOL 334c301a259f2c1d438318e79d397a8eb1974977648a656b7ed640249c8aac600a82b295107bc19b0e7033ebd056c9094cb999eaa56f9e48ef2def92a590a408
+MISC ChangeLog 34004 SHA256 40495de7ca2727494155ddbef092d9806d837073fb9cb6a0fa03c3ba82855b0a SHA512 76fe76cee2ee7c6efaf352cdd550ec91c34b9356597ad627f9dcfaba4288cafc785bd7986b3c1843d81a9f79213b937b101e0e6340a0d78df8c9e5c8172db8a6 WHIRLPOOL 92985f84fc2183eac55286848b98861758c86f4c480259fd05cc78f8da2bb82ff41f8e3b72b04bf0d2518e48462a66cdae9446800ae5c099edf57c9761d531aa
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTbVluAAoJEPGu1DbS6WIAoy8QAJec8ljytCbMMYAcoH7RN5S/
-4XCcYULGyjKBMlYiGg2kZ39gBigs4pVGYU0Zz2FFqXbNiJ7wxWHajm2Ir95Ord43
-TiV8ED8bKtySn87G4t982njQxtgxRuaXiX/CPWcGSCQ1HYFnPuOO/4bFxfrabp+p
-UW7+U62DRxKtUHDnLEcjsIC4yJAHHRW9sjwAKUS0V22NvazYn4UTCr2sLrGQMkXz
-s7FKyLpb3TPBLGr3vafAHwd8veUM5lL14SKK8cfOEVQ5SZeoRFJ7WvUBftJKUbM0
-iEg+fOUNkoDhGdIcINxuAaZYhf1vc+x4ZDjKN6I/PjTqEIHkI8wUjURqI1b8Gqe6
-fuF4NIFLjD4L7/blN3Vr/8hPJfqL3jjPPgrWTeLCjO7cnSMkYVyV4Cu5XpjAKYsR
-JI9wqBYMXj/R5oO2cF7lhS6oxzrGwiZzyBF9mZ9qFuZFUMLWiBnmhGfquwFoo79M
-eYWzE2uadFVZj8WmI+TOD4b3I0oETzXFzNsl/EVwWFHB0exJL6UKV7mbTGV00xUx
-z23h/0kSZk4IRnDPB6LQZfiz6q90n0bd/1yJmSjIGPzFO1fcavRVpZ6lgPIsuqPG
-BN1ojRVIsdmo3wIY41jbdc3I/HbIxbtI+i1Tc/xuv5+1jYRJBrpwjM40BUW0cu37
-04MgCbRq2dHiAFVkYdwT
-=76rA
+iQIcBAEBCAAGBQJTb8q2AAoJEPGu1DbS6WIAqmYP/1KUVB4QMAHLISc8tL5KdDZU
+1pHiOLQVEFz8ZQ3qbT6jNvuDif/Q0zhlkqSGVfqDIzUz7FqJZveBdweVWDwptPls
+21IaSuBPwTj+krJUaFWZEIb9rVk1e9co1aQOoQ9Kq00VfMxvK2LrZQUnajNo3xLj
+HXs0OmHRP1SZ6h0LgstbaMqmOxaENEiS7HfF0rLlUyTTv00+Nzq+kphM1cQc1g7n
+DPXFzUAfoQ+8FEO1xstYXVjmAdjIskasoI+pwhWcxyeE1W3hhjoswaamc6Wk8dMY
+Pz3NCVCEKZzTIyZYL06wfOQdrAXt1DI4uEVPg8Cyibd0fAYt9boJYG85FgA7PFV/
+RFSzFCKan0BQhXUYBK9S2Xjt+098kJfti5xvpBiPnD+ejjkMGeKAiUyLLnomde1a
+NVb2dSKAye1QsoIBLEdcnn5MjwDwDm5YuKamXUZWrzFeEgOkmJVF3REdl4gtGUlQ
+E/iYqwrA46CM9mRcWcIxipljuP9O7D9Rw7hg9QcNrN768C1bOy2EFX2BLepCv7e6
+518F/ZqQF6ZZ3Y5RTQS0wqX2gZH+MSXEdPa+2SE9xURB/c4inTBAJehQKFXpqb1G
+8k3HM9Td7Z7YjKFVCKvIWcrtdVDKmB2RHNia+1IZUTNvzK7zcTHsq0ol+HWBglXf
+aa1UJsIOJq1hT/e9UdCI
+=5xaC
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-13.0_p2.ebuild b/media-tv/xbmc/xbmc-13.0_p2.ebuild
new file mode 100644
index 000000000000..2a9100d50325
--- /dev/null
+++ b/media-tv/xbmc/xbmc-13.0_p2.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-13.0_p2.ebuild,v 1.1 2014/05/11 19:08:33 vapier Exp $
+
+EAPI="5"
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 multiprocessing autotools
+
+CODENAME="Gotham"
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-2
+	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
+	;;
+*_alpha*|*_beta*|*_rc*)
+	MY_PV="${CODENAME}_${PV#*_}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+	;;
+*|*_p*)
+	MY_PV=${PV/_p/_r}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
+		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${PN}-
+	[[ ${PV} == *_p* ]] \
+		&& S+=${PV/_p/-${CODENAME}_r} \
+		|| S+=${MY_PV}
+	;;
+esac
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql 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 )
+	X? ( sdl )
+	xrandr? ( X )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	airplay? ( app-pda/libplist )
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	cec? ( >=dev-libs/libcec-2.1 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-libs/yajl
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	media-fonts/corefonts
+	media-fonts/roboto
+	media-libs/alsa-lib
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-1.5.6
+	media-libs/jasper
+	media-libs/jbigkit
+	>=media-libs/libass-0.9.7
+	bluray? ( media-libs/libbluray )
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libpng
+	projectm? ( media-libs/libprojectm )
+	media-libs/libsamplerate
+	sdl? ( media-libs/libsdl[audio,opengl,video,X] )
+	alsa? ( media-libs/libsdl[alsa] )
+	>=media-libs/taglib-1.8
+	media-libs/libvorbis
+	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
+	|| ( >=media-video/ffmpeg-1.2.1:0=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) )
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs )
+	webserver? ( net-libs/libmicrohttpd[messages] )
+	sftp? ( net-libs/libssh[sftp] )
+	net-misc/curl
+	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 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	gles? ( virtual/opengl )
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		|| ( >=media-video/ffmpeg-1.2.1:0=[vdpau] >=media-video/libav-10_alpha:=[vdpau] )
+	)
+	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
+	X? ( x11-proto/xineramaproto )
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )"
+# Force java for latest git version to avoid having to hand maintain the
+# generated addons package.  #488118
+[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Building ${PN} against media-video/libav is not supported upstream."
+		ewarn "It requires building a (small) wrapper library with some code"
+		ewarn "from media-video/ffmpeg."
+		ewarn "If you experience issues, please try with media-video/ffmpeg."
+	fi
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+	# The mythtv patch touches configure.ac, so force a regen
+	rm -f configure
+
+	# some dirs ship generated autotools, some dont
+	multijob_init
+	local d
+	for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%configure/.} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	[[ ${PV} == "9999" ]] && emake -f codegenerator.mk
+
+	# Disable internal func checks as our USE/DEPEND
+	# stuff handles this just fine already #408395
+	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+	local squish #290564
+	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+	sed -i \
+		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+		-e "1iCXXFLAGS += ${squish}" \
+		lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	epatch_user #293109
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -exec touch -r configure {} +
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+	# No configure flage for this #403561
+	export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+	# Requiring java is asine #434662
+	[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
+		--enable-gl \
+		$(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) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable nfs) \
+		$(use_enable opengl gl) \
+		$(use_enable profile profiling) \
+		$(use_enable projectm) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr mythtv) \
+		$(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)
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	domenu tools/Linux/xbmc.desktop
+	newicon media/icon48x48.png xbmc.png
+
+	# Remove optional addons (platform specific and disabled by USE flag).
+	local disabled_addons=(
+		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
+		visualization.dxspectrum
+	)
+	use fishbmc  || disabled_addons+=( visualization.fishbmc )
+	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
+	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
+	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
+
+	# Punt simplejson bundle, we use the system one anyway.
+	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
+	# Remove fonconfig settings that are used only on MacOSX.
+	# Can't be patched upstream because they just find all files and install
+	# them into same structure like they have in git.
+	rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
+
+	# Replace bundled fonts with system ones
+	# teletext.ttf: unknown
+	# bold-caps.ttf: unknown
+	# roboto: roboto-bold, roboto-regular
+	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
+	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
+	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
+		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
+	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
+		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Bold.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send
+}
+
+pkg_postinst() {
+	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+}
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 13408abfc8a5..f0c2aa9c1007 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.156 2014/05/09 22:40:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.157 2014/05/11 19:08:33 vapier Exp $
 
 EAPI="5"
 
@@ -11,6 +11,7 @@ PYTHON_REQ_USE="sqlite"
 
 inherit eutils python-single-r1 multiprocessing autotools
 
+CODENAME="Helix"
 case ${PV} in
 9999)
 	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
@@ -18,16 +19,24 @@ case ${PV} in
 	#SRC_URI="!java? ( mirror://gentoo/${P}-20130413-generated-addons.tar.xz )"
 	;;
 *_alpha*|*_beta*|*_rc*)
-	MY_PV="Helix_${PV#*_}"
+	MY_PV="${CODENAME}_${PV#*_}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 		!java? ( mirror://gentoo/${P}-generated-addons.tar.xz )"
 	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
 	;;
-*)
-	MY_P=${P/_/-*_}
-	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+*|*_p*)
+	MY_PV=${PV/_p/_r}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz
+		http://mirrors.xbmc.org/releases/source/${MY_P}-generated-addons.tar.xz"
 	KEYWORDS="~amd64 ~x86"
+
+	S=${WORKDIR}/${PN}-
+	[[ ${PV} == *_p* ]] \
+		&& S+=${PV/_p/-${CODENAME}_r} \
+		|| S+=${MY_PV}
 	;;
 esac
 
@@ -137,8 +146,6 @@ DEPEND="${COMMON_DEPEND}
 # generated addons package.  #488118
 [[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
 
-S=${WORKDIR}/${MY_P}
-
 pkg_setup() {
 	python-single-r1_pkg_setup