[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Sterrett]

commit:     a144d7480f781f21323943d87e6a56136add3830
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 08:26:57 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 08:27:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a144d748

Stop inheriting base.eclass (bug #494208)

 eclass/games.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/games.eclass b/eclass/games.eclass
index 7d231e1..aebf679 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -24,11 +24,11 @@
 if [[ -z ${_GAMES_ECLASS} ]]; then
 _GAMES_ECLASS=1
 
-inherit base multilib toolchain-funcs eutils user
+inherit 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) EXPORT_FUNCTIONS pkg_setup src_configure src_compile 
pkg_preinst pkg_postinst ;;
+       2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup src_configure src_compile 
pkg_preinst pkg_postinst ;;
        *) die "no support for EAPI=${EAPI} yet" ;;
 esac
 
@@ -302,12 +302,14 @@ games_src_configure() {
 
 # @FUNCTION: games_src_compile
 # @DESCRIPTION:
-# Runs base_src_make(). This function is exported as src_compile().
+# This function is exported as src_compile().
 games_src_compile() {
        case ${EAPI:-0} in
                0|1) games_src_configure ;;
        esac
-       base_src_make
+       if [[ -f Makefile || -f GNUmakefile || -f makefile ]]; then
+               emake "$@" || die
+       fi
 }
 
 # @FUNCTION: games_pkg_preinst