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

5 files changed, 73 insertions, 41 deletions

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>