Skip to content

Commit

Permalink
[QA] games.eclass: Revert "Stop inheriting base.eclass (bug #494208)"
Browse files Browse the repository at this point in the history
Revert retroactive inherit (and therefore exported functions) change due
to potential breakage.

Discussion: https://archives.gentoo.org/gentoo-dev/message/37094a3177e6a938254173595775521a
  • Loading branch information
mgorny committed Nov 22, 2015
1 parent 31cb5e2 commit 80f37ef
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions eclass/games.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 80f37ef

Please sign in to comment.