[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

[Mike Frysinger]

commit:     89417912ce79d5e1f497625ce13ed02b2003b08b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 02:30:08 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 06:24:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89417912

media-tv/kodi: run the codegenerator when USE=java #558798

Since we don't include the precompiled generated files when USE=java,
make sure we explicitly run the bootstrap step since the build doesn't
handle it for us.

 media-tv/kodi/kodi-15.1.ebuild | 6 ++++--
 media-tv/kodi/kodi-9999.ebuild | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
index f8a9d2a..912c5e5 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils linux-info python-single-r1 multiprocessing autotools
+inherit eutils linux-info python-single-r1 multiprocessing autotools 
toolchain-funcs
 
 CODENAME="Isengard"
 case ${PV} in
@@ -172,7 +172,9 @@ src_prepare() {
        multijob_finish
        elibtoolize
 
-       [[ ${PV} == "9999" ]] && emake -f codegenerator.mk
+       if [[ ${PV} == "9999" ]] || use java ; then #558798
+               tc-env_build emake -f codegenerator.mk
+       fi
 
        # Disable internal func checks as our USE/DEPEND
        # stuff handles this just fine already #408395

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 5c7905d..165dacb 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -9,7 +9,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils linux-info python-single-r1 multiprocessing autotools
+inherit eutils linux-info python-single-r1 multiprocessing autotools 
toolchain-funcs
 
 CODENAME="Isengard"
 case ${PV} in
@@ -172,7 +172,9 @@ src_prepare() {
        multijob_finish
        elibtoolize
 
-       [[ ${PV} == "9999" ]] && emake -f codegenerator.mk
+       if [[ ${PV} == "9999" ]] || use java ; then #558798
+               tc-env_build emake -f codegenerator.mk
+       fi
 
        # Disable internal func checks as our USE/DEPEND
        # stuff handles this just fine already #408395