Introduce USE=libav to control the preferred implementation. Fixes subslot & implementation switch rebuilds as well.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 342 insertions, 23 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index d5bcc01bf53b..284c7f35ee12 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.217 2015/01/29 19:12:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.218 2015/02/01 22:59:56 mgorny Exp $
+
+*xbmc-13.2-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +xbmc-13.2-r1.ebuild,
+  xbmc-9999.ebuild:
+  Introduce USE=libav to control the preferred implementation. Fixes subslot &
+  implementation switch rebuilds as well.
 
   29 Jan 2015; Michał Górny <mgorny@gentoo.org> xbmc-11.0.ebuild,
   xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index d79dda82aa6c..6a9cb6c2ed1f 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -32,26 +32,27 @@ EBUILD xbmc-12.2-r1.ebuild 7173 SHA256 7532795a418421992b735b34634cc3f6167072717
 EBUILD xbmc-12.3.ebuild 7304 SHA256 902b98c507fdd54c87461ac77b74ec412c7abbc48839bb1ba594c083732629a3 SHA512 7c1696362b67711f6f628db4e9985f1e0dda157c9d86dbc4b32bf07a08cb4ae141a8c99528d5b6d9204660e5f8f589bd4c0766fddf3e1459dac54516b7348b3d WHIRLPOOL db416e19ce5fdfeba32d08c93a17c6c60ab98057075c02f28f9c2c459e775b8c487dc425012344fc416978a3aa674c79f69810012aaded376de1a9ec057ebeda
 EBUILD xbmc-13.0_p2.ebuild 9270 SHA256 9ecb70c2024f19560ae1ce253400cac01e1ccd85070e13cbd59eb6ef42a833ec SHA512 0bbb32e8a89e4af594d96c04b8fa53a7ebe97f8a7a5d7725c2db0bc1ee5a726628bafbda97b87d60174ffe2ab59758312592c31de22942ac92bd96365536d8de WHIRLPOOL d8bd77456a96b8c4f71cc366e492543c1204abaf65de0bb23ddd3caf2534b11803ae9a3fb2ed8e2c03d90eefca0c01081b146e5c0f3f0ab2a13dfb8006494423
 EBUILD xbmc-13.1.ebuild 9206 SHA256 39b3038b506ea6c7b28924460e3632a7819782ee3d4a35b5fc21383135cbfe73 SHA512 9827ad167e6d5bee7682db983638186c88c978e0b09284eb9dce3c8543a43b9ae7f209662c44d3f8bbc7a097dbfd46748433873c622ca7354fbac0eb52b0277c WHIRLPOOL f6214b9e8b5d1ca7bf23d2fe5f4707fb81ec3e1cc611d5264df689ac1edbeec20170cc3a3d8ec7dbd69d80031d46833b02078b5da177e19a3095af954adb15a5
+EBUILD xbmc-13.2-r1.ebuild 9205 SHA256 df7156a2a0c748039688f4a5096aa5dc9568ebc4060a4139bc2e4f640abf5b62 SHA512 bd879b71a0c33e8a461300d2863b03e227e1499ef1326a6cd197395d5cd3d1d0f7a9bafb8d0f8d103801f283dbd196865f8b993be36ca46ce5a138d645c0f0ea WHIRLPOOL 6c6766ee78f389dd31fa2ffff776cf0a27236f805be2fb4ed7c4ee8efd92143b1399fd05d083ba1e6ad3da521b065cf16e116fff29d1847a98f0d14a46401022
 EBUILD xbmc-13.2.ebuild 9206 SHA256 408dc67d983a22f9252e5d2cdd10cf60d022775074f14b9e269f0ac4a93b3ac6 SHA512 76d1491e51c9571361ecd5bc7e31b5a8d17b872ca33360a65e0a5d017c971a5429ecb3439c2889185c08443ed3b08158950093fd10ee034635b693975b7bb01f WHIRLPOOL 6df1aec03b4d339075ca7cf7078f3bab2af2b8ede8dea862e8831e523158015987228798bc166e730681c019f7a837e099e2f9688e54ce8ef5748ec4acca2d78
-EBUILD xbmc-9999.ebuild 9009 SHA256 a012ea526e312f8cf1613965e09680727bac6045205a08651ecf9d74b64301f6 SHA512 dabb9afa4c234d0a3cd33bdac5d45923ae896bf4173419447f893b387a6d289dc7adf562dcdbd2eaacbe8c488dda0925484ff3edf77745496015ef070b7c3bd3 WHIRLPOOL f65320d72d706b91dc86ed19f8f5db92b03b5e38b9d3e3c46f49c984f774c694924f433d787bb1a85bd3b8f3aa803a07b108304dcf6d16469a8cdf2e0c8cc710
-MISC ChangeLog 36263 SHA256 08728bf2462f087075bbb8566c438a8b5c035457680b523c86c55d10e76f5807 SHA512 2b606daeadb26d3d16ec77de94f49a7cf6022d8990e6847126dac250d845bad19a00a46bc86c8f27c8de8e19f278ee52f46e9a5d1ef9b635f143b33335f7576b WHIRLPOOL c0948f492eb8837d15a752b95811ba135787825939aadc2004f18fc51e9718f08ce0c24848b79b385428663ea0a361663241c623daf17767b78af63fdf71ebec
+EBUILD xbmc-9999.ebuild 9005 SHA256 47b8298edb77d93e1381d5d9e48e61d2ccb3e6390e8f3b639c320b7bd4c2c745 SHA512 47f1103ab806de7326ba0d422eaafc6c40290f7c01db2664f1d315dd8de0a3098efc895ad70ba4c28023c4a9eb458d723bdd9d41263ab8ac80889c620a75480d WHIRLPOOL 5a9cc8e61c8f4e7f8593931f024c44ce8553d700de06887d21fb9c4ddfdf93394372c60e5a038582a5ec992b95d34f5a35342988d5f9d5a2053b8b7074b5838f
+MISC ChangeLog 36506 SHA256 529ca9b28ab4a6003a840754e70f1ae2aaddbe1a08bdbb248aab01e41025b328 SHA512 a6f7bcc55dd115fd509fde99c6b182a373ad531a4f8127f174537f85d65cafd2088ef039fa43181a637ec9210885c12808636bf5c404246ddeb3d2f92ecc6651 WHIRLPOOL 8c893acae792052cd04e936a45e5b241097ea4d6943f2941dfe89f6bdee16312c826116ebe682ae09573adae7d153638527a58d0379796681f853a9ea5c37972
 MISC metadata.xml 1052 SHA256 b6b77bd21e644bef0a0cbb12c317862a73c7f42b93ddbc755ae33b389c4bfcb4 SHA512 9a49efe9d354d756955e08c219b847b3b7398305c82414c14f6e0d4e340c8b7548b2fd4af8ed90a767c3c1f53eb11be3b534a2b71bcc1dd98ac295e7ae3fe541 WHIRLPOOL 37ea2ca0a20055c0be670a5f438f5155866905516fff018b6584967f1c925ca8669386bbcbdffe6733c7075a1d21d704c6e08f20ccc0d34c25e4de62fd6b3f9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUyoYaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUzq/uXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO76sP/jo/i66vnh5zJmqWkzzZthyx
-z65chxbWzuJ3ggvo+wQ9xlDrAJt/blSLQjEZHxDD8VmoL42WZGC1MG4EQ1dtyKdZ
-gQU/UKz/KG9Xu943uyInbDO9sv48SzAubLIqACWKaEM76vLRUrhP74fY/tQB4xVb
-Y9qi7m9F7++oPbxGg6cXfp5s6nsQcMm33o7Gb/3vc8D+SN9QEDZVpS9nHv2s5N2B
-EgkpHN29Yl+clKEb6+IRF4ynYBiWGfJwA/55iD3xxFDCVA6jdBliDuGzflocNpxz
-SwvJs+Wa9/qALvJ5ikSLrXrRLcl/o+vf4aeJ66DUVBDw2mqYkRFfBqXc4P9yDX8S
-tz9mCR7auk2NQp6ERi3FnE3u0b0dIDB+ElsMcDQqFpexu6zOWSCG9Mpy4ddoUX0g
-+yWHfrFQMxFG1MSqjdppTOAKvbSZDm7wzZCPrJOknR9EcQ3fycdjXPm63EdWJ4CJ
-6whl+/ApffTLBTS5Ysqfaq3qP8VHU+oYD9qOj2J9o+gfWuqqxX8BTYDj8XxrPIR2
-UPa+tB8/B4ZV2A7SXkYKrfEFsr9OKUssk3Mjkee6lck7H1UM3KxXjSQt8upHOY3t
-eB/5uTUB/tywd6nQVBlSZF8tL9Q+/lD7JxkqJ5VVZ3/55THw0h3L/dQxAnvQMvtZ
-cgYXsOdgVe6NIdRLQcuq
-=rcen
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOb1MQALEElTM4d5yH4upxJ2D1ywBl
+wulJnMtVxNAa3lWKi19qASBc/atNc14teVXHMrP+77j0V5aZoG6OYd5U98Inn9h/
+0If4lzcTkg3ziN3Eo4JtPlgEIo1bTG6LKC/AP9AWNf8/rOYXMcTNbetS5KCltnN+
+27hP+G3+q0ABZ42gwo1LXfmJHIiamnuTYf+Q15fLHLFIh/JH3mFjCgeSPQyXJRSZ
+Imutkz6fOsvklnb3DopqFQbTEzyFAOCdiHn6z81JGxt3HLSWB4mpYCoo/9dOIFoW
+MJQYXojaIpydcVD+V7UZfYbB0AjE2urQO/b+/McIOBAKrGjvzAyT5m3htNMDIP//
+1/pDNLMrsLL320SXyBo/cZjgnmqvnuwLwGs3f3DCy9YFRaDh8iaTByeVEU0RD+mc
+1D1OfQhgrijpjbfArXiNm0eU3Gk1e0O5kftawqefSKAgxJQPnaRboZQZXDJNrGmh
+fM6zaxoFZl6+FPUJm1CZINuOqMm4r73Gcb1DVVJ58ajqzOIJHor0d2TedBZjj2n/
+83b1dxGYGrwIWrtgq9vCP36QhkitqxbOHBASt4T4Mbz6XT5ECGC0zoA2MK+pfl+L
+drOuYdXLi+Laqr4dByFh3N1NCedC/4Y3w0HXTpHM8k5eVwOY4cgcYa3ktByD7y4v
+8Nh8BQStbe45IauFJunl
+=3q9N
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-13.2-r1.ebuild b/media-tv/xbmc/xbmc-13.2-r1.ebuild
new file mode 100644
index 000000000000..131cbad132ad
--- /dev/null
+++ b/media-tv/xbmc/xbmc-13.2-r1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-13.2-r1.ebuild,v 1.1 2015/02/01 22:59:56 mgorny 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}/${MY_P}-${CODENAME}
+	;;
+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 libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp udisks upnp upower +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[sound,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
+	!libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] )
+	libav? ( media-libs/libpostproc:0=
+		>=media-video/libav-10_alpha:0=[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
+		media-libs/mesa[gles2]
+	)
+	vaapi? ( x11-libs/libva[opengl] )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		!libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] )
+		libav? ( >=media-video/libav-10_alpha:0=[vdpau] )
+	)
+	X? (
+		x11-apps/xdpyinfo
+		x11-apps/mesa-progs
+		x11-libs/libXinerama
+		xrandr? ( x11-libs/libXrandr )
+		x11-libs/libXrender
+	)"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:0 )
+	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+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 use 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 cpu_flags_x86_sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use cpu_flags_x86_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 \
+		$(usex libav "--enable-libav-compat" "") \
+		$(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 3ef2c7bf70e9..75cc0dca6bf1 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.166 2015/01/29 19:12:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.167 2015/02/01 22:59:56 mgorny Exp $
 
 EAPI="5"
 
@@ -45,7 +45,7 @@ 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 cpu_flags_x86_sse cpu_flags_x86_sse2 sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay alsa altivec avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick libav midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba +sdl cpu_flags_x86_sse cpu_flags_x86_sse2 sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
 	pvr? ( mysql )
 	rsxs? ( X )
@@ -100,7 +100,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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] ) )
+	!libav? ( >=media-video/ffmpeg-1.2.1:0=[encode] )
+	libav? ( media-libs/libpostproc:0=
+		>=media-video/libav-10_alpha:0=[encode] )
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )
@@ -126,7 +128,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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] )
+		!libav? ( >=media-video/ffmpeg-1.2.1:0=[vdpau] )
+		libav? ( >=media-video/libav-10_alpha:0=[vdpau] )
 	)
 	X? (
 		x11-apps/xdpyinfo
@@ -155,7 +158,7 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	python-single-r1_pkg_setup
 
-	if has_version 'media-video/libav' ; then
+	if use 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."
@@ -222,7 +225,7 @@ src_configure() {
 		--disable-ccache \
 		--disable-optimizations \
 		--enable-external-libraries \
-		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
+		$(usex libav "--enable-libav-compat" "") \
 		$(use_enable airplay) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \