hasufell 14/03/12 18:54:12 Modified: ChangeLog games.eclass Log: fix games.eclass to use games-misc/games-envd
Revision Changes Path 1.1175 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1175&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1175&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1174&r2=1.1175 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1174 retrieving revision 1.1175 diff -u -r1.1174 -r1.1175 --- ChangeLog 12 Mar 2014 09:29:39 -0000 1.1174 +++ ChangeLog 12 Mar 2014 18:54:12 -0000 1.1175 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1174 2014/03/12 09:29:39 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1175 2014/03/12 18:54:12 hasufell Exp $ + + 12 Mar 2014; Julian Ospald <[email protected]> games.eclass: + fix games.eclass to use games-misc/games-envd 12 Mar 2014; Michał Górny <[email protected]> python-utils-r1.eclass: Use subslot operator deps on non-slotted PyPy. 1.157 eclass/games.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.157&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?rev=1.157&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/games.eclass?r1=1.156&r2=1.157 Index: games.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- games.eclass 2 Feb 2014 12:15:05 -0000 1.156 +++ games.eclass 12 Mar 2014 18:54:12 -0000 1.157 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.156 2014/02/02 12:15:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.157 2014/03/12 18:54:12 hasufell Exp $ # devlist: [email protected] # @@ -19,6 +19,11 @@ *) die "no support for EAPI=${EAPI} yet" ;; esac +if [[ ${CATEGORY}/${PN} != "games-misc/games-envd" ]] ; then + # environment file + RDEPEND="games-misc/games-envd" +fi + export GAMES_PREFIX=${GAMES_PREFIX:-/usr/games} export GAMES_PREFIX_OPT=${GAMES_PREFIX_OPT:-/opt} export GAMES_DATADIR=${GAMES_DATADIR:-/usr/share/games} @@ -124,23 +129,6 @@ find "${D}/${GAMES_BINDIR}" -maxdepth 1 -type f -exec chmod 750 '{}' \; } -gamesenv() { - local d libdirs - - for d in $(get_all_libdirs) ; do - libdirs="${libdirs}:${GAMES_PREFIX}/${d}" - done - - # Wish we could use doevnd here, but we dont want the env - # file to be tracked in the CONTENTS of every game - cat <<-EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD} - LDPATH="${libdirs:1}" - PATH="${GAMES_BINDIR}" - EOF - gamesowners "${ROOT}"/etc/env.d/${GAMES_ENVD} - gamesperms "${ROOT}"/etc/env.d/${GAMES_ENVD} -} - games_pkg_setup() { tc-export CC CXX LD AR RANLIB @@ -183,9 +171,8 @@ done < <(find "${D}/${GAMES_STATEDIR}" -type f -printf '%P\n' 2>/dev/null) } -# pkg_postinst function ... create env.d entry and warn about games group +# pkg_postinst function ... warn about games group games_pkg_postinst() { - gamesenv if [[ -z "${GAMES_SHOW_WARNING}" ]] ; then ewarn "Remember, in order to play games, you have to" ewarn "be in the '${GAMES_GROUP}' group."
