Version bump #462266 by Anthony Ryan.

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

3 files changed, 259 insertions, 15 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index c7b92dbf5368..98c263628a9b 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.172 2013/03/23 09:15:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.173 2013/03/23 09:38:19 vapier Exp $
+
+*xbmc-12.1 (23 Mar 2013)
+
+  23 Mar 2013; Mike Frysinger <vapier@gentoo.org> +xbmc-12.1.ebuild:
+  Version bump #462266 by Anthony Ryan.
 
   23 Mar 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
   xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 11d238e2f8bb..65605044166a 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -15,27 +15,29 @@ AUX xbmc-9999-nomythtv.patch 1680 SHA256 fe0289d1361b0dde3c261bc082bcad123c9cc9a
 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.tar.gz 67176825 SHA256 53018cd014b5203df5e5ef4080931ef499d3740815f32d17dce92ef7d050c16f SHA512 37da579b055d4ea72cd18cf92541b47e6c42682091ef123baccdbce740b23842ac7c28eea032ada9a9c2232be034c7c4113ee8107ac3c7287834d08d4bcb67d6 WHIRLPOOL 6282dd7a728696c9a4577725d949d54992996d18a7b3c054c7d318b070fcad33efc4292afb83aa934c586cf718de67e294b2c498e491311b896e6a632cfa5b73
+DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
 DIST xbmc-9999-20121224-generated-addons.tar.xz 51980 SHA256 21284fe7ccee065eee10064f73a469722d6ffddf2fe882a0aefc07ea0eba0401 SHA512 48cdf8c685a48cd32462509962c888e8bc16254268d6fc891aacc5222da42e227ee5b6858c9e2b80d7d9fecc63862cd0c62c181a106212886a25f9be52778a1f WHIRLPOOL 12a31d33cc322b4afc3bdc829fc330a0971cab8a557a2f87885569d817a3664ae7506bfe7984322ec95b7786a246cd5edb10fceabfd96965ef33dd19cb934ae7
 EBUILD xbmc-11.0-r1.ebuild 6507 SHA256 8a061777222215b70be0e356744a733da97bff974afa311c945b33c46938cfc9 SHA512 118a994f758de41de5c1e294d4982750db0e55e15388d219a8bb0b5d703b7662910028effc002eb6923e5c2e8b4a65583ba03974e92b7f5f351d689ab729c65f WHIRLPOOL 198d13ab2449bcb49fcc8ffa3975a340af3ee97d1a9d0e2848977e4fd5809f56c84355b905dbc0fdb433cfa71c4b9f828ffd3fe5a9c06f70685e90d15418a878
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
 EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0cc57b9a2f23f8a9e2b8d3 SHA512 65a1cac4a88b806ecc327cfec1ac3ef90dc73868a82c8ace3a47fcf5eb2b61f125d317646c096b671bc88f7814e08231ace11312e74e595a8c421696bd1982c3 WHIRLPOOL da70651c655c64ca82895236d11e1ae4462cce62809ab0338364b142bcd03c42c6d244c75591df381cc93bc9809d44b6f5f6a9a518fd52e150d4c520a21d2622
+EBUILD xbmc-12.1.ebuild 6481 SHA256 1c4afac73d9c22544d07162d99af150037fedf8bd0de2118e09e071d3f6240c9 SHA512 e7d67461f2cb67163bcaf7f5880e012026290b0a3f4817dd79550b05a731989af6941e9f42284163f217738507e372156d223e55670f9cfa53103bc932bf96f7 WHIRLPOOL d8fb05634ceec550af5b76152a55a1d812339d765061e13b16f3f10de559bcc13e6e4c09660a1019d2c7bc21a35f1c8d42e3f5eef186077778f2f1693199c5cb
 EBUILD xbmc-9999.ebuild 7527 SHA256 2eaafe292e705d6f14104c54cd1e2b138f3058ff686ca8decaf713d0b6ba5589 SHA512 d8bffbc648c0de70eb63c775771c715c9811e90586640d8186bfaf55a40f76be75186f5a0b1cad8a3be90677f61d5a3f66993345cdf9872f7ddc8d1fad740eee WHIRLPOOL e47a5182b0e3f85a33a537536ff1123c0703bc51479d8efd94925fd066f2fb888fe8c32c150094f9da0dd68eadd082d441e68c0dc51cf829303e0a2352d5c5b8
-MISC ChangeLog 27740 SHA256 4950fec85fcc5d36635520c53d3d1019e3e426b48d58e78b106b349ce92f05f6 SHA512 711308ba103dd8103ab160a728baeb2a663a6d05f359eb1f785346d8b1c044ed770a62cdc254400fcaddd0d704125d8ceb21d2355cc13738e8d85f2b1d7f60cd WHIRLPOOL e8f636e9d69b3650ea46a38d35b6d8ce2516dbdba617657b59d2e447d1fe25acc1d3bc84c74d080f8648b397079dec60905d1875697f5894e5532f279a731858
+MISC ChangeLog 27876 SHA256 51e246f50baf3af541839d5d4eab10da886b36c4a5cac6a45f16c2acb2f9669e SHA512 2fb32e2cb112701148a8d34c2131774f5e29752c20ba4b50dab381539a36a79165d3f5166915f3f078514bf8f5416177f9d5b0651125892d552e2c15819b67d2 WHIRLPOOL db3a8f00ca2c0ff608f33bad21df715c95d9ed883d096dce1f9318e9ceee1f3928db3543353382a33ca02ec18443e2b617961d6fed58e161fe31743c6aedd88d
 MISC metadata.xml 1090 SHA256 8ec926619d4ed4beef3e8a3b5127906a6ac04132bf598452420969ad59615331 SHA512 d9b3c1fe1c8997434afcde1ea63276e7e8db0ba1a1e962e87e55a3ba106d95c536d9c38654cacb7d9d9da84cdd5236a49029748a4a8a6da061b864ae3db1f692 WHIRLPOOL 516eb5cd2d07536ad97ec71f3f68dcc1a874e9c369bad2f334a1272fb6a3ed795367a6b14cb8c4ed66a9b464bd68b6d11ab7eb195064543bfb102dae069a5791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRTXO4AAoJELEHsLL7fEFWma4P/1Stvb3HXtRkbso0FCoCza2Q
-i/TQJNx38C4URc1sNrZclnYU8ef1hhWUrq2YH/gOiQkH2G0FvA2DirfHOW1OBqiW
-U8oGwigSpL+dWe9HDqhRuJlZ1UD/lp6soiXv94DpWLJr5XppfMaoxLPiG7JMNRSW
-qKxeyCftyBMEYxG1meE02TXXH0dq5Ie9bBg/2WT3i7+ufNIF+QZ4fmvAkrV28q+l
-SGKoxl9Oa23N3YEkJYkz9Xdg65bTHTrmA5zbiFI/5TMsgIhor3/CWMCFsqs1xfR0
-1cMHZiXUdYqGWFSl3NTPJi0tObcYXi6WqV1Fsc9qIu69kA+vGoz/SQge61m41ap+
-iUvw72qFbqC95ihjZHvUUUfXmatWOHwXpcWbDZBjyz5rZ9N4sgKEn5I7B0OtSKJf
-Barme81XX89FHsAA/63/9VvTZCfVQEWpytmG/xx3HWsBfxy2LIz2lW7zIvEBgSpo
-qBrU8QPRSUj1p733IDue9WnzgxH7Tm3o5dsUOdonqZshJCTQYnb19YBR7rNi6oqz
-XpCpuxHypi9zZCS/LjlqM5drGhyrmt16FeQ7Uya4gkptL91eYewdSZtzJ4moFYfj
-0uoM2bMDbME7qObGhQnQnZJ49Xhf5g7wsLQXz0LDaT0L1ETbLlKv7nyv7GVE9aQI
-imGuPZv9IZxe8HQwJhqw
-=81MO
+iQIcBAEBCAAGBQJRTXkCAAoJELEHsLL7fEFWkXEP/1dWUFAgoJwhg+EwQ1DGljMH
+eQ4pBSoturzg+XvFhUxQwRNrPZY9agOn0snc56l0Y8MtMp1bUpvvpqUymKYXb8ix
+pIWgct27q/FsZEl8kJt6BSCyYjED99KhKZiqwp9tu3Nmr0Knf3fGtL+TGXD4w1bB
+ismDcSFEzE5BZjFl0zgxkUao1W8AhoMXJ3hvfZIUpLJRzAFVc/V77QHGt7vA5gVS
+sKkAX53c5CUoKo7SKa4T8cxec5EITbzlwhW9+V5xTYpUxcyfWptfGNF9/ThZIs+O
+oPMFIyaW4J6fiSSSZFMNf8sxYWc5ifZXrBcBbYoZawPeoYs7wIYIqB0PYSaDQe+K
+NBTUPgCx5axXp38WaNgC8xlPRGKprC+M1A9CVfdqXQ3lLFn0jAZE+TZx+6yY96bD
+Qr7kTYFeRtaJ32BAofod56BpzR0s5amf460mkBgRvjNsg8EVr5s1NwmU66+cuD6Q
+1h50MibDuOzr4iGnbY4diEEOU8QaIjLkox7OmP0sb/AJOYFWBZZhAZQci3VAKzFL
+sXwBHtk0+78HvwzI0RYfwhI2lQkm7H7thlxO9ntUlWW+P/zCndXVn0UVEY0uEQAA
+qY9W/H9tMzHvqaCYaE0mQE/yiukl+QtdAiROoQF0O3th3j5Gko5Nuy7Lkf2lnqeY
+IcbG47cnp8HKnv9lpxOj
+=1Mz+
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-12.1.ebuild b/media-tv/xbmc/xbmc-12.1.ebuild
new file mode 100644
index 000000000000..5cd0a0f32924
--- /dev/null
+++ b/media-tv/xbmc/xbmc-12.1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1.ebuild,v 1.1 2013/03/23 09:38:19 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"
+PYTHON_USE_WITH=sqlite
+
+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[stl]
+	dev-libs/yajl
+	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[messages] )
+	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\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
+
+	# 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"
+}