Add USE=java to contain upstream idiocy #434662 by BT. Version bump #443572 by Tomasz Golinski.

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

4 files changed, 301 insertions, 49 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 0cab3d480cf8..673da915a94e 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.158 2012/12/24 02:10:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.159 2012/12/25 04:08:18 vapier Exp $
+
+*xbmc-12.0_rc2 (25 Dec 2012)
+
+  25 Dec 2012; Mike Frysinger <vapier@gentoo.org> +xbmc-12.0_rc2.ebuild,
+  xbmc-9999.ebuild:
+  Add USE=java to contain upstream idiocy #434662 by BT.  Version bump #443572
+  by Tomasz Golinski.
 
   24 Dec 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Require libcec-2+ #438376 by Ian Whyman.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index f8bce8573f43..e2aa720d498a 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -13,25 +13,29 @@ AUX xbmc-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea7
 AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a2b7398e4eb48773f976be93a2 SHA512 403389bb1bf1442be1a8d23106bd78dc672c66fcf588b6076e6105023a69a92ca58cdaa91c9e2664123f244c3d5f42a9de6f72845c702339e3f8a0e976330ca1 WHIRLPOOL dcf13b59133f2b7288bc734803ad1317d6e943f7cd85b0428ec257b2ec9fb6a23311fbdd8574dbfb985a473dac7cf8ca30c2ac6d59b62797adb1f63d8bcc0b12
 DIST xbmc-11.0-ffmpeg-1.0-compat-1.tar.bz2 32687 SHA256 bfdca8283c35d0062ed2c2b3f67da29dcd71bb3e0f6b06c1dcc2e43d35d7c427 SHA512 e28f69719ee9b7343c8f43f34b0ae932b66452507daf3876f10e78c79fc2edeee2569c8470c0a7519ff24a43bf2558fe6d9e08a3aca73123ef423447b90f6abf WHIRLPOOL e0caafa34d99f8cfd7908ee7755352f2972794cd7460b04ab207d4f55ec39cbf09a22c77fc954b269d09b232dcf0cb357d6a41568337df5ea97aae6ee0d6faa6
 DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
+DIST xbmc-12.0_rc2-generated-addons.tar.xz 51984 SHA256 ea7a021c7fd28fa88476dddaf88b7fee9917de2364a57113dbbeda47e402bb52 SHA512 a2379276d2ffcb62e4410599ec1e8637eb52bd74f89731ceb66e92ac2e25cfe92eda76fd0e732749109e0b1986861815e0940d6be4380cab1029106420952578 WHIRLPOOL 571d9e8691ad6d49508708ee495262305eb15a18e8b0543aa308006e3216680e913761d1706c6bed2448eeb37f4546727cde922988fa0c6e9598a429e9f0b170
+DIST xbmc-12.0_rc2.tar.gz 63734373 SHA256 e8d08df41ddbd6490e07f46c9ce28d7ada216012647f52f5e54a3e6618aa8c69 SHA512 e738c22abf9477ddd5c6be977e85303679bbf5baa524da8baa34426930f3c4599e4bf6f8aba9a093ebf81b9948c77d3bb381cdf50457ca39fbbfe3dd3411b297 WHIRLPOOL a30730c69c8b1808fb6d500b682f46517c77495e08cc61db304d14db09c0a42c8ac9b05a45a4783c05a891fe5d3f190533608806432b8e29577b23768062b9de
+DIST xbmc-9999-20121224-generated-addons.tar.xz 51980 SHA256 21284fe7ccee065eee10064f73a469722d6ffddf2fe882a0aefc07ea0eba0401 SHA512 48cdf8c685a48cd32462509962c888e8bc16254268d6fc891aacc5222da42e227ee5b6858c9e2b80d7d9fecc63862cd0c62c181a106212886a25f9be52778a1f WHIRLPOOL 12a31d33cc322b4afc3bdc829fc330a0971cab8a557a2f87885569d817a3664ae7506bfe7984322ec95b7786a246cd5edb10fceabfd96965ef33dd19cb934ae7
 EBUILD xbmc-11.0-r1.ebuild 6509 SHA256 eb80e9c0f938833ad8cf7571dc718a4c29fedaee05646d58d1d509ef8a5a5902 SHA512 ec3732f072a4d7a4960a9ccb270c93c72b3d07fbeccec213fa62f4f5e1fc681db161b577ee226330900200fc1bb96b7b20b6e36f9908e36d77588fe4c31a6af1 WHIRLPOOL c84d67c21ac1287f82e41fd41a81f99947105ab22d900f1f8d82172f3fb9d3ebe73b8d707e5ed536c02f94f56a5bb14df33b936367a9baf93bff11dc4847eaf3
 EBUILD xbmc-11.0.ebuild 6297 SHA256 7395c414fbd86dc3cc3bef80a68a108ee750c4cb39280d255b2a4f086658c98d SHA512 c2ecfb837deac387388b56bdf297f5d0305a24b2f251f6fc9722c74e44689997a6b62330c98d7d72b73ecba6681b7659916f0f5ce8d5c7f2af22342653e0e3d0 WHIRLPOOL eebbf81f6e994a118a1b0bea796df3189d0f86a1f9984059d67d8968fe17b7c03de35b326d1569fe32762c4dd744740e5e04f5a4d8559dcd513c614408c61fb6
-EBUILD xbmc-9999.ebuild 6067 SHA256 c8336b0d290393061e186303a89a1e223008f77798c79dfe8b7eb2a8edab38b2 SHA512 64649ac567f7d7132bd686e4cb83515ab3beda288f082b443879009cfe1f531ca4d84ef95a9e571bd3de9d6524056f1cacb8c979b62c3e1d862f97854a643435 WHIRLPOOL 2713dbcbb566bb20807b5fe4eec63bdc0b83df8ee24f6477eeecfc816158f28c7b8e77bcf65773438d44c81cf3fe741f113561d222045a48e3e8cfd8da48d8d1
-MISC ChangeLog 25683 SHA256 b19e825ffbdedee935f24551c4dd9295cc21f2e562a85f61a75e317e2c8bb887 SHA512 7ac60fdb625aa1fd0e5539a95f5eab76a0e75db17081cd1374c3375983c2958dd2ca114ce615b0697a10cf2d23bd1aa1ce518e3288383bc9661584e39afd3fb6 WHIRLPOOL 1dfcee5cd766065e153b9660d9d8ef3612481012ea9a51aa5f07c77a42f701c4044f50f25c9bc030a66e195e3b9027348b586321e1fa1f94745f98fcd006af66
+EBUILD xbmc-12.0_rc2.ebuild 6464 SHA256 c50dfaf4fc6977ed6fb3b2a4953a77c0d72d52a545c8c2ed860b92421a012247 SHA512 48589280932dab38705a8b9ded560655d41ef14e53e76c9b39a16b48fb37545a42986b96b32d7bf86974bf5a36585239ce1f1743b7be17e7b09e2771a30eb9a4 WHIRLPOOL 566d6a1550c76a2f4e09ed952415e77a2b8160498763d3cc820a598ed660d8786b8a1c209ab30da746a544f308fd434ec39477cc166201e8283f4871af619adc
+EBUILD xbmc-9999.ebuild 6464 SHA256 aed2e268625333ae772a49eeabc17985656ca32a50ae6311d0e50e5cc90a0d42 SHA512 25e217359fb58c966163727a00bcba5a7c713fe9fd3bb1c882e1572a9156a5bbc5509df648625ce7522d068112937aee0ab69ad46e4ed685d89dd6d4818ba873 WHIRLPOOL a9e82be82032aa2f2e25f3563e97137640c26186a0afcbed45a68e94ffed9782819a13bc2defb64a430af34c45a1fc632b784a27af9b29b614aff38e4930f699
+MISC ChangeLog 25908 SHA256 4cea15d62d4e5ab5d1e9fb851b4351661e25bd50620c441c40b6680a4f655808 SHA512 a96d6ea13943b761e50275a47b2d0f27a644a5806a6da072718fdea97320103cb4c8c95538e2bdf2c98b21c2b36503010085f5de79083d0781c71051bd38898f WHIRLPOOL 54e97479909af9c2d59e7b779ab6628a4498433427b15617b9946f4f64d05e1bf350edf69b4e0b0ad4a372306a13794ecd26b1aea435cde16e9fa42b01b43ccc
 MISC metadata.xml 1025 SHA256 73ced63a34ac528635412bea6d8e671d6ba517c6bfa17d0f48a560a9de0f12f9 SHA512 40d2a20175ef2fd0bdc5228339f4236905cd91758d30bec4c8575ff2a90f59e3333167e8ffcb125f382530248931e1a0a98f7e67a40073bff0850c350bccc36f WHIRLPOOL 3c4f940a8a42426b530041e0958635cbd46d9a23817594f82dbe4dce2a0873189c727a53663bb98c198c146dd38dc2fcb6e06823c4c22cb9ae860c3d51ea6750
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ17mcAAoJELEHsLL7fEFWrxYP/A0wSHIQs4j+eHuBrLbU/bND
-MjVW3iM0Lbxk3eIC9Gl76SFni1ecT5uaUhpUWt9VbNs1WNgpYGLnDCcUPgYN9ST/
-63rJ0G6JKWA6O38x6Qmu+evk/1n0flXN9QPSfqY3hGJDP7HAwk3bY+ef0nwAIybp
-7ReH7BgVtCMRxnAOTam3wpaPbdem47De5mbCB+F+SmE3VvfvaiFHYNyvCKBRseSI
-VAapZ4Q2+Bpxh1LDdx1EiMrVm0lJrNgAbGq0qGkUAM6N1j/rvdgtEEsBxL+Br+m1
-nosCuggwLxHkEh7r9opQHJ65xcgxst7f0Fi6bKT57plaLJeWS8BLMpoJEzN26y4i
-VCVUqxa6/ALMvycBXuE+OwYtxj2U/MyeYSr/CWbgBXLiR7tWcJ+2CJYeiulmmxxb
-0TQtIX087rDVh2kTSfysSOxCmaA7q0rRsaobPk1F72ucnVS73qtEoKLE7jGr7HEA
-tVAT6rg43Jtr6Txseq3pP6eFBgRO0NzT/GbV2BxO5msRx24Lb1ErRmbUM+bC+r3Z
-TI0afGg5rkJC4UmeQoIl9NBFUsh9F2HnuGY4+S9YPzF+KdKQb0bYPPSbHR9NOziq
-iXS+Ab/ciC5seir4xW/M+QUlTmLgv2vLUM05MNHKvvzbL5svclSbvYX1yyXTGoYv
-5ZIghqJwNeJwilHj9kf6
-=6QZl
+iQIcBAEBCAAGBQJQ2SbaAAoJELEHsLL7fEFW+0sP/izshThAl/AmGhUNaXfyBTFs
+AXmFNDpAYfyCuQMROLQswLamA+wDBlw7huZCqfJORKekIVF2vw+Vbg03DBjGA2mq
+c9oWy2jMnpbqcs+j0pq/GAG8eyMTT6ID8a7V7kGJAAxBbZ8G2HlwiyLHcAo41VIW
+FRLU5xEniQTdJt75tCvkEl/73eUa1G5clNcssMy7nhPrrUCk0R3CfO/cr+m8AmJa
+IHW1LYRjFqFQCJiLdD9APOgpfD7PqoCfb5MAozNyoc3E50NFxQ1rGmCC9640a2UQ
+LSrNGPglA0wBcrSZxPetUek2rJwAaxIA3j/CE75aLyIbygLpljSwVglwRLQH+dDS
+c8C+Hh5/fQXia48QwYXWJx1E7BoUaxpKq6ZWPvqdDzroozv0u+YhO7AAxbRfTO1m
+sudWOXVxWCShF4As3IjLxZQhXbiJSOa0EOnmIaq54cMK1vKt3sl9gBZBRBKwu93C
+0eCCIFloxp+saBiPlaxBtAdHf/ZtCmrlhdw4ZLsD+SxjsgrmgGfP4j7YGPq8lxet
+CifJaJ1JOvNkG962u5mdQNytkdvxDySNppyZH7nqj08srjI/PiQ6wdLoufiho9Lv
+Z6mwrIKUc0Lhclv0a6DnQWjUMa17AahT5hwp+aWngLuSTHF7XCBaHB1n43hlcoaT
+lZcmzfdo6ATKujraLVJY
+=b34g
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-12.0_rc2.ebuild b/media-tv/xbmc/xbmc-12.0_rc2.ebuild
new file mode 100644
index 000000000000..1e4beb19fb35
--- /dev/null
+++ b/media-tv/xbmc/xbmc-12.0_rc2.ebuild
@@ -0,0 +1,238 @@
+# 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-12.0_rc2.ebuild,v 1.1 2012/12/25 04:08:18 vapier Exp $
+
+EAPI="4"
+
+# Does not work with py3 here
+# It might work with py:2.5 but I didn't test that
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils python multiprocessing autotools
+
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-2
+	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
+	;;
+*_alpha*|*_beta*|*_rc*)
+	MY_PV="Frodo_${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"
+	;;
+*)
+	MY_P=${P/_/-*_}
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	;;
+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 cec css debug goom java joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
+REQUIRED_USE="pvr? ( mysql )"
+
+COMMON_DEPEND="virtual/glu
+	virtual/opengl
+	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]
+	cec? ( >=dev-libs/libcec-2 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml
+	dev-libs/yajl
+	>=dev-python/pysqlite-2
+	dev-python/simplejson
+	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
+	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
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
+	>=virtual/ffmpeg-0.6[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	nfs? ( net-fs/libnfs )
+	webserver? ( net-libs/libmicrohttpd )
+	sftp? ( net-libs/libssh )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	bluetooth? ( net-wireless/bluez )
+	sys-apps/dbus
+	sys-libs/zlib
+	virtual/jpeg
+	mysql? ( virtual/mysql )
+	x11-apps/xdpyinfo
+	x11-apps/mesa-progs
+	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"
+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
+	dev-util/cmake
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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\techo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%\/configure/.} >/dev/null
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
+		popd >/dev/null
+	done
+	multijob_finish
+	elibtoolize
+
+	# 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 -print0 | xargs -0 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
+	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--enable-gl \
+		$(use_enable airplay) \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable cec libcec) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable goom) \
+		--disable-hal \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(use_enable nfs) \
+		$(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 sftp ssh) \
+		$(use_enable upnp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	domenu tools/Linux/xbmc.desktop
+	newicon tools/Linux/xbmc-48x48.png xbmc.png
+
+	insinto "$(python_get_sitedir)" #309885
+	doins tools/EventClients/lib/python/xbmcclient.py || die
+	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
+}
+
+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 364ac0e5f92e..c1b4de45c3db 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.124 2012/12/24 02:10:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.125 2012/12/25 04:08:18 vapier Exp $
 
 EAPI="4"
 
@@ -8,25 +8,34 @@ EAPI="4"
 # It might work with py:2.5 but I didn't test that
 PYTHON_DEPEND="2:2.6"
 
-inherit eutils python
-
-EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-2 autotools
-else
-	inherit autotools
+inherit eutils python multiprocessing autotools
+
+case ${PV} in
+9999)
+	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+	inherit git-2
+	SRC_URI="!java? ( mirror://gentoo/${P}-20121224-generated-addons.tar.xz )"
+	;;
+*_alpha*|*_beta*|*_rc*)
+	MY_PV="Frodo_${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"
+	;;
+*)
 	MY_P=${P/_/-*_}
 	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
+	;;
+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 cec css debug goom joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluetooth bluray cec css debug goom java joystick midi mysql nfs profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 sftp udev upnp vaapi vdpau webserver +xrandr"
 REQUIRED_USE="pvr? ( mysql )"
 
 COMMON_DEPEND="virtual/glu
@@ -102,11 +111,15 @@ COMMON_DEPEND="virtual/glu
 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
 	dev-util/cmake
-	x86? ( dev-lang/nasm )"
+	x86? ( dev-lang/nasm )
+	java? ( virtual/jre )"
+
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	python_set_active_version 2
@@ -114,18 +127,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-		cd "${S}"
-		rm -f configure
-	else
-		unpack ${A}
-		cd "${S}"
-	fi
-
-	# Fix case sensitivity
-	mv media/Fonts/{a,A}rial.ttf || die
-	mv media/{S,s}plash.png || die
+	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
 }
 
 src_prepare() {
@@ -135,18 +137,17 @@ src_prepare() {
 	rm -f configure
 
 	# some dirs ship generated autotools, some dont
+	multijob_init
 	local d
-	for d in \
-		. \
-		lib/{libdvd/lib*/,cpluff} \
-		xbmc/screensavers/rsxs-* \
-		xbmc/visualizations/Goom/goom2k4-0
-	do
-		[[ -e ${d}/configure ]] && continue
-		pushd ${d} >/dev/null
-		eautoreconf
+	for d in $(printf 'f:\n\techo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do
+		[[ -e ${d} ]] && continue
+		pushd ${d/%\/configure/.} >/dev/null
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+		multijob_child_init eautoreconf
 		popd >/dev/null
 	done
+	multijob_finish
+	elibtoolize
 
 	# Disable internal func checks as our USE/DEPEND
 	# stuff handles this just fine already #408395
@@ -183,6 +184,8 @@ src_configure() {
 	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
+	export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
 
 	econf \
 		--docdir=/usr/share/doc/${PF} \