gentoo resync : 15.01.2020

30 files changed, 657 insertions, 286 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index e127a04669a7..17aded4ceea2 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
index 31aa688c13d6..b3adb3eb95b9 100644
--- a/games-arcade/commandergenius/Manifest
+++ b/games-arcade/commandergenius/Manifest
@@ -3,5 +3,5 @@ AUX commandergenius-2.3.1-desktop.patch 1614 BLAKE2B f2b4a66d98af114a98a83a0ee7f
 AUX commandergenius-2.3.1-minizip.patch 2277 BLAKE2B d41e86021769db7189620b3ac6941d2a0c1d60efb97ddee30b449045a7d561011638cb56cfab4285b0c7a35a385a6c66d7159f4b01b42fae0c6f363d7d2d6054 SHA512 ff8a1a8fd6c1c87b52b05fcd248b3ba92e2b9559b8b68522ef83a49878d7ccd3d4c8d9ac2eebb8211e4213b4106f563eb59819117b962a28ecdfd9c60d29621d
 AUX commandergenius-2.3.1-paths.patch 528 BLAKE2B 0d3362d1f5099206a352c47c8625fc8bf7c5bcc371576340209eb4ef978c9cd7dfe0d13206fa2fe3f25dac094fd93e33a957d942a432080c77d50bab21b0a42e SHA512 f447166227566fe914c3d50f6f8c7b1dab6161b9ff633824c8feea0cc441872cd6245572e8cb2929a9f8345c0b8592cd3b3a7d77224ed9f5bc0076d82415f66a
 DIST Commander-Genius-v2.3.3.tar.bz2 63885924 BLAKE2B a072f922bac6f76e615bbb602c1b5ac4fca634a90bdead461d666da0d70ad5ddd6865504c84a09905bb313728b840df973ae006d120ae01d8c8f8a7bd4a10abe SHA512 f64f24b01cd0921570f633913c8a3b1b50537596b2c46377862a913e36c74934521c1c55fca676b78674c669d475d9c2c2c09ac4a22ebdad1826508e6b9598b6
-EBUILD commandergenius-2.3.3.ebuild 2297 BLAKE2B e8905a9a8b365d5a137ed602d47d09f190b4c42254505ac14ad9dc8bda88979d2b90056b85acbb3ab05b42bc72e49fb7e3f8f29cb6aba1734e249abba764a436 SHA512 751cbc1ccc7d6073ea78ddb1ce3e2df81d0b8671ee34f9c8eb9139be58464061034f0c68a89f8b21d8d72cab106f982496b723c0b00e4aebd6b7d751255f217d
+EBUILD commandergenius-2.3.3.ebuild 2277 BLAKE2B 1ac640057e311d1c6c7f7ccc9ccadd2abd0dd0dfeefa8807a5343fb5f0a7378743343035d5d66848d542d494a72e2b34d61530cc38dc6a528c05662c93d041c9 SHA512 099908a6ad457fa72c102c841879862253265a19617a74022a76f990fb5b9351cbcfc9bf389ef1d7790667eb6cd1bc1c511eac2f289f5b52878b124d8b392284
 MISC metadata.xml 506 BLAKE2B 2e4a746b047d9e50d4403cdd52984cc2f0e8ba58e81ac73b6d3e3363f60c8370221713248fcf56505ad5768f7f66dd30778d025b8342088fa9c329deb7afac20 SHA512 f7e6dd9ad5ba4e57218226ec1693e482228133d3e19332a9aa7995bf60e184a77520a59d7d2b3195429c3b56ecb857da675d467b05b1b9aeb52826500db2061a
diff --git a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
index e2625339eed6..9a139cff2fa3 100644
--- a/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
+++ b/games-arcade/commandergenius/commandergenius-2.3.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils desktop python-single-r1 xdg-utils
+inherit cmake desktop python-single-r1 xdg-utils
 
 MY_PN="Commander-Genius"
 MY_P="${MY_PN}-v${PV}"
@@ -58,11 +58,11 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# The normal executable name is weird.
 	dosym CGeniusExe /usr/bin/${PN}
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index 64b0b63e49c1..c21122a8a000 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,3 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
-EBUILD funnyboat-1.5-r2.ebuild 1020 BLAKE2B 0b50a20a35982b63165c17c2cdce6f396aedd8f74d21c2d2e18013e38d7681919c9a796adc1f462ed6c9181741aeb990902864dee540286d9aa79acd4de67423 SHA512 640fb4128d897d575650ff9b458420765b72f81791da96a5125d80eb53efb076f74f17cd7949c48b2d13efff91f481e1c40e9f1d0b15458a8aa48df4d2bce3d5
+DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
+EBUILD funnyboat-1.5_p11.ebuild 1150 BLAKE2B c15fe28cca00f427063881d50fcf9e3746f2a142a447822826131d1f14a045496b488b0cda94d265f525a86c52ef2e4271a42885ee6ba6bc0b09eaaa13194a8a SHA512 16fe973c776bb5bb7f2b559b5888c4b496239c313f31ed9a2ad92d2b022842e8357b2620d4665e3ebd3e1398ee6a08bb72a19373c52da4e901178c39c39378a0
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
deleted file mode 100644
index f36cf2509f0d..000000000000
--- a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
-HOMEPAGE="http://funnyboat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r data *.py
-	python_optimize "${ED%/}"/usr/share/${PN}
-
-	dodoc *.txt
-
-	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
-
-	newicon -s 32 data/kuvake.png ${PN}.png
-	make_desktop_entry ${PN} "Trip on the Funny Boat"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
new file mode 100644
index 000000000000..39266cdc5900
--- /dev/null
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
+HOMEPAGE="http://funnyboat.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}-src.zip
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]
+"
+DEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Drop Debian specific patch
+	rm "${WORKDIR}"/debian/patches/use_debian_vera_ttf.patch || die
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+
+	xdg_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r data *.py
+	python_optimize "${ED}"/usr/share/${PN}
+
+	dodoc *.txt
+
+	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
+
+	newicon data/titanic.png ${PN}.png
+	make_desktop_entry ${PN} "Trip on the Funny Boat"
+}
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
index e03309ea569b..9dfab1a0b725 100644
--- a/games-arcade/gnome-nibbles/Manifest
+++ b/games-arcade/gnome-nibbles/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-nibbles-3.24.1.tar.xz 1651024 BLAKE2B 99b3f4f2e0c3a2ec8b75cf137f6e73848461fb20cbed55e6aef216f357babd67dd449ec36fde87084acf3b8f014b813672a75e1dbe11d33ee8fcc3e52af2a903 SHA512 7f3d7240f64429398dae1cdee96d912a22a4f534752d656ab470bcaa8515e005c8b7015e93b162ba24c3b891a64f3b3b84639c2254c1c7e6c45aea229492cc02
 DIST gnome-nibbles-3.32.0.tar.xz 495180 BLAKE2B dd7c14a1ec3900e25b64f92519c51eadedf5eac6faa9f8a35612876cf2bb796049f278e904e796aba427f579c5bda093a15dd5310141b9dd7be179b0ecf5b629 SHA512 f151b66edcde40e971113cdff7f3b92d740b2f04d943a168cc5471a18fabf5649d31d68beb3ad3ce29f91b36d34ff49725ce0c67f87184f6af1cafd0aed92349
-EBUILD gnome-nibbles-3.24.1.ebuild 755 BLAKE2B 418ce5077d29654fb0ba26735afa405a5ed4b005a20467c8edd1f2b213de2df3d3c01ebbdbafd3f2b6e2faebe083ee66dece95dab387e6e50daaadcbf9872357 SHA512 fd38b34bedc194d83eec4f9ff9d0aa97fdd977989a4f3f6784b0fd94746c4b466e3c71f792dfad7a0a6edf2b4ba448b01077c1fff385e07a5a1d486d67ce142c
 EBUILD gnome-nibbles-3.32.0.ebuild 716 BLAKE2B 11ca8083505a9fc3716a456ab0723c88fc726a4988d7972bc77f36b6357e4fe7f6bee0b96db8409e12616ff78a82392dd9c2dee102edd8eb2aeea19d33a5ddda SHA512 6f5181899f083939fc5d01cef0b20837efeb71af98d52ac7d22f224ba6dd40fc3a72407281c311e439aa47452613a59d3461407b72920668f95101547920525f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild
deleted file mode 100644
index 3361dbbd9313..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1=
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.18.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.2
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
index 31eba53497c1..5bcbdc076f41 100644
--- a/games-arcade/gnome-robots/Manifest
+++ b/games-arcade/gnome-robots/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-robots-3.22.3.tar.xz 540824 BLAKE2B 2f6943b97878d37da8c8a59cc7752b2c0eba35bc9eea1cf4b8a221fbae59ec4730af2ae71b25f2e946ee1edcabdb1a72a67cb1754350728b737fa26e3f9193e3 SHA512 d521527d9ceab16f4e3c64677044c87e46f38291ff126cc2280f69100750cb0317e6ad45e8a0abaa4dad38b67b958cac66653c33ba7760a410354f9190c02399
 DIST gnome-robots-3.32.0.tar.xz 422684 BLAKE2B bf66057da9ed52ffe641d28aa522d7851a1ac7881369d1329507beffdeb3f9dc6a46988993c899783576e8c63730245dd340b62267809d1334515dabc2d599e4 SHA512 b037d576eea45843ae4c13ddf284a598931b295257688f6fa458fb4e33b987c01dd70d34007703b3f7bcb97cf8aa306e6473e4c24e5ee0253f1beaafcff1c6f7
-EBUILD gnome-robots-3.22.3.ebuild 610 BLAKE2B aa8cb7d3d3ea1a7399d6410248f1a42bb86ff388c36ac5b3c9ec3f8a2066fd2f418cae94f4b766ed3413d7f3177487caf3279c5d4d2c04ffcfa20d703132e7c4 SHA512 0400d44af720b8305ce74827d6f8472d008aa2d33378fd34b1128ee7b40aefaa9c97934419164a914cf09782a7ceea66f525b5f8932fafd6778b0e43c9c56eaa
 EBUILD gnome-robots-3.32.0.ebuild 748 BLAKE2B 738526de05754bc10d59628d71633cce42426cca98744aad8f778e0dded92416b7173381f12dbe6015383849d5e8d07e543a753fe2e63130e07674213196db04 SHA512 0c812d687c72331b67c39580ff8a1283497f9ae1fa020f65c340be8c4cef9270f9c7936e097c62a16cca127e08f448fc32956849ab7ed3fd935c95a4e8c42793
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild b/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
deleted file mode 100644
index c6c722054da7..000000000000
--- a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgnome-games-support:1=
-	>=gnome-base/librsvg-2.36.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-arcade/slimevolley/Manifest b/games-arcade/slimevolley/Manifest
index 747a11f49b5f..523eacce2ee8 100644
--- a/games-arcade/slimevolley/Manifest
+++ b/games-arcade/slimevolley/Manifest
@@ -1,5 +1,5 @@
 AUX slimevolley-2.4.2-nodatalocal.patch 746 BLAKE2B ff7a336c459395724931e613fab39c212fd06f578342ef7628a934a7b066c085af909bdd35dccac54b6b698f4628b594766caa8c8c814c30837da443a73fcec3 SHA512 e679365056b118e8cf6c5a6828709f8beed67eb2e84a1ce5082abfc0498f82624bbce6584f663cf371eaf81201e6c5bfb1619fedc99ab6395e3b87472e61bd1e
 AUX slimevolley-2.4.2-underlink.patch 232 BLAKE2B 29e3d0ed66ace5a588d6e0133a2427eebd225ff77100336426db8ad892f52ec552bc562f6edf6c8834e5915094558940254a5ef9c5e6444a7ffa415654bec7f6 SHA512 402baf0b3955d86768ea40a0eaa289cd160f06551392e653255c32f47d4aed22c33f57a67e98fb3fe28500ed6914f9b8e465737b5aa958fd3332721fb2fe419f
 DIST slimevolley_2.4.2.tar.bz2 2402839 BLAKE2B 5f3ca09b11721076c115af78117e8185b9c243efc23369f7fac4c5243e942b3b0cddd403f727cad1400a7ffbd77c080bad0d1ee123dfc015be7a98337bfbda36 SHA512 7a72329d9e22396f2e304d40370896b2c1a0ae22d5bf1769a46cad8fb1131b1ae9c16de0e5f847b8a31004df074cdeb710a28bfd1e1d94beceb1c8eb0a750680
-EBUILD slimevolley-2.4.2-r1.ebuild 839 BLAKE2B 3d4910ddc87c43fda028fa63752b54153dc024cd95de386f2fb176aa510634131bb7510a191d47984fba8b514af57fabbc85f0afef72024b0d197d28723bac22 SHA512 660950236e2c714c1633d5ab91ba767785f095cbea2a60a3aef3c0fe94106b1783a6cb2a21da18622bf910714c468aa7c6d9f1144bf9bda00d1e9acb760960d2
+EBUILD slimevolley-2.4.2-r1.ebuild 797 BLAKE2B f79519e89611756192186009ce3040c98b466c0516f093ccedda64414e61af4307d2ec8c417f9b0a5bb5b8ef113635333b39cf779b2bc91ea0fde33ebd535919 SHA512 ead57883093a86690444ef50f4984a68965409aa1d2dfa56eb519fdc2deb60d8d856f08c8e41405f41ca0cedd0b07deb568b47905e454100a3c28b3e671c9146
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
index 8b9cc92724b5..d855f92fd16f 100644
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
+++ b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A simple volleyball game"
 HOMEPAGE="http://slime.tuxfamily.org/index.php"
@@ -38,8 +38,7 @@ S="${WORKDIR}/${PN}"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DDATA_DIR=/usr/share/slimevolley
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 8bb4616fb9e1..acbf6309739e 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,3 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
-EBUILD solarwolf-1.5-r1.ebuild 807 BLAKE2B c33e0360969cdf10066eb8c434f1cad7445f6cd72c7f5a5d7b1acc2de8d14a2ef6852e0f5dd210b85afc758b8dc2ca8448ddae3ce1c450aeaf46e55a8400a362 SHA512 b1dc28843017beb10eff20dab03c847f61f554c1f512509e904e9fbe567d4c68e918266e08a341e309bcf5ab24e6a60fba11c975ba75575e162253d862b6550f
+DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
+EBUILD solarwolf-1.5-r2.ebuild 1084 BLAKE2B f0779beeb563736f2f70deff4ca9d2deb4f3605a218015f32d2fb4ac004b92763ff738aaa96d09a8db5491564b7713685d50ad803177aeffbf1926f3dbc3260a SHA512 706f0aaf0c067d2e40db53214d31869a527110600334d0ba4980a33b83ffade4a0d8e1b760142b305296630488b88c9f62bbec43b0a68bce3e9f9bd0c6d0674f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
deleted file mode 100644
index e47801d87ca2..000000000000
--- a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-DESCRIPTION="Action/arcade recreation of SolarFox"
-HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
-SRC_URI="http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pygame-1.5.6
-	media-libs/sdl-mixer[mod,vorbis]
-"
-DEPEND=""
-
-src_prepare() {
-	default
-	find . -name .xvpics -print0 | xargs -0 rm -fr
-	gunzip dist/${PN}.6.gz || die #619948
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data *py
-	make_wrapper ${PN} "python2 ./solarwolf.py" /usr/share/${PN}
-	doicon dist/${PN}.png
-	make_desktop_entry ${PN} SolarWolf
-	einstalldocs
-	doman dist/${PN}.6
-}
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
new file mode 100644
index 000000000000..8f291786f9cb
--- /dev/null
+++ b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils python-r1
+
+DESCRIPTION="Action/arcade recreation of SolarFox"
+HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
+SRC_URI="
+	http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+dfsg1-1.debian.tar.xz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.5.6[${PYTHON_USEDEP}]
+	media-libs/sdl-mixer[mod,vorbis]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+
+	find . -name .xvpics -print0 | xargs -0 rm -fr
+	gunzip dist/${PN}.6.gz || die #619948
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r code data *py
+	make_wrapper ${PN} "python3 ./solarwolf.py" /usr/share/${PN}
+	newicon data/ship-big.png ${PN}.png
+	make_desktop_entry ${PN} SolarWolf
+	einstalldocs
+	doman dist/${PN}.6
+}
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
index be40991e3180..da7ba2461eaf 100644
--- a/games-arcade/supertux/Manifest
+++ b/games-arcade/supertux/Manifest
@@ -1,14 +1,9 @@
-AUX supertux-0.4.0-desktop.patch 347 BLAKE2B fd34f3607975c4715dbba48e87c1090b992927e8ef5cd94a9054ea62de4bd79dcaa1b74e14a7af55aba68c06abc61311cfef2e2fd5ac79c78b86698dcc1579c4 SHA512 cc73bafd7862c52e7e52a2bb6b9198e731ae3c63a2c15a99df291a121c82b0f3daf5ffcbd565a3ba8bbbabf1d339ff88cfcd01549a0ea8846ad9a0c98961cec0
-AUX supertux-0.4.0-icon.patch 546 BLAKE2B c5e26bdb22cee7ffd8a3d9a9f87e0c2a486c4eb6857a7f9754106bac3fdcd80d2e95c7b62af2dcb32f34abd25af93d4de5d69a449ee1232ebc87a27d6319b6c0 SHA512 538adade8a8fafb187f893cdf870a9b212df52cc0c7d54d94438cfc4f4ddcaf871817aacac306656a6201dae70581de608a76694530e3d1138c70e5937f5fb6c
-AUX supertux-0.4.0-license.patch 599 BLAKE2B a89b596876956f260de582d7f31e1b8ded03471e5fbefd0cf9214dd95a54c889b295707becfbf9f98d32269e414acf498713cae47ae882604e8683eac926086a SHA512 d3609c7d0053d8f2bdaf4f91449ba71d8c2a2509bb6718393e06add5ff9b59a3dc78f70fcdb7ace4f73eab9325ab5ef64cf9399c0e65a9b31f5fc4bfeb6bb751
-AUX supertux-0.5.0-obstack.patch 958 BLAKE2B 41da812369a4a64040e7759a4c56a7b3fb42898f50fc58ef03d76a9c27cc904db9909223eee98f9f5a7f12b5c0fde295701633eab308fe495333df3989071de7 SHA512 aecba33369bb255c9fef8e0ed873d7c457ddd85340f2788bd3f517b1a126e943e0ec1085239f1fea7eb242d0344efaa5ddeaa14865cc61a6863dab44b854f9ed
 AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f257fda90493947e4fbaec24a6e4d540e0dcf28505be92be3224b4cb5f6ca978abc09adac0b86503132203e9ce0cacf2b1c2 SHA512 eaf1c0ca534cb6d0cd216bd69283856bdad46830210edb6b00d4d382b2a2045eede8e96fa7b1832e8e2246144452b59a82966621441362c56c8bd3ace758097e
-AUX supertux-0.5.1-ninja.patch 1045 BLAKE2B 2f59d8fdf05e1994ae9690cdce001ea6235f8c06e7438eba41b54264e631188210591adce6d212f08a497c31cca9f08542b4dff1cac4568b0fdb4410eaaecdb6 SHA512 8b877ab382913d74db9890bf19867efc0c6ff4a5901a679ffbfbe72142341e61c804e1f4def1bd1157f3f144b50f2eca143420b08940eeaaed93a9b8fc1c8d5d
 AUX supertux-0.6.0-icon.patch 531 BLAKE2B ffe235acd0ebaac3ecb2588d195496ac2ea34a906874e01fead00df73b6b9e694aa92d335bf3e69c42e4f773c3bfdd8c7a191d8610e400381e102a82a10357d2 SHA512 c1ec17a90100fb12d52561e028366264e6588e08fa1af1ace0438ebc4c2ea8b783c8720d47a9bf43e907ea8fcc3c6a91c510a221ac9c488234205a18ec567b6e
 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.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
 DIST SuperTux-v0.6.0-Source.tar.gz 131203604 BLAKE2B 196e2ec328469b8fd373abeca6755207dbfdb8d21ba294f8150abd889f0ea8636ab3132cee94c976b8b768a6965eafe7467f09333ecf59a294405e73a5211c59 SHA512 7e313f1af1131e83ec658fee12803542d59075fa94a0a79a9182382335dc1b10a9f75092562555acf875dd03b15b336b40772fb8cdd81a82fa5802deb51b610b
-EBUILD supertux-0.5.1.ebuild 1505 BLAKE2B 0de13bef427186ee354f5a370a7c0a1728a113cb4e060b11802774198196cfe6b21cc78450b52564cb0569b50839cf74742dec9545aeaee0bf5d0cda237263a6 SHA512 bb0f1b0db5463abf529ae7e073e95976ddd8d8c605ab11e0e8e8dee45763117920aa54448838ed0c09f1024cf14685277a1e633e95892f3df20c75c05bbca21b
-EBUILD supertux-0.6.0.ebuild 1456 BLAKE2B 575447891a0be20bf30420e03d5cfb3dc56b689510bd2bea904214b9ee4be65e75961e3adebc18fe84bbeed1064418a08f55e48dd300db78c274092daf44f18e SHA512 3c98a6973fae94edc48165c69612f1341b420bc0458387bd6ec7cbfaf8efdc083efdcd2fe9d0d73d3df33c2f09131652ed6d880b9cb5ec88e1826747bcc3d271
+DIST SuperTux-v0.6.1.1-Source.tar.gz 163363780 BLAKE2B 313c25a74b950fc292821739c9edfe5c5878fad5f74e6ba6957fb3fa3740b2dafebc443211c090c46eb30aa9906768774cae6d245ea0c88d86ef80e77283e866 SHA512 9c4b535d5c55b3a582b05dab4ffb9658fd3d500165d428eb9e69c91b03e90dcf7517cadfa99554485950085764e6589e6a0a83304abebf7911e4c5a240270c10
+EBUILD supertux-0.6.0.ebuild 1438 BLAKE2B feb9ee0fb3a5109d1d400a2dca0ae87499855f542107c0cbdeb9589dc030506f25dfa43589a152a3468dab205e959d4d6841e9f95b6615dec09a9d736beb5434 SHA512 ca5cfa35f1782c8053a10d4f78c96385e16ebd7d14503f401a23f089728087f444b01982334be05aac9709e3a808c5bbfea4d25edddce458eb471754e18f4b79
+EBUILD supertux-0.6.1.1.ebuild 1358 BLAKE2B 2dd6a37a7720a71d9751077d830cc786a7928d3ce86e7cc44079dd8b12d8aa9e5159400cbfead8f46de479f18e92c2727fb0447ad4907dc146893c55631c89e9 SHA512 9f0f0bc75a90f6aea3663259e47bfbdb40908ce0c325aff147f8ed97dabb65a9072796c33649abb54f02cb143525d410468d8d2b91dc845e2b5b52c2feb3586e
 MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
deleted file mode 100644
index 74a087263368..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/supertux2.desktop
-+++ b/supertux2.desktop
-@@ -35,7 +35,7 @@
- Comment[pt]=Joga este clássico de plataformas 2D
- Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr
- Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux2
- Terminal=false
- StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
deleted file mode 100644
index 66be0ebe493b..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -571,7 +571,7 @@
- 
-   SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
- 
--  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
-+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
- 
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
- ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
deleted file mode 100644
index e35f85ce416f..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -578,7 +578,7 @@
- 
- INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
- 
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
- 
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
- 
diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
deleted file mode 100644
index 1b05369f67f3..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- supertux-0.5.0/CMakeLists.txt
-+++ supertux-0.5.0/CMakeLists.txt
-@@ -382,7 +382,6 @@
- include_directories(${CMAKE_BINARY_DIR}/)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
- 
- IF(WIN32)
-@@ -392,7 +391,7 @@
- 
- ## Build list of sources for supertux binary
- 
--FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
-+FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
- 
- FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
- FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
deleted file mode 100644
index d5181177fdcd..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Allow building with ninja instead of CMake, see also:
-
-  https://bugs.gentoo.org/649458
-  https://cmake.org/pipermail/cmake/2015-April/060234.html
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -332,7 +332,10 @@
-   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-   -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
--  -DINSTALL_INC_DIR=include)
-+  -DINSTALL_INC_DIR=include
-+  BUILD_BYPRODUCTS
-+  squirrel/lib/libsquirrel_static.a
-+  squirrel/lib/libsqstdlib_static.a)
- 
- IF(WIN32)
- 	ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
-@@ -370,7 +373,9 @@
-   -DHAVE_SDL=ON
-   -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
-   -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
--  -DLIB_SUFFIX=${LIB_SUFFIX})
-+  -DLIB_SUFFIX=${LIB_SUFFIX}
-+  BUILD_BYPRODUCTS
-+  tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
- 
- ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
- SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/games-arcade/supertux/supertux-0.6.0.ebuild b/games-arcade/supertux/supertux-0.6.0.ebuild
index c12492e71e3c..4ce0d37323f4 100644
--- a/games-arcade/supertux/supertux-0.6.0.ebuild
+++ b/games-arcade/supertux/supertux-0.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=emake}
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 MY_P="SuperTux-v${PV}-Source"
 
@@ -37,7 +37,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# This is not a developer release so switch the logo to the non-dev one.
 	sed -e 's@logo_dev@logo@' \
@@ -56,5 +56,5 @@ src_configure() {
 		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
 		-DUSE_SYSTEM_PHYSFS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.6.1.1.ebuild
index f61607c368e3..0964ce28665f 100644
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ b/games-arcade/supertux/supertux-0.6.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils flag-o-matic
+: ${CMAKE_MAKEFILE_GENERATOR:=emake}
+inherit cmake flag-o-matic
 
 MY_P="SuperTux-v${PV}-Source"
 
@@ -32,13 +32,12 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
-	"${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
-	"${FILESDIR}"/${PN}-0.5.1-ninja.patch
+	"${FILESDIR}"/${PN}-0.5.0-tinygettext.patch
+	"${FILESDIR}"/${PN}-0.6.0-{license,icon,obstack}.patch
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# This is not a developer release so switch the logo to the non-dev one.
 	sed -e 's@logo_dev@logo@' \
@@ -54,8 +53,7 @@ src_configure() {
 		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
 		-DINSTALL_SUBDIR_SHARE=share/${PN}2
 		-DENABLE_SQDBG="$(usex debug)"
-		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
 		-DUSE_SYSTEM_PHYSFS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest
index e27b41e2b46c..588e8f27948b 100644
--- a/games-arcade/whichwayisup/Manifest
+++ b/games-arcade/whichwayisup/Manifest
@@ -1,4 +1,7 @@
+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
 AUX whichwayisup-32.xpm 1694 BLAKE2B 079e9f6e3dde54c1d2bb7f576330663fa886bc112f3e20398c3e50521c19ccc4c68647b37e9d3ed4dc88a7f2c2ac60d11c171e3350e7ec84fee0b193e4eeb830 SHA512 e0329876d45aa575abe07024d7f154ff743f1899c4dbb58b8e317ae9173c2aadd63a511924e99115a9f56f42411507f542225e4980d9588e09f7765cf41bf95c
 DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809
-EBUILD whichwayisup-0.7.9-r2.ebuild 1238 BLAKE2B 9470470daf38683f8a2f0e25872564ffd7117cd80c4eae2191d87db21089879b07d13738c24be27e11b515221a0bcf557ce29d7e222b1f78c71cae17dd0594b3 SHA512 c27361684ecb16ed1ee09f85adf191bec985703a0d6012e318c98859359354e30bb00c249c37fab47741fde4c233ac9285f4b4e3e0657b6473ef28af1b743f6a
+EBUILD whichwayisup-0.7.9-r3.ebuild 1370 BLAKE2B e6f8fb72e65f483ad7a387fcd060fcfe4c93d5f9d435e211e0333f6a77f4a4630d21952d55c14c148a2f2269c5f7ec88d5399d78af5a4da4dd35ae2b81b398fa SHA512 0d95d825fb0f05d15fd1e3abdad4d9d2e1f1023660a1fc13fe7551fff66413521d6bd3f1a5eb5656d779ca6b75748eddb1e2e28963eb0a345bc499bbddb3e6fe
 MISC metadata.xml 491 BLAKE2B 7c632e2660757b2796dc732506e95b040890bc30941d152f4b650a2aad266e9aa3c013ce8054d02979c64610559ace6b4ac4b6d8ed9b5277a0dd9c92d9414b4c SHA512 a53511b1c0d5b69a34c5dfb0c302505cda98b9a54edb6b4f74868a48ee7870b1ec83dfedff7833e2997a97160182fb35f610a2f97c3577ca4b4cc297c98eeb1b
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
new file mode 100644
index 000000000000..b97856a0d2b9
--- /dev/null
+++ b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-check_for_joystick_axes_not_null.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..5bfea4ddd6e6
--- /dev/null
+++ b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-initialize_only_required_pygame_modules.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 000000000000..5b2026405516
--- /dev/null
+++ b/games-arcade/whichwayisup/files/whichwayisup-0.7.9-python3.patch
@@ -0,0 +1,470 @@
+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-r2.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild
index 84964d15a797..0644c6c31c39 100644
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r2.ebuild
+++ b/games-arcade/whichwayisup/whichwayisup-0.7.9-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit desktop python-single-r1
+inherit desktop python-r1
 
 MY_PV="${PV//./}"
 MY_P="${PN}_b${MY_PV}"
@@ -23,12 +23,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	# Fixes from Fedora
+	"${FILESDIR}"/${P}-check_for_joystick_axes_not_null.patch
+	"${FILESDIR}"/${P}-initialize_only_required_pygame_modules.patch
+	"${FILESDIR}"/${P}-python3.patch
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -37,8 +43,7 @@ src_prepare() {
 	sed -i \
 		-e "s:data_dir\ =\ .*:data_dir\ =\ \"/usr/share/${PN}\":" \
 		lib/data.py || die
-	rm data/pictures/Thumbs.db
-	python_fix_shebang .
+	rm data/pictures/Thumbs.db || die
 }
 
 src_install() {
@@ -47,8 +52,6 @@ src_install() {
 	insinto "/usr/$(get_libdir)/${PN}"
 	doins lib/*.py
 
-	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
 	einstalldocs
 
 	insinto "/usr/share/${PN}"
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index adf227a3e85e..0e5bcec05ef5 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -2,5 +2,5 @@ AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de
 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r3.ebuild 1368 BLAKE2B 64093b3ba968f7caa10a5d81dd6b233ba81aa8271d2d8f618bf63e79de28a9764221d908803dbc08de30da81f15bf4ce0f25702e6ca6db48a2b7a5ee9c2be96f SHA512 1d914efbb76454c230f8328083f9d351dfe866d19bd406d0ef59a4322b5baeb54d009735536bf20981bdb82301ac411c1e0d66cce0e378b0b8ecde590473b1ce
+EBUILD xboing-2.4-r3.ebuild 1367 BLAKE2B a3d070460e8d6c8e587c0e951119d94ddabda41b64ada7ef4b27267d09570c1526185c89b9277e30c05db79075a0d1002e66238629b073a3dc9655b21160df05 SHA512 747ee0739e3b029c7c052469f58a3eb7be96142ce6af6eb188715c85062a85489fc05925a4a4123ca9b4e3f6809a3cae71923c212d639d490846d79ead4f7495
 MISC metadata.xml 214 BLAKE2B 86c649fbb74ec8627ccee25d0b0d3cbac3b6f9ba8e164327c15faf02abca8583969e3e2a35bb629643500d079e873cdb8093c5ed3d7bb5c4348269d485088ae2 SHA512 eb9f85ca2fca14bf2aae5fe6001c2d7d1cf93e00bd4de8dac2f71f23ad3c7a7c8fcd65593b1adf77a07260cc546339846f4b33ec99032e353da07d1b3bff8f08
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
index 50f62a16acc8..9c36b5a49e69 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz
 
 LICENSE="xboing"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="acct-group/gamestat