make mycmakeargs an array

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index d784201aab38860c7ed24a580373ae5c3b10be73..71a984c5cf93df2524aa30e597acbec9212d6092 100644 (file)
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.170 2010/03/15 02:47:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.171 2010/03/16 16:19:44 mr_bones_ Exp $
+
+  16 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.6.5.ebuild,
+  wesnoth-1.7.15.ebuild:
+  make mycmakeargs an array
 
 *wesnoth-1.7.15 (15 Mar 2010)
 

diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index e2581734f45bf781270c59baba06c0af1d73b0de..447c998a9d64e8ea82b6aeffb9a78e1647e904e5 100644 (file)
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,7 +1,7 @@
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
 DIST wesnoth-1.6.5.tar.bz2 230239169 RMD160 7fe957d7eeb61956252d0fc6e9ead74572be43a1 SHA1 232dac3a4327555bf52212cf4420c9ea823220e4 SHA256 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7
 DIST wesnoth-1.7.15.tar.bz2 283570482 RMD160 acc1b34c26c04e0a1735fa10967976bf10975421 SHA1 8e069bc0133dfd80c8d8202e98d471df4bc21720 SHA256 847cc36588e37e3e9ebe6f4e90a5a23ebbf17fc961c8560cfcb3fbc4707ea054
-EBUILD wesnoth-1.6.5.ebuild 2593 RMD160 a6b5dcbd551d8b3501a2401e11ee02d2385d6e7f SHA1 b488985b8805654a1a28e2ff75c3a0e41eb3c738 SHA256 a5a1cf905012265022e97b91f96f450cb8aa845755877fde026e4b7be4f12101
-EBUILD wesnoth-1.7.15.ebuild 2922 RMD160 3e4c4516f52f0522672a3d55c5d9b9886b2e068a SHA1 305afe5b3aeee5d71451d3fedac2c37e36d7b927 SHA256 926e9215b2ebacc2f39e2b0c4f5196df6502650aebac7f33d74aa23478d6860c
-MISC ChangeLog 22225 RMD160 321cea84b01cb1046b0b03a9d4c304589b2d69a0 SHA1 859257963f2271626b67eff8a27a8962a26599b1 SHA256 b812fc5278137ba4b6d353d4c3b53c3db9a7b843035231d47c4a332a04766a88
+EBUILD wesnoth-1.6.5.ebuild 2597 RMD160 c7c79698115547087ef5a87c85337503912b2263 SHA1 3495fc361d214db98faff4a0e3adb3bce64b5c79 SHA256 d85f60c43de30810ba10ef2036996efc93016838680d3d4811d163cf108e51d4
+EBUILD wesnoth-1.7.15.ebuild 2925 RMD160 7625a20ba9d304de5715c25a2c8c0e60d99d320e SHA1 ca2997df40a8345fa5bae84ce7bfdf1e5fa65d8e SHA256 878b6ac382bb780336efc4d8a4d87a88b6f783aaa51da0be2cbc899aeaa67768
+MISC ChangeLog 22356 RMD160 55c4f192af42166414e260d9fb931e579c42a9e9 SHA1 30f74d921e504973e33ad90adf2fec7572fec36d SHA256 a9344b4191a6bf54fd70394ac8f925c7afcbbd28aa0c5d43b5b05f1933590614
 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5

diff --git a/games-strategy/wesnoth/wesnoth-1.6.5.ebuild b/games-strategy/wesnoth/wesnoth-1.6.5.ebuild
index 54394adcd9f9cc43b91d48c1c10a87f767fe648e..48feb970fa309ffa76b79c810d8fddbfc150ac37 100644 (file)
--- a/games-strategy/wesnoth/wesnoth-1.6.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.6.5.ebuild,v 1.5 2009/12/31 14:28:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.6.5.ebuild,v 1.6 2010/03/16 16:19:44 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -50,32 +50,34 @@ src_configure() {
                append-flags -fno-stack-protector
        fi
        if use dedicated || use server ; then
-               mycmakeargs="${mycmakeargs}
-                       -DENABLE_CAMPAIGN_SERVER=TRUE
-                       -DENABLE_SERVER=TRUE
-                       -DSERVER_UID=${GAMES_USER_DED}
-                       -DSERVER_GID=${GAMES_GROUP}
-                       -DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+               mycmakeargs=(
+                       "-DENABLE_CAMPAIGN_SERVER=TRUE"
+                       "-DENABLE_SERVER=TRUE"
+                       "-DSERVER_UID=${GAMES_USER_DED}"
+                       "-DSERVER_GID=${GAMES_GROUP}"
+                       "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+                       )
        else
-               mycmakeargs="${mycmakeargs}
-                       -DENABLE_CAMPAIGN_SERVER=FALSE
-                       -DENABLE_SERVER=FALSE"
+               mycmakeargs=(
+                       "-DENABLE_CAMPAIGN_SERVER=FALSE"
+                       "-DENABLE_SERVER=FALSE"
+                       )
        fi
-       mycmakeargs="
-               ${mycmakeargs}
+       mycmakeargs+=(
                $(cmake-utils_use_enable !dedicated GAME)
                $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
                $(cmake-utils_use_enable nls NLS)
-               -DGUI=$(use tinygui && echo tiny || echo normal)
-               -DENABLE_FRIBIDI=FALSE
-               -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
-               -DPREFERENCES_DIR=.wesnoth
-               -DDATAROOTDIR=${GAMES_DATADIR}
-               -DBINDIR=${GAMES_BINDIR}
-               -DICONDIR=/usr/share/pixmaps
-               -DDESKTOPDIR=/usr/share/applications
-               -DMANDIR=/usr/share/man
-               -DDOCDIR=/usr/share/doc/${PF}"
+               "-DGUI=$(use tinygui && echo tiny || echo normal)"
+               "-DENABLE_FRIBIDI=FALSE"
+               "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+               "-DPREFERENCES_DIR=.wesnoth"
+               "-DDATAROOTDIR=${GAMES_DATADIR}"
+               "-DBINDIR=${GAMES_BINDIR}"
+               "-DICONDIR=/usr/share/pixmaps"
+               "-DDESKTOPDIR=/usr/share/applications"
+               "-DMANDIR=/usr/share/man"
+               "-DDOCDIR=/usr/share/doc/${PF}"
+               )
        cmake-utils_src_configure
 }
 

diff --git a/games-strategy/wesnoth/wesnoth-1.7.15.ebuild b/games-strategy/wesnoth/wesnoth-1.7.15.ebuild
index 5f598e97408509d188b0d51a4e8be5bb610debc0..73d9dabbd5926b1875ce1da0d393bb2a7a354349 100644 (file)
--- a/games-strategy/wesnoth/wesnoth-1.7.15.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.7.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.7.15.ebuild,v 1.1 2010/03/15 02:47:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.7.15.ebuild,v 1.2 2010/03/16 16:19:44 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils toolchain-funcs flag-o-matic games
@@ -65,34 +65,36 @@ src_configure() {
                append-flags -fno-stack-protector
        fi
        if use dedicated || use server ; then
-               mycmakeargs="${mycmakeargs}
-                       -DENABLE_CAMPAIGN_SERVER=TRUE
-                       -DENABLE_SERVER=TRUE
-                       -DSERVER_UID=${GAMES_USER_DED}
-                       -DSERVER_GID=${GAMES_GROUP}
-                       -DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+               mycmakeargs=(
+                       "-DENABLE_CAMPAIGN_SERVER=TRUE"
+                       "-DENABLE_SERVER=TRUE"
+                       "-DSERVER_UID=${GAMES_USER_DED}"
+                       "-DSERVER_GID=${GAMES_GROUP}"
+                       "-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+                       )
        else
-               mycmakeargs="${mycmakeargs}
-                       -DENABLE_CAMPAIGN_SERVER=FALSE
-                       -DENABLE_SERVER=FALSE"
+               mycmakeargs=(
+                       "-DENABLE_CAMPAIGN_SERVER=FALSE"
+                       "-DENABLE_SERVER=FALSE"
+                       )
        fi
-       mycmakeargs="
-               ${mycmakeargs}
+       mycmakeargs+=(
                $(cmake-utils_use_enable !dedicated GAME)
                $(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
                $(cmake-utils_use_enable nls NLS)
                $(cmake-utils_use_enable dbus NOTIFICATIONS)
-               -DGUI=$(use tinygui && echo tiny || echo normal)
-               -DENABLE_FRIBIDI=FALSE
-               -DENABLE_STRICT_COMPILATION=FALSE
-               -DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
-               -DPREFERENCES_DIR=.wesnoth
-               -DDATAROOTDIR=${GAMES_DATADIR}
-               -DBINDIR=${GAMES_BINDIR}
-               -DICONDIR=/usr/share/pixmaps
-               -DDESKTOPDIR=/usr/share/applications
-               -DMANDIR=/usr/share/man
-               -DDOCDIR=/usr/share/doc/${PF}"
+               "-DGUI=$(use tinygui && echo tiny || echo normal)"
+               "-DENABLE_FRIBIDI=FALSE"
+               "-DENABLE_STRICT_COMPILATION=FALSE"
+               "-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+               "-DPREFERENCES_DIR=.wesnoth"
+               "-DDATAROOTDIR=${GAMES_DATADIR}"
+               "-DBINDIR=${GAMES_BINDIR}"
+               "-DICONDIR=/usr/share/pixmaps"
+               "-DDESKTOPDIR=/usr/share/applications"
+               "-DMANDIR=/usr/share/man"
+               "-DDOCDIR=/usr/share/doc/${PF}"
+               )
        cmake-utils_src_configure
 }