diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-05-23 20:47:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-23 20:47:48 +0000 |
| commit | 31be34af1aa64b6a778eaed65265dc3e235bc74f (patch) | |
| tree | 2cbf8b6893639e2a1581726ccae51cee62fe3e42 /media-tv | |
| parent | add missing vaapi to IUSE (diff) | |
| download | gentoo-2-31be34af1aa64b6a778eaed65265dc3e235bc74f.tar.gz gentoo-2-31be34af1aa64b6a778eaed65265dc3e235bc74f.tar.bz2 gentoo-2-31be34af1aa64b6a778eaed65265dc3e235bc74f.zip | |
Sync recent updates between the release/live ebuilds.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9.11-r4.ebuild | 7 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index e475cf89442d..cbbe7a740d50 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,10 @@ # 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.55 2010/05/23 20:42:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.56 2010/05/23 20:47:48 vapier Exp $ + + 23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild, + xbmc-9999.ebuild: + Sync recent updates between the release/live ebuilds. *xbmc-9.11-r4 (23 May 2010) diff --git a/media-tv/xbmc/xbmc-9.11-r4.ebuild b/media-tv/xbmc/xbmc-9.11-r4.ebuild index 0d567c9c053a..81401fd93874 100644 --- a/media-tv/xbmc/xbmc-9.11-r4.ebuild +++ b/media-tv/xbmc/xbmc-9.11-r4.ebuild @@ -1,6 +1,6 @@ # 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-9.11-r4.ebuild,v 1.1 2010/05/23 20:42:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.2 2010/05/23 20:47:48 vapier Exp $ EAPI="2" @@ -37,7 +37,7 @@ RDEPEND="virtual/opengl dev-lang/python:2.4 dev-libs/boost dev-libs/fribidi - dev-libs/libcdio + dev-libs/libcdio[-minimal] dev-libs/libpcre dev-libs/lzo >=dev-python/pysqlite-2 @@ -60,7 +60,7 @@ RDEPEND="virtual/opengl media-libs/libmpeg2 media-libs/libogg media-libs/libsamplerate - media-libs/libsdl[alsa,audio,video,X] + media-libs/libsdl[alsa,audio,opengl,video,X] media-libs/libvorbis media-libs/sdl-gfx media-libs/sdl-image[gif,jpeg,png] @@ -159,7 +159,6 @@ src_prepare() { # Tweak autotool timestamps to avoid regeneration find . -type f -print0 | xargs -0 touch -r configure - } src_configure() { diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index 5796e41124fc..61dd6c657759 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.ebuild @@ -1,10 +1,10 @@ # 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-9999.ebuild,v 1.53 2010/05/23 20:45:52 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.54 2010/05/23 20:47:48 vapier Exp $ EAPI="2" -inherit eutils +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} @@ -185,6 +185,10 @@ src_install() { dodoc README.linux rm "${D}"/usr/share/xbmc/{README.linux,LICENSE.GPL,*.txt} + + 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() { |