commit: 80f37effc3a6bacfba4d999fbf6919b42168c2eb Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 22 08:39:59 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Nov 22 08:41:51 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f37eff
[QA] games.eclass: Revert "Stop inheriting base.eclass (bug #494208)" Revert retroactive inherit (and therefore exported functions) change due to potential breakage. Discussion: https://archives.gentoo.org/gentoo-dev/message/37094a3177e6a938254173595775521a eclass/games.eclass | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eclass/games.eclass b/eclass/games.eclass index aebf679..7d231e1 100644 --- a/eclass/games.eclass +++ b/eclass/games.eclass @@ -24,11 +24,11 @@ if [[ -z ${_GAMES_ECLASS} ]]; then _GAMES_ECLASS=1 -inherit multilib toolchain-funcs eutils user +inherit base multilib toolchain-funcs eutils user case ${EAPI:-0} in 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; - 2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; *) die "no support for EAPI=${EAPI} yet" ;; esac @@ -302,14 +302,12 @@ games_src_configure() { # @FUNCTION: games_src_compile # @DESCRIPTION: -# This function is exported as src_compile(). +# Runs base_src_make(). This function is exported as src_compile(). games_src_compile() { case ${EAPI:-0} in 0|1) games_src_configure ;; esac - if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then - emake "$@" || die - fi + base_src_make } # @FUNCTION: games_pkg_preinst
