summaryrefslogtreecommitdiff
path: root/games-action/geki3-KXL
diff options
context:
space:
mode:
Diffstat (limited to 'games-action/geki3-KXL')
-rw-r--r--games-action/geki3-KXL/Manifest7
-rw-r--r--games-action/geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch9
-rw-r--r--games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch20
-rw-r--r--games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch41
-rw-r--r--games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild50
-rw-r--r--games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild53
-rw-r--r--games-action/geki3-KXL/metadata.xml2
7 files changed, 87 insertions, 95 deletions
diff --git a/games-action/geki3-KXL/Manifest b/games-action/geki3-KXL/Manifest
index 1f05f757a005..9765878e15fa 100644
--- a/games-action/geki3-KXL/Manifest
+++ b/games-action/geki3-KXL/Manifest
@@ -1,5 +1,6 @@
-AUX geki3-KXL-1.0.3-paths.patch 1428 BLAKE2B 60b6dad603f917d3acdc722759a3e40857630d003cb2fe071590e04e4e610a5fe2c79e5e7957fa3f3f2747a2c27254440f93601ce79f3b70cc17567170267b55 SHA512 6189a5a49ca7792406dffbabf7e792ad6e14cc43019a654e4977f1b3f2d371201f432a0a338b4e297bc9498666412cd000ca57442129f53f277c716c18770fb7
+AUX geki3-KXL-1.0.3-cflags.patch 241 BLAKE2B c2ad244b85163a64f5da3cc48a42112ba18a335a1ce53d9afc69e8a2053f256c07c6e95c1d1053f769db5d9cb82feed8f2d0c30ec71977216742a353e6f7ca75 SHA512 61460d2ee596835ac01e0c1ebe287dcb1aa9edbe50a178c35df1919cee6972a97dd07427c31fee7f6ade77ea57cee76acd31c5415394099acbfbd4cef204dab8
+AUX geki3-KXL-1.0.3-clang.patch 466 BLAKE2B 38352e0cba305d49aca44de8d5b7f465ac637dd40d6212135abf81ac6b6f0ba27ba705a0d20ec566a37b85754a9907de8fe220791fb7aa538002a0ebbd1581f4 SHA512 5cd9e03672ce211fd9dd9d4e8869a95cb15f9eba31071b92214a76eec80c88ca215988204123ff177664e2550eda947c4f916235f44e0c50c0083cdb5891e520
DIST geki3-KXL-1.0.3.tar.gz 695913 BLAKE2B 92cb420b93efb5cf96964cbf091b979b6cdcd54e70d9dd34c87a201409f4820c98254cdfb50b84b140ab5dcac0d62aadc49c6466ba55aa20be1f1254866d3c00 SHA512 23433c40bb800fa6da132a87dc89ed18c156dba44f3479be39b00ac48942cbf9e3ae7318149d3184f4ba8c340c937fa44e334dad5c8e800b9906bd26cdd34fd7
DIST geki3-KXL.png 1142 BLAKE2B 17664d3614a88c80e8aca0da99e3a45894e9e6eb3b705fb4aad7d2663ce46c51ee6d5a64bbf67de42eae73ee75ce8308de3cab739b732cde7a5c66b83c45f0ba SHA512 bb78a188954e530638ebf3ded88a8a19402081d071341924f57b3cc1721de523cf099eac2585ea5a5dd0b86e67f68260d469db06408e86aea68e4950526103bd
-EBUILD geki3-KXL-1.0.3-r3.ebuild 1037 BLAKE2B a3806f8505397a5ee437c9da2c7d5b96d149d37a924addc3c372be3bf987f4ba4b2e657c4729f2a701382342813fb60e83025cdfeb21c6ccb99cfdf7e70f0cbc SHA512 00ddaddfe417d4af72b8d7c2d00fe45bb39260c150862f962aceefaf4ba4afab854ad78e4a4c427ba11653e30f5d8370b233b62d1e2c83a2832ba2e2a370596d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD geki3-KXL-1.0.3-r4.ebuild 1057 BLAKE2B 26e9b407200f306f2eb9b93bc78227199558a4dcf4a44fdad860213cc84c120f1270b6e5c7b9ecdb93b811401e3d078c2a9be1c326a4e2f39bdce8e845e8f833 SHA512 b42984ecf1f57b98e8257fa7b206ee326be0bb63f0dbd56880a73aaff2a300b3e96b65dd6d9165cadf008bf5204ee76dfbf78b499cb0603797cdc227edd2d493
+MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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
new file mode 100644
index 000000000000..952b4bf6d746
--- /dev/null
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-cflags.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/426890
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,4 +5,4 @@
+ ranking.c ranking.h your.c your.h
+
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
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
new file mode 100644
index 000000000000..ad84615a398a
--- /dev/null
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-clang.patch
@@ -0,0 +1,20 @@
+Use void so that clang does not complain about missing (unused)
+return value, and also add missing string.h.
+https://bugs.gentoo.org/730854
+--- a/src/ranking.c
++++ b/src/ranking.c
+@@ -1,2 +1,3 @@
+ #include <pwd.h>
++#include <string.h>
+ #include "geki3.h"
+@@ -7,3 +8,3 @@
+ **********************/
+-int ScoreRanking(void)
++void ScoreRanking(void)
+ {
+--- a/src/ranking.h
++++ b/src/ranking.h
+@@ -3,2 +3,3 @@
+
++void ScoreRanking(void);
+ void RankingScore(void);
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
deleted file mode 100644
index 26f3f4371b85..000000000000
--- a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/bmp/Makefile.am
-+++ b/bmp/Makefile.am
-@@ -1,4 +1,4 @@
--bmpdir = $(prefix)/share/geki3/bmp
-+bmpdir = $(BMP_PATH)
- bmp_DATA = back1.bmp boss2.bmp enemyshot1.bmp missile.bmp\
- pata.bmp back2.bmp boss3.bmp enemyshot2.bmp mogu.bmp\
- pata_ball.bmp back3.bmp boss4.bmp frame.bmp mogu_ball.bmp\
---- a/configure.in
-+++ b/configure.in
-@@ -25,9 +25,9 @@
- BMP_PATH=/usr/local/share/geki3/bmp
- WAV_PATH=/usr/local/share/geki3/wav
- else
-- DATA_PATH=$prefix/share/geki3/data
-- BMP_PATH=$prefix/share/geki3/bmp
-- WAV_PATH=$prefix/share/geki3/wav
-+ DATA_PATH=$datadir/geki3/data
-+ BMP_PATH=$datadir/geki3/bmp
-+ WAV_PATH=$datadir/geki3/wav
- fi
- AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
- AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -1,6 +1,4 @@
--datadir = $(prefix)/share/geki3/data
-+datadir = $(DATA_PATH)
- data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat
- EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat .score
-
--install:
-- $(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
---- a/wav/Makefile.am
-+++ b/wav/Makefile.am
-@@ -1,4 +1,4 @@
--wavdir = $(prefix)/share/geki3/wav
-+wavdir = $(WAV_PATH)
- wav_DATA = bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \
- laser.wav open.wav pow.wav warning.wav
- EXTRA_DIST = bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \
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
deleted file mode 100644
index 0e4d54af565c..000000000000
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="2D length scroll shooting game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz
- mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="acct-group/gamestat
- dev-games/KXL"
-RDEPEND="${DEPEND}
- media-fonts/font-adobe-100dpi"
-
-PATCHES=(
- "${FILESDIR}"/${P}-paths.patch
-)
-
-src_prepare() {
- default
- rm -f missing
- sed -i \
- -e '1i #include <string.h>' \
- -e "s:DATA_PATH \"/.score\":\"/var/games/${PN}\":" \
- src/ranking.c || die
- sed -i -e '/CFLAGS/s/$/ @CFLAGS@/' src/Makefile.am || die #bug 426890
- mv configure.{in,ac}
- eautoreconf
-}
-
-src_install() {
- default
-
- insinto /var/games/${PN}
- newins data/.score ${PN}
- fowners root:gamestat /var/games/${PN} /usr/bin/geki3
- fperms 660 /var/games/${PN}
- fperms 2755 /usr/bin/geki3
-
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry geki3 Geki3
-}
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
new file mode 100644
index 000000000000..a7530fbd1953
--- /dev/null
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="2D horizontal scroll shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="
+ mirror://gentoo/${P}.tar.gz
+ mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ acct-group/gamestat
+ dev-games/KXL"
+RDEPEND="
+ ${DEPEND}
+ media-fonts/font-adobe-100dpi
+ media-fonts/font-bitstream-100dpi"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cflags.patch
+ "${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i "s|DATA_PATH \"/.score\"|\"${EPREFIX}/var/games/${PN}.hs\"|" src/ranking.c || die
+
+ eautoreconf
+}
+
+src_install() {
+ emake -C data DESTDIR="${D}" install-dataDATA
+ default
+
+ rm "${ED}"/usr/share/geki3/data/.score
+ insinto /var/games
+ newins data/.score ${PN}.hs
+
+ fowners :gamestat /var/games/${PN}.hs /usr/bin/geki3
+ fperms g+s /usr/bin/geki3
+ fperms 660 /var/games/${PN}.hs
+
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry geki3 Geki3
+}
diff --git a/games-action/geki3-KXL/metadata.xml b/games-action/geki3-KXL/metadata.xml
index 78274e0fa550..1c3ba213c494 100644
--- a/games-action/geki3-KXL/metadata.xml
+++ b/games-action/geki3-KXL/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>games@gentoo.org</email>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 10:13:43 +0000