gentoo resync : 16.09.2021

7 files changed, 81 insertions, 100 deletions

diff --git a/games-action/geki2-KXL/Manifest b/games-action/geki2-KXL/Manifest
index 65789faecec1..2366e744bf01 100644
--- a/games-action/geki2-KXL/Manifest
+++ b/games-action/geki2-KXL/Manifest
@@ -1,6 +1,6 @@
-AUX geki2-KXL-2.0.3-cflags.patch 343 BLAKE2B 532233ad227a58aae86b8c8b4565680bdeab360f0cfb0eb1574310525a25d2d0fa3007ddaad220537a8ce9cd76de0ee1647ff343aa0cd8da386c594eb1a37e7b SHA512 8a3226a158bfff91328b53bb203b5de8cb2d1557dc765d41559679ac2e7ec6bc7c3c6e34793a1229331cb7090b7ecf222e09fc0383792188afd190b5f1634540
-AUX geki2-KXL-2.0.3-paths.patch 1576 BLAKE2B f4760e10071a7e6d316c1f1d7c5ec87f81a35b37c0ae12f7972f44212e495d3308794490edb693859ee63aa8cb85820c87ae1c2c4dbdc8cf2836de25f82710f1 SHA512 6165f119e3fc5359f4e9b674ca4df3b0f6784f6328262a65b714080f37799c3ccc8271df35e7531f13b907c0a7ab2b0bcc01b08a9887a4e81a5923777d86a4ca
+AUX geki2-KXL-2.0.3-cflags.patch 302 BLAKE2B 3dbb6703d2aca0d3d0331fba2b5e0a592ee9026b4cfbad5572ccfee3a754e0ed44c43ecb32d7e4f85accf3be6202e576b96c84f510b271156939e56125082008 SHA512 a1f4aa507c730b20723d1fbf213a6e12fb84a43596da21be50d8501a2164114b05bb771584b926fd343b841a62aab8053b06ef31fa9c1ba2f7358ff1bbf80b6d
+AUX geki2-KXL-2.0.3-clang.patch 466 BLAKE2B f9bcab21f2d72e10e162f3b9ca0a49d661b0d023a328a95acd323c387683db482931cc60e411fa7f3dbd03357c632cdfb3f73c20c169ec3a9820bd3559d91c78 SHA512 772f4030127fd7b624e55884dce1455bdc261b4e982f0f849b537a5b4397d9f7405ca32371158af2dfcf5a58cecab70561e7e45ff1041f2ef310c9d8792291c4
 DIST geki2-KXL-2.0.3.tar.gz 708419 BLAKE2B 4b155a518e8dc662ff831c25ec83e3c2f912403f21ca048310b6351e489182ede7001804a5cfc6df475a8291fe37596483680c601e1149ec2968ba6837ecf6b2 SHA512 15d97e72f7490b0a1fa32f3ce002f99fe88183664cb3833bb6a2513de26a0dfb0cd2e723c59d0b6bdd9620b200da2e0e7612d44c02fd1be8721441417a9cb3e5
 DIST geki2-KXL.png 883 BLAKE2B 584a8d91d3c6c5fc924a1f8aed1e52c621dd68b0ea149d58ce17251e8caa0b092bd7cf880d3023338b97d3bbb2a30223ed303ed5f511f8e533fc0fa6b168aec2 SHA512 20d58e6cc3fd5b6283e6042f8660c73b5a938157ab871dd78e7a2ea2c1187ecae63bcfd46b885255181028531ebbba2c2bf93138e311adf7be10026497a85b74
-EBUILD geki2-KXL-2.0.3-r3.ebuild 972 BLAKE2B 11e0e6d93663e20d665692f5c9e8a4d8c140d18c7a25a5b4756ca43fa2120e94f4124f757190ea7a11d23c199d9b4fbc90cdb14e0348416b122b6fd55cd43e0d SHA512 9b044f1889bf95dcb253c3a3ef5c1ea7a78a02b66988154516c57a71ba1f2519676ef7070b24d63babefcf5bc8a7f26177050b9f5441b08937ddc579f2ebcf04
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD geki2-KXL-2.0.3-r4.ebuild 1053 BLAKE2B 9d85a2561aa50f2723600b7efd476e3dd2573dfbe18f5a5314286e33cbd451319cf9df2f95192f6d8f47cade16f4945d64960526161eb00be023d01210b1b4b7 SHA512 00746762f9f49025b8fc68023874bba6dc9509bde28e3c42a35a2314c81c2bc01e6bdb5946fd790c1da4ec76dd069edabd42b6183d04cd98a90bcaaf66766c9e
+MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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 d00f8d439c80..e5e04cad6e73 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 000000000000..5d621e2de638
--- /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 22844202bb2c..000000000000
--- 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 c6ee48cce75e..000000000000
--- 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 000000000000..781b3790bff7
--- /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
+}
diff --git a/games-action/geki2-KXL/metadata.xml b/games-action/geki2-KXL/metadata.xml
index 78274e0fa550..1c3ba213c494 100644
--- a/games-action/geki2-KXL/metadata.xml
+++ b/games-action/geki2-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>