1 |
commit: eac91b797c30a05d5e13e1a6c1687ae5bd4b06c8 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 14 21:09:34 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=eac91b79 |
7 |
|
8 |
games-action/geki2-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 |
Add media-fonts/font-bitstream-100dpi as it'd crash (later) without. |
14 |
|
15 |
Closes: https://bugs.gentoo.org/730848 |
16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
17 |
|
18 |
.../geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch | 5 +- |
19 |
.../geki2-KXL/files/geki2-KXL-2.0.3-clang.patch | 20 ++++++++ |
20 |
.../geki2-KXL/files/geki2-KXL-2.0.3-paths.patch | 44 ------------------ |
21 |
games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild | 49 -------------------- |
22 |
games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild | 53 ++++++++++++++++++++++ |
23 |
5 files changed, 76 insertions(+), 95 deletions(-) |
24 |
|
25 |
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch |
26 |
index d00f8d439c8..e5e04cad6e7 100644 |
27 |
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch |
28 |
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch |
29 |
@@ -1,5 +1,6 @@ |
30 |
---- a/src/Makefile.am 2012-11-10 21:50:02.159117541 +0100 |
31 |
-+++ b/src/Makefile.am 2012-11-10 21:50:20.658715770 +0100 |
32 |
+https://bugs.gentoo.org/437992 |
33 |
+--- a/src/Makefile.am |
34 |
++++ b/src/Makefile.am |
35 |
@@ -4,5 +4,5 @@ |
36 |
boss.h extern.h ranking.h your.h game.h\ |
37 |
geki2.h load.h opening.h my.h misc.h |
38 |
|
39 |
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch |
40 |
new file mode 100644 |
41 |
index 00000000000..5d621e2de63 |
42 |
--- /dev/null |
43 |
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch |
44 |
@@ -0,0 +1,20 @@ |
45 |
+Use void so that clang does not complain about missing (unused) |
46 |
+return value, and also add missing string.h. |
47 |
+https://bugs.gentoo.org/730848 |
48 |
+--- a/src/ranking.c |
49 |
++++ b/src/ranking.c |
50 |
+@@ -1,2 +1,3 @@ |
51 |
+ #include <pwd.h> |
52 |
++#include <string.h> |
53 |
+ #include "geki2.h" |
54 |
+@@ -7,3 +8,3 @@ |
55 |
+ **********************/ |
56 |
+-int ScoreRanking(void) |
57 |
++void ScoreRanking(void) |
58 |
+ { |
59 |
+--- a/src/ranking.h |
60 |
++++ b/src/ranking.h |
61 |
+@@ -3,2 +3,3 @@ |
62 |
+ |
63 |
++void ScoreRanking(void); |
64 |
+ void RankingScore(void); |
65 |
|
66 |
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch |
67 |
deleted file mode 100644 |
68 |
index 22844202bb2..00000000000 |
69 |
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch |
70 |
+++ /dev/null |
71 |
@@ -1,44 +0,0 @@ |
72 |
---- a/bmp/Makefile.am |
73 |
-+++ b/bmp/Makefile.am |
74 |
-@@ -1,4 +1,4 @@ |
75 |
--bmpdir = $(prefix)/share/geki2/bmp |
76 |
-+bmpdir = $(BMP_PATH) |
77 |
- bmp_DATA = back1.bmp boss2.bmp enemyshot4.bmp kuru.bmp myshot.bmp back2.bmp\ |
78 |
- boss3.bmp enemyshot5.bmp mboss.bmp uraura.bmp back3.bmp\ |
79 |
- boss3laser.bmp flash.bmp uturn.bmp back4.bmp back6.bmp boss6.bmp\ |
80 |
---- a/configure.in |
81 |
-+++ b/configure.in |
82 |
-@@ -25,9 +25,9 @@ |
83 |
- BMP_PATH=/usr/local/share/geki2/bmp |
84 |
- WAV_PATH=/usr/local/share/geki2/wav |
85 |
- else |
86 |
-- DATA_PATH=$prefix/share/geki2/data |
87 |
-- BMP_PATH=$prefix/share/geki2/bmp |
88 |
-- WAV_PATH=$prefix/share/geki2/wav |
89 |
-+ DATA_PATH=$datadir/geki2/data |
90 |
-+ BMP_PATH=$datadir/geki2/bmp |
91 |
-+ WAV_PATH=$datadir/geki2/wav |
92 |
- fi |
93 |
- AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH") |
94 |
- AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH") |
95 |
---- a/data/Makefile.am |
96 |
-+++ b/data/Makefile.am |
97 |
-@@ -1,9 +1,7 @@ |
98 |
--datadir = $(prefix)/share/geki2/data |
99 |
-+datadir = $(DATA_PATH) |
100 |
- data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\ |
101 |
- map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat |
102 |
- EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\ |
103 |
- map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat .score |
104 |
- |
105 |
--install: |
106 |
-- $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH) |
107 |
- |
108 |
---- a/wav/Makefile.am |
109 |
-+++ b/wav/Makefile.am |
110 |
-@@ -1,4 +1,4 @@ |
111 |
--wavdir = $(prefix)/share/geki2/wav |
112 |
-+wavdir = $(WAV_PATH) |
113 |
- wav_DATA = bgm1.wav bgm2.wav bgm3.wav bgm4.wav bgm5.wav\ |
114 |
- bomb.wav laser5.wav warning.wav boss.wav open.wav\ |
115 |
- laser.wav pow.wav go.wav bgm6.wav |
116 |
|
117 |
diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild |
118 |
deleted file mode 100644 |
119 |
index c6ee48cce75..00000000000 |
120 |
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild |
121 |
+++ /dev/null |
122 |
@@ -1,49 +0,0 @@ |
123 |
-# Copyright 1999-2019 Gentoo Authors |
124 |
-# Distributed under the terms of the GNU General Public License v2 |
125 |
- |
126 |
-EAPI=6 |
127 |
- |
128 |
-inherit autotools desktop |
129 |
- |
130 |
-DESCRIPTION="2D length scroll shooting game" |
131 |
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" |
132 |
-SRC_URI="mirror://gentoo/${P}.tar.gz |
133 |
- mirror://gentoo/${PN}.png" |
134 |
- |
135 |
-LICENSE="GPL-2" |
136 |
-SLOT="0" |
137 |
-KEYWORDS="~amd64 ~x86" |
138 |
-IUSE="" |
139 |
- |
140 |
-DEPEND="acct-group/gamestat |
141 |
- dev-games/KXL" |
142 |
-RDEPEND="${DEPEND} |
143 |
- media-fonts/font-adobe-100dpi" |
144 |
- |
145 |
-PATCHES=( |
146 |
- "${FILESDIR}"/${P}-cflags.patch |
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 |
- eautoreconf |
158 |
-} |
159 |
- |
160 |
-src_install() { |
161 |
- default |
162 |
- |
163 |
- insinto /var/games/ |
164 |
- newins data/.score ${PN} |
165 |
- fowners root:gamestat /var/games/${PN} /usr/bin/geki2 |
166 |
- fperms 660 /var/games/${PN} |
167 |
- fperms 2755 /usr/bin/geki2 |
168 |
- |
169 |
- doicon "${DISTDIR}"/${PN}.png |
170 |
- make_desktop_entry geki2 Geki2 |
171 |
-} |
172 |
|
173 |
diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild |
174 |
new file mode 100644 |
175 |
index 00000000000..781b3790bff |
176 |
--- /dev/null |
177 |
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild |
178 |
@@ -0,0 +1,53 @@ |
179 |
+# Copyright 1999-2021 Gentoo Authors |
180 |
+# Distributed under the terms of the GNU General Public License v2 |
181 |
+ |
182 |
+EAPI=8 |
183 |
+ |
184 |
+inherit autotools desktop |
185 |
+ |
186 |
+DESCRIPTION="2D length scroll shooting game" |
187 |
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html" |
188 |
+SRC_URI=" |
189 |
+ mirror://gentoo/${P}.tar.gz |
190 |
+ mirror://gentoo/${PN}.png" |
191 |
+ |
192 |
+LICENSE="GPL-2" |
193 |
+SLOT="0" |
194 |
+KEYWORDS="~amd64 ~x86" |
195 |
+ |
196 |
+DEPEND=" |
197 |
+ acct-group/gamestat |
198 |
+ dev-games/KXL" |
199 |
+RDEPEND=" |
200 |
+ ${DEPEND} |
201 |
+ media-fonts/font-adobe-100dpi |
202 |
+ media-fonts/font-bitstream-100dpi" |
203 |
+ |
204 |
+PATCHES=( |
205 |
+ "${FILESDIR}"/${P}-cflags.patch |
206 |
+ "${FILESDIR}"/${P}-clang.patch |
207 |
+) |
208 |
+ |
209 |
+src_prepare() { |
210 |
+ default |
211 |
+ |
212 |
+ sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die |
213 |
+ |
214 |
+ eautoreconf |
215 |
+} |
216 |
+ |
217 |
+src_install() { |
218 |
+ emake -C data DESTDIR="${D}" install-dataDATA |
219 |
+ default |
220 |
+ |
221 |
+ rm "${ED}"/usr/share/geki2/data/.score |
222 |
+ insinto /var/games |
223 |
+ newins data/.score ${PN}.hs |
224 |
+ |
225 |
+ fowners :gamestat /var/games/${PN}.hs /usr/bin/geki2 |
226 |
+ fperms g+s /usr/bin/geki2 |
227 |
+ fperms 660 /var/games/${PN}.hs |
228 |
+ |
229 |
+ doicon "${DISTDIR}"/${PN}.png |
230 |
+ make_desktop_entry geki2 Geki2 |
231 |
+} |