gentoo resync : 05.12.2021

20 files changed, 161 insertions, 590 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index ebc02c72d184..e23bd65448fd 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
index ae02cc98ccbd..c7d58435212e 100644
--- a/games-arcade/cdogs-sdl/Manifest
+++ b/games-arcade/cdogs-sdl/Manifest
@@ -1,4 +1,6 @@
 AUX cdogs-sdl-1.1.1-cmake.patch 410 BLAKE2B b2a36bf3644e885dcf05147f63c4c72e5936acc7727fc37daf9f1732ab3edd699d7a990f63f1977e9e2e9e775b8102429fbba6ffdaf77834a9e7acd3e1933023 SHA512 dd2ffe17f21640d50dec2021fa133baed11f93eba53686792116f15d21d37aed144cc03708baf633d0e0b1c74999202fe58a92eae9f15b81f61bb1b215d39ac4
 DIST cdogs-sdl-1.1.1.tar.gz 35073687 BLAKE2B e4bcdbcafd281cfe127fc8b90bda479055042bf541ea7be7eaf2d0959e6d596565c8fca16bc703ca8263281d18372d89fa8ffa787592f3c01c0b048504df10fa SHA512 2d1357ba4a9892a7309d60b98aacf242b6d2b76f07f9f0a13fe0d97713b97507d1f163dfc63c1ac73c06b52590cda93bc212731bf201d5221ade8fa8b2e64598
+DIST cdogs-sdl-1.2.0.tar.gz 35018104 BLAKE2B 1a87f0c6e4af0fda69c0dd98249b319b58411a5b0b7377c21ebef51939f2b6e76959a00bf7fd5602b07bebb9eaab22c840699ae1c54e5d4dcb1aa26852fb8ba0 SHA512 70a5a4bb8e48cf53a4497807b14d8a70e26ad6b74f0c4675b3d98667c867d499d372f323e7abb669ebef08b1d6b5ac9c840ab14eada38e7b868d3099ed6b3e35
 EBUILD cdogs-sdl-1.1.1.ebuild 1186 BLAKE2B 334faa6b3ecd1aa8f04680151bafa15e088b86c3c03c1f7eb92bc28c9dc17b102276228e12ba64be748ee494e7ebd588e940d6572993c498e47f2e73cf7d18ce SHA512 98694df3a1b461ba98367d0d88f3bbe2feec44efc32a8a6cfc98357011e0acd0bda4b937a552a2bdf8b95540fb648025e2cb7708f20e15db449e8a8445f2c9b5
+EBUILD cdogs-sdl-1.2.0.ebuild 1024 BLAKE2B 3519b9c3f554a654e70ca2c68172eb7debd13d11b272bf0c8b7b3b8e640157b3b66c812d5af487a4e029b03cd1b5390eaea1005dba706fbe759e5e0d83452134 SHA512 ead8c69d596c43166e145a688b5c32c8453111c23e37dd38c7207e7fc74b56d88fdb55fb139b80fba48bb453e8404e4fe8c190497924f55eb9e46b8d7f5e93eb
 MISC metadata.xml 738 BLAKE2B d88ddca3d0f022c5dc03aa79cd3e64bc11e3328c53e75ec0ce719edb389ee4d119e044ded0c1c3fa7de058c62a6614459f2d3927d745cb3cb3a3e55e32ddac39 SHA512 49e02eb89ad38a8b2e8375940a9e30e2368d970c01a88095dd679e828ba91a6054c9db264a0af038648cf42f8da99800f682a6394db77c0278d98a87dc6648cb
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
new file mode 100644
index 000000000000..9f3981f80c07
--- /dev/null
+++ b/games-arcade/cdogs-sdl/cdogs-sdl-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Classic overhead run-and-gun game"
+HOMEPAGE="https://cxong.github.io/cdogs-sdl/"
+SRC_URI="https://github.com/cxong/cdogs-sdl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ BSD-2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 XMAME"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl2[haptic,opengl]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[vorbis,wav]
+	net-libs/enet:1.3="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-cmake.patch
+)
+
+CMAKE_IN_SOURCE_BUILD=1 # msg.pb.c not found
+
+src_configure() {
+	local mycmakeargs=(
+		-DCDOGS_DATA_DIR="${EPREFIX}"/usr/share/${PN}/
+		-DBUILD_EDITOR=OFF
+		-DUSE_SHARED_ENET=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc doc/{AUTHORS,original_readme.txt}
+
+	# CREDITS is used at runtime, rest is licenses or duplicates
+	find "${ED}"/usr/share/${PN}/doc -type f ! -name CREDITS -delete || die
+}
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 71337bfd1c92..9eb8949392ca 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,4 +1,5 @@
+AUX funnyboat-1.5_p11-windowed.patch 324 BLAKE2B 8733bac588e8e11dcf026465e536e0d4fc3e3ca13abc7283d06c53bfd40645e90072a3cae28efe435ac4c9cd78bff1dc2e492434a79623e121a18b9a921b96ab SHA512 65ba6d02f67cc817f08e8d2c616ab426225294fc2014ce81adbeb8087b5757b752848d6052c0e4694f2e3c0856b463a5cc52c56bc403038cbb45eab69d62a15e
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
 DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
-EBUILD funnyboat-1.5_p11-r2.ebuild 1200 BLAKE2B 0f0d5fdf7448493f3153d2fe24463ce53bfbac908e19f01c6b1c0f3b9002b7b25533712601b1df0bd77203aaa5caa8e3f3ffb81046a7b612887c16072a0c2325 SHA512 d8f1b1d834032d332ccf7e08241e5daa98e1e85d9be4c4c912a1ba2d840f75ace72d64b2b0ec2d0ba5d4901ec66d938234df73b1e16aabc6cd3785f8b0d3c2e0
+EBUILD funnyboat-1.5_p11-r3.ebuild 1235 BLAKE2B 7379af679f30a8a74516bc5c7ff29a87279930fa768c7873a2f6471e80964fef55e4b34ac99a1b695b719c5f9d6da32a4d8f28142fdb5fa99ca09c0d64e2f687 SHA512 282dc422260f987c260565c223f26c6984c7104394adbcb7a8102d145d6182dab54295984cee4383179f9e4a84d167b910e006408adc13c3c2b696ef60ac48ca
 MISC metadata.xml 333 BLAKE2B e506e238fa8d4ef6e00a4718e21c9497760eb471db4a5b3ad25884c03a088aff2d6452271ca7010d60587a71072f61b840a391664f8784b8745715d6dd9579c9 SHA512 499775c32a66f2a1447384a4d14c3690e88e289469eeb202d7c181e5c6984cb59be2dca5b819ab4cab458d5aebf9fab6ccca9fa776950ad8411874411d40c7ff
diff --git a/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch b/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch
new file mode 100644
index 000000000000..a736a43e9fb9
--- /dev/null
+++ b/games-arcade/funnyboat/files/funnyboat-1.5_p11-windowed.patch
@@ -0,0 +1,10 @@
+Fullscreen can misdisplay depending on available modes and, while there
+is a command line option to enable it (-f), there is none to disable.
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432693
+--- a/locals.py
++++ b/locals.py
+@@ -18,2 +18,2 @@
+     name = "Funny Boater"
+-    fullscreen = True
++    fullscreen = False
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r3.ebuild
index a0c6232d07c0..1f1181187f85 100644
--- a/games-arcade/funnyboat/funnyboat-1.5_p11-r2.ebuild
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop python-single-r1 wrapper
 
 DESCRIPTION="Side scrolling shooter game starring a steamboat on the sea"
@@ -28,7 +28,8 @@ BDEPEND="
 	app-arch/unzip"
 
 PATCHES=(
-	 "${WORKDIR}"/debian/patches
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${P}-windowed.patch
 )
 
 src_prepare() {
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>
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 4c20d3a5a6c6..53c91f11143c 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,4 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
 DIST solarwolf_1.5+dfsg1-3.debian.tar.xz 8944 BLAKE2B 7d83da34338e069d5076e7852f87f233043bfd3f3b2fe93a03fc3fcc631545ff666922d776d25689dec0723b077a373b30aed70ff713e27fad2c0f77bcf3b40e SHA512 e443c6096d7fae2ead3a4d6cacd21590dbdd89ae3293bbd3a219a5337647088b417d6712cef0839c394bc18570d0255d2c3af12a0fc1aae718955ddc64dced95
-EBUILD solarwolf-1.5_p3.ebuild 1434 BLAKE2B c84ceb67a5e48dd23abc088e8b97b578e31d19d940772addb4f18ab9538c28a8d24f5eb7cb615570628b8d84df6795327834cdfa67ea903d851d2fe931abc8ee SHA512 a4d6d0a00cd7a920f6f5929a30e66701daec848b4da097690e16f31a24cbf3221b61aba2402a9b351071453e5b12a5942068c23f7e666d23c31dbbd24af0e0d5
+EBUILD solarwolf-1.5_p3.ebuild 1435 BLAKE2B 431bc2164efaa7d6cf809e8aa4b7e62cfe4fbad2d23cbde508317232cb18cf0e9f37900c4b45f63d32f3c9a662a69f99462a4ee30bcf2f316faa05087ca8aa2a SHA512 79e8f058bb273d65288c58f48bb2b8223cd3070793cf66049cd21b84e30347df60f6b8715d017724d8197f5ab317b11fd5c64c2b2fe20b031395959023a507b8
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
index 93c392620e1a..5801f8c27825 100644
--- a/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
+++ b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop python-single-r1
 
 MY_P="${PN}-$(ver_cut 1-2)"
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index b2ea7f2ca187..6560f7baf869 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -3,5 +3,5 @@ AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a
 AUX supertux-0.6.0-license.patch 696 BLAKE2B 76ba58368ce9c02ce66f2a51f54e6c95ede9058130dc54e9560ad060f69806623ea6496a3cb89d823cfbae8d84ce00e4da19eb38e60519f48726a083a3633b76 SHA512 8b4baf774be6625ff253614bb68436ddc26149722af7acea0a4f0772d496c6b30013a22fd3777b11275bd901128caf11b968a37b6a7b99ab344bac78309a6e8e
 AUX supertux-0.6.0-obstack.patch 1063 BLAKE2B ab251d7514f38a8a641e680df6c69bea88b8cfb360fc93b7e91a5274ca20e0ef4210429f8ab0694cd5c3e9eee89c6ee955b54a20dd04b11cb385bccc5bb6be6c SHA512 32da8175888fca98b76640739aa531fbfcc132dbce0a89e76be49bca29bc5878266c702e5f4c7499ddd0473804b344c62d03f39f6b14941f0e669e20d2c2241d
 DIST SuperTux-v0.6.2-Source.tar.gz 174295862 BLAKE2B 1179a5ecf92dfb2ac56b87afe4fed21a2bdc1d7f91641fea8aafc2994ccfe49745420411f41b2145f06fa9714c73d75ecbc85160e85edcbd71c472026cefe708 SHA512 5baa783ee589b42a9bbce3740659dbb7b617ebfcc00c0a038c03d31b56700e3923c8548700ccebe42b325ca03bd85186bc5edef9f6580d93dc48d8aca88cbf74
-EBUILD supertux-0.6.2-r2.ebuild 1659 BLAKE2B 9d20ffa3966a675c41579cc0adab7112af44d9b2ab4be8efc530e85acdec49a71ee5b3e5b8335c78438f775a8fb674ee2ed4fec0f2c5bdb5cdf957b5a5cbdb1d SHA512 299c2f52397a1663d6cbde20a0aca47874423689b2f883c158630dfdc45cdba8359fb04f418931b1e0ede5ec2124cda2540166ca1aac452f0e685c0ffdb843a3
+EBUILD supertux-0.6.2-r2.ebuild 1666 BLAKE2B 902b667b6926ec14b53994eca084627c2634450a23c99261dd55f617a0d697ad1b33596d8ba7086c9f0d38b33242e247a08a0cdc889ec470dc36ca926382d48f SHA512 fb1ec2c2147416f87bfa532f93b309495980f7a9a1ae4b72afced452001a5cab88a52b3b9edbf5dce770529645e29c574fb413cdbc85c1ded390bf0c1ab7f267
 MISC metadata.xml 390 BLAKE2B a850f1d65a3de8f6ba0f4835c4fe013e748abf1da785b984a1ea5df2c7c176c8646c240b30137b42708e8e00b75a78fa236748991a9c32f6264d20b6312e5a22 SHA512 b814077d7680ad9cd8d3dd67f136ad09d7c321cb9fe8c019d256db495b88346b32d20791630956773dafe2ddfba76984bf2ef1d366f5575534712ef42f41a949
diff --git a/games-arcade/supertux/supertux-0.6.2-r2.ebuild b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
index 7682bb89378e..1967b4e4b40e 100644
--- a/games-arcade/supertux/supertux-0.6.2-r2.ebuild
+++ b/games-arcade/supertux/supertux-0.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="debug"
 
 # =media-libs/libsdl2-2.0.14-r0 can cause supertux binary to move entire
diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest
index e1072ef5388e..9df4e7a0163d 100644
--- a/games-arcade/whichwayisup/Manifest
+++ b/games-arcade/whichwayisup/Manifest
@@ -1,7 +1,5 @@
-AUX whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch 582 BLAKE2B 6d5c35fe35fe08df884c69b54c8a0ca18bfa2f22706274cf7a8589391fc0f25d77ae7619c8ec44fe075e31020af19b0350bbac7f9e2866838629e24df6e7468f SHA512 506560bb48348b37034a6f7851e1d4ff4e56374df7fed9cc5ac405aadfd4e63cf947fdfa837f45b51eaa08f5bd0f5deeb805a02afb67eae9a03c8b24aff53c74
-AUX whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch 631 BLAKE2B 09c7b64e45ec239905043b1d1a8abf965d92a54405f98ee5db4f3c6e494dc509ca99ee00f42c2c125320975e8e8e7bd17436a05b1066218b70ba27c16af65643 SHA512 2fb39740ed5ee4814f496e799d27f4d9377771861799e907bab5d3454aca2b3d6d25616d254977f7bf3504b4874774bc9984ddcfca58660fd63cb5bc6938663d
-AUX whichwayisup-0.7.9-python3.patch 18559 BLAKE2B 96cb66f5092e1a0ee29e82b12ec5c6cdde3f92cdc3cb6a0db5b768e0eb51e6a8eaf5e4ca85889966d5155f9197fff8431408ac5a3a63b58cb65d38db15e04c64 SHA512 cefabb3deee25bf6fb008d648257dfd5fbe30a87e7aa9fc3cb0d80ce544db6e7c52193a3aad68761a8d7258b9474066eba6c5723b7da3ad1ac5c27f579184f28
 DIST whichwayisup.png 6720 BLAKE2B 26514e025341ce7d5145d69295a24477ea3575afcfb0a11bbbddb1dd716feadef9a030ec9dc4171b75842fafc78670ed1fc7656dac8dbd6695b9592b73bb1383 SHA512 469b847955a745177c7629dd13f1975191766863bfe263e3818105356d71aaaeb66cbe34846d0bd908bf494e2d7d42b7f33499868da2fa346f96f8080bccc0b2
+DIST whichwayisup_0.7.9-8.debian.tar.xz 17196 BLAKE2B 8b2cb1933a6c5480edb1091a824b2a61d9c41ed1a4a3b534a11a28163f9db3a3790d89faa1eb1995b459bb3c03515c154ca2714bfcf63c2c43669c60abf4d75f SHA512 cb1402f0210c0457dbeb5a1151679c755b10b022c20cbb8a0bdc23bf7b463a7e0db4e92141906e3995a894fd3d0aeb21b48358b3e2c221f37deec4c008128edc
 DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809
-EBUILD whichwayisup-0.7.9-r4.ebuild 1308 BLAKE2B 836ee81070c329f198af378100a0dfa628af0c44c1265dbb2dec45b160bccf0596ea941232a79cfdb2969b1ccf43c844f59161174ccc897d510a87e848370ad6 SHA512 1ac00033d22e0f3e51c785336c9b4898f01d38e55960d51f6ca27c3ece458722606e33c48139efa1bab0f79d8ed76003a510e7d936a112e391bc540985e34013
+EBUILD whichwayisup-0.7.9_p8.ebuild 1362 BLAKE2B 7128d76afd334c9b660cc8ebbf35e9ff6f1c85b6c850dac9c49fc561734b60279d3a3c34e8650a85fb678c39ae465d3879de8c8b828f22e194174435adc8e9f6 SHA512 404c6d927d6870871c4184d6ca7aab039d0f5ead28a1de3613b304cdbc30dc65441ac1515ac7cf7f731594a9cbf5c5dce3df2a150a5dd50d67029cba11659163
 MISC metadata.xml 492 BLAKE2B 590277a9d86bff742c8ed5502253a37b89dba6707490f22613acb2bf5a39f2a7e48cd3eed2b51d0fe460db0b4b8d3ce4113a580e2a8e78632046be6c4582a78e SHA512 dfd52496f968a0f3926ae2d2dcdd6dd7c3cb3a29996b8612eaa7e625e1e9331a8366f7b57b73903fb39727654e473fc10ba7add9867d0f7fc4fdf87f8d6fc1cb
diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch
deleted file mode 100644
index b97856a0d2b9..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Tue, 28 May 2013 18:40:34 +0200
-Subject: check for joystick axes not null
-
----
- lib/game.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/game.py b/lib/game.py
-index f0afd84..30f86fd 100644
---- a/lib/game.py
-+++ b/lib/game.py
-@@ -138,7 +138,7 @@ def parse_inputs(joystick = None):
-   if keys[K_F10]:

-     inputs["SPECIAL"] = True

- 

--  if joystick != None:   # Parse joystick input

-+  if joystick != None and joystick.get_numaxes() != 0:   # Parse joystick input

- 

-     axis0 = joystick.get_axis(0)

- 

diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch
deleted file mode 100644
index 5bfea4ddd6e6..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Tue, 28 May 2013 18:21:54 +0200
-Subject: initialize only required pygame modules.
-
----
- lib/main.py |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/main.py b/lib/main.py
-index cfe9046..6a0376a 100644
---- a/lib/main.py
-+++ b/lib/main.py
-@@ -60,7 +60,9 @@ def main():
- 

-     #Initializing pygame and screen

- 

--    pygame.init()

-+    pygame.joystick.init()

-+    pygame.display.init()

-+    pygame.mixer.init()

-     screen = pygame.display.set_mode((SCREEN_WIDTH,SCREEN_HEIGHT))

-     caption = "Which way is up?"

-     if (Variables.vdict["devmode"]):

diff --git a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch
deleted file mode 100644
index 5b2026405516..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-Author: Reiner Herrmann <reiner@reiner-h.de>
-Description: Port game to python3
-Bug-Debian: https://bugs.debian.org/912500
-
---- a/run_game.py
-+++ b/run_game.py
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python3
- 
- import sys
- import os
---- a/lib/util.py
-+++ b/lib/util.py
-@@ -113,12 +113,12 @@
-   try:

-     conffile = codecs.open(file_path, "w", "utf_8")

-     for world in WORLDS:

--      print >> conffile, "unlocked\t%(world)s\t%(unlocked)s" % {"world": world, "unlocked": Variables.vdict["unlocked" + world]}

--      print >> conffile, "hiscore\t%(world)s\t%(hiscore)s" % {"world": world, "hiscore": Variables.vdict["hiscore" + world]}

--      print >> conffile, "besttime\t%(world)s\t%(besttime)s" % {"world": world, "besttime": Variables.vdict["besttime" + world]}

--    print >> conffile, "sound\t%s" % bool_to_str(Variables.vdict["sound"])

--    print >> conffile, "dialogue\t%s" % bool_to_str(Variables.vdict["dialogue"])

--    print >> conffile, "fullscreen\t%s" % bool_to_str(Variables.vdict["fullscreen"])

-+      print("unlocked\t%(world)s\t%(unlocked)s" % {"world": world, "unlocked": Variables.vdict["unlocked" + world]}, file=conffile)

-+      print("hiscore\t%(world)s\t%(hiscore)s" % {"world": world, "hiscore": Variables.vdict["hiscore" + world]}, file=conffile)

-+      print("besttime\t%(world)s\t%(besttime)s" % {"world": world, "besttime": Variables.vdict["besttime" + world]}, file=conffile)

-+    print("sound\t%s" % bool_to_str(Variables.vdict["sound"]), file=conffile)

-+    print("dialogue\t%s" % bool_to_str(Variables.vdict["dialogue"]), file=conffile)

-+    print("fullscreen\t%s" % bool_to_str(Variables.vdict["fullscreen"]), file=conffile)

-   except:

-     error_message("Could not write configuration file to " + file_path)

-     return False

-@@ -136,13 +136,13 @@
-       count += 1

-       if count > MAX_OLD_LOG_LINES:

-         break

--  if Variables.vdict.has_key("log"):

-+  if "log" in Variables.vdict:

-     try:

-       conffile = codecs.open(file_path, "w", "utf_8")

--      print >> conffile, "Log updated " + str(datetime.date.today())

--      print >> conffile, Variables.vdict["log"]

--      print >> conffile, ""

--      print >> conffile, old_log

-+      print("Log updated " + str(datetime.date.today()), file=conffile)

-+      print(Variables.vdict["log"], file=conffile)

-+      print("", file=conffile)

-+      print(old_log, file=conffile)

-     except:

-       error_message("Could not write log file to " + file_path)

-       return False

-@@ -166,7 +166,7 @@
- The constant colors can be found from locals.py.

- '''

- def render_text(string, color = COLOR_GUI, bgcolor = COLOR_GUI_BG):

--  if Util.cached_text_images.has_key(string + str(color) + str(bgcolor)):

-+  if (string + str(color) + str(bgcolor)) in Util.cached_text_images:

-     final_image = Util.cached_text_images[string + str(color) + str(bgcolor)]

-   else:

-     text_image_bg = Util.smallfont.render(string, True, bgcolor)

-@@ -200,8 +200,8 @@
-   rendered_string = string[0:phase]

-   string_image = render_text(rendered_string)

-   string_rect = string_image.get_rect()

--  string_rect.centerx = SCREEN_WIDTH / 2

--  string_rect.centery = SCREEN_HEIGHT / 2

-+  string_rect.centerx = SCREEN_WIDTH // 2

-+  string_rect.centery = SCREEN_HEIGHT // 2

- 

-   if key == "p":

-     skip_image = Util.cached_images["key_p"]

-@@ -209,7 +209,7 @@
-     skip_image = Util.cached_images["key_z"]

- 

-   skip_rect = skip_image.get_rect()

--  skip_rect.centerx = SCREEN_WIDTH / 2

-+  skip_rect.centerx = SCREEN_WIDTH // 2

-   skip_rect.top = string_rect.bottom + 5

- 

-   bg_rect = pygame.Rect(string_rect.left - 10, string_rect.top - 5, string_rect.width + 20, string_rect.height + skip_rect.height + 15)

---- a/lib/animation.py
-+++ b/lib/animation.py
-@@ -58,9 +58,9 @@
-             self.finished = True

-           else:

-             self.i = 0

--        if Animation.cached_frames.has_key(self.cache_name + str(self.i)):

-+        if (self.cache_name + str(self.i)) in Animation.cached_frames:

-           self.image = Animation.cached_frames[self.cache_name + str(self.i)]

-         else:

-           self.image = (self.frames[self.i]).get_image()

-           Animation.cached_frames[self.cache_name + str(self.i)] = self.image

--    return self.image
-\ No newline at end of file
-+    return self.image

---- a/lib/edit_utils.py
-+++ b/lib/edit_utils.py
-@@ -16,23 +16,23 @@
-     return

- 

-   def update(self, inputs):

--    if inputs.has_key("REMOVE_TILE"):

-+    if "REMOVE_TILE" in inputs:

-       return Change("remove", self.cursor)

--    if inputs.has_key("ADD_TILE_WALL"):

-+    if "ADD_TILE_WALL" in inputs:

-       return Change("W", self.cursor)

--    if inputs.has_key("ADD_TILE_SPIKES"):

-+    if "ADD_TILE_SPIKES" in inputs:

-       return Change("S", self.cursor)

--    if inputs.has_key("ADD_TILE_BARS"):

-+    if "ADD_TILE_BARS" in inputs:

-       return Change("B", self.cursor)

--    if inputs.has_key("SAVE_TILES"):

-+    if "SAVE_TILES" in inputs:

-       return Change("save", (0, 0))

--    if inputs.has_key("EDIT_RIGHT") and self.cursor[0] < (TILES_HOR - 1):

-+    if "EDIT_RIGHT" in inputs and self.cursor[0] < (TILES_HOR - 1):

-       self.cursor[0] += 1

--    if inputs.has_key("EDIT_LEFT") and self.cursor[0] > 0:

-+    if "EDIT_LEFT" in inputs and self.cursor[0] > 0:

-       self.cursor[0] -= 1

--    if inputs.has_key("EDIT_DOWN") and self.cursor[1] < (TILES_VER - 1):

-+    if "EDIT_DOWN" in inputs and self.cursor[1] < (TILES_VER - 1):

-       self.cursor[1] += 1

--    if inputs.has_key("EDIT_UP") and self.cursor[1] > 0:

-+    if "EDIT_UP" in inputs and self.cursor[1] > 0:

-       self.cursor[1] -= 1

-     return None

- 

---- a/lib/game.py
-+++ b/lib/game.py
-@@ -265,7 +265,7 @@
-     trigger = None

- 

-     if scripted_event_on:

--      if inputs.has_key("JUMP") or inputs.has_key("DOWN"):

-+      if "JUMP" in inputs or "DOWN" in inputs:

-         cleared = True

- 

-     moved = False

-@@ -277,20 +277,20 @@
-       #There isn't anything special going on: player can control the character

-       #Translates input to commands to the player object

-       add_time = True

--      if inputs.has_key("LEFT"):

-+      if "LEFT" in inputs:

-         player.move((-PLAYER_MAX_ACC, 0))

-         moved = True

- 

--      if inputs.has_key("RIGHT"):

-+      if "RIGHT" in inputs:

-         player.move((PLAYER_MAX_ACC, 0))

-         moved = True

- 

--      if inputs.has_key("JUMP"):

-+      if "JUMP" in inputs:

-         if (player.on_ground):

-           count = 0

-           while (count < 5):

-             count += 1

--            particles.append(Particle(screen, 10, player.rect.centerx - player.dx / 4 + random.uniform(-3, 3), player.rect.bottom, -player.dx * 0.1, -0.5, 0.3, level.dust_color, 4))

-+            particles.append(Particle(screen, 10, player.rect.centerx - player.dx // 4 + random.uniform(-3, 3), player.rect.bottom, -player.dx * 0.1, -0.5, 0.3, level.dust_color, 4))

-           player.jump()

- 

-           #The blobs always try to jump when the player jumps

-@@ -299,10 +299,10 @@
-             if o.itemclass == "blob":

-               o.jump()

- 

--      if inputs.has_key("UP") and not player.on_ground:

-+      if "UP" in inputs and not player.on_ground:

-         player.jump()

- 

--      if inputs.has_key("DOWN"):

-+      if "DOWN" in inputs:

-         pick_up_item = level.pick_up(player.x, player.y)

-         if pick_up_item != None:

-           play_sound("coins")

-@@ -314,10 +314,10 @@
-           trigger = level.trigger(player.x, player.y)

- 

-       #Debug command for flipping:

--      if inputs.has_key("SPECIAL"):

-+      if "SPECIAL" in inputs:

-         trigger = Trigger(TRIGGER_FLIP, player.x, player.y)

- 

--    if inputs.has_key("PAUSE") and player.current_animation != "dying":

-+    if "PAUSE" in inputs and player.current_animation != "dying":

-       paused = not paused

- 

-     #Decelerates the player, if he doesn't press any movement keys or when he is dead and on the ground

-@@ -344,7 +344,7 @@
-     #Dust effect rising from the character's feet:

- 

-     if (player.current_animation == "walking"):

--      particles.append(Particle(screen, 10, player.rect.centerx - player.dx / 2 + random.uniform(-2, 2), player.rect.bottom, -player.dx * 0.1, 0.1, 0.3, level.dust_color))

-+      particles.append(Particle(screen, 10, player.rect.centerx - player.dx // 2 + random.uniform(-2, 2), player.rect.bottom, -player.dx * 0.1, 0.1, 0.3, level.dust_color))

- 

-     #Updating level and objects:

- 

-@@ -455,7 +455,7 @@
-             player.orientation = current_scripted_event_element.orientation

-           current_scripted_event_element.finished = True

-         elif current_scripted_event_element.event_type == "change_level":

--          score.score += (5 + score_mod) * ((player.life + 4) / 5 + 12)

-+          score.score += (5 + score_mod) * ((player.life + 4) // 5 + 12)

-           score.levels += 1

-           current_scripted_event_element.finished = True

-           if player.current_animation != "gone":

---- a/lib/level.py
-+++ b/lib/level.py
-@@ -129,8 +129,8 @@
-     self.bg_animations["default"] = Animation(self.set + "_background", "static")

-     self.current_animation = "default"

-     self.rect = (self.bg_animations[self.current_animation].update_and_get_image()).get_rect()

--    self.rect.centerx = SCREEN_WIDTH / 2

--    self.rect.centery = SCREEN_HEIGHT / 2

-+    self.rect.centerx = SCREEN_WIDTH // 2

-+    self.rect.centery = SCREEN_HEIGHT // 2

- 

-     self.reset_active_tiles()

-     return

-@@ -217,7 +217,7 @@
- 

-   #Checks the point for solid ground

-   def ground_check(self, x, y):

--    if self.cached_ground_check.has_key(str(x) + "_" +  str(y)):

-+    if (str(x) + "_" +  str(y)) in self.cached_ground_check:

-       return self.cached_ground_check[str(x) + "_" +  str(y)]

-     else:

-       if x > SCREEN_WIDTH or y > SCREEN_HEIGHT or x < 0 or y < 0:

-@@ -333,7 +333,7 @@
-   def remove_tile(self, coords):

-     """Remove a tile from the level with coordinates relative to the corner of the area currently visible."""

-     for t in self.active_tiles:

--      if t.rect.collidepoint(coords[0]*TILE_DIM + TILE_DIM / 2, coords[1]*TILE_DIM + TILE_DIM / 2):

-+      if t.rect.collidepoint(coords[0]*TILE_DIM + TILE_DIM // 2, coords[1]*TILE_DIM + TILE_DIM // 2):

-         self.active_tiles.remove(t)

-         self.tiles.remove(t)

-         self.edited = True

---- a/lib/log.py
-+++ b/lib/log.py
-@@ -15,7 +15,7 @@
-     """Add a message to the message log, which can be written on disk later."""

- 

-     #Multiple messages of the same type aren't added to the log:

--    if Variables.vdict.has_key("last_log_message"):

-+    if "last_log_message" in Variables.vdict:

-       if string == Variables.vdict["last_log_message"]:

-         return

-         

-@@ -24,9 +24,9 @@
- 

-     Variables.vdict["last_log_message"] = string

- 

--    if Variables.vdict.has_key("log"):

-+    if "log" in Variables.vdict:

-         Variables.vdict["log"] = string + "\n" + Variables.vdict["log"]

-     else:

-         Variables.vdict["log"] = string

- 

--    return
-\ No newline at end of file
-+    return

---- a/lib/sound.py
-+++ b/lib/sound.py
-@@ -25,7 +25,7 @@
-   if not Variables.vdict["sound"]:

-     return

-   snd = None

--  if (not sounds.has_key(sound_id)):

-+  if sound_id not in sounds:

-     try:

-       sound_path = data.filepath(os.path.join("sounds", sound_id + ".ogg"))

-       snd = sounds[sound_id] = pygame.mixer.Sound(sound_path)

---- a/lib/visibleobject.py
-+++ b/lib/visibleobject.py
-@@ -27,9 +27,9 @@
-     self.x = x

-     self.y = y

-     if (self.x == None):

--      self.x = SCREEN_WIDTH / 2

-+      self.x = SCREEN_WIDTH // 2

-     if (self.y == None):

--      self.y = SCREEN_HEIGHT / 2

-+      self.y = SCREEN_HEIGHT // 2

- 

-     self.flipping = False

-     self.flipcounter = 0

-@@ -122,7 +122,7 @@
- 

-   def die(self):

-     """Make the object die - if the object has a death animation, it will be played first."""

--    if self.animations.has_key("dying"):

-+    if "dying" in self.animations:

-       self.current_animation = "dying"

-     else:

-       self.dead = True

---- a/lib/player.py
-+++ b/lib/player.py
-@@ -79,7 +79,7 @@
- 

-     blood = []

- 

--    if collision_type > 0:

-+    if collision_type and collision_type > 0:

-       blood = self.take_damage(collision_type)

-       if self.current_animation != "dying":

-         self.dy -= collision_type*PLAYER_JUMP_ACC / 4.5

---- a/lib/object.py
-+++ b/lib/object.py
-@@ -34,7 +34,7 @@
-     self.initial_y = y

-     self.gravity = gravity

-     self.colliding = colliding

--    self.active = (self.x + self.rect.width / 2 > 0) and (self.y + self.rect.height / 2 > 0)

-+    self.active = (self.x + self.rect.width // 2 > 0) and (self.y + self.rect.height // 2 > 0)

- 

-     self.on_ground = False

- 

-@@ -76,7 +76,7 @@
-     VisibleObject.update(self)

- 

-     if self.flip_finished and self.itemclass != "player":

--      self.active = (self.x + self.rect.width / 2 > 0) and (self.y + self.rect.height / 2 > 0)

-+      self.active = (self.x + self.rect.width // 2 > 0) and (self.y + self.rect.height // 2 > 0)

- 

-     if self.flipping:

-       return

-@@ -101,9 +101,9 @@
-     """Make the object flip with the level to either direction"""

-     if VisibleObject.flip(self, flip_direction):

-       if flip_direction == CLOCKWISE:

--        self.initial_x, self.initial_y = -self.initial_y + PLAY_AREA_WIDTH / TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR), self.initial_x

-+        self.initial_x, self.initial_y = -self.initial_y + PLAY_AREA_WIDTH // TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR), self.initial_x

-       else:

--        self.initial_x, self.initial_y = self.initial_y, -self.initial_x + PLAY_AREA_WIDTH / TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR)

-+        self.initial_x, self.initial_y = self.initial_y, -self.initial_x + PLAY_AREA_WIDTH // TILES_HOR * (TILES_HOR*2 - FULL_TILES_HOR)

-     return

- 

-   def check_collisions(self, level):

-@@ -116,25 +116,25 @@
- 

-     self.on_ground = False

- 

--    if self.x < 0 + self.rect.width / 2:

--      self.x = 0 + self.rect.width  / 2

-+    if self.x < 0 + self.rect.width // 2:

-+      self.x = 0 + self.rect.width  // 2

-       self.dx = 0

-       collision_type = 0

- 

--    if self.x > PLAY_AREA_WIDTH - self.rect.width  / 2:

--      self.x = PLAY_AREA_WIDTH - self.rect.width  / 2

-+    if self.x > PLAY_AREA_WIDTH - self.rect.width  // 2:

-+      self.x = PLAY_AREA_WIDTH - self.rect.width  // 2

-       self.dx = 0

-       collision_type = 0

- 

-     # The commented block is the collision code for the upper edge of the screen.

-     # The spiders and projectiles might need this, but they use simplified

-     # collision detection for better performance anyway.

--    '''if self.y < 0 + self.rect.height / 2:

--      self.y = 0 + self.rect.height  / 2

-+    '''if self.y < 0 + self.rect.height // 2:

-+      self.y = 0 + self.rect.height  // 2

-       self.dy = 0'''

- 

--    if self.y > PLAY_AREA_HEIGHT - self.rect.height / 2:

--      self.y = PLAY_AREA_HEIGHT - self.rect.height  / 2

-+    if self.y > PLAY_AREA_HEIGHT - self.rect.height // 2:

-+      self.y = PLAY_AREA_HEIGHT - self.rect.height  // 2

-       self.dy = 0

-       self.on_ground = True

-       collision_type = 0

---- a/lib/locals.py
-+++ b/lib/locals.py
-@@ -16,8 +16,8 @@
- 

- TILE_DIM = 40

- 

--PLAY_AREA_CENTER_X = (-FULL_TILES_HOR / 2 + TILES_HOR) * TILE_DIM

--PLAY_AREA_CENTER_Y = (-FULL_TILES_VER / 2 + TILES_VER) * TILE_DIM

-+PLAY_AREA_CENTER_X = (-FULL_TILES_HOR // 2 + TILES_HOR) * TILE_DIM

-+PLAY_AREA_CENTER_Y = (-FULL_TILES_VER // 2 + TILES_VER) * TILE_DIM

- 

- GRAVITY = 1.0

- GRAVITY_PARTICLE = 0.5

---- a/lib/mainmenu.py
-+++ b/lib/mainmenu.py
-@@ -73,19 +73,19 @@
- 

-     menu_image = render_text("World " + str(self.world.number) + ": " + self.world.name, COLOR_GUI)

-     rect = menu_image.get_rect()

--    rect.centerx = SCREEN_WIDTH / 2

-+    rect.centerx = SCREEN_WIDTH // 2

-     rect.top = GUI_MENU_TOP - 75

-     self.bgscreen.blit(menu_image, rect)

- 

-     menu_image = render_text(score_text, COLOR_GUI)

-     rect = menu_image.get_rect()

--    rect.centerx = SCREEN_WIDTH / 2

-+    rect.centerx = SCREEN_WIDTH // 2

-     rect.top = GUI_MENU_TOP - 50

-     self.bgscreen.blit(menu_image, rect)

- 

-     menu_image = render_text(time_text, COLOR_GUI)

-     rect = menu_image.get_rect()

--    rect.centerx = SCREEN_WIDTH / 2

-+    rect.centerx = SCREEN_WIDTH // 2

-     rect.top = GUI_MENU_TOP - 30

-     self.bgscreen.blit(menu_image, rect)

-     

---- a/lib/menu.py
-+++ b/lib/menu.py
-@@ -91,14 +91,14 @@
- 

-       menu_bg = pygame.image.load(data.picpath("menu", "bg")).convert_alpha()

-       rect = menu_bg.get_rect()

--      rect.centerx = SCREEN_WIDTH / 2

-+      rect.centerx = SCREEN_WIDTH // 2

-       rect.top = GUI_MENU_TOP

-       self.screen.blit(menu_bg, rect)

- 

-       if self.heading_text != None:

-         menu_head = render_text(self.heading_text)

-         rect = menu_head.get_rect()

--        rect.centerx = SCREEN_WIDTH / 2

-+        rect.centerx = SCREEN_WIDTH // 2

-         rect.top = GUI_MENU_TOP + 50 + menu_offset

-         self.screen.blit(menu_head, rect)

- 

-@@ -120,7 +120,7 @@
-         else:

-           menu_image = render_text(m, COLOR_GUI)

-         rect = menu_image.get_rect()

--        rect.centerx = SCREEN_WIDTH / 2

-+        rect.centerx = SCREEN_WIDTH // 2

-         rect.top = GUI_MENU_TOP + 60 + (menu_visible + 1) * 20 + menu_offset

-         self.screen.blit(menu_image, rect)

-         current_menu_index += 1

---- a/lib/particle.py
-+++ b/lib/particle.py
-@@ -28,9 +28,9 @@
-     self.radius = radius

-     self.gravity = gravity

-     if (self.x == None):

--      self.x = SCREEN_WIDTH / 2

-+      self.x = SCREEN_WIDTH // 2

-     if (self.y == None):

--      self.y = SCREEN_HEIGHT / 2

-+      self.y = SCREEN_HEIGHT // 2

-     if (self.dx == None):

-       self.dx = 0.0

-     if (self.dy == None):

---- a/lib/tile.py
-+++ b/lib/tile.py
-@@ -47,8 +47,8 @@
-   def realign(self):

-     self.rect.centerx = self.x

-     self.rect.centery = self.y

--    self.x = round((float(self.rect.right)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.width / 2

--    self.y = round((float(self.rect.bottom)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.height / 2

-+    self.x = round((float(self.rect.right)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.width // 2

-+    self.y = round((float(self.rect.bottom)/float(TILE_DIM)), 0)*TILE_DIM - self.rect.height // 2

-     if self.rect.height % 2 == 1:

-        self.y -= 1

-     if self.rect.width % 2 == 1:

diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9_p8.ebuild
index f37eff3578bc..814f5785d8c6 100644
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r4.ebuild
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9_p8.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop python-single-r1
 
 DESCRIPTION="Traditional and challenging 2D platformer game with a slight rotational twist"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://www.oletus.fi/static/whichwayisup/"
 SRC_URI="
-	mirror://gentoo/${PN}_b$(ver_rs 1- '').zip
+	https://www.oletus.fi/static/whichwayisup/${PN}_b079.zip
+	mirror://debian/pool/main/${P::1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
 	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
 S="${WORKDIR}/${PN}"
 
@@ -28,12 +29,13 @@ BDEPEND="
 	app-arch/unzip"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
-	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
-	"${FILESDIR}"/${P}-python3.patch
+	"${WORKDIR}"/debian/patches
 )
 
 src_prepare() {
+	# drop Debian specific patch
+	rm "${WORKDIR}"/debian/patches/font_path.patch || die
+
 	default
 
 	sed -i "/libdir =/s|= .*|= \"${EPREFIX}/usr/share/${PN}/lib\"|" run_game.py || die