From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27CA8138334 for ; Fri, 14 Sep 2018 07:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBE06E0E1A; Fri, 14 Sep 2018 07:06:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9231E0E1A for ; Fri, 14 Sep 2018 07:06:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20EDE335CEB for ; Fri, 14 Sep 2018 07:06:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 68B573D6 for ; Fri, 14 Sep 2018 07:06:13 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1536908767.0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/freeciv/Manifest games-strategy/freeciv/freeciv-2.6.0.ebuild games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild X-VCS-Directories: games-strategy/freeciv/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817 X-VCS-Branch: master Date: Fri, 14 Sep 2018 07:06:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbc2bdf9-3179-4f25-9140-9e00f67ead7e X-Archives-Hash: 826448448fbdb7218ba13ab806bcbdab commit: 0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817 Author: Lars Wendler gentoo org> AuthorDate: Fri Sep 14 07:05:37 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Sep 14 07:06:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f842e1c games-strategy/freeciv: Bump to version 2.6.0. Removed old. Package-Manager: Portage-2.3.49, Repoman-2.3.10 games-strategy/freeciv/Manifest | 2 +- ...eeciv-2.6.0_rc2.ebuild => freeciv-2.6.0.ebuild} | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 2fd784292d5..b5c5d316432 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,2 +1,2 @@ DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456 -DIST freeciv-2.6.0-RC2.tar.bz2 51828653 BLAKE2B 87e83e23cb1cec91e408415a5c0b7f4f2fc438f239ca48ba4e713b89c8624fdd58c1888ff53119196085b1f7f2c663af91df4af9c789c3238465f887758bf09f SHA512 254e492bb2ece390bcdb6c7ec9151b812811e7a1bff72eea4a9179a97c865d754436c5a02de2acb1ccf86850e1dd7db1218a84b836d18400217813d0c0ae173c +DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8 diff --git a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild b/games-strategy/freeciv/freeciv-2.6.0.ebuild similarity index 92% rename from games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild rename to games-strategy/freeciv/freeciv-2.6.0.ebuild index 54306880240..5df947c98b8 100644 --- a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild +++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild @@ -89,23 +89,23 @@ src_prepare() { } src_configure() { - local myclient mydatabase myeconfargs + local myclient=() mydatabase=() myeconfargs=() if use auth ; then if ! use mysql && ! use sqlite ; then einfo "No database backend chosen, defaulting" einfo "to mysql!" - mydatabase=mysql + mydatabase=( mysql ) else - use mysql && mydatabase+=" mysql" - use sqlite && mydatabase+=" sqlite3" + use mysql && mydatabase+=( mysql ) + use sqlite && mydatabase+=( sqlite3 ) fi else - mydatabase=no + mydatabase=( no ) fi if use dedicated ; then - myclient="no" + myclient=( no ) myeconfargs+=( --enable-server --enable-freeciv-manual=html @@ -114,12 +114,12 @@ src_configure() { if use !sdl && use !gtk && ! use qt5 ; then einfo "No client backend given, defaulting to" einfo "gtk2 client!" - myclient="gtk2" + myclient=( gtk2 ) else - use sdl && myclient+=" sdl2" - use gtk && myclient+=" gtk2" + use sdl && myclient+=( sdl2 ) + use gtk && myclient+=( gtk2 ) if use qt5 ; then - myclient+=" qt" + myclient+=( qt ) append-cxxflags -std=c++11 fi fi @@ -131,8 +131,8 @@ src_configure() { myeconfargs+=( --enable-aimodules="$(usex aimodules "yes" "no")" - --enable-client="${myclient}" - --enable-fcdb="${mydatabase}" + --enable-client="${myclient[*]}" + --enable-fcdb="${mydatabase[*]}" --enable-fcmp="$(usex modpack "gtk2" "no")" # disabling shared libs will break aimodules USE flag --enable-shared