gentoo auto-resync : 13:08:2022 - 14:24:01

25 files changed, 252 insertions, 269 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 84e3ef75ac47..e350ff539a78 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
index 316537cbfffc..7b47fa3b9b65 100644
--- a/games-arcade/criticalmass/Manifest
+++ b/games-arcade/criticalmass/Manifest
@@ -3,5 +3,5 @@ AUX criticalmass-1.0.2-gcc43.patch 878 BLAKE2B c66f75c86894f99a9b60b9bbdb545a56c
 AUX criticalmass-1.0.2-libpng.patch 767 BLAKE2B 489aed2c08011dd48c97491150b78b520fa91b57b6e1a4b8e29afa4bb1e3ff013b3c1cc3dfbd931d6056b54c6c93f5eb45d19bb6226a1e51f7a946f65f68cdcf SHA512 a33d54c8353311c01639368c5522d3ac6c4fdef802303f0df878065a82282ef705c24be370358ddc19abfd3cc824d706738923342643df80a2dcbfebcbd50edb
 AUX criticalmass-1.0.2-system-curl.patch 619 BLAKE2B 7e0df192cf53b9ab3b6b860e7e06091622c1d803b93001766c006e0b2c85a32da38be3aa4ac79c6e11dd57ccd434efc380b360013054ef57c37cad3c8354a796 SHA512 b4e6ae1d4c3a529b3bc2dff438813cddbfa1b97aa2b824dec0ab1030feda7f81a44586dbf0df80ef4b75fe8106daf97444df85199fe168ef79fe414e8cbfd8ff
 DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
-EBUILD criticalmass-1.0.2-r2.ebuild 1042 BLAKE2B 51826c148183c1b8ba53ba29edd6b00fc77bfb23d0e09070bce711e16ff311769686afb2cf6ff2d669b90cc425dff2f6f6ac1f348945efd3f98a35cf60ea2b15 SHA512 eb191b24b563aebc30ce508aa68c8273fa2ede8522004dd6dde3c18bfe9133fce6fd5d04438320687dda6cb57d1bfc8fd70277a537eade53aa4eea588d3cbd9a
+EBUILD criticalmass-1.0.2-r2.ebuild 1042 BLAKE2B bc885c11b0765f560d2493b6064af204e2556faa5f9539b44a2112992dcccb811b077a6a6c52f11d5aa2262e66146d253d06ef5d955ce785bb7e6cb9cc98b1a9 SHA512 3ecf4226bbda87d74842e796131b7d3f2b4905528952a0bce716676e0be71f7418d21afb724b6aac19d2622402052167889c9974077068cad6e353b248cbab3e
 MISC metadata.xml 336 BLAKE2B ab745e031c331036c976bdc93264f212e9535e5e338a57c5d03b1e88321bf32f7301cbb632a368629ea68e211f15c784bb3542aa607b9731b3d3018cc3d056ec SHA512 8190699a3e41b2d66670117038d9446f4a70e745eeaaeec50161a9e9c8a60c254c3e31c251cf43518a013f9eb5458042db2b10841ab5b1b8a3a24418b1c86f7c
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
index 550a1493e02e..d3390c64c074 100644
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools desktop flag-o-matic
 MY_P="CriticalMass-${PV}"
 
 DESCRIPTION="SDL/OpenGL space shoot'em up game"
-HOMEPAGE="https://criticalmass.sourceforge.io/"
+HOMEPAGE="http://criticalmass.sourceforge.net/"
 SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
index fbf41f75df3a..0a11d0904bc2 100644
--- a/games-arcade/digger/Manifest
+++ b/games-arcade/digger/Manifest
@@ -1,4 +1,4 @@
-AUX digger-20140423-ldflags.patch 659 BLAKE2B f999cde34935ff2919327b4a6e1fa8ff9a8559507d97e504b0b6ff3f1958307a0aa03b4f0c93415e3056798ed555795079aeb36e830fa02da71962cfa957656e SHA512 69ebbe64576df62927389087f22f4871582bde0507be7cd80f1ea96abb14819c844d7adbbfd13c89e2e6921d1accd289e5cc2246a25a962639dc5bdf40b23fd1
 DIST digger-20140423.tar.gz 117375 BLAKE2B 39ec5a17c2a12c1d23ed8dbcecfcd1f8309d5309540cd6d50d92aeee056e60f31156016f7cbcdf35092690c0e4df9312feee0a686c8fb1afb6068181630aca59 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece
-EBUILD digger-20140423-r1.ebuild 525 BLAKE2B e0fb6abcf8bf9fc946d87659f0510b6ffbca397415dddd21ca495228c660ab2b9ddc414e84bb2f6f8127cc28a236a496efdde71e2c1d626f6501cdb33456fed4 SHA512 acbc98c8ddcfa6b75849c8c8b591b53e522218f8b703563d3826b06539b1f922cff0d6cd9b9f284e22eb0247369e1a2ff318f4860b9a5f867ef664a3817120c0
+DIST digger.png 1593 BLAKE2B 64595baa9bc41756cdfaf7bd9a4421e42b0bf82f8114d28227e887e822dcf19e2e6dd40344cdb83875dbcbc6200007ffdd2e0d16bfed8e92ef1b14bdf131fbf7 SHA512 3b191bdb8d823b777bc77495cf8566aa911d46ec45dd1c46f3a0dc100f25ee01b3e145a1512d0122b496ed5eabbdf3a4b3b609a3b2867de49aae22c644a9f510
+EBUILD digger-20140423-r2.ebuild 629 BLAKE2B 3f10b5c04f4f288ac8d1d333b7fd2907675c198ea424fce7ba385f27efcc3e03e8ce77deb7a13a6f9b3d8c12ef97f6055800521cf58ae06e3a4b5e844f2c335d SHA512 f5e81c040045c31420a5e4f307f97dcb0bd577da868cdcbfe48f80e270f414f359149039e3227f8f0cc693e6b81e403af9fe9d874153e45fcaaae4e9fa128db0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/digger/digger-20140423-r1.ebuild b/games-arcade/digger/digger-20140423-r1.ebuild
deleted file mode 100644
index 0fd2a02a51dd..000000000000
--- a/games-arcade/digger/digger-20140423-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Digger Remastered"
-HOMEPAGE="http://www.digger.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="media-libs/libsdl[X,video]
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_install() {
-	dobin digger
-	dodoc digger.txt
-	make_desktop_entry digger Digger
-}
diff --git a/games-arcade/digger/digger-20140423-r2.ebuild b/games-arcade/digger/digger-20140423-r2.ebuild
new file mode 100644
index 000000000000..20b53e40a1c3
--- /dev/null
+++ b/games-arcade/digger/digger-20140423-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Digger Remastered"
+HOMEPAGE="https://www.digger.org/"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${PN}-${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[X,sound,video]
+	sys-libs/zlib:=
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+src_install() {
+	dobin "${BUILD_DIR}"/${PN}
+	dodoc ${PN}.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-arcade/digger/files/digger-20140423-ldflags.patch b/games-arcade/digger/files/digger-20140423-ldflags.patch
deleted file mode 100644
index fd1e9953b634..000000000000
--- a/games-arcade/digger/files/digger-20140423-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru digger-digger.orig/Makefile digger-digger/Makefile
---- digger-digger.orig/Makefile	2013-10-11 04:56:41.000000000 -0400
-+++ digger-digger/Makefile	2014-04-24 13:11:58.749211920 -0400
-@@ -26,7 +26,7 @@
- ifeq ($(ARCH),"LINUX")
- OBJS	+= fbsd_sup.o	# strup()
- RCFLAGS	+= -DLINUX $(shell sdl-config --cflags)
--LIBS	+= $(shell sdl-config --libs) -lz
-+LIBS	+= $(shell sdl-config --libs) -lX11 -lz
- ESUFFIX	=
- endif
- 
-@@ -40,7 +40,7 @@
- all: digger$(ESUFFIX)
- 
- digger$(ESUFFIX): $(OBJS)
--	$(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
- 
- $(OBJS): %.o: %.c
- 	$(CC) -c $(RCFLAGS) $(CFLAGS) $< -o $@
diff --git a/games-arcade/gnake/Manifest b/games-arcade/gnake/Manifest
index 6c70b961cecc..5e62bbeef729 100644
--- a/games-arcade/gnake/Manifest
+++ b/games-arcade/gnake/Manifest
@@ -1,3 +1,3 @@
 DIST Gnake.0.94b.tar.gz 6656 BLAKE2B 2b230246b6dbb3ae9dcb3ed1dabf9f49c594180cb4e624e8e7cfb7c36823f64a0c60ec378773fea3fd1af5e036b8df98a3603b648e71f14a8e5523982aad5e83 SHA512 c5fb84cd8dc0a1b88f9eb6139f898515d109e2de0786284a4fa85f5efc0967ef02c2458d0e7f783d31fbd9a41e0f4114f7bd00717042ac9b2ca9ce4dc18e7fb7
-EBUILD gnake-0.94b-r2.ebuild 541 BLAKE2B 1c2eb58ed895cf98d48b773d544bea30fcd4b59311a03326988aee640dc7ce46c9bf8eaff1cc98c86b11ebed7d091f759b80cebfe6eabd18ba38db6e657f6324 SHA512 23032989611a35de03e9fb105aee2a37526d31b06e7d74bfa80e15a5f2675426e7754acd7645390c1aa94c4b6810a00989447050ec3033f8ec6f6314ce242028
+EBUILD gnake-0.94b-r3.ebuild 672 BLAKE2B aac52adc49b2ac953bcf82bf412f2fd0bb2474584833a5b0fc3cedd863ebc465fc9220be6982b2822e65a6ed8e965a635d257f7ca6f29d08833e8ab3b5933fb6 SHA512 4f87e8de75630507740181f9bb51029090f461079269429c88470208a8152062a8148b0cffb4ab0fe21a4fa55528d1036be7376c3f8a2a06da041eb8fb129fc5
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/gnake/gnake-0.94b-r2.ebuild b/games-arcade/gnake/gnake-0.94b-r2.ebuild
deleted file mode 100644
index 565824fbdade..000000000000
--- a/games-arcade/gnake/gnake-0.94b-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses-based Nibbles clone"
-HOMEPAGE="http://lightless.org/gnake"
-SRC_URI="mirror://gentoo/Gnake.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" gnake
-}
-
-src_install() {
-	dobin gnake
-	einstalldocs
-}
diff --git a/games-arcade/gnake/gnake-0.94b-r3.ebuild b/games-arcade/gnake/gnake-0.94b-r3.ebuild
new file mode 100644
index 000000000000..2ebe161e455a
--- /dev/null
+++ b/games-arcade/gnake/gnake-0.94b-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="ncurses-based Nibbles clone"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN^}.${PV}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags ncurses || die)
+	append-libs $($(tc-getPKG_CONFIG) --libs ncurses || die)
+
+	emake LDLIBS="${LIBS}" gnake
+}
+
+src_install() {
+	dobin gnake
+	einstalldocs
+}
diff --git a/games-arcade/gnujump/Manifest b/games-arcade/gnujump/Manifest
index 106d79d93493..947499ab91bc 100644
--- a/games-arcade/gnujump/Manifest
+++ b/games-arcade/gnujump/Manifest
@@ -1,3 +1,4 @@
+AUX gnujump-1.0.8-musl.patch 243 BLAKE2B b937fa87710dda8f92685a5ec2419f4c3d994777faeaf96aac540bfdc72be0bb3550d57093dc10a154c343f9aabf82530526a6becd9a6b9c4326619d4173d651 SHA512 78e8d47eb340fc2de6bf3a423b3c92a2db7243f7538210355ff236de6ad9e47f86e6f82bb10bb9350758bddc55d83e05937726984a93a4638a5c734479f78497
 DIST gnujump-1.0.8.tar.gz 2508641 BLAKE2B 2e6af8b316cedd37a0d8272ccafe548a62932bfede68bd8debc54d98ce3089c925192ae70f5fe9716fee0a82d3fe6b7cc3b8ca2d506abc2401138b5b7e7032d8 SHA512 fb8a06e17f700ea1e8c264b23a9f286d595cf48cc78efbe60ffdad298bc33ff0ecb2035a1db8281886614fbc8280d2b0c86a2099d55e31bff970f3b3c3caa421
-EBUILD gnujump-1.0.8-r1.ebuild 645 BLAKE2B 5dbdbd10b96b854afb47a197e6fc07cb3129089cc852a04761dbb1e9db2bdfc64a9e988f079272b2e051d9af29bed43e8df4c884644ba1565d80d21da38cadd3 SHA512 ac4c1e29b53b14caa68f636e1da28f16ccfbf94daf8417ecf79ce788cab4e8d10dbcd86d54950e8b5f8f38623f0b19d0fbf0877fbc4aeca409add52083c888c3
-MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
+EBUILD gnujump-1.0.8-r2.ebuild 1097 BLAKE2B c9b39d0bf6d76d9d3b253c51a0f244c3cdb0461b0bddfe3147fa5377cf1b18d488235af1edfa8dfe6b4374d22598d01caeb73192e017b870d3c612279086c1dc SHA512 55b436e2db76ea4641b667014f0cf9788611b2e0b52173f0b93665364b57b25423d1049b05191e03c2d5c38fbebd0205cf48a001ca71ae5753110ce8e4a087c2
+MISC metadata.xml 403 BLAKE2B 85ec60a033ea62046e6f791232c02a4c29c0e540c1c94f3705088856e724cbf044783b38ccaa688c2b2f5c4bde23f4746925e9adfc37868548833bb89f5a5d85 SHA512 ee6de7060202f92db1f506356078b23bd1bee7c51c59aed6271fe56a06896868218ab4ea81e1bdfff82e08961ad8a981b857ff2deaddb06e446d3080761ed51c
diff --git a/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch
new file mode 100644
index 000000000000..83bb4214e722
--- /dev/null
+++ b/games-arcade/gnujump/files/gnujump-1.0.8-musl.patch
@@ -0,0 +1,10 @@
+locale.h is always needed, include here rather than rely on
+conditional macros which lead to failure with musl
+
+https://bugs.gentoo.org/831726
+--- a/src/gnujump.h
++++ b/src/gnujump.h
+@@ -38,2 +38,3 @@
+ #include <time.h>
++#include <locale.h>
+ 
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
deleted file mode 100644
index 271171a2cf0a..000000000000
--- a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="Xjump clone with added features"
-HOMEPAGE="http://gnujump.es.gnu.org"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	virtual/opengl
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	append-libs -lm
-}
-
-src_install() {
-	default
-	einstalldocs
-
-	newicon skins/xjump/hero1.0.png ${PN}.png
-	make_desktop_entry ${PN} "GNUjump"
-}
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..dfae59b48abd
--- /dev/null
+++ b/games-arcade/gnujump/gnujump-1.0.8-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="Xjump clone with added features"
+HOMEPAGE="https://jump.gnu.sinusoid.es/"
+SRC_URI="mirror://gnu/gnujump/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libglvnd[X]
+	media-libs/libsdl[opengl,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	virtual/glu
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
+src_prepare() {
+	default
+
+	# change ac_unique_file given eautoreconf will move configure.in
+	sed -i 's/(configure.in)//' configure.in || die
+
+	# regenerate due to missing macros, ensure have autoconf-archive for GLU
+	# and remove acinclude.m4 which does unnecessary checks (bug #818814)
+	rm acinclude.m4 || die
+	eautoreconf
+
+	append-libs -lm #496924
+}
+
+src_install() {
+	default
+
+	newicon skins/xjump/hero1.0.png ${PN}.png
+	make_desktop_entry ${PN} "GNUjump"
+}
diff --git a/games-arcade/gnujump/metadata.xml b/games-arcade/gnujump/metadata.xml
index 1c3ba213c494..0f5219c82e8e 100644
--- a/games-arcade/gnujump/metadata.xml
+++ b/games-arcade/gnujump/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://savannah.gnu.org/bugs/?group=gnujump</bugs-to>
+		<remote-id type="github">arximboldi/gnujump</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-arcade/komi/Manifest b/games-arcade/komi/Manifest
index efd81b5afec7..a332e1e9165e 100644
--- a/games-arcade/komi/Manifest
+++ b/games-arcade/komi/Manifest
@@ -1,5 +1,4 @@
-AUX 1.04-DESTDIR.patch 974 BLAKE2B be10af269f5c812e921cf2d7e355b2d4d9380ac4b70910cb43f488572f753da34b3b162aa7e7aa5138eefc62ba17c3e678a59e9954f50165cc3954d0d33defdc SHA512 225ff9737d8cbb76d20be02fded66a12f70d0e65dddfd979f5b72fe1f1dffb74b47ccb065235b1c2ea7d71a198e10bbad144fb22ce4743e4d9842c138b696598
-AUX komi-1.04-install.patch 384 BLAKE2B fcc975cbbc6fce54edb399b73d0f0672e30ab6cf7db8bb68c80468fb4a17c19331444c4d7c3428e0c812dac9468b1fce9cb87e65adcea49a733aca2e875249e3 SHA512 65174431b1668e842795af8f0e17d8e1ea004af29068cc968494ee81bf5fe3c9308192c772f6f37f97388cd1630b7e67f65a8c0973365e7aa2b260c9104e03e0
 DIST komi-1.04.tar.gz 954526 BLAKE2B b7be781da0143f4cd563e885ff7688c2f50b5c1be6fbd8d383aeda06873b25a2081ae58b750a00a70d140757a57ec49652ff5e8c4ebf6ba0f306539707c06c31 SHA512 60babb3642bea7598089b342ba582b2f63f6aa051352ad9b2fa5bad0222a32306775a207712d2e7a9242be5e3ff5b4734f5b62708e451e7230499c6812d4c8a3
-EBUILD komi-1.04-r1.ebuild 918 BLAKE2B 7361900135a1206de147ecfc4a855441fbf20d64f81ba2d0c0d307f32cf943a11e44d7ea5d1f68081b3c007f0b30f7ef5b9557562aa24b90e8aaf36144181eab SHA512 5b1498f26459c6b83ace2efbfcc27ffddb02f4484e3416512ad5a8056e8b97010a0ccd1dabf285d9c28ae0f76df1c3cab61cfdfeb83b8498a87ca12966da0f52
+DIST komi.png 352 BLAKE2B 676acccaf198680b62143c436b21aae418ffeacefbcdf32b03b6a78d69e529a499dd4c7a4e2cdf7bdf996d330b683d09cd7b485b7a76dc6805e7798c13acf2e2 SHA512 ba899f07a56e38ccd7fe35b2060f651ab8a5a7edb099ec0bcc69bb70c43b94d459910fc4fb5fe931617cd8d17aa945e2847325ce5aba0b2550713a35216cf88f
+EBUILD komi-1.04-r2.ebuild 1029 BLAKE2B dfc16e9071e601d32f72c0c4549959281559c5ef5fbd0fd827fcf0cc3a2cdf7442f9608132d1b4419dddc5d3d8adbeb058934cfc00a07080482e734074a51368 SHA512 cb3961229725101316633e6489c6900367f76290511988c176647453d55dfba6994bf1f09b9aff9988058a7b3997f3596479c6cb364108f957ac71230a4c5de9
 MISC metadata.xml 328 BLAKE2B ee75aeb71624ad6198f6d5a65c49bc79556f0bdd37f571287885937d2c4ccc6dafbc1b48ffb0e8b3b983e7dfa73633cada40dd3eef7c5ca3e80be522372dcdde SHA512 6743d5969966274c3048450c1f89ab9266393f693fe958a59fb11d0987e58d2fa808618a5df66bcd68294c771eb92c8c021d4825f528a0e4f84b65e4fc0d6761
diff --git a/games-arcade/komi/files/1.04-DESTDIR.patch b/games-arcade/komi/files/1.04-DESTDIR.patch
deleted file mode 100644
index 4060d51f3a7d..000000000000
--- a/games-arcade/komi/files/1.04-DESTDIR.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile.orig	2004-12-11 01:36:11.000000000 -0800
-+++ b/Makefile	2004-12-11 01:36:14.000000000 -0800
-@@ -13,9 +13,7 @@
- MIXER=-lSDL_mixer
- SDL_LIB=$(shell sdl-config --static-libs) $(MIXER)
- 
--CFLAGS=-Wall -pedantic -std=c99 -O2 \
--	$(shell sdl-config --cflags) \
--	-DDATAPATH=\"$(DATAPATH)\"
-+CFLAGS= $(ECFLAGS) $(shell sdl-config --cflags) -DDATAPATH=\"$(DATAPATH)\"
- 
- all:	komi
- 
-@@ -24,15 +22,13 @@
- 	-rm *.o
- 
- install:
--	install -d $(DATAPATH)
--	cp -R komidata/* $(DATAPATH)
--	chmod -R 644 $(DATAPATH)
--	chmod 755 $(DATAPATH)
--	install -d $(BINPATH)
--	cp komi $(BINPATH)
--	chmod 755 $(BINPATH)komi
--	install -d $(MANPATH)
--	cp komi.6 $(MANPATH)komi.6
-+	install -d $(DESTDIR)$(DATAPATH)
-+	cp -R komidata/* $(DESTDIR)$(DATAPATH)
-+	chmod -R 644 $(DESTDIR)$(DATAPATH)
-+	chmod 755 $(DESTDIR)$(DATAPATH)
-+	install -d $(DESTDIR)$(BINPATH)
-+	cp komi $(DESTDIR)$(BINPATH)
-+	chmod 755 $(DESTDIR)$(BINPATH)/komi
- 
- komi:	komi.o
- 	$(CC) $(CFLAGS) komi.o -o komi $(SDL_LIB)
diff --git a/games-arcade/komi/files/komi-1.04-install.patch b/games-arcade/komi/files/komi-1.04-install.patch
deleted file mode 100644
index 30395eaff72b..000000000000
--- a/games-arcade/komi/files/komi-1.04-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2015-01-05 11:35:24.794160467 +0100
-+++ b/Makefile	2015-01-05 11:36:23.181058180 +0100
-@@ -24,8 +24,6 @@
- install:
- 	install -d $(DESTDIR)$(DATAPATH)
- 	cp -R komidata/* $(DESTDIR)$(DATAPATH)
--	chmod -R 644 $(DESTDIR)$(DATAPATH)
--	chmod 755 $(DESTDIR)$(DATAPATH)
- 	install -d $(DESTDIR)$(BINPATH)
- 	cp komi $(DESTDIR)$(BINPATH)
- 	chmod 755 $(DESTDIR)$(BINPATH)/komi
diff --git a/games-arcade/komi/komi-1.04-r1.ebuild b/games-arcade/komi/komi-1.04-r1.ebuild
deleted file mode 100644
index 5e0804c4843e..000000000000
--- a/games-arcade/komi/komi-1.04-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Komi the Space Frog - simple SDL game of collection"
-HOMEPAGE="http://komi.sourceforge.net"
-SRC_URI="mirror://sourceforge/komi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-DESTDIR.patch \
-		"${FILESDIR}"/${P}-install.patch
-	sed -i \
-		-e "/^BINPATH/s:=.*:=/usr/bin/:" \
-		-e "/^DATAPATH/s:=.*:=/usr/share/${PN}/:" \
-		-e '/^SDL_LIB/s:$: $(LDFLAGS):' \
-		-e '/^SDL_LIB/s:--static-:--:' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake ECFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newicon komidata/sprites_komi.bmp ${PN}.bmp
-	make_desktop_entry komi Komi /usr/share/pixmaps/${PN}.bmp
-	doman komi.6
-}
diff --git a/games-arcade/komi/komi-1.04-r2.ebuild b/games-arcade/komi/komi-1.04-r2.ebuild
new file mode 100644
index 000000000000..037419878c52
--- /dev/null
+++ b/games-arcade/komi/komi-1.04-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Komi the Space Frog - a simple SDL game"
+HOMEPAGE="http://komi.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/komi/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \
+		-DDATAPATH="'\"${EPREFIX}/usr/share/${PN}/\"'"
+	append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die)
+
+	# simpler to use implicit rules than fix the Makefile
+	emake -f /dev/null LDLIBS="${LIBS}" ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r komidata/.
+
+	doman ${PN}.6
+	dodoc CHANGELOG.txt README.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest
index d17ca6d13707..2cd6aa15a42c 100644
--- a/games-arcade/late/Manifest
+++ b/games-arcade/late/Manifest
@@ -1,5 +1,6 @@
-AUX late-0.1.0-gcc43.patch 190 BLAKE2B 4105d416951cb0c7cf15476dabd35695f2da4f491069f308b705316960c51702ba3407575b82d1a56eddb636cb69265c3ad980c90603f4944bd1bfdf5d7d8d43 SHA512 0c75110c749029b56838d0b67f6ccfb18a8861c5ddd7f4256ee4644b6a176ba9b53f3dea80035e9576904344ea6e867bfcd11087d9463898fe8b1b2458afb652
-AUX late-0.1.0-gcc46.patch 283 BLAKE2B 0e25d7738f81b3d2d626094bbe5c59426f5c859b9432ca5bdb2e4f50ebf1c06df9ec2170a76ffaa032a4c7f383d4c832930fe5369de9cb931c6d0e1763b96398 SHA512 4284066e07331e77dda457ecbb62d387eebda33cd98a1bc4095cbac11871ff5728d4a9ae9737882b0f411958d0318eadf54f661ad85884902bee8ff5ac6836b8
+AUX late-0.1.0-gcc43.patch 140 BLAKE2B 69b5ecdc6b0e56572a3dc1a7967237878885a2830d2080e858427cba24da811939c22b748cde85cf1c4036e22992d847499cb4731158547fa76a64adf5e2047c SHA512 57c6f284ce05845dc23abad176beba60febdd12a1f3af1d2ab43f3c1e636ab7c3d4a6e691398e3b5dbfcf9a8fa0d46dbef47eaabe2460826cefd60b3f3fa5633
+AUX late-0.1.0-gcc46.patch 126 BLAKE2B e22f438961f2bf9c5bf026d3ca51bb107e5afd49e12f3d81b1b0131a7e10f34bb862e8e93a07022d169b4acec43422f485fde1210c8ba9f3226edaf77e181721 SHA512 feed8d0bf53e5b9128e6e14f03a63f1cfb3531e966268d65a687bfdfc0e5ff3ce2864ba456d119fa405a5bf2231810af236d22c9347dd8b856951ee8795cc948
 DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e
-EBUILD late-0.1.0-r1.ebuild 719 BLAKE2B a1aeb8074390b71d123ba7cd71b862ad00d8b91366a2c45d4c1be188333b9286480206901650b57b486c8b2fd2fabe97f0637ecad560bd4320e3d8f19204da27 SHA512 039b3de0bf2cdbdf02ea2a0ff3ef1c6c6e1d7c1db6d679f39428e23326f669e35e875b24436c091519c633125c58be482031c4978fd48b4f007557d445ce610f
+DIST late.png 6564 BLAKE2B 9170d82259c632f44ba6149333e33c61fc8d39cf2b5002d3142b685e3ae6bd642dbc137cd5955cd807a412eb1270446a7b3d1b8cc0b92ceb0fd0d53516a0846d SHA512 2038e18857266dcb1aea3ab9c5c2a09b6d3d43c9e97bb4e141d1d7f650b20d743262e29aafe7fc04ecb6583ea209513f49cb3787ed15c7eb96fbbda86f9ee185
+EBUILD late-0.1.0-r2.ebuild 1091 BLAKE2B d3247c0f2de7cac574b980c6a89ca9b4b328297f5f273103544824f57d24d6dffb1c3f7c61e985e49c132c9bc0e07b4db7aabd10d41abec6119aabc28b738a41 SHA512 2a76c158cd273f63011f24027f6d3ea21191952969f9c25ea1ab6e8d82d6349b7c66ca93fbbe798accbf0c21f89f4c7bcacbf901cff88d8ea813fb99c4589a73
 MISC metadata.xml 328 BLAKE2B 3ef0c7ae81eeb4211267b4a022b423fc2d5c416394c8896ba002146c1ad82807657c5fdbf229ac232a6e4dc6192c88ced0c50ef13269ca69d4fa7cb75c269940 SHA512 43329dddbf03b6cb3dabdf2ebfa1cdde69f9d9fe9bd6be63861e342ec21b5167a8a7b597d829407cc2ba565f8f511b93c4b249dd021bda7e1ed4597033ba6253
diff --git a/games-arcade/late/files/late-0.1.0-gcc43.patch b/games-arcade/late/files/late-0.1.0-gcc43.patch
index 8cfead22a27d..a769f61465ab 100644
--- a/games-arcade/late/files/late-0.1.0-gcc43.patch
+++ b/games-arcade/late/files/late-0.1.0-gcc43.patch
@@ -1,11 +1,7 @@
 --- a/src/init.cpp
 +++ b/src/init.cpp
-@@ -26,6 +26,8 @@
- #include "scorescreen.h"
- #include <fstream>
+@@ -28,2 +28,4 @@
  #include <iostream>
 +#include <cstdlib>
 +#include <cstring>
  using namespace std; 
- 
- 
diff --git a/games-arcade/late/files/late-0.1.0-gcc46.patch b/games-arcade/late/files/late-0.1.0-gcc46.patch
index 95d18ba7ed11..a40d93914f8f 100644
--- a/games-arcade/late/files/late-0.1.0-gcc46.patch
+++ b/games-arcade/late/files/late-0.1.0-gcc46.patch
@@ -1,11 +1,7 @@
-diff -ru late-0.1.0.orig/src/ball.h late-0.1.0/src/ball.h
---- late-0.1.0.orig/src/ball.h	2003-08-07 18:26:13.000000000 -0400
-+++ late-0.1.0/src/ball.h	2011-04-07 21:32:14.189799689 -0400
-@@ -25,6 +25,7 @@
- class ball;
- 
+https://bugs.gentoo.org/362367
+--- a/src/ball.h
++++ b/src/ball.h
+@@ -27,2 +27,3 @@
  #include "square.h"
 +#include <cstddef>
  
- class ball_base
- {
diff --git a/games-arcade/late/late-0.1.0-r1.ebuild b/games-arcade/late/late-0.1.0-r1.ebuild
deleted file mode 100644
index de1a4c7a13c5..000000000000
--- a/games-arcade/late/late-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A game, similar to Barrack by Ambrosia Software"
-HOMEPAGE="http://late.sourceforge.net/"
-SRC_URI="mirror://sourceforge/late/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-	sed -i \
-		-e "/chown/d" \
-		Makefile.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	newicon graphics/latebg2.jpg ${PN}.jpg
-	make_desktop_entry late Late /usr/share/pixmaps/${PN}.jpg
-}
diff --git a/games-arcade/late/late-0.1.0-r2.ebuild b/games-arcade/late/late-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..47ca9482589c
--- /dev/null
+++ b/games-arcade/late/late-0.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Game similar to Barrack by Ambrosia Software"
+HOMEPAGE="http://late.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/late/${P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+)
+
+src_prepare() {
+	default
+
+	# handle score file and permissions ourselves
+	sed -i '/score/d;/chgrp/d' Makefile.in || die
+
+	# want /var/games rather than /var/lib/lib/games
+	sed -i "s|LOCALSTATEDIR\"/lib|\"${EPREFIX}/var|" src/arch.cpp || die
+}
+
+src_install() {
+	default
+
+	dodir /var/games
+	:> "${ED}"/var/games/${PN}.scores || die
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}