Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/chromium-bsu/, games-action/chromium-bsu/files/
Date: Tue, 29 Jun 2021 20:55:28
Message-Id: 1624999994.66e089a33ac28de08328aa2601d949f1cf7ccdec.ionen@gentoo
1 commit: 66e089a33ac28de08328aa2601d949f1cf7ccdec
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 29 20:12:33 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 20:53:14 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e089a3
7
8 games-action/chromium-bsu: drop 0.9.15.1-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 games-action/chromium-bsu/Manifest | 1 -
13 .../chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild | 70 ---------------
14 .../files/chromium-bsu-0.9.15.1-gcc6.patch | 100 ---------------------
15 games-action/chromium-bsu/metadata.xml | 6 --
16 4 files changed, 177 deletions(-)
17
18 diff --git a/games-action/chromium-bsu/Manifest b/games-action/chromium-bsu/Manifest
19 index 7cef0d1e202..39dcb685bee 100644
20 --- a/games-action/chromium-bsu/Manifest
21 +++ b/games-action/chromium-bsu/Manifest
22 @@ -1,2 +1 @@
23 -DIST chromium-bsu-0.9.15.1.tar.gz 1689634 BLAKE2B c834cb5b962031a1b8d187df9a58104896a53188907e5c3e7776aa129be3ff9287c6750af3f3df2a447b86f9f67f7dc5db21dca7d6f6cdaf2a8faad619723c75 SHA512 1e62161a10a5eb4246c0e04a13e7d8b521218aa709cced5bed1440055bb91bbcff45a85e544bdc6854f1ed727ea15257d34a3c988c65818bfbfe8004ac76c104
24 DIST chromium-bsu-0.9.16.1.tar.gz 1709898 BLAKE2B b89ba20756fcb5903ed45c5174a0353618fb1bb1577ddb3f525d3f2a4242744e76297ca35fe186d36687d4d7f6bbe8de2a5dca8049697d5b82059e056fd16995 SHA512 1d202c0704e16b31d93c552ae6cfc17caf1182a9ec80730a981cd99c8ca8cb64d4e6e838691aa86e17ea23b7c2c0b1e7b1f4dab91bbc6129f9bf86801f2b27c8
25
26 diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
27 deleted file mode 100644
28 index e1ca44d220f..00000000000
29 --- a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
30 +++ /dev/null
31 @@ -1,70 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -inherit desktop gnome2-utils
38 -
39 -DESCRIPTION="Chromium B.S.U. - an arcade game"
40 -HOMEPAGE="http://chromium-bsu.sourceforge.net/"
41 -SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
42 -
43 -LICENSE="Clarified-Artistic"
44 -SLOT="0"
45 -KEYWORDS="~amd64 ~x86"
46 -IUSE="mixer nls +sdl"
47 -
48 -RDEPEND="
49 - media-fonts/dejavu
50 - media-libs/quesoglc
51 - media-libs/glpng
52 - virtual/opengl
53 - virtual/glu
54 - x11-libs/libXmu
55 - mixer? ( media-libs/sdl-mixer )
56 - !mixer? (
57 - media-libs/freealut
58 - media-libs/openal
59 - )
60 - nls? ( virtual/libintl )
61 - sdl? (
62 - media-libs/libsdl[X]
63 - media-libs/sdl-image[png]
64 - )
65 - !sdl? ( media-libs/freeglut )"
66 -DEPEND="${RDEPEND}
67 - nls? ( sys-devel/gettext )"
68 -
69 -PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
70 -
71 -src_configure() {
72 - econf \
73 - --disable-ftgl \
74 - --enable-glc \
75 - $(use_enable mixer sdlmixer) \
76 - $(use_enable !mixer openal) \
77 - $(use_enable nls) \
78 - $(use_enable sdl) \
79 - $(use_enable sdl sdlimage) \
80 - $(use_enable !sdl glut)
81 -}
82 -
83 -src_install() {
84 - default
85 - dodoc data/doc/*.htm
86 -
87 - newicon -s 64 misc/${PN}.png ${PN}.png
88 - domenu misc/chromium-bsu.desktop
89 -}
90 -
91 -pkg_preinst() {
92 - gnome2_icon_savelist
93 -}
94 -
95 -pkg_postinst() {
96 - gnome2_icon_cache_update
97 -}
98 -
99 -pkg_postrm() {
100 - gnome2_icon_cache_update
101 -}
102
103 diff --git a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch b/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
104 deleted file mode 100644
105 index 5d3b919adf3..00000000000
106 --- a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
107 +++ /dev/null
108 @@ -1,100 +0,0 @@
109 ---- a/src/AudioOpenAL.cpp
110 -+++ b/src/AudioOpenAL.cpp
111 -@@ -711,7 +711,7 @@
112 - if(!file)
113 - {
114 - char configOldFilename[256];
115 -- sprintf(configOldFilename, "%s/.chromium-music"CONFIG_EXT, homeDir);
116 -+ sprintf(configOldFilename, "%s/.chromium-music" CONFIG_EXT, homeDir);
117 - alterPathForPlatform(configOldFilename);
118 - rename(configOldFilename,configFilename);
119 - file = fopen(configFilename, "r");
120 ---- a/src/Config.cpp
121 -+++ b/src/Config.cpp
122 -@@ -161,7 +161,7 @@
123 - if(!homeDir)
124 - homeDir = "./";
125 -
126 -- sprintf(configFilename, "%s/.chromium"CONFIG_EXT, homeDir);
127 -+ sprintf(configFilename, "%s/.chromium" CONFIG_EXT, homeDir);
128 - alterPathForPlatform(configFilename);
129 - return configFilename;
130 - }
131 ---- a/src/define.h
132 -+++ b/src/define.h
133 -@@ -34,14 +34,14 @@
134 -
135 - #ifdef macintosh
136 - #define CONFIG_EXT ".cfg"
137 --#define CONFIG_FILE PACKAGE".cfg"
138 --#define CONFIG_SCORE_FILE PACKAGE"-score.cfg"
139 --#define CONFIG_MUSIC_FILE PACKAGE"-music.cfg"
140 -+#define CONFIG_FILE PACKAGE ".cfg"
141 -+#define CONFIG_SCORE_FILE PACKAGE "-score.cfg"
142 -+#define CONFIG_MUSIC_FILE PACKAGE "-music.cfg"
143 - #else
144 - #define CONFIG_EXT
145 --#define CONFIG_FILE "."PACKAGE
146 --#define CONFIG_SCORE_FILE "."PACKAGE"-score"
147 --#define CONFIG_MUSIC_FILE "."PACKAGE"-music"
148 -+#define CONFIG_FILE "." PACKAGE
149 -+#define CONFIG_SCORE_FILE "." PACKAGE "-score"
150 -+#define CONFIG_MUSIC_FILE "." PACKAGE "-music"
151 - #endif //macintosh
152 -
153 - #define HI_SCORE_HIST 5
154 ---- a/src/HiScore.cpp
155 -+++ b/src/HiScore.cpp
156 -@@ -187,7 +187,7 @@
157 - const char *homeDir = getenv("HOME");
158 - if(!homeDir)
159 - homeDir = "./";
160 -- sprintf(configFilename, "%s/.chromium-score"CONFIG_EXT, homeDir);
161 -+ sprintf(configFilename, "%s/.chromium-score" CONFIG_EXT, homeDir);
162 - alterPathForPlatform(configFilename);
163 - return configFilename;
164 - }
165 ---- a/src/main.cpp
166 -+++ b/src/main.cpp
167 -@@ -198,7 +198,7 @@
168 -
169 - if(getenv("HOME") != NULL && ((strlen(getenv("HOME"))+strlen(filename)) < 239) )
170 - {
171 -- sprintf(buffer, "%s/."PACKAGE"-data/%s", getenv("HOME"), filename);
172 -+ sprintf(buffer, "%s/." PACKAGE "-data/%s", getenv("HOME"), filename);
173 - if(stat(buffer, &sbuf) == 0) return buffer;
174 - }
175 -
176 ---- a/src/MainSDL_Event.cpp
177 -+++ b/src/MainSDL_Event.cpp
178 -@@ -19,6 +19,7 @@
179 - #include <cstdlib>
180 - #include <cstdio>
181 - #include <cstring>
182 -+#include <cmath>
183 -
184 - #include "Config.h"
185 -
186 -@@ -417,14 +418,14 @@
187 - #else
188 - Uint8 *keystate = SDL_GetKeyState(NULL);
189 - #endif
190 -- if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4;
191 -- if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4;
192 -- if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4;
193 -- if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4;
194 -- if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
195 -- if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
196 -- if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
197 -- if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
198 -+ if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4;
199 -+ if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs((int)key_speed_x)*0.4;
200 -+ if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4;
201 -+ if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs((int)key_speed_y)*0.4;
202 -+ if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
203 -+ if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
204 -+ if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
205 -+ if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
206 - //float s = (1.0-game->speedAdj)+(game->speedAdj*0.7);
207 - float s = 0.7;
208 - key_speed_x *= s;
209
210 diff --git a/games-action/chromium-bsu/metadata.xml b/games-action/chromium-bsu/metadata.xml
211 index a8145e90454..2fe30fb0235 100644
212 --- a/games-action/chromium-bsu/metadata.xml
213 +++ b/games-action/chromium-bsu/metadata.xml
214 @@ -5,12 +5,6 @@
215 <email>games@g.o</email>
216 <name>Gentoo Games Project</name>
217 </maintainer>
218 - <use>
219 - <flag name="mixer">
220 - Enables <pkg>media-libs/sdl-mixer</pkg> sound backend instead of
221 - <pkg>media-libs/openal</pkg> one.
222 - </flag>
223 - </use>
224 <upstream>
225 <remote-id type="sourceforge">chromium-bsu</remote-id>
226 </upstream>