Run autotools in more subdirs, update docdir install, and convert to emake+DESTDIR...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 58a395c5de94e505660124539f90c4644c2eab93..6da40999856e401dca1345d3c5d907c24e871861 100644 (file)
--- 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/Manifest b/media-tv/xbmc/Manifest
index b3db171eba3c2e8d44b60c0e0228876b0a6a6848..1d10ec0c1970bee7b217db4e9b5ef9c3db94efbd 100644 (file)
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -10,13 +10,13 @@ AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
 EBUILD xbmc-9.11-r3.ebuild 5062 RMD160 bd1d51bf0637833c8ea1e6a79a00bc0a5dbbeaa1 SHA1 bd451c1b37c11d800496d40a5657b2ac21d65ed8 SHA256 0f34e65defa5b970eb91e69d42ac1e37ab032797e2d98fc8b7386d736ab983ad
 EBUILD xbmc-9.11-r4.ebuild 5464 RMD160 c2befb2c16954b4ed92d3b89bb58562a7f96029c SHA1 15b61d3e369157c4b506cd229c175a4090087d5d SHA256 83f0885bc85a2203b5882382c4c7ea4a96006b8f630ff1042e55448e28f12fe4
-EBUILD xbmc-9999.ebuild 4887 RMD160 4f8095290f637e6b98195805811efe209da23fc3 SHA1 1d2a366f8ac6a5ced8e53a42472f176266ad3b36 SHA256 9ff736b8c1c0f429b40f9c487961270f9ed7c95016f279a4b4e1b6403d910a82
-MISC ChangeLog 9614 RMD160 37981fc3c362093dce450d749687b7cc0fe5aad0 SHA1 f70a2faaee47a09dd0a6b36433d2d8fdf8cc91b4 SHA256 f7e55773deffc893b14a3c2941e928ae600282b40ea52113b9dc6f0196d59ed5
+EBUILD xbmc-9999.ebuild 4956 RMD160 48503783b4b87276f12578b451edf12a8f9b13cb SHA1 35512f53b588581b3b5cc3f3560613a13255ac65 SHA256 748b1bd73b35373668c116f2c4341ad5feca2f2d5cb50e271b65e14cadcd5a0f
+MISC ChangeLog 9786 RMD160 fa2a6caff7e7564e20f4033535723f350e6c2930 SHA1 5eebd523a50d0aca61452ace933e1bfbdd8ac598 SHA256 43de8668800aea7f643baea4ddc1fa2a2d774f090a37bcc4a2f1c61664159a5f
 MISC metadata.xml 446 RMD160 8784194c0d5667ad0a7a662e090aaf2006a2dc9a SHA1 28161d5a31a40fb383431a1b069b45270938bcc2 SHA256 ef0d7c7d3311d8a7b2b534d8e0e5ae8216dbbc91bb1a808d7d427f828be5bad8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkv5l4QACgkQTwhj9JtAlp6WuQEAjVEU/b3QOBb9Jc0M8ZTM72xK
-onXb0XfAPL6RcOnFN/cA/1Atk1AudW1iuf5AAnS5KcjJcYfvEQAnobAfXxP9tJsO
-=39eo
+iF4EAREIAAYFAkv5uNcACgkQTwhj9JtAlp4S6gEAh34yL/D4UZKrFr8rO4EBmxuu
+4voGBHPA1StFD25KYh4BAMoz49z40Vqh6G8oI0PdnJ0kW8z7JdLPMLGm2L4xisfF
+=NzSG
 -----END PGP SIGNATURE-----

diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 9125bfff6112e972229646271d13840f97566744..b631cd062784828e1054093572e08f3dd6c555c9 100644 (file)
--- 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