From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Mv9dF-0006AG-Nh for garchives@archives.gentoo.org; Tue, 06 Oct 2009 12:59:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E25C8E0B65; Tue, 6 Oct 2009 12:59:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9B0E6E0B65 for ; Tue, 6 Oct 2009 12:59:08 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 2A947665B4 for ; Tue, 6 Oct 2009 12:59:08 +0000 (UTC) Received: from nyhm by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Mv9dD-00047y-Fl for gentoo-commits@lists.gentoo.org; Tue, 06 Oct 2009 12:59:07 +0000 From: "Tristan Heaven (nyhm)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nyhm@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: games-mods.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: games-mods.eclass X-VCS-Directories: eclass X-VCS-Committer: nyhm X-VCS-Committer-Name: Tristan Heaven Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tristan Heaven Date: Tue, 06 Oct 2009 12:59:07 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e5d61b83-9e45-4f6f-bf05-2429de7781a0 X-Archives-Hash: 3a9cd061dc7c765a0f48dcc882f5ff99 nyhm 09/10/06 12:59:07 Modified: games-mods.eclass Log: name wrappers and init scripts ${PN/${GAME}-} instead of ${MOD_DIR} Revision Changes Path 1.32 eclass/games-mods.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games-mods.= eclass?rev=3D1.32&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games-mods.= eclass?rev=3D1.32&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games-mods.= eclass?r1=3D1.31&r2=3D1.32 Index: games-mods.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- games-mods.eclass 4 Oct 2009 14:13:59 -0000 1.31 +++ games-mods.eclass 6 Oct 2009 12:59:07 -0000 1.32 @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.31 2009/= 10/04 14:13:59 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games-mods.eclass,v 1.32 2009/= 10/06 12:59:07 nyhm Exp $ =20 # Variables to specify in an ebuild which uses this eclass: # GAME - (doom3, quake4 or ut2004, etc), unless ${PN} starts with e.g. "= doom3-" @@ -260,20 +260,20 @@ # We don't want to leave the binary directory around rm -rf bin elif [[ -n "${MOD_DIR}" ]] ; then - games_make_wrapper "${GAME_EXE}-${MOD_DIR}" \ + games_make_wrapper "${GAME_EXE}-${PN/${GAME}-}" \ "${GAME_EXE} ${SELECT_MOD}${MOD_DIR}" "${dir}" "${dir}" - make_desktop_entry "${GAME_EXE}-${MOD_DIR}" \ + make_desktop_entry "${GAME_EXE}-${PN/${GAME}-}" \ "${GAME_TITLE} - ${MOD_NAME}" "${MOD_ICON}" # Since only quake3 has both a binary and a source-based install, # we only look for quake3 here. case "${GAME_EXE}" in "quake3") if has_version games-fps/quake3-bin ; then - games_make_wrapper "${GAME_EXE}-bin-${MOD_DIR}" \ + games_make_wrapper "${GAME_EXE}-bin-${PN/${GAME}-}" \ "${GAME_EXE}-bin ${SELECT_MOD}${MOD_DIR}" \ "${dir}" "${dir}" fi - make_desktop_entry "${GAME_EXE}-bin-${MOD_DIR}" \ + make_desktop_entry "${GAME_EXE}-bin-${PN/${GAME}-}" \ "${GAME_TITLE} - ${MOD_NAME} (binary)" \ "${MOD_ICON}" ;; @@ -358,7 +358,7 @@ "${GAMES_PREFIX}"/${DED_CFG_DIR}/${MOD_DIR}/server.cfg fi games_make_wrapper \ - ${GAME_EXE}-${MOD_DIR}-ded \ + ${GAME_EXE}-${PN/${GAME}-}-ded \ "${DED_EXE} ${SELECT_MOD}${MOD_DIR} ${DED_OPTIONS}"=20 games-mods_make_initd games-mods_make_confd @@ -378,13 +378,13 @@ done elif [[ -n "${MOD_DIR}" ]] ; then elog "To play this mod run:" - elog " ${GAME_EXE}-${MOD_DIR}" + elog " ${GAME_EXE}-${PN/${GAME}-}" echo fi fi if games-mods_use_dedicated ; then elog "To launch a dedicated server run:" - elog " ${GAME_EXE}-${MOD_DIR}-ded" + elog " ${GAME_EXE}-${PN/${GAME}-}-ded" echo elog "To launch server at startup run:" elog " rc-update add ${GAME_EXE}-${MOD_DIR}-ded default" @@ -393,7 +393,7 @@ } =20 games-mods_make_initd() { - cat < "${T}"/${GAME_EXE}-${MOD_DIR}-ded + cat < "${T}"/${GAME_EXE}-${PN/${GAME}-}-ded #!/sbin/runscript $(head -n 2 ${PORTDIR}/header.txt) # Generated by games-mods.eclass @@ -406,27 +406,27 @@ ebegin "Starting ${GAME_TITLE} ${MOD_NAME} dedicated server" start-stop-daemon --start --quiet --background --chuid \\ ${GAMES_USER_DED}:${GAMES_GROUP} --env HOME=3D"${GAMES_PREFIX}" --exec= \\ - ${GAMES_BINDIR}/${GAME_EXE}-${MOD_DIR}-ded -- \\ - \${${GAME_EXE}_${MOD_DIR}_opts} + ${GAMES_BINDIR}/${GAME_EXE}-${PN/${GAME}-}-ded -- \\ + \${${GAME_EXE}_${PN/${GAME}-}_opts} eend \$? } =20 stop() { ebegin "Stopping ${GAME_TITLE} ${MOD_NAME} dedicated server" start-stop-daemon --stop --quiet --exec \\ - ${GAMES_BINDIR}/${GAME_EXE}-${MOD_DIR}-ded + ${GAMES_BINDIR}/${GAME_EXE}-${PN/${GAME}-}-ded eend \$? } EOF =20 - doinitd "${T}"/${GAME_EXE}-${MOD_DIR}-ded || die "doinitd failed" + doinitd "${T}"/${GAME_EXE}-${PN/${GAME}-}-ded || die "doinitd failed" } =20 games-mods_make_confd() { - cat <<-EOF > "${T}"/${GAME_EXE}-${MOD_DIR}-ded + cat <<-EOF > "${T}"/${GAME_EXE}-${PN/${GAME}-}-ded # Any extra options you want to pass to the dedicated server - ${GAME_EXE}_${MOD_DIR}_opts=3D"" + ${GAME_EXE}_${PN/${GAME}-}_opts=3D"" EOF =20 - doconfd "${T}"/${GAME_EXE}-${MOD_DIR}-ded || die "doconfd failed" + doconfd "${T}"/${GAME_EXE}-${PN/${GAME}-}-ded || die "doconfd failed" }