Make the wrapper scripts less sucky #153338 by Richard Freeman.

Package-Manager: portage-2.1.2_rc1-r1

diff --git a/games-action/armagetronad/ChangeLog b/games-action/armagetronad/ChangeLog
index 75c6e51d780fc8a8508a5a027fde32b32e1e32d6..720303c503bd7d7a1e574e493ae09e18c1eca260 100644 (file)
--- a/games-action/armagetronad/ChangeLog
+++ b/games-action/armagetronad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/armagetronad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.10 2006/10/28 07:40:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/ChangeLog,v 1.11 2006/10/30 03:38:24 vapier Exp $
+
+  30 Oct 2006; Mike Frysinger <vapier@gentoo.org> files/armagetronad,
+  files/armagetronad-ded, armagetronad-0.2.7.1-r1.ebuild:
+  Make the wrapper scripts less sucky #153338 by Richard Freeman.
 
   28 Oct 2006; <tupone@gentoo.org> files/armagetronad-ded,
   -armagetronad-0.2.7.1.ebuild, armagetronad-0.2.7.1-r1.ebuild:

diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index e99b95f321c5af44c7695596131fba27ff9e254d..d85080e65cedb22d445677c57c7eef72a9e84db8 100644 (file)
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX armagetronad 1102 RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b SHA1 bd4feaba945fe12dc47bfae4e8fe18992e4546cd SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579
-MD5 617e831d7f4c02cd72d67800bcf0144f files/armagetronad 1102
-RMD160 e9a7852c6b03010e03d93f1c849e4c582338745b files/armagetronad 1102
-SHA256 b267de50ee8b41028b2fe3e441dd4049d3fd689cb3fa7788427ade03e7851579 files/armagetronad 1102
+AUX armagetronad 961 RMD160 a819cdcd81eb604d4a9f532510bd085f402e7d76 SHA1 9af62de21e0976237f4e9921bcedf685609ac45c SHA256 9794c2d7f9483a946e7c2a720a902cbd5199e1be2da7fe42be523cbc97764063
+MD5 eb50191689b8eb12be831c00e00b52c4 files/armagetronad 961
+RMD160 a819cdcd81eb604d4a9f532510bd085f402e7d76 files/armagetronad 961
+SHA256 9794c2d7f9483a946e7c2a720a902cbd5199e1be2da7fe42be523cbc97764063 files/armagetronad 961
 AUX armagetronad-0.2.7.1-gcc4.patch 2269 RMD160 aabe55c0522d5cf6112fd4f3195dbb902c9ce0be SHA1 2a6769775e08ebfb42c837b6750031c67a9da1d4 SHA256 17bd03efb07f729db9f37e730b9e6582f13cf333c66e68941cbbc6634fdb8e86
 MD5 345a68fc8620586e70edae5f9444a62d files/armagetronad-0.2.7.1-gcc4.patch 2269
 RMD160 aabe55c0522d5cf6112fd4f3195dbb902c9ce0be files/armagetronad-0.2.7.1-gcc4.patch 2269
@@ -13,21 +13,21 @@ AUX armagetronad-0.2.7.1-security-1.patch 527 RMD160 c9e68014c8a1fc1aaf06aacbcac
 MD5 670d4b614568e27d820f556214804787 files/armagetronad-0.2.7.1-security-1.patch 527
 RMD160 c9e68014c8a1fc1aaf06aacbcac8521007996932 files/armagetronad-0.2.7.1-security-1.patch 527
 SHA256 b813bb1e74188e200217fa31f075c90ff625d8e9d2f073d8a6ced120af228cd0 files/armagetronad-0.2.7.1-security-1.patch 527
-AUX armagetronad-ded 1255 RMD160 1edb6ca70ec4f16d32cb90faa82fea30325692bf SHA1 bb4de11c2ccabbe4fc84da065fc5a3ecc43f519d SHA256 35464a514e7d32ff3934a34546c0e1797d23a089819fa46cf58bb889d57a352b
-MD5 b624061ccaa75238ae555721639f5483 files/armagetronad-ded 1255
-RMD160 1edb6ca70ec4f16d32cb90faa82fea30325692bf files/armagetronad-ded 1255
-SHA256 35464a514e7d32ff3934a34546c0e1797d23a089819fa46cf58bb889d57a352b files/armagetronad-ded 1255
+AUX armagetronad-ded 905 RMD160 035ea8726e699270e0cfd362ddced5b2b6bff384 SHA1 fe6e2899d63874b6a7740c295dd83a08fd2e8cfa SHA256 e1bfc2fdd5edaaa64f161c8be8aa68abf1d83b02f48701fb82777da1cf0f163c
+MD5 1deba7ce7cdbc75a2173592da4615c19 files/armagetronad-ded 905
+RMD160 035ea8726e699270e0cfd362ddced5b2b6bff384 files/armagetronad-ded 905
+SHA256 e1bfc2fdd5edaaa64f161c8be8aa68abf1d83b02f48701fb82777da1cf0f163c files/armagetronad-ded 905
 DIST armagetronad-0.2.7.1.tar.bz2 1243746 RMD160 0dcf9d383fccd42509cae3aacc2df0d5531bd021 SHA1 a93d587e1154f0465c6fdb3c5518a5003add6240 SHA256 0ec8793f6d4d4f5a90feec1c8b0a4846aa4fa2c1f3c69a20b21b5e930d70992c
 DIST moviepack.zip 352253 RMD160 07c8b2aa48ad84092869c90e32d32a96d367afd5 SHA1 2dfe328f325add441a74c79685806d16fddce2c6 SHA256 3de835e1e8af71f1dcbf5ac8405dfa87973eac50d206c12338278fc601cf9d78
 DIST moviesounds_fq.zip 2182021 RMD160 9fe95f3cc31bfdf9149bf850d5ae46ca5253a09a SHA1 357d87ef40e25bec19fdc8a3aac70db53d3820ec SHA256 9f8061eb0fef416885424bdba9f899fc5b4d9a021f46eef4eb821a7f1e08c1ba
-EBUILD armagetronad-0.2.7.1-r1.ebuild 2376 RMD160 dff4179341259e5e7cefb4c29cb677fd5e42079c SHA1 c691888e257f4714b9feb37570f3961284fa163a SHA256 9b8f6636e3e65c774b28385f54c2088253f4e8d3782b383b0ad2cb2c108f0c5c
-MD5 232fa262a546205d138e7eed0754e6d0 armagetronad-0.2.7.1-r1.ebuild 2376
-RMD160 dff4179341259e5e7cefb4c29cb677fd5e42079c armagetronad-0.2.7.1-r1.ebuild 2376
-SHA256 9b8f6636e3e65c774b28385f54c2088253f4e8d3782b383b0ad2cb2c108f0c5c armagetronad-0.2.7.1-r1.ebuild 2376
-MISC ChangeLog 1679 RMD160 fa57ce6e5bc022da04647dcdb92adeb5b66d2c4d SHA1 b569e104ad22425f4cf7aeffc31f1fecc2bc0c28 SHA256 a8cd04eccf5a2b99f3c67ebcbe59ca3e4adce528bfa26dc80b7cf64925ee5a2e
-MD5 6df652bcfb4cc8b35bf7f50761b5131f ChangeLog 1679
-RMD160 fa57ce6e5bc022da04647dcdb92adeb5b66d2c4d ChangeLog 1679
-SHA256 a8cd04eccf5a2b99f3c67ebcbe59ca3e4adce528bfa26dc80b7cf64925ee5a2e ChangeLog 1679
+EBUILD armagetronad-0.2.7.1-r1.ebuild 2328 RMD160 e02c5b4c85eecb8ed19f79810ca8a51b0626cf6b SHA1 9ef7ee6900703c9d6f03ded71bfb1daefa0937f6 SHA256 a02ce8f78483d9c6aab635b2728dd222c1423490c79f7bbebb3f56531bab00c4
+MD5 e4efa6188e39a84b76faca7d675bb62b armagetronad-0.2.7.1-r1.ebuild 2328
+RMD160 e02c5b4c85eecb8ed19f79810ca8a51b0626cf6b armagetronad-0.2.7.1-r1.ebuild 2328
+SHA256 a02ce8f78483d9c6aab635b2728dd222c1423490c79f7bbebb3f56531bab00c4 armagetronad-0.2.7.1-r1.ebuild 2328
+MISC ChangeLog 1874 RMD160 3b91c1e2c67796f7784f451570b207c847359df7 SHA1 cd8ca9199e83d47f46184770cb3688d429676fd3 SHA256 795dd513475a444e0569056936b81fa2bd7e517392e107255ca6495bc529fbe2
+MD5 f1cf92d8896632239f1adc09c6f71f6b ChangeLog 1874
+RMD160 3b91c1e2c67796f7784f451570b207c847359df7 ChangeLog 1874
+SHA256 795dd513475a444e0569056936b81fa2bd7e517392e107255ca6495bc529fbe2 ChangeLog 1874
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -38,7 +38,7 @@ SHA256 1841508c1a90c849360c296c55631a65462f160e12626ed3d333635d787afe72 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFQwmAbfN2jvlVAhwRAhdoAJ4tW0SI1zS9GSPVXv7ebIPZjV6g1QCgl+yR
-NVkgJDrHHi0z6eEwNwWocYU=
-=RoJf
+iD8DBQFFRXO7amhnQswr0vIRAiNqAJ452sGrgVj0j2B9+FwXLzFcQhwn4QCcDRQ6
+RbfgvUGNNBNYjLIMgEcFd0A=
+=4TxX
 -----END PGP SIGNATURE-----

diff --git a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
index c552ef10fdbfa5ce524ba75bcd57c955af555999..6017e33d1e689a2fb266782c15719f8421159688 100644 (file)
--- a/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.3 2006/10/28 07:40:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/armagetronad/armagetronad-0.2.7.1-r1.ebuild,v 1.4 2006/10/30 03:38:24 vapier Exp $
 
-
-inherit flag-o-matic eutils games
+inherit eutils games
 
 DESCRIPTION="3d tron lightcycles, just like the movie"
 HOMEPAGE="http://armagetronad.sourceforge.net/"
@@ -26,7 +25,8 @@ RDEPEND="
                media-libs/libsdl
                media-libs/sdl-image
                media-libs/jpeg
-               media-libs/libpng )"
+               media-libs/libpng
+       )"
 DEPEND="${RDEPEND}
        !dedicated? ( app-arch/unzip )"
 
@@ -35,23 +35,20 @@ src_unpack() {
        cd "${S}"
        epatch "${FILESDIR}"/${P}-gcc4.patch
        epatch "${FILESDIR}"/${P}-security-1.patch
-       if use dedicated; then
-               cp "${FILESDIR}"/${PN}-ded .
+       if use dedicated ; then
+               cp "${FILESDIR}"/${PN}-ded "${FILESDIR}"/${PN} . || die
                sed -i \
                        -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \
                        -e "s:@GAMES_LIBDIR@:${GAMES_LIBDIR}:" \
                        -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \
-                       ${PN}-ded
+                       ${PN}-ded ${PN}
        fi
 }
 
 src_compile() {
-       filter-flags -fno-exceptions
-       if use dedicated; then
-               egamesconf --disable-glout || die "egamesconf failed"
-       else
-               egamesconf || die "egamesconf failed"
-       fi
+       local myconf=""
+       use dedicated && myconf="--disable-glout"
+       egamesconf ${myconf} || die "egamesconf failed"
        emake || die "emake failed"
        make documentation || "make doc failed"
 }
@@ -62,7 +59,7 @@ src_install() {
        dohtml doc/net/*.html
        newicon tron.ico ${PN}.ico
        exeinto "${GAMES_LIBDIR}/${PN}"
-       if use dedicated; then
+       if use dedicated ; then
                doexe src/tron/${PN}-dedicated || die "copying files"
        else
                doexe src/tron/${PN} || die "copying files"
@@ -70,21 +67,20 @@ src_install() {
        doexe src/network/armagetronad-* || die "copying files"
        insinto "${GAMES_DATADIR}/${PN}"
        doins -r log language || die "copying files"
-       if ! use dedicated; then
+       if ! use dedicated ; then
                doins -r arenas models sound textures music || die "copying files"
        fi
        insinto "${GAMES_SYSCONFDIR}/${PN}"
        doins -r config/* || die "copying files"
-       if use dedicated; then
-               dogamesbin ${PN}-ded
-       fi
        cd "${S}"
-       insinto "${GAMES_DATADIR}/${PN}"
-       if ! use dedicated; then
-               dogamesbin "${FILESDIR}/${PN}"
+       if ! use dedicated ; then
+               insinto "${GAMES_DATADIR}/${PN}"
+               dogamesbin ${PN} || die
                insinto "${GAMES_DATADIR}/${PN}"
                doins -r ../moviepack ../moviesounds || die "copying movies"
                make_desktop_entry armagetronad "Armagetron Advanced" ${PN}.ico
+       else
+               dogamesbin ${PN}-ded || die
        fi
        prepgamesdirs
 }

diff --git a/games-action/armagetronad/files/armagetronad b/games-action/armagetronad/files/armagetronad
index fe647e03a56bd8a0258beeab801689bac9c4b519..bf362ebbad75a9579b52af1425f4ca178b9cd764 100644 (file)
--- a/games-action/armagetronad/files/armagetronad
+++ b/games-action/armagetronad/files/armagetronad
@@ -2,38 +2,35 @@
 #
 # starts Armagetron Advanced from the installation directory
 
-GAMES_LIBDIR=/usr/games/lib/armagetronad
-GAMES_DATADIR=/usr/share/games
-GAMES_SYSCONFDIR=/etc/games
+GAMES_LIBDIR="@GAMES_LIBDIR@/armagetronad"
+GAMES_DATADIR="@GAMES_DATADIR@"
+GAMES_SYSCONFDIR="@GAMES_SYSCONFDIR@"
 PN=armagetronad
-if test ! -r $HOME/.armagetronad ; then
-   mkdir $HOME/.armagetronad
 
-   if test -r $HOME/.ArmageTronrc ; then
-       #migrage very old configuration
-       echo "Porting very old configuration..."
-       mkdir $HOME/.armagetronad/var
-       mv $HOME/.ArmageTronrc $HOME/.armagetronad/var/user.cfg
-   fi
-fi
-
-if test ! -r $HOME/.armagetronad/var ; then
-    #migrate old configuration
-    files=$( find $HOME/.armagetronad -type f -maxdepth 1 )
+if test ! -r "${HOME}"/.armagetronad ; then
+       mkdir "${HOME}"/.armagetronad
 
-    mkdir $HOME/.armagetronad/var
-       
-    test "$files" != "" && echo "Porting old configuration..." && mv $files $HOME/.armagetronad/var
+       if test -r "${HOME}"/.ArmageTronrc ; then
+               # migrage very old configuration
+               echo "Porting very old configuration..."
+               mkdir "${HOME}"/.armagetronad/var
+               mv "${HOME}"/.ArmageTronrc "${HOME}"/.armagetronad/var/user.cfg
+       fi
 fi
 
-if test  "x$1" = "x-h" ; then
-    echo -e "\n\nTo uninstall Armagetron Advanced, type armagetronad --uninstall."
-fi
+if test ! -r "${HOME}"/.armagetronad/var ; then
+       #migrate old configuration
+       files=$( find "${HOME}"/.armagetronad -type f -maxdepth 1 )
 
-if test  "x$1" = "x--uninstall"  ; then
-    emerge unmerge armagetronad
-else
-       $GAMES_LIBDIR/$PN --datadir $GAMES_DATADIR/$PN --configdir $GAMES_SYSCONFDIR/$PN \
-       --userdatadir $HOME/.armagetronad $*
+       mkdir "${HOME}"/.armagetronad/var
+       if test "$files" != "" ; then
+               echo "Porting old configuration..."
+               mv $files "${HOME}"/.armagetronad/var
+       fi
 fi
 
+exec \
+"${GAMES_LIBDIR}"/${PN} \
+       --datadir "${GAMES_DATADIR}"/${PN} \
+       --configdir "${GAMES_SYSCONFDIR}"/${PN} \
+       --userdatadir "${HOME}"/.armagetronad "$@"

diff --git a/games-action/armagetronad/files/armagetronad-ded b/games-action/armagetronad/files/armagetronad-ded
index 82a23e1721b612cacf7a810f2c90f8a6d01d158e..a28dc3bf3b2b18d2cfdab6a64851afbd1a823fc4 100644 (file)
--- a/games-action/armagetronad/files/armagetronad-ded
+++ b/games-action/armagetronad/files/armagetronad-ded
@@ -2,47 +2,31 @@
 #
 # starts Armagetron Advanced Dedicated Server from the installation directory
 
-       GAME_CONFDIR=@GAMES_SYSCONFDIR@/armagetronad
-       GAME_LIBDIR=@GAMES_LIBDIR@/armagetronad
-       GAME_DATADIR=@GAMES_DATADIR@/armagetronad
+GAME_CONFDIR="@GAMES_SYSCONFDIR@/armagetronad"
+GAME_LIBDIR="@GAMES_LIBDIR@/armagetronad"
+GAME_DATADIR="@GAMES_DATADIR@/armagetronad"
 
-       NO=$'\x1b[0;0m'
-       RD=$'\x1b[31;01m'
-       GR=$'\x1b[32;01m'
-       YL=$'\x1b[33;01m'
+echo "Checking Configuration"
+if test ! -r "${HOME}"/.armagetronad-ded ; then
+       mkdir -p "${HOME}"/.armagetronad-ded
 
-               echo "${GR} *${NO} Checking Configuration."
-       if test ! -r $HOME/.armagetronad-ded ; then
-               mkdir $HOME/.armagetronad-ded
-
-       if test -r $HOME/.ArmageTronrc ; then
-               echo "${YL} *${NO} Migrating very old configuration."
-       cp $HOME/.ArmageTronrc $HOME/.armagetronad-ded/user.cfg 
-       fi
-fi
-       if test ! -r $HOME/.armagetronad-ded/var ; then
-               files=$( ls $HOME/.armagetronad-ded )
-               mkdir $HOME/.armagetronad-ded/var
-               echo "${GR} *${NO} Testing configuration."
-       test "$files" != "" && mv $files $HOME/.armagetronad-ded/var
+       if test -r "${HOME}"/.ArmageTronrc ; then
+               echo "Migrating very old configuration"
+               cp "${HOME}"/.ArmageTronrc "${HOME}"/.armagetronad-ded/user.cfg 
        fi
-       
-               echo "${GR} *${NO} Done."
-       
-       
-       if test "x$1" = "x-h" ; then
-               echo "${RD} *${NO} Please uninstall Armagetron Advanced via Portage."
 fi
 
-       if test  "x$1" = "x--uninstall" ; then
-               echo "${RD} *${NO} Please uninstall Armagetron Advanced via Portage."
-        else
-        
-       while true; do
-       
-       $GAME_LIBDIR/armagetronad-dedicated \
-       --datadir $GAME_DATADIR \
-       --configdir $GAME_CONFDIR \
-       --userdatadir $HOME/.armagetronad-ded
-done
+if test ! -r "${HOME}"/.armagetronad-ded/var ; then
+       files=$(ls "${HOME}"/.armagetronad-ded)
+       mkdir "${HOME}"/.armagetronad-ded/var
+       echo "Testing configuration"
+       test "$files" != "" && mv $files "${HOME}"/.armagetronad-ded/var
 fi
+
+echo "Done"
+
+exec \
+"${GAME_LIBDIR}"/armagetronad-dedicated \
+       --datadir "${GAME_DATADIR}" \
+       --configdir "${GAME_CONFDIR}" \
+       --userdatadir "${HOME}"/.armagetronad-ded