Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@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, 23 Oct 2020 17:13:54
Message-Id: 1603472895.fb75467bcf4b8c308ebbc5b9121a6f42d43680d3.mgorny@gentoo
1 commit: fb75467bcf4b8c308ebbc5b9121a6f42d43680d3
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Fri Oct 23 14:50:59 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 23 17:08:15 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb75467b
7
8 games-simulation/simutrans: Delete old ebuild.
9
10 It doesn't compile since 2018.
11
12 Bug: https://bugs.gentoo.org/664634
13 Bug: https://bugs.gentoo.org/724470
14 Bug: https://bugs.gentoo.org/739360
15
16 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
17 Closes: https://github.com/gentoo/gentoo/pull/15314
18 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
19
20 games-simulation/simutrans/Manifest | 3 -
21 .../files/simutrans-0.120.2.2-Makefile.patch | 89 ----------------------
22 .../simutrans/simutrans-0.120.2.2.ebuild | 71 -----------------
23 3 files changed, 163 deletions(-)
24
25 diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
26 index 404b39b85fe..ee3db6e423f 100644
27 --- a/games-simulation/simutrans/Manifest
28 +++ b/games-simulation/simutrans/Manifest
29 @@ -1,6 +1,3 @@
30 -DIST language_pack-Base+texts.zip 1097263 BLAKE2B 08678f36a2425b84bf5f440a546af7ca6507ee17bdcfd3096335c20ce60c23a5375eb133f597806bed28db2d9ed067669e83a4df47443be0cb48bf151ba91ef2 SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248
31 -DIST simupak64-120-2.zip 4453079 BLAKE2B 910f7937d5eabe8c97f9b9fb6b1d0a63ffe5c7a897a83d5649581f629c1e6d000442399f3e181c0a6e2b08a6f9948354df1848b84df6c2d37bd65d4c303d1626 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
32 -DIST simutrans-src-120-2-2.zip 3900947 BLAKE2B 69e9f78883d1b611bc76bbff1dc46ab1a645580ec0114f342aeb5e243c643c0fa4d3684e8102a0196f95320b4f93a0a50a93bb61802e81236f286a2989ac646f SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2
33 DIST simutrans-src-122-0.zip 4534293 BLAKE2B c4117baf82530adced1fbb60e099176b7b63ade07e10f741e19e41aedd4b65f5d7b6ab60145f3bce7ff88def9836eac88323b14aa74f2ce5f1c76eeaa6beb713 SHA512 7a044ceda9359847353c1dcd23c380d1ddcca901fd674a25b66d7bd0ede7f974525c5fc3b37781977e9946626f30b538c483166983ab8b7be9e73903dc9be0bd
34 DIST simutrans_PAK128.german_2.0_for_ST_122.0.zip 186572954 BLAKE2B 1f21655660f947767657f79fa45f66cd434888c37596e17dbd8400ce684251c33617dc78096c34b23bad3f241cc4641029d0f12b5f09d199013582c89fa02ab3 SHA512 9e6250b333e6b31e0ad23f2629409c2b4914e5fb9cb0304baa1e70f0c268d5eca7db27d77b51f18fff57569df56eecb82c8ec9b48c3a3efacf7d47501546347d
35 DIST simutrans_coalwagonfix.rar 10769 BLAKE2B 4ebb14c5585fcb09b2c9e70451a0a4f1133d1bf7a184c898463c4393026dcbaf10954430d83e64cd7430ec3e3708e0d51f04b805ac0c32656c138b001e617079 SHA512 503c795b4fdc168cc925a3b5ff385880dd28c8e3214a7c5aeb80e937378cf19b1f2408d19f2ab6ef066f47d6f6ab0955e6d5ec59981d1e76fbe3cd661b8bd22e
36
37 diff --git a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
38 deleted file mode 100644
39 index f9fb48ab682..00000000000
40 --- a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
41 +++ /dev/null
42 @@ -1,89 +0,0 @@
43 ---- a/Makefile 2017-03-29 12:04:15.000000000 +0300
44 -+++ b/Makefile 2017-06-08 01:41:32.605031258 +0300
45 -@@ -87,8 +87,6 @@
46 - CFLAGS += -minline-all-stringops
47 - endif
48 - endif
49 --else
50 -- CFLAGS += -O
51 - endif
52 -
53 - ifdef DEBUG
54 -@@ -110,6 +108,7 @@
55 - endif
56 - else
57 - CFLAGS += -DNDEBUG
58 -+ CXXFLAGS += -DNDEBUG
59 - endif
60 -
61 - ifdef MSG_LEVEL
62 -@@ -127,6 +126,7 @@
63 - ifneq ($(MULTI_THREAD),)
64 - ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)
65 - CFLAGS += -DMULTI_THREAD
66 -+ CXXFLAGS += -DMULTI_THREAD
67 - ifneq ($(OSTYPE),haiku)
68 - LDFLAGS += -lpthread
69 - endif
70 -@@ -142,11 +142,13 @@
71 - endif
72 - ifneq ($(REV),)
73 - CFLAGS += -DREVISION="$(REV)"
74 -+ CXXFLAGS += -DREVISION="$(REV)"
75 - endif
76 - endif
77 - endif
78 -
79 - CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
80 -+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
81 - CCFLAGS += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
82 -
83 -
84 -@@ -514,6 +516,7 @@
85 - endif
86 - endif
87 - CFLAGS += $(SDL_CFLAGS)
88 -+ CXXFLAGS += $(SDL_CFLAGS)
89 - LIBS += $(SDL_LDFLAGS)
90 - endif
91 -
92 -@@ -553,6 +556,7 @@
93 - endif
94 - endif
95 - CFLAGS += $(SDL_CFLAGS)
96 -+ CXXFLAGS += $(SDL_CFLAGS)
97 - LIBS += $(SDL_LDFLAGS)
98 - endif
99 -
100 -@@ -568,6 +572,7 @@
101 - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
102 - endif
103 - CFLAGS += $(SDL_CFLAGS)
104 -+ CXXFLAGS += $(SDL_CFLAGS)
105 - LIBS += $(SDL_LDFLAGS) -lSDL_mixer
106 - endif
107 -
108 -@@ -594,6 +599,7 @@
109 - SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
110 - endif
111 - CFLAGS += $(SDL_CFLAGS)
112 -+ CXXFLAGS += $(SDL_CFLAGS)
113 - LIBS += $(SDL_LDFLAGS) -lglew32
114 - ifeq ($(OSTYPE),mingw)
115 - LIBS += -lopengl32
116 -@@ -609,6 +615,7 @@
117 - endif
118 -
119 - CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
120 -+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
121 -
122 - ifneq ($(findstring $(OSTYPE), cygwin mingw),)
123 - SOURCES += simres.rc
124 -@@ -616,7 +623,6 @@
125 - endif
126 -
127 - CCFLAGS += $(CFLAGS)
128 --CXXFLAGS += $(CFLAGS)
129 -
130 - BUILDDIR ?= build/$(CFG)
131 - PROGDIR ?= $(BUILDDIR)
132
133 diff --git a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
134 deleted file mode 100644
135 index f175a36b9e0..00000000000
136 --- a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
137 +++ /dev/null
138 @@ -1,71 +0,0 @@
139 -# Copyright 1999-2017 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI=6
143 -
144 -inherit flag-o-matic eutils
145 -
146 -MY_PV=${PV/0./}
147 -MY_PV=${MY_PV//./-}
148 -SIMUPAK="simupak64-${MY_PV%-[0-9]*}.zip"
149 -
150 -DESCRIPTION="A free Transport Tycoon clone"
151 -HOMEPAGE="http://www.simutrans.com/"
152 -SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
153 - http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
154 - mirror://sourceforge/simutrans/${SIMUPAK}"
155 -
156 -LICENSE="Artistic"
157 -SLOT="0"
158 -KEYWORDS="-* ~amd64 ~x86"
159 -IUSE=""
160 -
161 -RDEPEND="
162 - sys-libs/zlib
163 - app-arch/bzip2
164 - media-libs/sdl-mixer
165 - media-libs/libpng:0
166 - media-libs/libsdl[sound,video]"
167 -
168 -DEPEND="
169 - ${RDEPEND}
170 - app-arch/unzip"
171 -
172 -S=${WORKDIR}
173 -
174 -PATCHES=(
175 - "${FILESDIR}"/${P}-Makefile.patch
176 -)
177 -
178 -src_unpack() {
179 - unpack simutrans-src-${MY_PV}.zip
180 - unpack "${SIMUPAK}"
181 -
182 - # Bundled text files are incomplete, bug #580948
183 - cd "${S}/simutrans/text" || die
184 - unpack language_pack-Base+texts.zip
185 -}
186 -
187 -src_prepare() {
188 - default
189 -
190 - strip-flags # bug #293927
191 - printf "BACKEND=mixer_sdl\nCOLOUR_DEPTH=16\nOSTYPE=linux\nVERBOSE=1" \
192 - > config.default || die
193 -
194 - # make it look in the install location for the data
195 - sed -i \
196 - -e "s:argv\[0\]:\"/usr/share/${PN}/\":" \
197 - simmain.cc || die
198 -
199 - rm simutrans/*.txt || die
200 -}
201 -
202 -src_install() {
203 - newbin build/default/sim ${PN}
204 - insinto /usr/share/${PN}
205 - doins -r simutrans/*
206 - dodoc documentation/*
207 - doicon simutrans.ico
208 - make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
209 -}