Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/burgerspace/files/, games-arcade/burgerspace/
Date: Sat, 01 May 2021 12:09:30
Message-Id: 1619870953.8b55dcf5d4e525de5bf22009ce51f08c6d697847.soap@gentoo
1 commit: 8b55dcf5d4e525de5bf22009ce51f08c6d697847
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 12:09:13 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 12:09:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b55dcf5
7
8 games-arcade/burgerspace: Remove old
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 games-arcade/burgerspace/Manifest | 1 -
14 .../burgerspace/burgerspace-1.9.2-r1.ebuild | 54 ------
15 .../files/burgerspace-1.9.2-gcc11.patch | 202 ---------------------
16 3 files changed, 257 deletions(-)
17
18 diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
19 index 331b56aebaa..05af86cb66e 100644
20 --- a/games-arcade/burgerspace/Manifest
21 +++ b/games-arcade/burgerspace/Manifest
22 @@ -1,2 +1 @@
23 -DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
24 DIST burgerspace-1.9.3.tar.gz 517492 BLAKE2B 6d3cf554580a1a370720f349ae71edab7228c18426d4ae39a8f5bb9177071204715e527beea52aa6b11b9112db5a168951d92b0de60189cfdb1882c85c79d1f2 SHA512 59629ca497a0a379858ba69bb444182f935b58be6554109fb9b309713bd6bde0d771e63858802f9153a4e46bbfe63b5edf58f857bb94ca337dbba89ff3c610cb
25
26 diff --git a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
27 deleted file mode 100644
28 index 7ff631c964f..00000000000
29 --- a/games-arcade/burgerspace/burgerspace-1.9.2-r1.ebuild
30 +++ /dev/null
31 @@ -1,54 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit autotools
38 -
39 -DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
40 -HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/burgerspace.html"
41 -SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
42 -
43 -LICENSE="GPL-2"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~x86"
46 -IUSE="network"
47 -RESTRICT="test" # doesn't really test anything
48 -
49 -RDEPEND=">=dev-games/flatzebra-0.1.6"
50 -DEPEND="${RDEPEND}"
51 -BDEPEND="virtual/pkgconfig"
52 -
53 -PATCHES=( "${FILESDIR}"/${PN}-1.9.2-gcc11.patch )
54 -
55 -src_prepare() {
56 - default
57 -
58 - sed -i \
59 - -e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
60 - -e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
61 - -e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
62 - src/Makefile.am \
63 - || die
64 -
65 - sed -i \
66 - -e "/Categories/s:Application;::" \
67 - -e "/Icon/s:\..*::" \
68 - -e "/Terminal/s:0:false:" \
69 - src/burgerspace.desktop.in \
70 - || die
71 -
72 - eautoreconf
73 -}
74 -
75 -src_configure() {
76 - econf \
77 - $(use_with network)
78 -}
79 -
80 -src_install() {
81 - emake -C src DESTDIR="${D}" install
82 -
83 - doman doc/${PN}.6
84 - dodoc AUTHORS NEWS README THANKS
85 -}
86
87 diff --git a/games-arcade/burgerspace/files/burgerspace-1.9.2-gcc11.patch b/games-arcade/burgerspace/files/burgerspace-1.9.2-gcc11.patch
88 deleted file mode 100644
89 index aea4d2ee318..00000000000
90 --- a/games-arcade/burgerspace/files/burgerspace-1.9.2-gcc11.patch
91 +++ /dev/null
92 @@ -1,202 +0,0 @@
93 ---- a/src/BurgerSpaceClient.cpp
94 -+++ b/src/BurgerSpaceClient.cpp
95 -@@ -209,7 +209,7 @@
96 -
97 -
98 - void
99 --BurgerSpaceClient::loadPixmaps() throw(PixmapLoadError)
100 -+BurgerSpaceClient::loadPixmaps()
101 - {
102 - /* Tiles:
103 - */
104 ---- a/src/BurgerSpaceClient.h
105 -+++ b/src/BurgerSpaceClient.h
106 -@@ -177,7 +177,7 @@
107 -
108 - ///////////////////////////////////////////////////////////////////////////
109 -
110 -- void loadPixmaps() throw(flatzebra::PixmapLoadError);
111 -+ void loadPixmaps();
112 - void restoreBackground();
113 - void draw();
114 - void displayMessage(int row, const char *msg);
115 ---- a/src/BurgerSpaceServer.cpp
116 -+++ b/src/BurgerSpaceServer.cpp
117 -@@ -733,7 +733,7 @@
118 -
119 -
120 - BurgerSpaceServer::BurgerSpaceServer(int initLevelNumber,
121 -- bool _oldMotionMode) throw(int, string)
122 -+ bool _oldMotionMode)
123 - : theScreenSizeInPixels(SCREEN_WIDTH_IN_PIXELS, SCREEN_HEIGHT_IN_PIXELS),
124 -
125 - initLevelNo(1),
126 -@@ -830,7 +830,7 @@
127 -
128 -
129 - void
130 --BurgerSpaceServer::displayErrorMessage(const string &msg) throw()
131 -+BurgerSpaceServer::displayErrorMessage(const string &msg)
132 - {
133 - cerr << msg << endl;
134 - }
135 -@@ -871,7 +871,7 @@
136 -
137 -
138 - void
139 --BurgerSpaceServer::initializeSprites() throw(PixmapLoadError)
140 -+BurgerSpaceServer::initializeSprites()
141 - /* Initializes the sprites that appear at the beginning of a level,
142 - like the ingredients.
143 -
144 -@@ -930,7 +930,7 @@
145 -
146 -
147 - void
148 --BurgerSpaceServer::initializeMisc() throw(string)
149 -+BurgerSpaceServer::initializeMisc()
150 - /* Initializes things that need to be initialized once, but not at the
151 - beginning of each level.
152 -
153 -@@ -1160,7 +1160,7 @@
154 -
155 -
156 - void
157 --BurgerSpaceServer::initNextLevel(int levelNo /*= 0*/) throw(int)
158 -+BurgerSpaceServer::initNextLevel(int levelNo /*= 0*/)
159 - /* Initialize the next level. Increments the current level number if
160 - levelNo is zero, or uses levelNo if it is positive.
161 - */
162 -@@ -2118,7 +2118,7 @@
163 - if (numDirectionsAllowed == 0)
164 - {
165 - belowStructure = true;
166 -- allowedDirections[UP]++;
167 -+ allowedDirections[UP] = true;
168 - }
169 - }
170 -
171 -@@ -2643,7 +2643,7 @@
172 - static void
173 - loadPixmap(const char **xpmData,
174 - SDL_Surface *&pixmap,
175 -- Couple &pixmapSize) throw(PixmapLoadError)
176 -+ Couple &pixmapSize)
177 - {
178 - pixmapSize.zero();
179 -
180 -@@ -2661,7 +2661,6 @@
181 -
182 - static void
183 - loadPixmap(const char **xpmData, PixmapArray &pa, size_t index)
184 -- throw(PixmapLoadError)
185 - {
186 - // Masks are not be relevant with SDL.
187 -
188 -@@ -2674,7 +2673,7 @@
189 -
190 -
191 - void
192 --BurgerSpaceServer::loadPixmaps() throw(PixmapLoadError)
193 -+BurgerSpaceServer::loadPixmaps()
194 - {
195 - /* Load the player pixmaps:
196 -
197 -@@ -2813,7 +2812,7 @@
198 -
199 -
200 - void
201 --BurgerSpaceServer::loadLevel(int levelNo) throw(string)
202 -+BurgerSpaceServer::loadLevel(int levelNo)
203 - /* Affects the data member 'theCurrentLevel', which must already be
204 - initialized to defined values.
205 - 'levelNo' may exceed NUM_LEVELS.
206 ---- a/src/BurgerSpaceServer.h
207 -+++ b/src/BurgerSpaceServer.h
208 -@@ -72,7 +72,7 @@
209 - {
210 - public:
211 -
212 -- BurgerSpaceServer(int initLevelNumber, bool _oldMotionMode) throw(int, std::string);
213 -+ BurgerSpaceServer(int initLevelNumber, bool _oldMotionMode);
214 -
215 - void finishInit(); // must be called after constructor -- calls virtual functions
216 -
217 -@@ -355,7 +355,7 @@
218 - void putSprite(const flatzebra::Sprite &s);
219 - void showInstructions();
220 - void initGameParameters();
221 -- void initNextLevel(int levelNo = 0) throw(int);
222 -+ void initNextLevel(int levelNo = 0);
223 - void resetPlay();
224 - int isPositionAtSideOfStructure(flatzebra::Couple pos) const;
225 - void animateTemporarySprites(flatzebra::SpriteList &slist) const;
226 -@@ -369,11 +369,11 @@
227 - bool ingredientGroupCollidesWithSprite(
228 - const flatzebra::Couple groupPos, const flatzebra::Couple groupSize,
229 - const flatzebra::Sprite &s) const;
230 -- void loadLevel(int levelNo) throw(std::string);
231 -- void displayErrorMessage(const std::string &msg) throw();
232 -+ void loadLevel(int levelNo);
233 -+ void displayErrorMessage(const std::string &msg);
234 - void createPlayerSprite();
235 -- void initializeSprites() throw(flatzebra::PixmapLoadError);
236 -- void initializeMisc() throw(std::string);
237 -+ void initializeSprites();
238 -+ void initializeMisc();
239 - void deleteSprite(flatzebra::Sprite *s) const;
240 - void deleteSprites(flatzebra::SpriteList &sl) const;
241 - void deleteSprites(IngredientSprite::List &isl) const;
242 -@@ -386,7 +386,7 @@
243 - size_t carryEnemiesInList(IngredientGroup &g, flatzebra::SpriteList &slist);
244 - size_t releaseCarriedEnemies(IngredientGroup &g);
245 - void createScoreSprites(long n, flatzebra::Couple center);
246 -- void loadPixmaps() throw(flatzebra::PixmapLoadError);
247 -+ void loadPixmaps();
248 - void moveEnemyList(flatzebra::SpriteList &slist, int speedFactor);
249 - flatzebra::Couple getDistanceToPerfectPos(const flatzebra::Sprite &s) const;
250 - bool isSpriteOnFloor(const flatzebra::Sprite &s) const;
251 ---- a/src/EnemySprite.cpp
252 -+++ b/src/EnemySprite.cpp
253 -@@ -29,7 +29,7 @@
254 -
255 - EnemySprite::EnemySprite(const PixmapArray &pa,
256 - Couple pos, Couple speed,
257 -- Couple collBoxPos, Couple collBosSize) throw(int)
258 -+ Couple collBoxPos, Couple collBosSize)
259 - : Sprite(pa, pos, speed, Couple(0, 0), collBoxPos, collBosSize),
260 - carryingGroup(NULL),
261 - disappearanceTime(0),
262 ---- a/src/EnemySprite.h
263 -+++ b/src/EnemySprite.h
264 -@@ -45,7 +45,7 @@
265 - flatzebra::Couple pos,
266 - flatzebra::Couple speed,
267 - flatzebra::Couple collBoxPos,
268 -- flatzebra::Couple collBosSize) throw(int);
269 -+ flatzebra::Couple collBosSize);
270 - /* Calls Sprite constructor.
271 - */
272 -
273 ---- a/src/IngredientSprite.h
274 -+++ b/src/IngredientSprite.h
275 -@@ -42,7 +42,7 @@
276 -
277 - IngredientSprite(const flatzebra::PixmapArray &pixmapArray,
278 - const flatzebra::Couple &pos,
279 -- IngredientGroup *ig) throw(int)
280 -+ IngredientGroup *ig)
281 - : flatzebra::Sprite(pixmapArray, pos,
282 - flatzebra::Couple(0, 0), flatzebra::Couple(0, 0),
283 - flatzebra::Couple(0, 5), flatzebra::Couple(24, 1)),
284 ---- a/src/server.cpp
285 -+++ b/src/server.cpp
286 -@@ -304,7 +304,7 @@
287 - {
288 - public:
289 -
290 -- BurgerSpaceCommandLineServer(int _initLevelNumber, int _sock, Uint32 _minMSBetweenWrites) throw(int, std::string)
291 -+ BurgerSpaceCommandLineServer(int _initLevelNumber, int _sock, Uint32 _minMSBetweenWrites)
292 - : BurgerSpaceServer(_initLevelNumber, false),
293 - sock(_sock),
294 - minMSBetweenWrites(_minMSBetweenWrites),