gentoo resync : 05.12.2021

5 files changed, 83 insertions, 58 deletions

diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest
index c1f3e4f1e219..f4411ee73edb 100644
--- a/games-arcade/jumpnbump/Manifest
+++ b/games-arcade/jumpnbump/Manifest
@@ -1,3 +1,4 @@
-DIST jumpnbump-1.61.tar.xz 309072 BLAKE2B 057f597aedfcacb5c45e2980d670109c6ed1d9508a17ff467f44e10190d84d19609fded416c30512a59385a6c59221da98af90069adc993f0cc4c9332d248321 SHA512 1c5999c6d0d00770416a61803e5dac4742e23d787ba6bec3742517e3eab006efe9448e59f3e84278e224e184a8ac8444c7c766b74374761b1aec7cffdc1708c1
-EBUILD jumpnbump-1.61.ebuild 1124 BLAKE2B c3691bf61af7c6e851b5c483bcb2384e89895e3fbd2c50d0b02478fe4c4ec528e520baf22f3280d552508e778ab316fde6f621fcc1e516fdbf00f5d6ef6a36db SHA512 c84789413db6261eed2764baaa582cde21209d2bdc80de45ba593bbfe982905e4618018c467de5785a22c7f48a3eae8f6f337b11edfebbd8cf1bce37710df4c5
-MISC metadata.xml 325 BLAKE2B 47e7ef8a17c3b1fd80752ad1125b3e95de36842126f65bb7bc40ba9d48e817e1356abaa38ec281b3ffc812f7a1d283242e0520b136814f4f8240bb8f30b86848 SHA512 c5aed292718e1dbb51be9c3996d6bdb32a05a56d2950222b05007bfc0884e80195aeb01ea495c5894aad5a2072e3ddb5277e5e52f5043e8674f75b558f1f69e9
+AUX jumpnbump-1.61-ranlib.patch 129 BLAKE2B 32aa6504ec01c71052e3b5add8c69caaa2637c69f80c5d524fd2760b67b1ef91694f4e264205a304f48d7e86379cc19f88342a86af310f457d715a57e128a3de SHA512 046830f2e66f96001949c1ba3463b5f05ff282da75fd03457c0c4db80e03a57daac58acddef37b5fc532c9a40ad17dae246bf738d03bd05b743dfab0f1aeb06d
+DIST jumpnbump-1.61_p20210421.tar.gz 436105 BLAKE2B 3546c3c1d625b2560acbd39cf4a1a0b1fc022254c8b99913ead856d90a9354426220c2cae57ea991e4133287bc9e10d2b7b8d621f70eaa8c0baf93ee3d419a30 SHA512 ae5a7173fe43c3674ab6883d5daf3758680e53b4b33ada4c998831fcd52b6769683e72b484d01e976e3358dc1992a46e764b75d7cbe1632c48b00b570a03e03b
+EBUILD jumpnbump-1.61_p20210421.ebuild 1484 BLAKE2B 769c953e75b578efc047e9fa900c9e185b1a2dbadbb3a44bcb2c4716b53fc82ceb637e595d5bf87dbe6f8799f3f956fb7d9d8f8f9747d7d165cea9331316b11d SHA512 d2070e3b7cfed7c837c76d65cab1000c7a3e0ff475708bae311b5df21b6fe28687d57fafe368d989f81913cfef8391e41c332a9a5e7a7b6909d8e47634e818ee
+MISC metadata.xml 339 BLAKE2B 6948de49fe5adaa5e5ca2e231380ca2538aceb60ea5ca86e05592e35dfe6fa5c0541d483029b4e6ca6d1be2233b7636c3fd6ec945c03181b7da2d4df3e60002d SHA512 b8990099a51c62b81d5a7eac6d1184fb189cabc50ca5309eabab45d887e1a62295ff6e2884a11dde569c28afa52c698ff28befc97aff4bb2da90678a4f9d99d4
diff --git a/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch b/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch
new file mode 100644
index 000000000000..10d6d48b6deb
--- /dev/null
+++ b/games-arcade/jumpnbump/files/jumpnbump-1.61-ranlib.patch
@@ -0,0 +1,7 @@
+--- a/sdl/Makefile
++++ b/sdl/Makefile
+@@ -10,3 +10,3 @@
+ 	$(AR) cru $(TARGET) $(OBJS)
+-	ranlib $(TARGET)
++	$(RANLIB) $(TARGET)
+ 
diff --git a/games-arcade/jumpnbump/jumpnbump-1.61.ebuild b/games-arcade/jumpnbump/jumpnbump-1.61.ebuild
deleted file mode 100644
index d7aafa39634f..000000000000
--- a/games-arcade/jumpnbump/jumpnbump-1.61.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit python-single-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies"
-HOMEPAGE="https://libregames.gitlab.io/jumpnbump"
-SRC_URI="https://gitlab.com/LibreGames/${PN}/uploads/95acdae2a232513f068e260977371dcf/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	media-libs/sdl2-mixer[mod]
-	media-libs/libsdl2
-	media-libs/sdl2-net
-"
-RDEPEND="
-	${DEPEND}
-	gtk? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_USEDEP}]
-		')
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-	)
-"
-
-src_compile() {
-	tc-export AR CC RANLIB
-
-	append-flags -fcommon
-
-	emake PREFIX="${EPREFIX}/usr"
-	use gtk && emake PREFIX="${EPREFIX}/usr" jnbmenu
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	if use gtk; then
-		emake -C menu PREFIX="${ED}/usr" install
-		python_doscript "${ED}/usr/bin/jumpnbump-menu"
-	fi
-}
diff --git a/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild b/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild
new file mode 100644
index 000000000000..7b0afcd18e3f
--- /dev/null
+++ b/games-arcade/jumpnbump/jumpnbump-1.61_p20210421.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit desktop python-single-r1 toolchain-funcs
+
+MY_COMMIT="73c5fe86fd831dec45a22077e8d63dd2b6a6349e"
+
+DESCRIPTION="Funny multiplayer game about cute little fluffy bunnies"
+HOMEPAGE="https://libregames.gitlab.io/jumpnbump"
+SRC_URI="https://gitlab.com/LibreGames/jumpnbump/-/archive/${MY_COMMIT}/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	app-arch/bzip2:=
+	media-libs/libsdl2[joystick,sound,video]
+	media-libs/sdl2-mixer[mod]
+	media-libs/sdl2-net
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-python/pygobject[${PYTHON_USEDEP}]
+		')
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+	)"
+BDEPEND="gui? ( ${PYTHON_DEPS} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.61-ranlib.patch
+)
+
+pkg_setup() {
+	use gui && python-single-r1_pkg_setup
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+
+	emake PREFIX="${EPREFIX}"/usr
+
+	if use gui; then
+		emake PREFIX="${EPREFIX}"/usr jnbmenu
+		python_fix_shebang menu/jumpnbump_menu.py
+	fi
+}
+
+src_install() {
+	emake PREFIX="${ED}"/usr install
+
+	use gui && emake -C menu PREFIX="${ED}"/usr install
+
+	doicon dist/${PN}.png
+	rm "${ED}"/usr/share/icons/${PN}.png || die
+
+	einstalldocs
+}
diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml
index ce13a43dc82a..1d0c993d37f9 100644
--- a/games-arcade/jumpnbump/metadata.xml
+++ b/games-arcade/jumpnbump/metadata.xml
@@ -5,7 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="gtk">Install Python-based GTK menu</flag>
-	</use>
+	<upstream>
+		<remote-id type="gitlab">LibreGames/jumpnbump</remote-id>
+	</upstream>
 </pkgmetadata>