summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2021-09-14 17:09:34 -0400
committerIonen Wolkens <ionen@gentoo.org>2021-09-14 22:40:36 -0400
commiteac91b797c30a05d5e13e1a6c1687ae5bd4b06c8 (patch)
tree058370b4901174d40f97191c749bd0e3db59eb94
parentapp-admin/conky: Keyword 1.12.2 arm64, #809704 (diff)
downloadgentoo-eac91b797c30a05d5e13e1a6c1687ae5bd4b06c8.tar.gz
gentoo-eac91b797c30a05d5e13e1a6c1687ae5bd4b06c8.tar.bz2
gentoo-eac91b797c30a05d5e13e1a6c1687ae5bd4b06c8.zip
games-action/geki2-KXL: EAPI6->8, fix clang/fonts, cleanup patches
Removed paths patch that was mostly for /usr/games, and instead require a smaller workaround to install-data and remove .score. Add media-fonts/font-bitstream-100dpi as it'd crash (later) without. Closes: https://bugs.gentoo.org/730848 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch5
-rw-r--r--games-action/geki2-KXL/files/geki2-KXL-2.0.3-clang.patch20
-rw-r--r--games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch44
-rw-r--r--games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild49
-rw-r--r--games-action/geki2-KXL/geki2-KXL-2.0.3-r4.ebuild53
5 files changed, 76 insertions, 95 deletions
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
index d00f8d439c8..e5e04cad6e7 100644
--- 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
@@ -1,5 +1,6 @@
---- a/src/Makefile.am 2012-11-10 21:50:02.159117541 +0100
-+++ b/src/Makefile.am 2012-11-10 21:50:20.658715770 +0100
+https://bugs.gentoo.org/437992
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -4,5 +4,5 @@
boss.h extern.h ranking.h your.h game.h\
geki2.h load.h opening.h my.h misc.h
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
new file mode 100644
index 00000000000..5d621e2de63
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.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/730848
+--- a/src/ranking.c
++++ b/src/ranking.c
+@@ -1,2 +1,3 @@
+ #include <pwd.h>
++#include <string.h>
+ #include "geki2.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/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
deleted file mode 100644
index 22844202bb2..00000000000
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/bmp/Makefile.am
-+++ b/bmp/Makefile.am
-@@ -1,4 +1,4 @@
--bmpdir = $(prefix)/share/geki2/bmp
-+bmpdir = $(BMP_PATH)
- bmp_DATA = back1.bmp boss2.bmp enemyshot4.bmp kuru.bmp myshot.bmp back2.bmp\
- boss3.bmp enemyshot5.bmp mboss.bmp uraura.bmp back3.bmp\
- boss3laser.bmp flash.bmp uturn.bmp back4.bmp back6.bmp boss6.bmp\
---- a/configure.in
-+++ b/configure.in
-@@ -25,9 +25,9 @@
- BMP_PATH=/usr/local/share/geki2/bmp
- WAV_PATH=/usr/local/share/geki2/wav
- else
-- DATA_PATH=$prefix/share/geki2/data
-- BMP_PATH=$prefix/share/geki2/bmp
-- WAV_PATH=$prefix/share/geki2/wav
-+ DATA_PATH=$datadir/geki2/data
-+ BMP_PATH=$datadir/geki2/bmp
-+ WAV_PATH=$datadir/geki2/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,9 +1,7 @@
--datadir = $(prefix)/share/geki2/data
-+datadir = $(DATA_PATH)
- data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\
- map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat
- EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\
- map1.dat map2.dat map3.dat map4.dat map5.dat map6.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/geki2/wav
-+wavdir = $(WAV_PATH)
- wav_DATA = bgm1.wav bgm2.wav bgm3.wav bgm4.wav bgm5.wav\
- bomb.wav laser5.wav warning.wav boss.wav open.wav\
- laser.wav pow.wav go.wav bgm6.wav
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
deleted file mode 100644
index c6ee48cce75..00000000000
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,49 +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}-cflags.patch
- "${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
- eautoreconf
-}
-
-src_install() {
- default
-
- insinto /var/games/
- newins data/.score ${PN}
- fowners root:gamestat /var/games/${PN} /usr/bin/geki2
- fperms 660 /var/games/${PN}
- fperms 2755 /usr/bin/geki2
-
- doicon "${DISTDIR}"/${PN}.png
- make_desktop_entry geki2 Geki2
-}
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
new file mode 100644
index 00000000000..781b3790bff
--- /dev/null
+++ b/games-action/geki2-KXL/geki2-KXL-2.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 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"
+
+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/geki2/data/.score
+ insinto /var/games
+ newins data/.score ${PN}.hs
+
+ fowners :gamestat /var/games/${PN}.hs /usr/bin/geki2
+ fperms g+s /usr/bin/geki2
+ fperms 660 /var/games/${PN}.hs
+
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry geki2 Geki2
+}