diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-05-23 23:22:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-23 23:22:58 +0000 |
| commit | 207b9103bab9f8a4920ebcc1f9df4b72218a0410 (patch) | |
| tree | 2c80bdb552799d3977625c9b00c785ca10e363e8 | |
| parent | Remove old. (diff) | |
| download | gentoo-2-207b9103bab9f8a4920ebcc1f9df4b72218a0410.tar.gz gentoo-2-207b9103bab9f8a4920ebcc1f9df4b72218a0410.tar.bz2 gentoo-2-207b9103bab9f8a4920ebcc1f9df4b72218a0410.zip | |
Run autotools in more subdirs, update docdir install, and convert to emake+DESTDIR for installing.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/xbmc-9999.ebuild | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 58a395c5de94..6da40999856e 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.57 2010/05/23 21:00:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.58 2010/05/23 23:22:58 vapier Exp $ + + 23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild: + Run autotools in more subdirs, update docdir install, and convert to + emake+DESTDIR for installing. 23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild: Make hal support optional via USE=hal now that upstream supports it diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild index 9125bfff6112..b631cd062784 100644 --- a/media-tv/xbmc/xbmc-9999.ebuild +++ b/media-tv/xbmc/xbmc-9999.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-9999.ebuild,v 1.55 2010/05/23 21:00:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.56 2010/05/23 23:22:58 vapier Exp $ EAPI="2" @@ -88,7 +88,9 @@ RDEPEND="virtual/opengl x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender" +# The cpluff bundled addon uses gettext which needs CVS ... DEPEND="${RDEPEND} + dev-util/cvs x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm )" @@ -115,7 +117,7 @@ src_prepare() { # some dirs ship generated autotools, some dont local d - for d in . xbmc/cores/dvdplayer/Codecs/libbdnav ; do + for d in . xbmc/cores/dvdplayer/Codecs/{libbdnav,libdvd/lib*/} lib/cpluff ; do [[ -e ${d}/configure ]] && continue pushd ${d} >/dev/null einfo "Generating autotools in ${d}" @@ -157,6 +159,7 @@ src_configure() { export HELP2MAN=$(type -P help2man || echo true) econf \ + --docdir=/usr/share/doc/${PF} \ --disable-ccache \ --disable-optimizations \ --enable-external-libraries \ @@ -178,15 +181,13 @@ src_configure() { } src_install() { - einstall || die "Install failed!" + emake install DESTDIR="${D}" || die + prepalldocs insinto /usr/share/applications doins tools/Linux/xbmc.desktop doicon tools/Linux/xbmc.png - 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 |