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: Wed, 19 Feb 2020 12:49:45
Message-Id: 1582116577.510bc3d8e3dc1c88f39e1c57a0edaf3c5678ad19.polynomial-c@gentoo
1 commit: 510bc3d8e3dc1c88f39e1c57a0edaf3c5678ad19
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 19 12:49:15 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 19 12:49:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510bc3d8
7
8 games-strategy/freeciv: Removed old
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 games-strategy/freeciv/Manifest | 2 -
14 games-strategy/freeciv/freeciv-2.5.11-r1.ebuild | 183 -----------------------
15 games-strategy/freeciv/freeciv-2.6.0-r1.ebuild | 184 ------------------------
16 3 files changed, 369 deletions(-)
17
18 diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
19 index 75bf4a2b689..1e0f51f78f2 100644
20 --- a/games-strategy/freeciv/Manifest
21 +++ b/games-strategy/freeciv/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
24 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d
25 -DIST freeciv-2.6.0.tar.bz2 51912466 BLAKE2B 180fa8900af6763ecae9190ce24799a77b8504d98081e48600c16c19e814b2ff1ef01ce6a41cb1a1739f848895e1551ba158f0357602f758e76b9ee6e0104a36 SHA512 658f05ed32a2045eeeadd1e12f88df927378f8032292e709af78f24c2dbc6019ba45ce67e4fe24001a9e70756c68126a313607a81e7009270ad255d7c9fe75d8
26 DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b10000bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b SHA512 44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
27 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3
28
29 diff --git a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild b/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
30 deleted file mode 100644
31 index 6428dc82064..00000000000
32 --- a/games-strategy/freeciv/freeciv-2.5.11-r1.ebuild
33 +++ /dev/null
34 @@ -1,183 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit autotools eutils flag-o-matic gnome2-utils ltprune
40 -
41 -DESCRIPTION="multiplayer strategy game (Civilization Clone)"
42 -HOMEPAGE="http://www.freeciv.org/"
43 -SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
44 -
45 -LICENSE="GPL-2+"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~ppc64 ~x86"
48 -IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
49 -
50 -# postgres isn't yet really supported by upstream
51 -RDEPEND="app-arch/bzip2
52 - app-arch/xz-utils
53 - net-misc/curl
54 - sys-libs/zlib
55 - auth? (
56 - mysql? ( dev-db/mysql-connector-c:0= )
57 - sqlite? ( dev-db/sqlite:3 )
58 - !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
59 - )
60 - readline? ( sys-libs/readline:0= )
61 - dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
62 - !dedicated? (
63 - media-libs/libpng:0
64 - gtk? ( x11-libs/gtk+:2 )
65 - mapimg? ( media-gfx/imagemagick:= )
66 - modpack? ( x11-libs/gtk+:2 )
67 - nls? ( virtual/libintl )
68 - qt5? (
69 - dev-qt/qtcore:5
70 - dev-qt/qtgui:5
71 - dev-qt/qtwidgets:5
72 - )
73 - sdl? (
74 - media-libs/libsdl[video]
75 - media-libs/sdl-gfx
76 - media-libs/sdl-image[png]
77 - media-libs/sdl-ttf
78 - )
79 - server? ( aimodules? ( sys-devel/libtool:2 ) )
80 - sound? (
81 - media-libs/libsdl[sound]
82 - media-libs/sdl-mixer[vorbis]
83 - )
84 - !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
85 - )
86 - system-lua? ( >=dev-lang/lua-5.2 )"
87 -DEPEND="${RDEPEND}
88 - virtual/pkgconfig
89 - !dedicated? (
90 - x11-base/xorg-proto
91 - nls? ( sys-devel/gettext )
92 - )"
93 -
94 -PATCHES=(
95 - "${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
96 -)
97 -
98 -pkg_setup() {
99 - if use !dedicated && use !server ; then
100 - ewarn "Disabling server USE flag will make it impossible"
101 - ewarn "to start local games, but you will still be able to"
102 - ewarn "join multiplayer games."
103 - fi
104 -}
105 -
106 -src_prepare() {
107 - default
108 -
109 - eautoreconf
110 -
111 - # install the .desktop in /usr/share/applications
112 - # install the icons in /usr/share/pixmaps
113 - sed -i \
114 - -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
115 - -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
116 - -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
117 - client/Makefile.in \
118 - server/Makefile.in \
119 - tools/Makefile.in \
120 - data/icons/Makefile.in || die
121 - sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
122 -}
123 -
124 -src_configure() {
125 - local myclient mydatabase myeconfargs
126 -
127 - if use auth ; then
128 - if ! use mysql && ! use sqlite ; then
129 - einfo "No database backend chosen, defaulting"
130 - einfo "to mysql!"
131 - mydatabase=mysql
132 - else
133 - use mysql && mydatabase+=" mysql"
134 - use sqlite && mydatabase+=" sqlite3"
135 - fi
136 - else
137 - mydatabase=no
138 - fi
139 -
140 - if use dedicated ; then
141 - myclient="no"
142 - myeconfargs+=( --enable-server )
143 - else
144 - if use !sdl && use !gtk && ! use qt5 ; then
145 - einfo "No client backend given, defaulting to"
146 - einfo "gtk2 client!"
147 - myclient="gtk2"
148 - else
149 - use sdl && myclient+=" sdl"
150 - use gtk && myclient+=" gtk2"
151 - if use qt5 ; then
152 - myclient+=" qt"
153 - append-cxxflags -std=c++11
154 - fi
155 - fi
156 - myeconfargs+=( $(use_enable server) --without-ggz-client )
157 - fi
158 -
159 - myeconfargs+=(
160 - --enable-aimodules="$(usex aimodules "yes" "no")"
161 - --enable-client="${myclient}"
162 - --enable-fcdb="${mydatabase}"
163 - --enable-fcmp="$(usex modpack "gtk2" "no")"
164 - # disabling shared libs will break aimodules USE flag
165 - --enable-shared
166 - --localedir=/usr/share/locale
167 - $(use_enable ipv6)
168 - $(use_enable mapimg)
169 - $(use_enable nls)
170 - $(use_enable sound sdl-mixer)
171 - $(use_enable system-lua sys-lua)
172 - $(use_with readline)
173 - )
174 - econf "${myeconfargs[@]}"
175 -}
176 -
177 -src_install() {
178 - default
179 -
180 - if use dedicated ; then
181 - rm -rf "${ED%/}/usr/share/pixmaps"
182 - rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
183 - else
184 - if use server ; then
185 - # Create and install the html manual. It can't be done for dedicated
186 - # servers, because the 'freeciv-manual' tool is then not built. Also
187 - # delete freeciv-manual from the GAMES_BINDIR, because it's useless.
188 - # Note: to have it localized, it should be ran from _postinst, or
189 - # something like that, but then it's a PITA to avoid orphan files...
190 - ./tools/freeciv-manual || die
191 - docinto html
192 - dodoc manual*.html
193 - fi
194 - if use sdl ; then
195 - make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
196 - else
197 - rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
198 - fi
199 - rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
200 - fi
201 - find "${ED}" -name "freeciv-manual*" -delete
202 -
203 - rm -f "${ED%/}/usr/$(get_libdir)"/*.a
204 - prune_libtool_files
205 -}
206 -
207 -pkg_preinst() {
208 - gnome2_icon_savelist
209 -}
210 -
211 -pkg_postinst() {
212 - gnome2_icon_cache_update
213 -}
214 -
215 -pkg_postrm() {
216 - gnome2_icon_cache_update
217 -}
218
219 diff --git a/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild b/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
220 deleted file mode 100644
221 index 764443f246c..00000000000
222 --- a/games-strategy/freeciv/freeciv-2.6.0-r1.ebuild
223 +++ /dev/null
224 @@ -1,184 +0,0 @@
225 -# Copyright 1999-2019 Gentoo Authors
226 -# Distributed under the terms of the GNU General Public License v2
227 -
228 -EAPI=7
229 -
230 -MY_PV="${PV/_beta/-beta}"
231 -MY_PV="${MY_PV/_rc/-RC}"
232 -MY_P="${PN}-${MY_PV}"
233 -inherit desktop flag-o-matic xdg
234 -
235 -DESCRIPTION="multiplayer strategy game (Civilization Clone)"
236 -HOMEPAGE="http://www.freeciv.org/"
237 -
238 -if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
239 - SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2"
240 - KEYWORDS="~amd64 ~x86"
241 -fi
242 -
243 -LICENSE="GPL-2+"
244 -SLOT="0"
245 -IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
246 -
247 -# postgres isn't yet really supported by upstream
248 -BDEPEND="
249 - virtual/pkgconfig
250 - !dedicated? (
251 - x11-base/xorg-proto
252 - nls? ( sys-devel/gettext )
253 - )
254 -"
255 -DEPEND="
256 - app-arch/bzip2
257 - app-arch/xz-utils
258 - net-misc/curl
259 - sys-libs/zlib
260 - auth? (
261 - !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) )
262 - mysql? ( dev-db/mysql-connector-c:0= )
263 - sqlite? ( dev-db/sqlite:3 )
264 - )
265 - dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
266 - !dedicated? (
267 - media-libs/libpng:0
268 - gtk? ( x11-libs/gtk+:2 )
269 - mapimg? ( media-gfx/imagemagick:= )
270 - modpack? ( x11-libs/gtk+:2 )
271 - nls? ( virtual/libintl )
272 - qt5? (
273 - dev-qt/qtcore:5
274 - dev-qt/qtgui:5
275 - dev-qt/qtwidgets:5
276 - )
277 - !sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
278 - sdl? (
279 - media-libs/libsdl2[video]
280 - media-libs/sdl2-gfx
281 - media-libs/sdl2-image[png]
282 - media-libs/sdl2-ttf
283 - )
284 - server? ( aimodules? ( sys-devel/libtool:2 ) )
285 - sound? (
286 - media-libs/libsdl2[sound]
287 - media-libs/sdl2-mixer[vorbis]
288 - )
289 - )
290 - readline? ( sys-libs/readline:0= )
291 - system-lua? ( >=dev-lang/lua-5.3:= )
292 -"
293 -RDEPEND="${DEPEND}"
294 -
295 -S="${WORKDIR}/${MY_P}"
296 -
297 -pkg_setup() {
298 - if use !dedicated && use !server ; then
299 - ewarn "Disabling server USE flag will make it impossible"
300 - ewarn "to start local games, but you will still be able to"
301 - ewarn "join multiplayer games."
302 - fi
303 -}
304 -
305 -src_prepare() {
306 - default
307 -
308 - # install the .desktop in /usr/share/applications
309 - # install the icons in /usr/share/pixmaps
310 - sed -i \
311 - -e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
312 - -e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
313 - -e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
314 - client/Makefile.in \
315 - server/Makefile.in \
316 - tools/Makefile.in \
317 - data/icons/Makefile.in || die
318 - sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
319 -}
320 -
321 -src_configure() {
322 - local myclient=() mydatabase=() myeconfargs=()
323 -
324 - if use auth ; then
325 - if ! use mysql && ! use sqlite ; then
326 - einfo "No database backend chosen, defaulting"
327 - einfo "to mysql!"
328 - mydatabase=( mysql )
329 - else
330 - use mysql && mydatabase+=( mysql )
331 - use sqlite && mydatabase+=( sqlite3 )
332 - fi
333 - else
334 - mydatabase=( no )
335 - fi
336 -
337 - if use dedicated ; then
338 - myclient=( no )
339 - myeconfargs+=(
340 - --enable-server
341 - --enable-freeciv-manual=html
342 - )
343 - else
344 - if use !sdl && use !gtk && ! use qt5 ; then
345 - einfo "No client backend given, defaulting to"
346 - einfo "gtk2 client!"
347 - myclient=( gtk2 )
348 - else
349 - use sdl && myclient+=( sdl2 )
350 - use gtk && myclient+=( gtk2 )
351 - if use qt5 ; then
352 - myclient+=( qt )
353 - append-cxxflags -std=c++11
354 - fi
355 - fi
356 - myeconfargs+=(
357 - $(use_enable server)
358 - $(use_enable server freeciv-manual html )
359 - )
360 - fi
361 -
362 - myeconfargs+=(
363 - --enable-aimodules="$(usex aimodules "yes" "no")"
364 - --enable-client="${myclient[*]}"
365 - --enable-fcdb="${mydatabase[*]}"
366 - --enable-fcmp="$(usex modpack "gtk2" "no")"
367 - # disabling shared libs will break aimodules USE flag
368 - --enable-shared
369 - --localedir=/usr/share/locale
370 - $(use_enable ipv6)
371 - $(use_enable mapimg)
372 - $(use_enable nls)
373 - $(use_enable sound sdl-mixer)
374 - $(use_enable system-lua sys-lua)
375 - $(use_with readline)
376 - )
377 - econf "${myeconfargs[@]}"
378 -}
379 -
380 -src_install() {
381 - default
382 -
383 - if use dedicated ; then
384 - rm -rf "${ED}"/usr/share/pixmaps
385 - rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
386 - else
387 - if use server ; then
388 - # Create and install the html manual. It can't be done for dedicated
389 - # servers, because the 'freeciv-manual' tool is then not built. Also
390 - # delete freeciv-manual from the GAMES_BINDIR, because it's useless.
391 - # Note: to have it localized, it should be ran from _postinst, or
392 - # something like that, but then it's a PITA to avoid orphan files...
393 - ./tools/freeciv-manual || die
394 - docinto html
395 - dodoc classic*.html
396 - fi
397 - if use sdl ; then
398 - make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
399 - else
400 - rm -f "${ED}"/usr/share/man/man6/freeciv-sdl*
401 - fi
402 - rm -f "${ED}"/usr/share/man/man6/freeciv-xaw*
403 - fi
404 - find "${ED}" -name "freeciv-manual*" -delete
405 -
406 - rm -f "${ED}/usr/$(get_libdir)"/*.a
407 - find "${ED}" -name "*.la" -delete || die
408 -}