Version bump.

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

3 files changed, 211 insertions, 14 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 59eb700e203f..ef96935a2adf 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.70 2010/12/22 18:20:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.71 2010/12/22 18:21:45 vapier Exp $
+
+*xbmc-10.0 (22 Dec 2010)
+
+  22 Dec 2010; Mike Frysinger <vapier@gentoo.org> +xbmc-10.0.ebuild:
+  Version bump.
 
   22 Dec 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Only delay for 3 seconds when dbus services are missing #348580 by James
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 96e797b3c435..1eb75a984117 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX xbmc-9.11-TexturePacker-parallel-build.patch 357 RMD160 37802ec3ce31d10d58802acf267aaf568d3ef8d0 SHA1 5909a4a61e1dbac3f51c6a8c393f1d4cfd7a38ca SHA256 a9b990cdd5473e72cc83cda36cc9faaf67e97649cec45af9c529455464b12d43
 AUX xbmc-9.11-external-python.patch 751 RMD160 b7774014df1addd0c4479acefccacc8596759763 SHA1 93dd96b787c4b88a9bbb7e10f44deb2bdec96b4d SHA256 a0c8325ebc742c7e1164a50ea380460b38eff58dd59c60e56b3eee78bb6aacc9
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
@@ -9,16 +6,10 @@ AUX xbmc-9.11-libpng14.patch 4263 RMD160 90a82d1783f2237416c0932c968347394f303bf
 AUX xbmc-9.11-shader-upscalers.patch 29024 RMD160 d100a35684cad2a6dea0c6eeb9bfbc00e4151bbb SHA1 130fa8bccb6dfab723daf2ebafd88b6e22c109b3 SHA256 965099c217920d5db259944adc4250ed73e4b08ddcd7b0d88d843c9a9a41d396
 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
+DIST xbmc-10.0.tar.gz 130239951 RMD160 dcb94d89c0cb35e8a4cb021a19f6dec23dd59fb6 SHA1 8752c0c26e872b408b3575d2744fdd812d5775ac SHA256 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-9.11-r4.ebuild 5704 RMD160 9f0d0dcac650102a736c83e9ed75cc25e0e00314 SHA1 b1520e0996a09a26dc9c28fff3ab0fa142eddcbd SHA256 f887da91e775c6e108cdb72b5ad058b3485947bb93a144f4a67202592cc2932e
+EBUILD xbmc-10.0.ebuild 5156 RMD160 9a851e9ba986b8d8fe240231055b9a859c6ec27f SHA1 55cfe09a1164b85898b8309663208809fbc7f99e SHA256 a0a187469e6f7d3fee93b533ef3e1b2f5465e84f84d085af21ac3edf60de875b
 EBUILD xbmc-9.11-r5.ebuild 5783 RMD160 a9799026ec29b74cb9cf002c89958274f546f202 SHA1 10ef102e761d16f931731088f27be73e7ff667fe SHA256 eb959e3ab1cbae5f9ed5eeba5a3235b2dab53381d77d0a5d0901b78b7e8be4b0
-EBUILD xbmc-9999.ebuild 5052 RMD160 1c334541311d3542a8516cb8d16cb4b0ded35b02 SHA1 2aee79686acb31291f2b6220c8d59d7be80f4681 SHA256 5bcedf6e59b2da1feb2742f1738a5ed85f9ae801fa7d6d1e6862a2eb61620212
-MISC ChangeLog 11464 RMD160 2adc14d143f5f7e40aeaea8fe9294226b852dff4 SHA1 11d73419e48537de0abeb409a460b0e16b40b3a1 SHA256 4f6eb0ba5c03d10df0cd003e40eeb57ce4f295352ed925efcac02603151c00d9
+EBUILD xbmc-9999.ebuild 5095 RMD160 798865d5090603d7c832cec90e3b427aec87eb25 SHA1 9d54c9f572b076133aea1b0f0f0f2dec9acc1d23 SHA256 751337018ccfe2c205d12fc64e6966ec77157517e580471a2f3ba90f08a77995
+MISC ChangeLog 11730 RMD160 d0bac1613075c31e8c3227c225ed576441a45a2b SHA1 920fcc0b4fb24afe3371d9bacb5171b7bbc08eb8 SHA256 c1db50f16e4768860628bfaa6ef851708b196d5d3c5f61a5fd01bad7ca7770d3
 MISC metadata.xml 579 RMD160 cf1a05346b2c33147e752be840dfb562726b42dd SHA1 0fabb20c84367962605b88b9030fabf6acf3045d SHA256 f61dd5617b99b9fa5505269e6633d317f90a2c6903108bdcc84370cfb8858afb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAkzmORkACgkQTwhj9JtAlp671gD+IiXUZ4HBjm8EZtXpENhvQhn/
-KEXls2ilvIhYL20gptwA/1eip176ru/wV9XN5yxLhoZT9cEe7LMeKxnnxHOqaOTx
-=uxiJ
------END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-10.0.ebuild b/media-tv/xbmc/xbmc-10.0.ebuild
new file mode 100644
index 000000000000..b66c264f7fd7
--- /dev/null
+++ b/media-tv/xbmc/xbmc-10.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.0.ebuild,v 1.1 2010/12/22 18:21:45 vapier Exp $
+
+EAPI="2"
+
+inherit eutils python
+
+# Use XBMC_ESVN_REPO_URI to track a different branch
+ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk}
+ESVN_PROJECT=${ESVN_REPO_URI##*/svnroot/}
+ESVN_PROJECT=${ESVN_PROJECT%/*}
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion autotools
+	KEYWORDS=""
+else
+	inherit autotools
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa altivec avahi css debug hal joystick midi profile pulseaudio rtmp sse sse2 vaapi vdpau webserver xrandr"
+
+RDEPEND="virtual/opengl
+	app-arch/bzip2
+	app-arch/unrar
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	>=dev-lang/python-2.4
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	dev-libs/libpcre
+	dev-libs/lzo
+	>=dev-python/pysqlite-2
+	media-libs/a52dec
+	media-libs/alsa-lib
+	media-libs/faad2
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glew
+	media-libs/jasper
+	media-libs/jbigkit
+	media-libs/jpeg:0
+	>=media-libs/libass-0.9.7
+	media-libs/libdca
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmms
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	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[gif,jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	>=media-video/ffmpeg-0.6
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	webserver? ( net-libs/libmicrohttpd )
+	net-misc/curl
+	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
+	sys-apps/dbus
+	hal? ( sys-apps/hal )
+	sys-libs/zlib
+	virtual/mysql
+	x11-apps/xdpyinfo
+	x11-apps/mesa-progs
+	vaapi? ( x11-libs/libva )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	x11-libs/libXinerama
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender"
+# The cpluff bundled addon uses gettext which needs CVS ...
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	dev-vcs/cvs
+	x11-proto/xineramaproto
+	dev-util/cmake
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_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() {
+	# some dirs ship generated autotools, some dont
+	local d
+	for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do
+		[[ -e ${d}/configure ]] && continue
+		pushd ${d} >/dev/null
+		einfo "Generating autotools in ${d}"
+		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}" \
+		xbmc/lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export SVN_REV=${ESVN_WC_REVISION:-exported}
+
+	# Avoid lsb-release dependency
+	sed -i \
+		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
+		xbmc/utils/SystemInfo.cpp
+
+	# Do not use termcap #262822
+	sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure
+
+	# 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-goom \
+		--enable-gl \
+		$(use_enable avahi) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable hal) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable profile profiling) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rtmp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc keymapping.txt README.linux
+	rm "${D}"/usr/share/doc/${PF}/{copying.txt,LICENSE.GPL} || die
+
+#	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"
+}