axs 14/07/08 21:05:13 Modified: metadata.xml doom3-1.3.1304-r1.ebuild ChangeLog Log: dropped opengl and alsa use flags as the deps are not actually optional; made USE=dedicated just install dedicated server as it should (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Revision Changes Path 1.4 games-fps/doom3/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/metadata.xml?r1=1.3&r2=1.4 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/metadata.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- metadata.xml 26 Jul 2008 03:53:08 -0000 1.3 +++ metadata.xml 8 Jul 2014 21:05:13 -0000 1.4 @@ -11,6 +11,7 @@ information, checkout http://www.doom3.com </longdescription> <use> + <flag name='dedicated'>install only as a dedicated game server</flag> <flag name="roe">Adds support for the Resurrection of Evil expansion</flag> </use> </pkgmetadata> 1.3 games-fps/doom3/doom3-1.3.1304-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild?r1=1.2&r2=1.3 Index: doom3-1.3.1304-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- doom3-1.3.1304-r1.ebuild 3 Jul 2014 21:53:21 -0000 1.2 +++ doom3-1.3.1304-r1.ebuild 8 Jul 2014 21:05:13 -0000 1.3 @@ -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/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.2 2014/07/03 21:53:21 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.3 2014/07/08 21:05:13 axs Exp $ EAPI=5 inherit eutils unpacker games @@ -15,27 +15,25 @@ LICENSE="DOOM3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa cdinstall dedicated opengl roe" +IUSE="cdinstall dedicated roe" RESTRICT="strip" DEPEND="app-arch/bzip2 app-arch/tar" RDEPEND="sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) - || ( + !dedicated? ( || ( ( + >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] + >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] + ) + ( + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) - app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] - ) - opengl? ( || ( - >=virtual/opengl-7.0-r1[abi_x86_32(-)] - app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] - ) ) - alsa? ( || ( - >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] - app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) ) cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 @@ -53,25 +51,31 @@ QA_EXECSTACK="${dir:1}/doom.x86 ${dir:1}/doomded.x86" +pkg_pretend() { + if use dedicated; then + ewarn "${CATEGORY}/${PN}[dedicated] will only install the dedicated game server" + fi +} + src_unpack() { unpack_makeself ${PN}-linux-${MY_PV}.x86.run } src_install() { - exeinto "${dir}" - doexe openurl.sh bin/Linux/x86/doom{,ded}.x86 - insinto "${dir}" doins License.txt CHANGES README version.info ${PN}.png doins -r base d3xp pb - games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}" - if use dedicated ; then - games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}" + exeinto "${dir}" + doexe openurl.sh bin/Linux/x86/doomded.x86 + if ! use dedicated; then + doexe bin/Linux/x86/doom.x86 + + games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}" + doicon "${DISTDIR}"/${PN}.png || die "doicon" + make_desktop_entry ${PN} "Doom III" fi - - doicon "${DISTDIR}"/${PN}.png || die "doicon" - make_desktop_entry ${PN} "Doom III" + games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}" prepgamesdirs } @@ -84,16 +88,20 @@ elog "pak004.pk4 from either your installation media or your hard drive to" elog "${dir}/base before running the game," elog "or 'emerge games-fps/doom3-data' to install from CD." - echo if use roe ; then + echo elog "To use the Resurrection of Evil expansion pack, you also need to copy" elog "pak000.pk4 to ${dir}/d3xp from the RoE CD before running the game," elog "or 'emerge doom3-roe' to install from CD." fi fi + if ! use dedicated; then echo elog "To play the game, run:" elog " doom3" + fi echo + elog "To start the dedicated server, run:" + elog " doom3-ded" } 1.42 games-fps/doom3/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/doom3/ChangeLog?r1=1.41&r2=1.42 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- ChangeLog 3 Jul 2014 21:53:21 -0000 1.41 +++ ChangeLog 8 Jul 2014 21:05:13 -0000 1.42 @@ -1,6 +1,11 @@ # ChangeLog for games-fps/doom3 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.41 2014/07/03 21:53:21 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.42 2014/07/08 21:05:13 axs Exp $ + + 08 Jul 2014; Ian Stakenvicius (_AxS_) <[email protected]> + doom3-1.3.1304-r1.ebuild, metadata.xml: + dropped opengl and alsa use flags as the deps are not actually optional; made + USE=dedicated just install dedicated server as it should 03 Jul 2014; Ian Stakenvicius (_AxS_) <[email protected]> doom3-1.3.1304-r1.ebuild:
