Stop inheriting base.eclass (bug #494208)

diff --git a/eclass/games.eclass b/eclass/games.eclass
index 7d231e186cc9142259a39a517b762fb963155b50..aebf679b642347b04920b49f64b63b4aa974062d 100644 (file)
--- 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