Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-simulation/simutrans/, games-simulation/simutrans/files/
Date: Fri, 01 Apr 2016 02:45:57
Message-Id: 1459478675.8f4dbb0f3ee942b078562276e972fd959c4a37c2.mr_bones_@gentoo
1 commit: 8f4dbb0f3ee942b078562276e972fd959c4a37c2
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 02:44:19 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 02:44:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4dbb0f
7
8 games-simulation/simutrans: version bump
9
10 Package-Manager: portage-2.2.26
11
12 games-simulation/simutrans/Manifest | 2 +
13 .../files/simutrans-0.120.1.3-Makefile.patch | 89 ++++++++++++++++++++++
14 .../simutrans/simutrans-0.120.1.3.ebuild | 54 +++++++++++++
15 3 files changed, 145 insertions(+)
16
17 diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
18 index 03971e0..5ddd2b6 100644
19 --- a/games-simulation/simutrans/Manifest
20 +++ b/games-simulation/simutrans/Manifest
21 @@ -1,2 +1,4 @@
22 DIST simupak64-120-0-1.zip 4051769 SHA256 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78 SHA512 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc WHIRLPOOL 5ae84653b5a138b5a987b7ca6512994f3ba8dff48fffbb94f6fe0bf4845d5537e93734f73174eb328f20b6c9986235ae6c461c55b5efde53a4b81620a3b1da83
23 +DIST simupak64-120-1-2.zip 4308534 SHA256 125fa5c13a51bb0630ca651fddb8af06a823e8c4d4638bfa1bb2d89e92cc1d54 SHA512 ddc75ad1cafa23d9a7387dc38b14de7414ea7c8bb7caa2afde6d8cdf9c3f5251719966b2274c5bc4ecc9915ec764d517e24b79d5ef199904e3d9185214cba129 WHIRLPOOL 4f91de57be620849f2a278df5510ea390d737a4f063dc659ed2d5f488ce0e631b1c15d6282554574b89316b3b968e4b850db8764b24b714df1a3c5e642e34907
24 DIST simutrans-src-120-0-1.zip 3909005 SHA256 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683 SHA512 6f32b6f1c12f45125de8a12c4a034387a784e21fd8cdedcf7b1daefd9174d9a94825e8f68effa2ff1436cce2e2bc8cb5707161f3fa004185ae158400840dc450 WHIRLPOOL 36155184f5806a9cfab742f26e3fc78d5d7d928f99cddabbaf36c7c90d065dab02bb174c07d9633958f8b891b0db8cc5c94e45fd4f22d917b9a037c51a99b69a
25 +DIST simutrans-src-120-1-3.zip 3447115 SHA256 2d29b849fc39d25a0580091e1377270bddb2cae36c0fc32bd7c2d0f1d7ccfb84 SHA512 ae31dda7bdbd057aaf9c40914eb7ec0c60b21d2790d1ca12aa8db698cd112043a291934f6f460b1d5a8a1984b7defb4a0c4bc9839c81c674834062cc1e49c8bd WHIRLPOOL 273aa58b6e6d7e53a67e092ff5d0a4ef9f00ef3c96bdaf8393a01511c8b655956085f6c94a3f74ab5eeffbe312a4d3d9596a4cfbef57a7053ddd7a1f4d4fbd1d
26
27 diff --git a/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
28 new file mode 100644
29 index 0000000..d1ff41f
30 --- /dev/null
31 +++ b/games-simulation/simutrans/files/simutrans-0.120.1.3-Makefile.patch
32 @@ -0,0 +1,89 @@
33 +--- Makefile.orig
34 ++++ Makefile
35 +@@ -81,8 +81,6 @@
36 + ifeq ($(findstring $(OSTYPE), amiga haiku mac),)
37 + CFLAGS += -minline-all-stringops
38 + endif
39 +-else
40 +- CFLAGS += -O
41 + endif
42 +
43 + ifdef DEBUG
44 +@@ -101,6 +99,7 @@
45 + endif
46 + else
47 + CFLAGS += -DNDEBUG
48 ++ CXXFLAGS += -DNDEBUG
49 + endif
50 +
51 + ifneq ($(PROFILE),)
52 +@@ -114,6 +113,7 @@
53 + ifneq ($(MULTI_THREAD),)
54 + ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
55 + CFLAGS += -DMULTI_THREAD
56 ++ CXXFLAGS += -DMULTI_THREAD
57 + ifeq ($(OSTYPE),mingw)
58 + #use lpthreadGC2d for debug alternatively
59 + LDFLAGS += -lpthreadGC2
60 +@@ -132,11 +132,13 @@
61 + endif
62 + ifneq ($(REV),)
63 + CFLAGS += -DREVISION="$(REV)"
64 ++ CXXFLAGS += -DREVISION="$(REV)"
65 + endif
66 + endif
67 + endif
68 +
69 + CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
70 ++CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
71 + CCFLAGS += -Wstrict-prototypes
72 +
73 +
74 +@@ -492,6 +494,7 @@
75 + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
76 + endif
77 + CFLAGS += $(SDL_CFLAGS)
78 ++ CXXFLAGS += $(SDL_CFLAGS)
79 + LIBS += $(SDL_LDFLAGS)
80 + endif
81 +
82 +@@ -523,6 +526,7 @@
83 + SDL_LDFLAGS := $(shell $(SDL2_CONFIG) --libs)
84 + endif
85 + CFLAGS += $(SDL_CFLAGS)
86 ++ CXXFLAGS += $(SDL_CFLAGS)
87 + LIBS += $(SDL_LDFLAGS)
88 + endif
89 +
90 +@@ -538,6 +542,7 @@
91 + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
92 + endif
93 + CFLAGS += $(SDL_CFLAGS)
94 ++ CXXFLAGS += $(SDL_CFLAGS)
95 + LIBS += $(SDL_LDFLAGS) -lSDL_mixer
96 + endif
97 +
98 +@@ -564,6 +569,7 @@
99 + SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
100 + endif
101 + CFLAGS += $(SDL_CFLAGS)
102 ++ CXXFLAGS += $(SDL_CFLAGS)
103 + LIBS += $(SDL_LDFLAGS) -lglew32
104 + ifeq ($(OSTYPE),mingw)
105 + LIBS += -lopengl32
106 +@@ -579,6 +585,7 @@
107 + endif
108 +
109 + CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
110 ++CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
111 +
112 + ifneq ($(findstring $(OSTYPE), cygwin mingw),)
113 + SOURCES += simres.rc
114 +@@ -586,7 +593,6 @@
115 + endif
116 +
117 + CCFLAGS += $(CFLAGS)
118 +-CXXFLAGS += $(CFLAGS)
119 +
120 + BUILDDIR ?= build/$(CFG)
121 + PROGDIR ?= $(BUILDDIR)
122
123 diff --git a/games-simulation/simutrans/simutrans-0.120.1.3.ebuild b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
124 new file mode 100644
125 index 0000000..85f6186
126 --- /dev/null
127 +++ b/games-simulation/simutrans/simutrans-0.120.1.3.ebuild
128 @@ -0,0 +1,54 @@
129 +# Copyright 1999-2016 Gentoo Foundation
130 +# Distributed under the terms of the GNU General Public License v2
131 +# $Id$
132 +
133 +EAPI=5
134 +inherit flag-o-matic eutils games
135 +
136 +MY_PV=${PV/0./}
137 +MY_PV=${MY_PV//./-}
138 +DESCRIPTION="A free Transport Tycoon clone"
139 +HOMEPAGE="http://www.simutrans.com/"
140 +SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
141 + mirror://sourceforge/simutrans/simupak64-${MY_PV/3/2}.zip" #FIXME: rev bump when .3 is released
142 +
143 +LICENSE="Artistic"
144 +SLOT="0"
145 +KEYWORDS="-* ~amd64 ~x86"
146 +IUSE=""
147 +
148 +RDEPEND="media-libs/libsdl[sound,video]
149 + sys-libs/zlib
150 + app-arch/bzip2
151 + media-libs/libpng:0
152 + media-libs/sdl-mixer"
153 +DEPEND="${RDEPEND}
154 + app-arch/unzip"
155 +
156 +S=${WORKDIR}
157 +
158 +src_prepare() {
159 + strip-flags # bug #293927
160 + echo "BACKEND=mixer_sdl
161 +COLOUR_DEPTH=16
162 +OSTYPE=linux
163 +VERBOSE=1" > config.default || die
164 +
165 + # make it look in the install location for the data
166 + sed -i \
167 + -e "s:argv\[0\]:\"${GAMES_DATADIR}/${PN}/\":" \
168 + simmain.cc || die
169 +
170 + epatch "${FILESDIR}"/${P}-Makefile.patch
171 + rm -f simutrans/{simutrans,*.txt}
172 +}
173 +
174 +src_install() {
175 + newgamesbin build/default/sim ${PN}
176 + insinto "${GAMES_DATADIR}"/${PN}
177 + doins -r simutrans/*
178 + dodoc documentation/*
179 + doicon simutrans.ico
180 + make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
181 + prepgamesdirs
182 +}