1 |
commit: 646c2153d2ca776aea214b6962b89046078156a7 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 4 06:03:18 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 4 06:03:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646c2153 |
7 |
|
8 |
games-strategy/freeciv: Bump to versions 2.5.10 and 2.6.0_beta2 |
9 |
|
10 |
Removed old. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/646266 |
13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
14 |
|
15 |
games-strategy/freeciv/Manifest | 3 +- |
16 |
...iv-2.6.0_beta1.ebuild => freeciv-2.5.10.ebuild} | 37 ++++++++-------------- |
17 |
...6.0_beta1.ebuild => freeciv-2.6.0_beta2.ebuild} | 2 +- |
18 |
3 files changed, 17 insertions(+), 25 deletions(-) |
19 |
|
20 |
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest |
21 |
index e6798cd6bd2..1abf5589715 100644 |
22 |
--- a/games-strategy/freeciv/Manifest |
23 |
+++ b/games-strategy/freeciv/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
+DIST freeciv-2.5.10.tar.bz2 40920632 BLAKE2B 1fb6d3d8130088c818ffe95c68a4061732278da8b7e477347cc67e7cc770526a65006844db0d3ecdb462a903fb5589d18666ffe6c9262956bf30fbc0c79742e5 SHA512 198ea42af083ebbfc4d79cbcbc9fc2dd548c92581301d77fd9cff0e2addc7b7255090471dc52aceb966320958b3a4c542615d5ec91a114dfc805fe993864a6f5 |
26 |
DIST freeciv-2.5.9.tar.bz2 41176249 BLAKE2B d590318e8f03c726fd36714751ed666574951bf988a37b1ee6527a07dcdf4e637cfa525c2ecdf83d537fefdc4c3fd4a3db2c0e037424825af6d1c38f009293c9 SHA512 e8002dc2d0c313ec34d6245f69bf8cc9ed4f98a826d9f564e21cbca379529f6060b8efb3453ec38cb2c7efd222a4aea04033c3ff84b191271ba0af5b770c7677 |
27 |
-DIST freeciv-2.6.0-beta1.tar.bz2 51744941 BLAKE2B e9d25aee0b13c189ff3a0c6a94c8925075fb7da22f40308db5db8d3bec580f46179228bd278279f0aa1d2fff606913af94ed1b25ae4d51f677f98738a056fb97 SHA512 5e70239e375710ec61f69f6daaa62d1c6881df3f5ddb2905229e2c0cec5cad9ce33688693580b2a24aa5aff79471cda4dbef4f9d51df34bd491b5284b12782e5 |
28 |
+DIST freeciv-2.6.0-beta2.tar.bz2 51503051 BLAKE2B 45bf863a530d726261670cbdcd16daefeecaa72e3f090d98d274baa0cd52f3cd0dd1807d660863c822a2dafd170ad51a6b45d756c43aaf6e95e70c74460ce90b SHA512 e92411f43192dc28bcd492f7e78f455cbc18264c7720dd8d35eb86fcc6da5e3927d79751bd1cd6f88d2904283c0844910415df5d7e36d0b9b76ab5fe3c872976 |
29 |
|
30 |
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.5.10.ebuild |
31 |
similarity index 86% |
32 |
copy from games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild |
33 |
copy to games-strategy/freeciv/freeciv-2.5.10.ebuild |
34 |
index 4fc0202df50..b235bb640ff 100644 |
35 |
--- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild |
36 |
+++ b/games-strategy/freeciv/freeciv-2.5.10.ebuild |
37 |
@@ -1,16 +1,15 @@ |
38 |
-# Copyright 1999-2017 Gentoo Foundation |
39 |
+# Copyright 1999-2018 Gentoo Foundation |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
|
42 |
EAPI=6 |
43 |
-inherit flag-o-matic gnome2-utils ltprune xdg-utils |
44 |
+inherit eutils flag-o-matic gnome2-utils |
45 |
|
46 |
DESCRIPTION="multiplayer strategy game (Civilization Clone)" |
47 |
HOMEPAGE="http://www.freeciv.org/" |
48 |
-SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2" |
49 |
+SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2" |
50 |
|
51 |
LICENSE="GPL-2+" |
52 |
SLOT="0" |
53 |
-[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \ |
54 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
55 |
IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" |
56 |
|
57 |
@@ -38,19 +37,19 @@ RDEPEND="app-arch/bzip2 |
58 |
dev-qt/qtwidgets:5 |
59 |
) |
60 |
sdl? ( |
61 |
- media-libs/libsdl2[video] |
62 |
- media-libs/sdl2-gfx |
63 |
- media-libs/sdl2-image[png] |
64 |
- media-libs/sdl2-ttf |
65 |
+ media-libs/libsdl[video] |
66 |
+ media-libs/sdl-gfx |
67 |
+ media-libs/sdl-image[png] |
68 |
+ media-libs/sdl-ttf |
69 |
) |
70 |
server? ( aimodules? ( sys-devel/libtool:2 ) ) |
71 |
sound? ( |
72 |
- media-libs/libsdl2[sound] |
73 |
- media-libs/sdl2-mixer[vorbis] |
74 |
+ media-libs/libsdl[sound] |
75 |
+ media-libs/sdl-mixer[vorbis] |
76 |
) |
77 |
!sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) |
78 |
) |
79 |
- system-lua? ( >=dev-lang/lua-5.3 )" |
80 |
+ system-lua? ( >=dev-lang/lua-5.2 )" |
81 |
DEPEND="${RDEPEND} |
82 |
virtual/pkgconfig |
83 |
!dedicated? ( |
84 |
@@ -58,8 +57,6 @@ DEPEND="${RDEPEND} |
85 |
nls? ( sys-devel/gettext ) |
86 |
)" |
87 |
|
88 |
-S="${WORKDIR}/${P/_/-}" |
89 |
- |
90 |
pkg_setup() { |
91 |
if use !dedicated && use !server ; then |
92 |
ewarn "Disabling server USE flag will make it impossible" |
93 |
@@ -102,27 +99,21 @@ src_configure() { |
94 |
|
95 |
if use dedicated ; then |
96 |
myclient="no" |
97 |
- myeconfargs+=( |
98 |
- --enable-server |
99 |
- --enable-freeciv-manual=html |
100 |
- ) |
101 |
+ myeconfargs+=( --enable-server ) |
102 |
else |
103 |
if use !sdl && use !gtk && ! use qt5 ; then |
104 |
einfo "No client backend given, defaulting to" |
105 |
einfo "gtk2 client!" |
106 |
myclient="gtk2" |
107 |
else |
108 |
- use sdl && myclient+=" sdl2" |
109 |
+ use sdl && myclient+=" sdl" |
110 |
use gtk && myclient+=" gtk2" |
111 |
if use qt5 ; then |
112 |
myclient+=" qt" |
113 |
append-cxxflags -std=c++11 |
114 |
fi |
115 |
fi |
116 |
- myeconfargs+=( |
117 |
- $(use_enable server) |
118 |
- $(use_enable server freeciv-manual html ) |
119 |
- ) |
120 |
+ myeconfargs+=( $(use_enable server) --without-ggz-client ) |
121 |
fi |
122 |
|
123 |
myeconfargs+=( |
124 |
@@ -158,7 +149,7 @@ src_install() { |
125 |
# something like that, but then it's a PITA to avoid orphan files... |
126 |
./tools/freeciv-manual || die |
127 |
docinto html |
128 |
- dodoc classic*.html |
129 |
+ dodoc manual*.html |
130 |
fi |
131 |
if use sdl ; then |
132 |
make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client |
133 |
|
134 |
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild |
135 |
similarity index 99% |
136 |
rename from games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild |
137 |
rename to games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild |
138 |
index 4fc0202df50..85687658671 100644 |
139 |
--- a/games-strategy/freeciv/freeciv-2.6.0_beta1.ebuild |
140 |
+++ b/games-strategy/freeciv/freeciv-2.6.0_beta2.ebuild |
141 |
@@ -1,4 +1,4 @@ |
142 |
-# Copyright 1999-2017 Gentoo Foundation |
143 |
+# Copyright 1999-2018 Gentoo Foundation |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
|
146 |
EAPI=6 |