Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeciv/
Date: Fri, 14 Sep 2018 07:06:18
Message-Id: 1536908767.0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817.polynomial-c@gentoo
1 commit: 0f842e1cb96d0c7677f0fa9cffdda4b49d8bc817
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 14 07:05:37 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 14 07:06:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f842e1c
7
8 games-strategy/freeciv: Bump to version 2.6.0. Removed old.
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 games-strategy/freeciv/Manifest | 2 +-
13 ...eeciv-2.6.0_rc2.ebuild => freeciv-2.6.0.ebuild} | 24 +++++++++++-----------
14 2 files changed, 13 insertions(+), 13 deletions(-)
15
16 diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
17 index 2fd784292d5..b5c5d316432 100644
18 --- a/games-strategy/freeciv/Manifest
19 +++ b/games-strategy/freeciv/Manifest
20 @@ -1,2 +1,2 @@
21 DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
22 -DIST freeciv-2.6.0-RC2.tar.bz2 51828653 BLAKE2B 87e83e23cb1cec91e408415a5c0b7f4f2fc438f239ca48ba4e713b89c8624fdd58c1888ff53119196085b1f7f2c663af91df4af9c789c3238465f887758bf09f SHA512 254e492bb2ece390bcdb6c7ec9151b812811e7a1bff72eea4a9179a97c865d754436c5a02de2acb1ccf86850e1dd7db1218a84b836d18400217813d0c0ae173c
23 +DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
24
25 diff --git a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild b/games-strategy/freeciv/freeciv-2.6.0.ebuild
26 similarity index 92%
27 rename from games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
28 rename to games-strategy/freeciv/freeciv-2.6.0.ebuild
29 index 54306880240..5df947c98b8 100644
30 --- a/games-strategy/freeciv/freeciv-2.6.0_rc2.ebuild
31 +++ b/games-strategy/freeciv/freeciv-2.6.0.ebuild
32 @@ -89,23 +89,23 @@ src_prepare() {
33 }
34
35 src_configure() {
36 - local myclient mydatabase myeconfargs
37 + local myclient=() mydatabase=() myeconfargs=()
38
39 if use auth ; then
40 if ! use mysql && ! use sqlite ; then
41 einfo "No database backend chosen, defaulting"
42 einfo "to mysql!"
43 - mydatabase=mysql
44 + mydatabase=( mysql )
45 else
46 - use mysql && mydatabase+=" mysql"
47 - use sqlite && mydatabase+=" sqlite3"
48 + use mysql && mydatabase+=( mysql )
49 + use sqlite && mydatabase+=( sqlite3 )
50 fi
51 else
52 - mydatabase=no
53 + mydatabase=( no )
54 fi
55
56 if use dedicated ; then
57 - myclient="no"
58 + myclient=( no )
59 myeconfargs+=(
60 --enable-server
61 --enable-freeciv-manual=html
62 @@ -114,12 +114,12 @@ src_configure() {
63 if use !sdl && use !gtk && ! use qt5 ; then
64 einfo "No client backend given, defaulting to"
65 einfo "gtk2 client!"
66 - myclient="gtk2"
67 + myclient=( gtk2 )
68 else
69 - use sdl && myclient+=" sdl2"
70 - use gtk && myclient+=" gtk2"
71 + use sdl && myclient+=( sdl2 )
72 + use gtk && myclient+=( gtk2 )
73 if use qt5 ; then
74 - myclient+=" qt"
75 + myclient+=( qt )
76 append-cxxflags -std=c++11
77 fi
78 fi
79 @@ -131,8 +131,8 @@ src_configure() {
80
81 myeconfargs+=(
82 --enable-aimodules="$(usex aimodules "yes" "no")"
83 - --enable-client="${myclient}"
84 - --enable-fcdb="${mydatabase}"
85 + --enable-client="${myclient[*]}"
86 + --enable-fcdb="${mydatabase[*]}"
87 --enable-fcmp="$(usex modpack "gtk2" "no")"
88 # disabling shared libs will break aimodules USE flag
89 --enable-shared