1 |
commit: 2fc2e16c0ed4057ca455e1a684cb9a1838f64d65 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 22:33:14 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 15 02:40:36 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc2e16c |
7 |
|
8 |
games-action/geki3-KXL: EAPI6->8, fix clang/fonts, cleanup patches |
9 |
|
10 |
Removed paths patch that was mostly for /usr/games, and instead |
11 |
require a smaller workaround to install-data and remove .score. |
12 |
|
13 |
Also fix description, this is a different game than geki2 (horizontal). |
14 |
|
15 |
Add media-fonts/font-bitstream-100dpi as it'd crash (later) without. |
16 |
|
17 |
Closes: https://bugs.gentoo.org/730854 |
18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
19 |
|
20 |
.../geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch | 9 ++++ |
21 |
.../geki3-KXL/files/geki3-KXL-1.0.3-clang.patch | 20 ++++++++ |
22 |
.../geki3-KXL/files/geki3-KXL-1.0.3-paths.patch | 41 ----------------- |
23 |
games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild | 50 -------------------- |
24 |
games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild | 53 ++++++++++++++++++++++ |
25 |
5 files changed, 82 insertions(+), 91 deletions(-) |
26 |
|
27 |
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch |
28 |
new file mode 100644 |
29 |
index 00000000000..952b4bf6d74 |
30 |
--- /dev/null |
31 |
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch |
32 |
@@ -0,0 +1,9 @@ |
33 |
+https://bugs.gentoo.org/426890 |
34 |
+--- a/src/Makefile.am |
35 |
++++ b/src/Makefile.am |
36 |
+@@ -5,4 +5,4 @@ |
37 |
+ ranking.c ranking.h your.c your.h |
38 |
+ |
39 |
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@ |
40 |
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@ |
41 |
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL |
42 |
|
43 |
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch |
44 |
new file mode 100644 |
45 |
index 00000000000..ad84615a398 |
46 |
--- /dev/null |
47 |
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch |
48 |
@@ -0,0 +1,20 @@ |
49 |
+Use void so that clang does not complain about missing (unused) |
50 |
+return value, and also add missing string.h. |
51 |
+https://bugs.gentoo.org/730854 |
52 |
+--- a/src/ranking.c |
53 |
++++ b/src/ranking.c |
54 |
+@@ -1,2 +1,3 @@ |
55 |
+ #include <pwd.h> |
56 |
++#include <string.h> |
57 |
+ #include "geki3.h" |
58 |
+@@ -7,3 +8,3 @@ |
59 |
+ **********************/ |
60 |
+-int ScoreRanking(void) |
61 |
++void ScoreRanking(void) |
62 |
+ { |
63 |
+--- a/src/ranking.h |
64 |
++++ b/src/ranking.h |
65 |
+@@ -3,2 +3,3 @@ |
66 |
+ |
67 |
++void ScoreRanking(void); |
68 |
+ void RankingScore(void); |
69 |
|
70 |
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch |
71 |
deleted file mode 100644 |
72 |
index 26f3f4371b8..00000000000 |
73 |
--- a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch |
74 |
+++ /dev/null |
75 |
@@ -1,41 +0,0 @@ |
76 |
---- a/bmp/Makefile.am |
77 |
-+++ b/bmp/Makefile.am |
78 |
-@@ -1,4 +1,4 @@ |
79 |
--bmpdir = $(prefix)/share/geki3/bmp |
80 |
-+bmpdir = $(BMP_PATH) |
81 |
- bmp_DATA = back1.bmp boss2.bmp enemyshot1.bmp missile.bmp\ |
82 |
- pata.bmp back2.bmp boss3.bmp enemyshot2.bmp mogu.bmp\ |
83 |
- pata_ball.bmp back3.bmp boss4.bmp frame.bmp mogu_ball.bmp\ |
84 |
---- a/configure.in |
85 |
-+++ b/configure.in |
86 |
-@@ -25,9 +25,9 @@ |
87 |
- BMP_PATH=/usr/local/share/geki3/bmp |
88 |
- WAV_PATH=/usr/local/share/geki3/wav |
89 |
- else |
90 |
-- DATA_PATH=$prefix/share/geki3/data |
91 |
-- BMP_PATH=$prefix/share/geki3/bmp |
92 |
-- WAV_PATH=$prefix/share/geki3/wav |
93 |
-+ DATA_PATH=$datadir/geki3/data |
94 |
-+ BMP_PATH=$datadir/geki3/bmp |
95 |
-+ WAV_PATH=$datadir/geki3/wav |
96 |
- fi |
97 |
- AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH") |
98 |
- AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH") |
99 |
---- a/data/Makefile.am |
100 |
-+++ b/data/Makefile.am |
101 |
-@@ -1,6 +1,4 @@ |
102 |
--datadir = $(prefix)/share/geki3/data |
103 |
-+datadir = $(DATA_PATH) |
104 |
- data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat |
105 |
- EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat .score |
106 |
- |
107 |
--install: |
108 |
-- $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH) |
109 |
---- a/wav/Makefile.am |
110 |
-+++ b/wav/Makefile.am |
111 |
-@@ -1,4 +1,4 @@ |
112 |
--wavdir = $(prefix)/share/geki3/wav |
113 |
-+wavdir = $(WAV_PATH) |
114 |
- wav_DATA = bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \ |
115 |
- laser.wav open.wav pow.wav warning.wav |
116 |
- EXTRA_DIST = bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \ |
117 |
|
118 |
diff --git a/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild b/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild |
119 |
deleted file mode 100644 |
120 |
index 0e4d54af565..00000000000 |
121 |
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild |
122 |
+++ /dev/null |
123 |
@@ -1,50 +0,0 @@ |
124 |
-# Copyright 1999-2019 Gentoo Authors |
125 |
-# Distributed under the terms of the GNU General Public License v2 |
126 |
- |
127 |
-EAPI=6 |
128 |
- |
129 |
-inherit autotools desktop |
130 |
- |
131 |
-DESCRIPTION="2D length scroll shooting game" |
132 |
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" |
133 |
-SRC_URI="mirror://gentoo/${P}.tar.gz |
134 |
- mirror://gentoo/${PN}.png" |
135 |
- |
136 |
-LICENSE="GPL-2" |
137 |
-SLOT="0" |
138 |
-KEYWORDS="~amd64 ~x86" |
139 |
-IUSE="" |
140 |
- |
141 |
-DEPEND="acct-group/gamestat |
142 |
- dev-games/KXL" |
143 |
-RDEPEND="${DEPEND} |
144 |
- media-fonts/font-adobe-100dpi" |
145 |
- |
146 |
-PATCHES=( |
147 |
- "${FILESDIR}"/${P}-paths.patch |
148 |
-) |
149 |
- |
150 |
-src_prepare() { |
151 |
- default |
152 |
- rm -f missing |
153 |
- sed -i \ |
154 |
- -e '1i #include <string.h>' \ |
155 |
- -e "s:DATA_PATH \"/.score\":\"/var/games/${PN}\":" \ |
156 |
- src/ranking.c || die |
157 |
- sed -i -e '/CFLAGS/s/$/ @CFLAGS@/' src/Makefile.am || die #bug 426890 |
158 |
- mv configure.{in,ac} |
159 |
- eautoreconf |
160 |
-} |
161 |
- |
162 |
-src_install() { |
163 |
- default |
164 |
- |
165 |
- insinto /var/games/${PN} |
166 |
- newins data/.score ${PN} |
167 |
- fowners root:gamestat /var/games/${PN} /usr/bin/geki3 |
168 |
- fperms 660 /var/games/${PN} |
169 |
- fperms 2755 /usr/bin/geki3 |
170 |
- |
171 |
- doicon "${DISTDIR}"/${PN}.png |
172 |
- make_desktop_entry geki3 Geki3 |
173 |
-} |
174 |
|
175 |
diff --git a/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild b/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild |
176 |
new file mode 100644 |
177 |
index 00000000000..a7530fbd195 |
178 |
--- /dev/null |
179 |
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild |
180 |
@@ -0,0 +1,53 @@ |
181 |
+# Copyright 1999-2021 Gentoo Authors |
182 |
+# Distributed under the terms of the GNU General Public License v2 |
183 |
+ |
184 |
+EAPI=8 |
185 |
+ |
186 |
+inherit autotools desktop |
187 |
+ |
188 |
+DESCRIPTION="2D horizontal scroll shooting game" |
189 |
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" |
190 |
+SRC_URI=" |
191 |
+ mirror://gentoo/${P}.tar.gz |
192 |
+ mirror://gentoo/${PN}.png" |
193 |
+ |
194 |
+LICENSE="GPL-2" |
195 |
+SLOT="0" |
196 |
+KEYWORDS="~amd64 ~x86" |
197 |
+ |
198 |
+DEPEND=" |
199 |
+ acct-group/gamestat |
200 |
+ dev-games/KXL" |
201 |
+RDEPEND=" |
202 |
+ ${DEPEND} |
203 |
+ media-fonts/font-adobe-100dpi |
204 |
+ media-fonts/font-bitstream-100dpi" |
205 |
+ |
206 |
+PATCHES=( |
207 |
+ "${FILESDIR}"/${P}-cflags.patch |
208 |
+ "${FILESDIR}"/${P}-clang.patch |
209 |
+) |
210 |
+ |
211 |
+src_prepare() { |
212 |
+ default |
213 |
+ |
214 |
+ sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die |
215 |
+ |
216 |
+ eautoreconf |
217 |
+} |
218 |
+ |
219 |
+src_install() { |
220 |
+ emake -C data DESTDIR="${D}" install-dataDATA |
221 |
+ default |
222 |
+ |
223 |
+ rm "${ED}"/usr/share/geki3/data/.score |
224 |
+ insinto /var/games |
225 |
+ newins data/.score ${PN}.hs |
226 |
+ |
227 |
+ fowners :gamestat /var/games/${PN}.hs /usr/bin/geki3 |
228 |
+ fperms g+s /usr/bin/geki3 |
229 |
+ fperms 660 /var/games/${PN}.hs |
230 |
+ |
231 |
+ doicon "${DISTDIR}"/${PN}.png |
232 |
+ make_desktop_entry geki3 Geki3 |
233 |
+} |