From: <lu...@us...> - 2010-03-19 22:19:13
|
Revision: 9396 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9396&view=rev Author: luke-jr Date: 2010-03-19 22:18:54 +0000 (Fri, 19 Mar 2010) Log Message: ----------- bump to 0.2.8.3.1, pulling changes from live for new features NOTE: setting S here breaks since releases use P not PN usually Modified Paths: -------------- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/Manifest armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.3.0-r1.ebuild armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/metadata.xml Added Paths: ----------- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.3.1.ebuild Removed Paths: ------------- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.7.1-r2.ebuild armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.2.1.ebuild Modified: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/Manifest =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/Manifest 2010-03-19 21:58:14 UTC (rev 9395) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/Manifest 2010-03-19 22:18:54 UTC (rev 9396) @@ -6,14 +6,12 @@ AUX armagetronad-0.2.7.1-security-1.patch 527 RMD160 c9e68014c8a1fc1aaf06aacbcac8521007996932 SHA1 0029073a50655e6f87935732de186ced9d4db16e SHA256 b813bb1e74188e200217fa31f075c90ff625d8e9d2f073d8a6ced120af228cd0 AUX armagetronad-0.2.8.2.1-build-fixups.patch 29270 RMD160 c89f7cae58a8bca40a0192263a9542da8d290ff8 SHA1 adb42b67fb3ad9bec5eef776815a9800e32a4286 SHA256 a0575417d34c623e3a05eb619709fe881dd833ca87413e6f10050acd46461c38 AUX autoconf-compat.patch 941 RMD160 1038ffed3fec413cdda3677ab91ee555dead0e9d SHA1 b8fb94b546bbebb451865506bd5fc1a7cadb1a7c SHA256 1abb4ec84fc862b6699e1dc2b0e9cdb00b8a723621e495846c0cd4fd2486fdf0 -DIST armagetronad-0.2.7.1.tar.bz2 1243746 RMD160 0dcf9d383fccd42509cae3aacc2df0d5531bd021 SHA1 a93d587e1154f0465c6fdb3c5518a5003add6240 SHA256 0ec8793f6d4d4f5a90feec1c8b0a4846aa4fa2c1f3c69a20b21b5e930d70992c -DIST armagetronad-0.2.8.2.1.src.tar.bz2 1623441 RMD160 b09448954dde1005ff0063f7f7a5a4de48aa49c9 SHA1 5df5f1b767ee8dcb0f50ce8459a9acfcdb073a66 SHA256 5ccb12cd07118bb210c8256edf2e33a34dc0e9880c3f1c926a9fe4db87f15940 +DIST armagetronad-0.2.8.3.1.src.tar.bz2 1849966 RMD160 0685332fd4b2482d0c4e5178c112f36aa71e90fb SHA1 1be6e075b71a3a3c5ef7ced50785472374364224 SHA256 17ebb23c5e785baa3bae4a1c5373872df9aa89d22c121066e98267f4af4685ca DIST armagetronad-0.3.0.src.tar.bz2 3995064 RMD160 fc56e917acee9c828b20569e9ff28cd8b95aca5c SHA1 efb0898e7c3c003e8217ed31737e47b04ee485e1 SHA256 e79f1baec7fe6409eed52f0b1805072104c98b3d3501fdba82e516013a654358 DIST moviepack.zip 352253 RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 SHA1 2dfe328f325add441a74c79685806d16fddce2c6 SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78 DIST moviesounds_fq.zip 2182021 RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a SHA1 357d87ef40e25bec19fdc8a3aac70db53d3820ec SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba DIST spanishvoices.zip 349593 RMD160 13a7b307e1da341fe37e164e36db7778960edaee SHA1 c3a21209dd0bddcc1e50515169ce64504aa485a9 SHA256 fff02f9f002927929dc7ed102d4b01875c20a6e42188fe0a3b2d8b9cfdbad1a4 -EBUILD armagetronad-0.2.7.1-r2.ebuild 4595 RMD160 fe8453861e12f5012a1590b8ff625ef8e49d3d81 SHA1 0ee472e329ee3d78c62e986ef7426a801e19ea0d SHA256 a4835b5e6a8a9fda698b32d7dd40455580e3d1d9ac3066a30dc53d2bc6c4a0e8 -EBUILD armagetronad-0.2.8.2.1.ebuild 6537 RMD160 79d6fabb3c9a2fd7963e1842a393dd413a03aed8 SHA1 8994f55a36e23de3dbe796b521a4f97b5f863f79 SHA256 bc4926fabc3848f1e3d63813809d1555f778a69b11e9f6e921d3993e68263a42 -EBUILD armagetronad-0.3.0-r1.ebuild 6907 RMD160 4ca38a91a7b54911acc3f25824021adf881fa58d SHA1 1645e719149f8621aed6c5761a9fb59a1169b2a6 SHA256 6d60c489c62bd36aabbeb300578d51256d93abff346d173599dbd57c59ea3421 +EBUILD armagetronad-0.2.8.3.1.ebuild 6917 RMD160 7396b0baa9f253c45481656ab32664206308fe48 SHA1 d05cb6c8534bd353e7b4c1c4f563d69422bcf31d SHA256 34489832d3f9b36be1345e77fc5002c0ece18391eedf5200815baac942e66417 +EBUILD armagetronad-0.3.0-r1.ebuild 6882 RMD160 3a46cdd413debbfe14a65b21dd180b12c0b65fed SHA1 f2292cafa7712fd7e02021434058fdde6cd3cace SHA256 1e50ff0650648b4c8814d9e91cb4a5dce600b0c62ce95e644db0df079c2ad043 MISC ChangeLog 1135 RMD160 1c6614950b6f1335961bf5861eb271bdad581a3f SHA1 20f362b0931466395a95f999a17c2120287682a6 SHA256 92a0ef97d7c497a473ea4c0e4a70fb7e9edf2fdd18b351c5a4d6a7e8cd08f74c -MISC metadata.xml 780 RMD160 c4eaa27ec030bbd17cc59191533120ac4f1db5ab SHA1 87089de25b758218eca5aed19ae4f2954f4ec5d8 SHA256 8915873fe734d793a012fd853b483b0ab7713f4016466433bf08825324504d88 +MISC metadata.xml 983 RMD160 c78a2a4721ed3468027a2663e194138a08a0f574 SHA1 bd6deca5a23fbdb821350c687b3038898975011d SHA256 947626c113ec244a2a1750827898bd1123701f041ef846e6860186d2d58e881f Deleted: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.7.1-r2.ebuild =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.7.1-r2.ebuild 2010-03-19 21:58:14 UTC (rev 9395) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.7.1-r2.ebuild 2010-03-19 22:18:54 UTC (rev 9396) @@ -1,176 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit eutils games - -DESCRIPTION="3d tron lightcycles, just like the movie" -HOMEPAGE="http://armagetronad.net/" - -MY_PN="${PN/-live/}" -OPT_CLIENTSRC=" - moviesounds? ( - http://beta.armagetronad.net/fetch.php/PreResource/moviesounds_fq.zip - linguas_es? ( !linguas_en? ( - http://beta.armagetronad.net/fetch.php/PreResource/spanishvoices.zip - ) ) - ) - moviepack? ( - http://beta.armagetronad.net/fetch.php/PreResource/moviepack.zip - ) -" -SRC_URI="mirror://sourceforge/armagetronad/${P}.tar.bz2 - opengl? ( ${OPT_CLIENTSRC} ) - !dedicated? ( - ${OPT_CLIENTSRC} - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="dedicated linguas_de linguas_es linguas_en moviepack moviesounds opengl" - -GLDEPS=" - sys-libs/zlib - virtual/opengl - virtual/glu - media-libs/libsdl - media-libs/sdl-image[png] - media-libs/jpeg - media-libs/libpng -" -RDEPEND=" - opengl? ( ${GLDEPS} ) - !dedicated? ( ${GLDEPS} ) -" -OPT_CLIENTDEPS=" - moviepack? ( app-arch/unzip ) - moviesounds? ( app-arch/unzip ) -" -DEPEND="${RDEPEND} - opengl? ( ${OPT_CLIENTDEPS} ) - !dedicated? ( ${OPT_CLIENTDEPS} ) -" - -S="${WORKDIR}/${MY_PN}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc4.patch - epatch "${FILESDIR}"/${P}-security-1.patch - epatch "${FILESDIR}"/${P}-gcc43.patch -} - -aaconf() { - MyBUILDDIR="${WORKDIR}/build-$1" - mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)" # -p to allow EEXIST scenario - cd "${MyBUILDDIR}" - [ "$1" == "server" ] && ded='-dedicated' || ded='' - GameDir="${PN}${ded}${GameSLOT}" - ECONF_SOURCE="${S}" \ - egamesconf ${myconf} \ - --disable-music \ - --disable-krawall \ - --enable-etc \ - "${@:2}" || die "egamesconf($1) failed" -} - -aabuild() { - MyBUILDDIR="${WORKDIR}/build-$1" - cd "${MyBUILDDIR}" - emake || die "emake($1) failed" - make documentation || die "make documentation($1) failed" - mkdir startscript - sed \ - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \ - -e "s:@GAMES_LIBDIR@:${GAMES_LIBDIR}:" \ - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \ - < "${FILESDIR}/027-startscript.sh" \ - > "startscript/${PN}${ded}" || die 'sed failed' -} - -src_configure() { - # Assume client if they don't want a server - use opengl || ! use dedicated && build_client=true || build_client=false - use dedicated && build_server=true || build_server=false - - GameSLOT="" - if ${build_client}; then - einfo "Configuring game client" - aaconf client --enable-glout - fi - if ${build_server}; then - einfo "Configuring dedicated server" - aaconf server --disable-glout - fi -} - -src_compile() { - if ${build_client}; then - einfo "Building game client" - aabuild client - fi - if ${build_server}; then - einfo "Building dedicated server" - aabuild server - fi -} - -src_install() { - if ${build_client} && ${build_server}; then - # Setup symlink so both client and server share their common data - dodir "${GAMES_DATADIR}" - dosym "${PN}${GameSLOT}" "${GAMES_DATADIR}/${PN}-dedicated${GameSLOT}" - dodir "${GAMES_SYSCONFDIR}" - dosym "${PN}${GameSLOT}" "${GAMES_SYSCONFDIR}/${PN}-dedicated${GameSLOT}" - fi - exeinto "${GAMES_LIBDIR}/${PN}" - if ${build_client}; then - einfo "Installing game client" - cd "${S}" - newicon tron.ico ${PN}.ico - insinto "${GAMES_DATADIR}/${PN}" - doins -r models sound textures music || die "copying files" - cd "${WORKDIR}/build-client" - doexe src/tron/${PN} || die "copying files" - make_desktop_entry armagetronad "Armagetron Advanced" ${PN}.ico - dogamesbin startscript/${PN} || die - - # copy moviepacks/sounds - cd "${WORKDIR}" - insinto "${GAMES_DATADIR}/${PN}${GameSLOT}" - if use moviepack; then - einfo 'Installing moviepack' - doins -r moviepack || die "copying moviepack" - fi - if use moviesounds; then - einfo 'Installing moviesounds' - doins -r moviesounds || die "copying moviesounds" - if use linguas_es && ! use linguas_en; then - einfo 'Installing Spanish moviesounds' - doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds" - fi - fi - cd "${WORKDIR}/build-client" - fi - if ${build_server}; then - einfo "Installing dedicated server" - cd "${WORKDIR}/build-server" - doexe src/tron/${PN}-dedicated || die "copying files" - dogamesbin startscript/${PN}-dedicated || die - fi - - local LangDir="${D}${GAMES_DATADIR}/${GameDir}/language/" - use linguas_de || rm -v "${LangDir}deutsch.txt" - - dohtml doc/*.html - docinto html/net - dohtml doc/net/*.html - insinto "${GAMES_DATADIR}/${PN}" - doins -r language || die "copying files" - insinto "${GAMES_SYSCONFDIR}/${PN}" - doins -r config/* || die "copying files" - - prepgamesdirs -} Deleted: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.2.1.ebuild =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.2.1.ebuild 2010-03-19 21:58:14 UTC (rev 9395) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.2.1.ebuild 2010-03-19 22:18:54 UTC (rev 9396) @@ -1,212 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -EAPI=2 - -inherit flag-o-matic eutils games - -DESCRIPTION="3D light cycles like in the movie TRON" -HOMEPAGE="http://armagetronad.net/" - -MY_PN="${PN/-live/}" -OPT_CLIENTSRC=" - moviesounds? ( - http://beta.armagetronad.net/fetch.php/PreResource/moviesounds_fq.zip - linguas_es? ( !linguas_en? ( - http://beta.armagetronad.net/fetch.php/PreResource/spanishvoices.zip - ) ) - ) - moviepack? ( - http://beta.armagetronad.net/fetch.php/PreResource/moviepack.zip - ) -" -SRC_URI="mirror://sourceforge/armagetronad/${P}.src.tar.bz2 - opengl? ( ${OPT_CLIENTSRC} ) - !dedicated? ( ${OPT_CLIENTSRC} ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="debug dedicated linguas_de linguas_fr linguas_en linguas_en_GB linguas_en_US linguas_es moviepack moviesounds opengl" - -GLDEPS=" - || ( - x11-libs/libX11 - virtual/x11 - ) - virtual/glu - virtual/opengl - media-libs/libsdl - media-libs/sdl-image[png] - media-libs/sdl-mixer - media-libs/jpeg - media-libs/libpng -" -RDEPEND=" - >=dev-libs/libxml2-2.6.11 - sys-libs/zlib - opengl? ( ${GLDEPS} ) - !dedicated? ( ${GLDEPS} ) -" -OPT_CLIENTDEPS=" - moviepack? ( app-arch/unzip ) - moviesounds? ( app-arch/unzip ) -" -DEPEND="${RDEPEND} - opengl? ( ${OPT_CLIENTDEPS} ) - !dedicated? ( ${OPT_CLIENTDEPS} ) -" - -S="${WORKDIR}/${MY_PN}" - -pkg_setup() { - if use debug; then - ewarn - ewarn 'The "debug" USE flag will enable debugging code. This will cause AI' - ewarn ' players to chat debugging information, debugging lines to be drawn' - ewarn ' on the grid and at wall angles, and probably most relevant to your' - ewarn ' decision to keep the USE flag:' - ewarn ' FULL SCREEN MODE AND SOUND WILL BE DISABLED' - ewarn - ewarn "If you don't like this, add this line to /etc/portage/package.use:" - ewarn ' games-action/armagetronad -debug' - ewarn - ewarn 'If you ignore this warning and complain about any of the above' - ewarn ' effects, the Armagetron Advanced team will either ignore you or' - ewarn ' delete your complaint.' - ewarn - ebeep 5 - fi - games_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${P}-build-fixups.patch" -} - -aaconf() { - MyBUILDDIR="${WORKDIR}/build-$1" - mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)" # -p to allow EEXIST scenario - cd "${MyBUILDDIR}" - use debug && DEBUGLEVEL=3 || DEBUGLEVEL=0 - export DEBUGLEVEL CODELEVEL=0 - [ "$SLOT" == "0" ] && myconf="--disable-multiver" || myconf="--enable-multiver=${SLOT}" - [ "$1" == "server" ] && ded='-dedicated' || ded='' - GameDir="${MY_PN}${ded}${GameSLOT}" - ECONF_SOURCE="${S}" \ - egamesconf ${myconf} \ - --disable-binreloc \ - --docdir "/usr/share/doc/${PF}/${DOCDESTTREE}" \ - --disable-master \ - --enable-main \ - --disable-krawall \ - --enable-sysinstall \ - --disable-useradd \ - --enable-etc \ - --disable-restoreold \ - --disable-games \ - --enable-uninstall="emerge --clean =${CATEGORY}/${PF}" \ - "${@:2}" || die "egamesconf($1) failed" -} - -aabuild() { - MyBUILDDIR="${WORKDIR}/build-$1" - cd "${MyBUILDDIR}" - emake armabindir="${GAMES_BINDIR}" || die "emake($1) failed" -} - -src_configure() { - # Assume client if they don't want a server - use opengl || ! use dedicated && build_client=true || build_client=false - use dedicated && build_server=true || build_server=false - - [ "$SLOT" == "0" ] && GameSLOT="" || GameSLOT="-${SLOT}" - filter-flags -fno-exceptions - if ${build_client}; then - einfo "Configuring game client" - aaconf client --enable-glout --disable-initscripts --enable-desktop - fi - if ${build_server}; then - einfo "Configuring dedicated server" - aaconf server --disable-glout --enable-initscripts --disable-desktop - fi -} - -src_compile() { - if ${build_client}; then - einfo "Building game client" - aabuild client - fi - if ${build_server}; then - einfo "Building dedicated server" - aabuild server - fi -} - -src_install() { - if ${build_client} && ${build_server}; then - # Setup symlink so both client and server share their common data - dodir "${GAMES_DATADIR}" - dosym "${MY_PN}${GameSLOT}" "${GAMES_DATADIR}/${MY_PN}-dedicated${GameSLOT}" - dodir "${GAMES_SYSCONFDIR}" - dosym "${MY_PN}${GameSLOT}" "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}" - fi - if ${build_client}; then - einfo "Installing game client" - cd "${WORKDIR}/build-client" - make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(client) install failed" - # copy moviepacks/sounds - cd "${WORKDIR}" - insinto "${GAMES_DATADIR}/${MY_PN}${GameSLOT}" - if use moviepack; then - einfo 'Installing moviepack' - doins -r moviepack || die "copying moviepack" - fi - if use moviesounds; then - einfo 'Installing moviesounds' - doins -r moviesounds || die "copying moviesounds" - if use linguas_es && ! use linguas_en; then - einfo 'Installing Spanish moviesounds' - doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds" - fi - fi - fi - if ${build_server}; then - einfo "Installing dedicated server" - cd "${WORKDIR}/build-server" - make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(server) install failed" - einfo 'Adjusting dedicated server configuration' - dosed "s,^\(user=\).*$,\1${GAMES_USER_DED},; s,^#\(VARDIR=/.*\)$,\\1," "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}/rc.config" || ewarn 'adjustments for rc.config FAILED; the defaults may not be suited for your system!' - fi - - local LangDir="${D}${GAMES_DATADIR}/${GameDir}/language/" - use linguas_de || rm -v "${LangDir}deutsch.txt" - use linguas_fr || rm -v "${LangDir}french.txt" - local en_GB='true' en_US='true' - use linguas_en_GB || en_GB='false' - use linguas_en_US || en_US='false' - # Force both on if: - # # linguas_en is set, but neither subset is - # # no other supported linguas is set - { { ! $en_GB && ! $en_US; } && { - use linguas_en || - ! { - use linguas_de || - use linguas_fr || - use linguas_es || - false; - }; - }; } && - en_GB='true' en_US='true' - $en_US || rm -v "${LangDir}american.txt" - use linguas_es || rm -v "${LangDir}spanish.txt" - - # Ok, so we screwed up on doc installation... so for now, the ebuild does this manually - dohtml -r "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"* - dodoc "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"*.txt - rm -r "${D}${GAMES_PREFIX}/share/doc" - rmdir "${D}${GAMES_PREFIX}/share" || true # Supress potential error - prepgamesdirs -} Copied: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.3.1.ebuild (from rev 9392, armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.2.1.ebuild) =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.3.1.ebuild (rev 0) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.2.8.3.1.ebuild 2010-03-19 22:18:54 UTC (rev 9396) @@ -0,0 +1,225 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +EAPI=2 + +inherit flag-o-matic eutils games + +DESCRIPTION="3D light cycles like in the movie TRON" +HOMEPAGE="http://armagetronad.net/" + +MY_PN="${PN/-live/}" +OPT_CLIENTSRC=" + moviesounds? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviesounds_fq.zip + linguas_es? ( !linguas_en? ( + http://beta.armagetronad.net/fetch.php/PreResource/spanishvoices.zip + ) ) + ) + moviepack? ( + http://beta.armagetronad.net/fetch.php/PreResource/moviepack.zip + ) +" +SRC_URI="mirror://sourceforge/armagetronad/${P}.src.tar.bz2 + opengl? ( ${OPT_CLIENTSRC} ) + !dedicated? ( ${OPT_CLIENTSRC} ) +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" +IUSE="auth debug dedicated linguas_de linguas_fr linguas_en linguas_en_GB linguas_en_US linguas_es linguas_pl moviepack moviesounds opengl respawn threads" + +GLDEPS=" + || ( + x11-libs/libX11 + virtual/x11 + ) + virtual/glu + virtual/opengl + media-libs/libsdl + media-libs/sdl-image[png] + media-libs/sdl-mixer + media-libs/jpeg + media-libs/libpng +" +RDEPEND=" + >=dev-libs/libxml2-2.6.11 + sys-libs/zlib + opengl? ( ${GLDEPS} ) + !dedicated? ( ${GLDEPS} ) + dedicated? ( + auth? ( threads? ( >=dev-libs/zthread-2.3.2 ) ) + ) +" +OPT_CLIENTDEPS=" + moviepack? ( app-arch/unzip ) + moviesounds? ( app-arch/unzip ) +" +DEPEND="${RDEPEND} + opengl? ( ${OPT_CLIENTDEPS} ) + !dedicated? ( ${OPT_CLIENTDEPS} ) + sys-apps/util-linux +" + +pkg_setup() { + if use debug; then + ewarn + ewarn 'The "debug" USE flag will enable debugging code. This will cause AI' + ewarn ' players to chat debugging information, debugging lines to be drawn' + ewarn ' on the grid and at wall angles, and probably most relevant to your' + ewarn ' decision to keep the USE flag:' + ewarn ' FULL SCREEN MODE AND SOUND WILL BE DISABLED' + ewarn + ewarn "If you don't like this, add this line to /etc/portage/package.use:" + ewarn ' games-action/armagetronad -debug' + ewarn + ewarn 'If you ignore this warning and complain about any of the above' + ewarn ' effects, the Armagetron Advanced team will either ignore you or' + ewarn ' delete your complaint.' + ewarn + ebeep 5 + fi + games_pkg_setup +} + +aaconf() { + MyBUILDDIR="${WORKDIR}/build-$1" + mkdir -p "${MyBUILDDIR}" || die "error creating build directory($1)" # -p to allow EEXIST scenario + cd "${MyBUILDDIR}" + use debug && DEBUGLEVEL=3 || DEBUGLEVEL=0 + export DEBUGLEVEL CODELEVEL=0 + [ "$SLOT" == "0" ] && myconf="--disable-multiver" || myconf="--enable-multiver=${SLOT}" + [ "$1" == "server" ] && ded='-dedicated' || ded='' + GameDir="${MY_PN}${ded}${GameSLOT}" + ECONF_SOURCE="${S}" \ + egamesconf ${myconf} \ + --disable-binreloc \ + --docdir "/usr/share/doc/${PF}/${DOCDESTTREE}" \ + --disable-master \ + --enable-main \ + --disable-krawall \ + --enable-sysinstall \ + --disable-useradd \ + --enable-etc \ + --disable-restoreold \ + --disable-games \ + $(use_enable respawn) \ + --enable-uninstall="emerge --clean =${CATEGORY}/${PF}" \ + "${@:2}" || die "egamesconf($1) failed" +} + +aabuild() { + MyBUILDDIR="${WORKDIR}/build-$1" + cd "${MyBUILDDIR}" + emake armabindir="${GAMES_BINDIR}" || die "emake($1) failed" +} + +src_configure() { + # Assume client if they don't want a server + use opengl || ! use dedicated && build_client=true || build_client=false + use dedicated && build_server=true || build_server=false + + [ "$SLOT" == "0" ] && GameSLOT="" || GameSLOT="-${SLOT}" + filter-flags -fno-exceptions + if ${build_client}; then + einfo "Configuring game client" + aaconf client --enable-glout --disable-initscripts --enable-desktop + fi + if ${build_server}; then + einfo "Configuring dedicated server" + local myconf='' + if use auth; then + use threads || + myconf="$myconf --with-zthread-prefix=/.../nope"; + fi + aaconf server \ + --disable-glout \ + --enable-initscripts \ + $(use_enable auth armathentication) \ + $myconf \ + --disable-desktop + fi +} + +src_compile() { + if ${build_client}; then + einfo "Building game client" + aabuild client + fi + if ${build_server}; then + einfo "Building dedicated server" + aabuild server + fi +} + +src_install() { + if ${build_client} && ${build_server}; then + # Setup symlink so both client and server share their common data + dodir "${GAMES_DATADIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_DATADIR}/${MY_PN}-dedicated${GameSLOT}" + dodir "${GAMES_SYSCONFDIR}" + dosym "${MY_PN}${GameSLOT}" "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}" + fi + if ${build_client}; then + einfo "Installing game client" + cd "${WORKDIR}/build-client" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(client) install failed" + # copy moviepacks/sounds + cd "${WORKDIR}" + insinto "${GAMES_DATADIR}/${MY_PN}${GameSLOT}" + if use moviepack; then + einfo 'Installing moviepack' + doins -r moviepack || die "copying moviepack" + fi + if use moviesounds; then + einfo 'Installing moviesounds' + doins -r moviesounds || die "copying moviesounds" + if use linguas_es && ! use linguas_en; then + einfo 'Installing Spanish moviesounds' + doins -r ArmageTRON/moviesounds || die "copying spanish moviesounds" + fi + fi + rename armagetronad{,${GameSLOT}} "${D}"/usr/share/*/armagetronad.* + cd "${WORKDIR}/build-client" + fi + if ${build_server}; then + einfo "Installing dedicated server" + cd "${WORKDIR}/build-server" + make DESTDIR="${D}" armabindir="${GAMES_BINDIR}" install || die "make(server) install failed" + einfo 'Adjusting dedicated server configuration' + dosed "s,^\(user=\).*$,\1${GAMES_USER_DED},; s,^#\(VARDIR=/.*\)$,\\1," "${GAMES_SYSCONFDIR}/${MY_PN}-dedicated${GameSLOT}/rc.config" || ewarn 'adjustments for rc.config FAILED; the defaults may not be suited for your system!' + fi + + local LangDir="${D}${GAMES_DATADIR}/${GameDir}/language/" + use linguas_de || rm -v "${LangDir}deutsch.txt" + use linguas_fr || rm -v "${LangDir}french.txt" + local en_GB='true' en_US='true' + use linguas_en_GB || en_GB='false' + use linguas_en_US || en_US='false' + # Force both on if: + # # linguas_en is set, but neither subset is + # # no other supported linguas is set + { { ! $en_GB && ! $en_US; } && { + use linguas_en || + ! { + use linguas_de || + use linguas_fr || + use linguas_es || + use linguas_pl || + false; + }; + }; } && + en_GB='true' en_US='true' + $en_US || rm -v "${LangDir}american.txt" + use linguas_es || rm -v "${LangDir}spanish.txt" + use linguas_pl || rm -v "${LangDir}polish.txt" + + # Ok, so we screwed up on doc installation... so for now, the ebuild does this manually + dohtml -r "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"* + dodoc "${D}${GAMES_PREFIX}/share/doc/${GameDir}/html/"*.txt + rm -r "${D}${GAMES_PREFIX}/share/doc" + rmdir "${D}${GAMES_PREFIX}/share" || true # Supress potential error + prepgamesdirs +} Modified: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.3.0-r1.ebuild =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.3.0-r1.ebuild 2010-03-19 21:58:14 UTC (rev 9395) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/armagetronad-0.3.0-r1.ebuild 2010-03-19 22:18:54 UTC (rev 9396) @@ -61,8 +61,6 @@ !dedicated? ( ${OPT_CLIENTDEPS} ) " -S="${WORKDIR}/${MY_PN}" - pkg_setup() { if use debug; then ewarn Modified: armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/metadata.xml =================================================================== --- armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/metadata.xml 2010-03-19 21:58:14 UTC (rev 9395) +++ armagetronad/trunk/build/gentoo/overlay/games-action/armagetronad/metadata.xml 2010-03-19 22:18:54 UTC (rev 9396) @@ -12,7 +12,9 @@ In the game, you control a lightcycle in a digital grid, and you battle gladiatorial style against your opponents; one of you must die for the game to end. </longdescription> <use> + <flag name='auth'>Enables server-side authentication support</flag> <flag name='moviesounds'>install sound effects extracted from the TRON movie</flag> <flag name='moviepack'>install graphics based on the TRON movie</flag> + <flag name='respawn'>enable unsupported, hacky, impossible to deactivate at runtime, deathmatch mode. Use at your own risk.</flag> </use> </pkgmetadata> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |