Version bump.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 233 insertions, 15 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 7c5bb4381028..20112687d244 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.112 2012/02/04 19:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.113 2012/02/14 22:39:34 vapier Exp $
+
+*xbmc-11.0_beta3 (14 Feb 2012)
+
+  14 Feb 2012; Mike Frysinger <vapier@gentoo.org> +xbmc-11.0_beta3.ebuild:
+  Version bump.
 
   04 Feb 2012; Mike Frysinger <vapier@gentoo.org>
   +files/xbmc-11.0-libpng-1.5.patch, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 7fa57c8c7653..34f11747a96e 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -9,24 +9,26 @@ AUX xbmc-11.0-libpng-1.5.patch 18833 RMD160 023626a75b96fbae4d662ff875f1647113d5
 AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
 AUX xbmc-9999-nomythtv.patch 6029 RMD160 d8cd1b795225b15f11c8fffd7b92fccffb62e5f2 SHA1 e36f5a7c0b7c98a2141ba858a904d01eb54693a9 SHA256 409a755e2dc7a77c5a73d0e39d9bb46eb824a9501f40225866938ec1d0c0eb4e
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
+DIST xbmc-11.0-Eden_beta3.tar.gz 56614229 RMD160 9c689b32479a7f8c53de2df51d1cf2bb7e1a1158 SHA1 c619d785bcc995363e637c0cf0f3cd4e63efef60 SHA256 30ce58a2f4a2c08b125ce0965675a0dd94ed16c945f4861a3198552f76875024
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
+EBUILD xbmc-11.0_beta3.ebuild 5409 RMD160 247ee2f58a5b926a7136921352231b2bb7314090 SHA1 3886fdefa465994a8e1dac24d9478b9c2081a317 SHA256 ccb0d31da0234604d7e41ead4a1d2136642e1823f554146400c835661b2dbf56
 EBUILD xbmc-9999.ebuild 5385 RMD160 635f52c192a95a4f32e40affc06707c0ba0c1011 SHA1 c42c0f4afbcbfbc60a7e42601ebd07bde73963d1 SHA256 57b2597fba4aac744a9a7f7431a7715d2005c01ba0d3e0337359d2ba81648099
-MISC ChangeLog 17713 RMD160 21a83dcb200833771ea0a533e6bdce1674628ea4 SHA1 e3bdfb382401f31b2cd3492366f744daa74cda4d SHA256 e23cbd349b542a2f06dcb762f0c1532c24480448f85717bf17492c9a6afcf327
+MISC ChangeLog 17837 RMD160 97c4175c7fae0c833334e06142ba64da43bc503b SHA1 e318ba07c11d23b4dba2fc65294bef7908464062 SHA256 335127337ba2751db0ccc5f5a03dbe95094fc7703796c0484ec13ce880b94d21
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPLYzhAAoJELEHsLL7fEFW6gQP/0BNh7BjrmkzhfyvcprW8pHw
-LmtonSU7cty4B+b5vYlcEVozGwVi9Qy8QTbff8WNrM5ldzD18UkKKtsgPb5SbK+w
-K4adVgaz5RB1cLLqBe1WBPQWJq+JzvfnwQZi/UnBThzjDdJWRKoYnJoOUKuhAAqa
-30Az/qFqkx/ztDd9uWGc8Tfqvcdhxxc4kCVb7tTiYtgwg9t1JwTE1A07nNSykbTm
-trNEYsx1zOx1g0eLSpUSva/f5pYbeZTi5hXfmCuFC5l8QAh5rWLSxU2fnwNVqoN+
-n51+tAAb5+1CM9gWtfW3f8/ru0v8gD01Xc89J22XSIzfc7epYwhT72PZwUzB37fI
-hambQTMsliibZtUA2bvVDkdiSoAibZKpnoP/kfEkR3dCbrNu0uy/A4CcKU+CrRyb
-zaYjwY+XTSuiXTRsi8L8BBXcZTaghTTQ6da9MCDFRB72Ao5Az2z3e+/CJzbzk0sR
-M/C/OTjkL4XPjDJfSPtv0JB9WJ8a42v8X2DtrneBUXQEBcu9DYa4qyHvTdPDe8gQ
-g9EVKn5Wfgqcra9T5iJhUO52KK3l3pOid+NAKtF1vLdncS6siGfyheODHZNyYG6l
-VnzFO0JcwbnGsDlkoqiqMhWBa0qDI0FI4yu6W6fn9L0M/qg/qjV1LlFkNv0QvqX8
-onV5Dfjpd4LQ3PuSsaVu
-=OP0i
+iQIcBAEBAgAGBQJPOuKuAAoJELEHsLL7fEFWMkUQAMfb2SXZtWjgYhRuHgT0yhR5
+d/4zsIuCqKU+5NWxlyFMXlqZD/lowCgCH0tWPeJu+X26PcAxtmGBF/ONheNEwx+p
+p+eCPkpSLf9jLjvK1LUZBiuJxqbh729oE3XPquj10bjMA/fnF28ayzIBI11OlNYn
+gKfJeWiHv5kFcho2nrqFB/ZK+C3XQzW5ozF7K37ZAV9pFdQhEN72rxABnxh2EAeJ
+OnbL8mfcxKxtvSAVpMXGykqpDeDnilqXy5OBdYBJCI1ryj3Ht1NFWYx3CQNz7IM3
+/TEjAkN7UzNofAhUlVyegpy1X0ZTQH++L1lrJF03fArAC7CjmWBebtGEdfEtZz8M
+/uUXmIAiMJaqNQoSDIwWM/N0374LvB4PdJR9q2ba0CXqEgwqy1MjhQ5YlJ+EnEtu
+zvSp0w3HECJ+m+HF6U4lyzQ8zhIlUgVQu98I7tx8H2YSpfstuWElCd/KZFVJiuGh
+zy6oMPA8jemZJCakvSuILfsUEhFNd0nrZj0xW9oeBYLxsNPMGVxXnsMQR5f34Kj8
+8ddL8RlwHkEa5kXPX9mRJvSOaHlqFqkvjlAZ5a0ueyNHHXEMUabCijHbE8nnW/fk
+ngaZsDI/EAiWXu4FEgf2o8JoRiCFHeKlu9OFf0js884/UChpOGGdvIdQny1e7oi/
+azPVHge8OJZP06BYJpwx
+=/xnb
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-11.0_beta3.ebuild b/media-tv/xbmc/xbmc-11.0_beta3.ebuild
new file mode 100644
index 000000000000..630808e1b123
--- /dev/null
+++ b/media-tv/xbmc/xbmc-11.0_beta3.ebuild
@@ -0,0 +1,211 @@
+# 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-11.0_beta3.ebuild,v 1.1 2012/02/14 22:39:34 vapier Exp $
+
+EAPI="4"
+
+inherit eutils python
+
+EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-2 autotools
+else
+	inherit autotools
+	MY_P=${P/_/-Eden_}
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}.1
+fi
+
+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 bluray css debug goom joystick midi mysql profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
+REQUIRED_USE="pvr? ( mysql )"
+
+COMMON_DEPEND="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]
+	dev-libs/libpcre[cxx]
+	>=dev-libs/lzo-2.04
+	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
+	virtual/jpeg
+	>=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/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
+	>=virtual/ffmpeg-0.6[encode]
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	webserver? ( net-libs/libmicrohttpd )
+	net-misc/curl
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	sys-apps/dbus
+	sys-libs/zlib
+	mysql? ( virtual/mysql )
+	x11-apps/xdpyinfo
+	x11-apps/mesa-progs
+	vaapi? ( x11-libs/libva )
+	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 sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	x11-proto/xineramaproto
+	dev-util/cmake
+	x86? ( dev-lang/nasm )"
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11.0-libpng-1.5.patch #380127
+	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+
+	# some dirs ship generated autotools, some dont
+	local d
+	for d in \
+		. \
+		lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \
+		xbmc/screensavers/rsxs-* \
+		xbmc/visualizations/Goom/goom2k4-0
+	do
+		[[ -e ${d}/configure ]] && continue
+		pushd ${d} >/dev/null
+		eautoreconf
+		popd >/dev/null
+	done
+
+	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 lsb-release dependency
+	sed -i \
+		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
+		xbmc/utils/SystemInfo.cpp || die
+
+	# 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)
+
+	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 css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable goom) \
+		--disable-hal \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable mysql) \
+		$(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 vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+
+	insinto /usr/share/applications
+	doins tools/Linux/xbmc.desktop
+	doicon tools/Linux/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"
+}