gentoo resync : 15.01.2020

37 files changed, 184 insertions, 620 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 86d296558459..b7ef7c6003f2 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index 64b72a56ad53..77b6e5ebaec8 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,3 +1,4 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
-EBUILD angrydd-1.0.1-r2.ebuild 996 BLAKE2B b611b57f30602703b7192c66b93d440f5bbe58ecc57dedfd394d23248ec03b1575a226a27c4fbad6191d6b69d7ee6a511b14929e5cbf93a5b0c67d13aaa94160 SHA512 64a41bd21a70182a70b726cab70a5e4b02b0465caa26ecd3da7b9c65326d61f420e3b07c886f7bed57cc2fc47195d5465a57d63dfd591045c37b7fb995181a50
+DIST angrydd_1.0.1-13.debian.tar.xz 11940 BLAKE2B d64ae1f878f3dfe4eee9f236ce6869f7ce3d77021a09593240a84860157781ecd776be7a06edbb48d1e340c654c50f4463b76b42049076e9c02b6397988ca9df SHA512 123d593ac7ceff8f6fe5d70442b92e6564f4e6ee668450cb623bbdeb4633cad6e04cf896d93cacc5e11bda08cb61b7c92ce0b99072e6e12b21e023620d12b360
+EBUILD angrydd-1.0.1_p13.ebuild 1176 BLAKE2B 9688e6504169eb00f1cb80663ad6576bb76dfed060b8ef05513d68c6e3b9415b149fc945a5509bf69420a9957a0463333884134d9b3e4d2b76617284cb8c9644 SHA512 b8724a45d1c547bdb010ab9f1563ff063c7197b1623407b951e9fa8e9a055ea89694a9bcb48802298dd831976f1e80e1a2afc1905765ac0deb6a77f6f3922065
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13.ebuild
index fe4be2ac4003..24ba06527628 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13.ebuild
@@ -1,14 +1,17 @@
 # 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
 
 DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
 HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
-SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
+SRC_URI="
+	https://www.sacredchao.net/~piman/angrydd/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,9 +24,13 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/_p*}"
 
 src_prepare() {
 	default
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
 	python_fix_shebang .
 }
 
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index 044f2c5ab18b..b842ab88e3dc 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,7 +1,5 @@
 DIST five-or-more-3.28.0.tar.xz 1507188 BLAKE2B 992bc75847b7e51cb5b5a23c3d3aad89a6daee00546711cf1d273663d2ebf8c2801c7a42f2aae1154114715d56ab1395def074beb30944762e9c560311880377 SHA512 33bf396426401dde2b326af8e7d137c23679589568e78f8b7e0020c074169318ba7925ecbd23bc18a2cfe0abecfca05c3090b78f1f86801c84e6fa385ca23f8b
-DIST five-or-more-3.30.0.tar.xz 1445044 BLAKE2B c26e1cf781f32e74d3fb65757cfef3f4dbf078e2dc047e49d12de3d03850c6395f98f90368bb0df4bfeee22db0da76580e3c1c62ff26cc5236e37acb9fca84e5 SHA512 20c5b089c00808f3d170dae514da35b02dd007feb6daa3e818c435bf09b012b343839aad82a9cb022bc0247388bde387d35e8d428b2f561c4a7ae43073bed469
 DIST five-or-more-3.32.0.tar.xz 1238080 BLAKE2B ce810414ff58dff833560f1540f533aaa9fccf20af4a0b6ce42d6c4dafc21c72c210c0b710e1ae1ff04fa33f1e23ffbcc498a547169d216d26d02fd1fabbc1a4 SHA512 7a2eeed345754e8d27e626a63eb6ea00b22dd600e405899543c402490b953d3675597fa2c2df6f661108ac818664f82682f710652cfb2a0058c1da753d21df80
 EBUILD five-or-more-3.28.0.ebuild 602 BLAKE2B 6e5eb0d9326692db4d1ad8508a7f6b0c0e41dce848c27a60e3962567f8adef752cb14b971bc25512b957e4d0adca0860585f4e182aa1e398d1a543c49d692da9 SHA512 6c6e1cb840b97e334ad5007bcf9aaecf1ca359d22d3083a9bd9a274a8af694430bb2808013033065d0c4eb1ecfd9d4195bcfd03643a02b0ad7e627ef95293720
-EBUILD five-or-more-3.30.0.ebuild 707 BLAKE2B b72f093dfcb3555d110512d2169d8afa6af97b88a428edcc134e38291274a0597576d5a9e64cf361cb39d0ad5fc5c88306691802025d727e58930542186dbc01 SHA512 ca1ac37482b0487ff5d026507eb140b6b8a0735444e2232901411a459a5d4f4588769d5d3a18c6496b5ebd513b0d1597cabbe1eb1c733918701e760fd15f91b9
 EBUILD five-or-more-3.32.0.ebuild 835 BLAKE2B 0710c1639d54ac0563aaf86a4ae52aaceee3a00bd62493abca8e706b5ab4cf9e48cdc69039c142173744edb8feec8914b37983c9efe962493d8a7ecebb623bec SHA512 19b2dc91c8258c9fd38d6e4ad09807674e547cbcf605037c3046a56abeb7319afcc9e4c2c814029a2f7b78a5055d5d63f550e5ea3540ee00c5bf5d696317a39f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild
deleted file mode 100644
index 5da398c241c5..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.30.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Remove colored balls from the board by forming lines"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.20:3
-	dev-libs/libgnome-games-support:=
-	>=gnome-base/librsvg-2.32:2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index 30f1ee0281b1..2e0a58f56ad5 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-klotski-3.22.3.tar.xz 664380 BLAKE2B 3c5ca5da9baa30921796a8701fcd2e1f5214fe19070895390fd26617af6eac7dbe12c92e643cfd2b3b5b1bbb0303e4272e338100f23a79011939506a433be014 SHA512 d86b39c60b545abfe6fce2366dd40e2d603e635f4b33c42e76a4447b845981c51fadfdb8f9f073e515ccd9772c9ee5f29258ac63b6620acff03150cc52a51d0d
 DIST gnome-klotski-3.34.0.tar.xz 846780 BLAKE2B 9928b79b0963078cb046eda5d776080fa61c6b2bf09af3da5da1e15ee7385771d792522dc44c63c1b4b3f0d218e4fe41b09fa35a86e90ae15b39a5fddf066667 SHA512 6a21588895594abe772d0a4cac3bc4049586078b35514647d1d9847472cae809c1a916a8bcd12775df5331a58058936e9723f0fd5e80844df2b362596e0694c5
-EBUILD gnome-klotski-3.22.3.ebuild 681 BLAKE2B 849c639c254afedee442889b54271aa6cb3ed576727b0a63221eaeed05698212e463f7e2af2dc454445f911479f3b3e706cd1230b18384d98cbef5b9a464564b SHA512 4606a75e4efb20ca59ec5dfa49899e268b4d9a9d316fa97ad1b10db729180e8dcaa2ed9a23f92afed24f6936c12b37ab91589ac5573d3365089ba48b6f0857fa
 EBUILD gnome-klotski-3.34.0.ebuild 847 BLAKE2B bdde8e9c2293814371dc410d54c58b67a9fa91aeb0f33f5fd9b563d27c083fba2b61218709322028d86f1c77e259afc23d1af2d2244defd680e6533a56df3e6f SHA512 326ec6fdb7050e926278f32a0c7b6b0be64488994a539efeebd079b942ce18e0fe31398460b93d0cc2b21cc5ca15b32a13b964272c0d0236a29114bb4a913a69
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
deleted file mode 100644
index 14f34f774e13..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
+++ /dev/null
@@ -1,36 +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="Slide blocks to solve the puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1=
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/gtk+-3.19.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 01b7cce6fdab..f985610bf080 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sudoku-3.30.0.tar.xz 430480 BLAKE2B ddf5462ae9e37d1428ca96468dc8fc5f6a157c541f79cac2a96fbbcc082d4bda8adc3539add48f7cb248caa722c21bc14bdabce54a94ae6cfbfd62d2be18c500 SHA512 ca1b830279b89bb35c281eec275af758cae32c0caec7b09a02790efc272701fa03aafb61000dcabc0ac78c7b04d886290c75bd79d6a3d8a89565dc0b122862c4
 DIST gnome-sudoku-3.34.1.tar.xz 355424 BLAKE2B fcf8a175e1b2dbbb4498d185ee4b628766fe4c112c5126d253ecf16430a8e1b647fd9b4779b8dea24fb6bd8460d2b8824f087b077c7b91d8764ddfae97d72d46 SHA512 a1967098d10a28fd5e49e6e63c9c0aec7f2c80dbe5973ef4fafe175f39e3d885c4c428953e528ee0fa3eea05c644f0aafea133b195acdf7e495314fe3d8d090c
-EBUILD gnome-sudoku-3.30.0.ebuild 1085 BLAKE2B fe3f7184c20c0b2720ab7d4c9774e603f04db3ce2daaf21f901018e1b24e2dc0f1fb8a395326dffcee416cd46b8c7d6309a378f2888dfa7f328ec21e20ddba5a SHA512 4b105f0cf500de6b9be8754e9a1f960cc5dc895879016129d2cb76cf851bde9b5e2d3a03cf0c2458bbd204676bc23a2479af6ff1e6b9f25083dc80322a10eba2
 EBUILD gnome-sudoku-3.34.1.ebuild 918 BLAKE2B cdf450b8115e7564d92cf13ae1bba7f8a5caa032cb1cd554511a1b86efcb085696e4e53149699c2056c4d5fdf8e5caf6b8c5dce90231d2c6d2590bf68fe131b1 SHA512 5db53414ea66e70e8081db1f8cf38dbf3fe0e911a98c8f9c670650566e2f10a019beaf580f57a6c960feb7eaf5583ed120ed5203d49fb8c6f45056a0dd432e36
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
deleted file mode 100644
index 8c5504ead34b..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.30.0.ebuild
+++ /dev/null
@@ -1,52 +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.36"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.19.0:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-
-	# Make build compatible with vala release <0.38
-	sed -e "s/\(--vapidir.*\)/\1, '--target-glib=2.38'/" -i meson.build || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index a92d2fa4ccbc..c7f4820f40d8 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-taquin-3.30.0.tar.xz 4553892 BLAKE2B f397dddb8d8564fc403b971f044e1d39bd779af370670f45469490aa0f9f8da857d6b216f8378346d835d9b13c57d47bd960a993cc1eb3d33e705f82b5474f30 SHA512 77c500c7871440abd18cc34d64bfba1b89d7067557cfd12306f887ea1a8138dc040b00203ae6515755ec3bb13beed8a523b039c00112fce7f8e80f3ab34398f2
 DIST gnome-taquin-3.32.0.tar.xz 5234188 BLAKE2B c302cc24385161d7cb12f77a8278399ef0e08322912d1afa0fce92a8064ccf8320de570f5995a84354db92179f697e31a600ad2144d44d9d006f539a1135428b SHA512 b874d38ca3a3d31fecabe0f0661d0410e69d744e06192c037f8a71da11e963e2a557780eb1a7fe9c75dd64a969b8d39c3ec1318ffe6a99c4248652ff5a416418
-EBUILD gnome-taquin-3.30.0.ebuild 718 BLAKE2B 480c9710416c329c9d4bf9a4042f4d8d65c77e0808bf7de3b228677dbae424984b8804562090554d394903b38b595a1c53b8a5b633b4f00898aa124793548a0b SHA512 6711665b0480ac1616b1c6035e90410e2d17de2185673d4499ac15d8dd4252bfe1f2b0c091d2496bf7e08cdb153b805cb04b7ee4743c25c8e0439cff1623e160
 EBUILD gnome-taquin-3.32.0.ebuild 957 BLAKE2B b0b8f3f0c96dec67ddf2aa9263179da2eeb37b078ffe5c373776ea88c4de2ab7f482f902cb5a51e54923ecf6afa052b3092bafea0d65ce137986a8bdb5e6ab3b SHA512 d74e8e24fa39d8f8cb0bd0c39ad691a5db773c20c09cc4d73fc0bbc640c1c0e6119bfe5e6985f4b6bc85bc9a1720f2db42d1d805bba9c9e5cd1935d098223562
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild
deleted file mode 100644
index 635595621ca3..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.30.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Move tiles so that they reach their places"
-HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-"
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index a4801d7dcec0..72f4688135a3 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-tetravex-3.22.0.tar.xz 2170464 BLAKE2B 43ee2d93a8d8b2a1f9515ee23a85a77be3f30b299652f2b5192d5f97bf3064d6a636f10e78438aee329ad91d1f0b7fed6ec2109593397b7c849c36ec727692d2 SHA512 d4497fae7e2c95f6d6e26b72690c86ec12250ccc6136f02436a53fa285215415a471d91f2ded10690faced6f6f856218750eb76313d368863a7a31afd02a9d2d
 DIST gnome-tetravex-3.34.1.tar.xz 914192 BLAKE2B 2bf9dd70d3c8bd71d7f6f4cc8412ad0ef1f89191890910253b8986b633a8d02660867d4be088d27ff50551c5de14448f4026689230984de213cd2c46d69a091b SHA512 bdf39318b093b10e4a018cd7ef4d8acc65013325bb5406347024f870be2758a42b6b9cdd01d6098d06372cef8967eb948857453f951f8fb54f469bb534642059
-EBUILD gnome-tetravex-3.22.0.ebuild 616 BLAKE2B 0684a8191b6b69b6f419753242c4b8ff90420e6e03eb46e55f36584133fd951b352d32d9a0a1ed7738c242c8e35f4d119d0870f2406b7989e27a3689e678e9ce SHA512 3a3f8de7fe28cc0713764bdbd3a20a7bee7b7548ad92edcf43cde4e276185ccca7bac5b3097b481c118ad985b538f6458c4b2af848c3de32fdf7e22d02fbf9da
 EBUILD gnome-tetravex-3.34.1.ebuild 712 BLAKE2B 8e128566a327df50f28213bfa3dc10ee5fe2d25271552d384db13258ffba16d9f5844ec39f30e56c9fec57d308de28dc74391a3acc65d68289874ce8d865463f SHA512 bbf43f9a65575981a30d8328c0990d61bbf27b1c7b39089fc48b03ff3d58b94e0f045fa7f5a8e24d02d865a5d06698f494f155b1f060104f1c2e201cee001eb0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
deleted file mode 100644
index 292f7923c60f..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
+++ /dev/null
@@ -1,33 +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.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 86d13314fb99..65ac7ff277b1 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,5 +1,3 @@
-DIST hitori-3.22.4.tar.xz 471136 BLAKE2B e9581f9588ab307fba781b3907c1e5d5a34db462a9fa050cf6b2438efbae76ed74fc69623de28a2ec59c4340f487df68156dee453a314adab7cb6846edc347ef SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a
 DIST hitori-3.34.0.tar.xz 163152 BLAKE2B a52446fe62c2d09e9f1f97e77dc82a2902c05013e6c13d64ef58c4b9fcb500cc8533ea094bc91c1c933f5923e3dc889b5db23b1050d8809c0f405ba81917bfe2 SHA512 f4c67da619fdefe03492dacee81bb7972ec40e003c51a1363c19b6eb2690505a0a14e7402ddb61ef0487605d91a7674654ecc470e01febe649b25e173a889354
-EBUILD hitori-3.22.4.ebuild 556 BLAKE2B bb2ecf9a4dadc2bcbea4e2b6c7386fd5a5b5fe7c8f1a4ec443ee321f4d00b6c340eec55458a12990f1dcd48361caf1b56af0f0147dac030dc5947973b6561007 SHA512 af2590ef13af207521f99e2416f6f4fc044a37e2a843a201bbbbea254b5bb9cce8d5f079b56dcacda353c9aaba4995c9c0aa10b4f94f0218d0f7cc2fabe95df8
 EBUILD hitori-3.34.0.ebuild 702 BLAKE2B 148a78cea45a19d47dd46372419c94c26e6905593a86a432a41b9e9255dfcb04efe230117755b31c344c0463a690c8f0f3aee5f7b15e55cde8ea0905a9917394 SHA512 b0757befb91f8a53ffffbd93b08d04aee7c8af3d9d64a7f7c059833a298d9dea67364e30e0138a5f9dd5197c0facde011acd188d77f7d42d1161a0cb386eacf0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
deleted file mode 100644
index 33183ab94665..000000000000
--- a/games-puzzle/hitori/hitori-3.22.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Logic puzzle game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/cairo-1.4
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
index 91f2f5e6f542..644cb48e4019 100644
--- a/games-puzzle/ksokoban/Manifest
+++ b/games-puzzle/ksokoban/Manifest
@@ -1,4 +1,4 @@
 DIST ksokoban-0.5.0_pre20190225.tar.gz 433196 BLAKE2B 5c5c132b09165798042d1f41ffc282dc41e70bc1f0573bd55373c237dc7d8424119b2c78ae6bfb741193e3699d7120c952da66f579993189332da4104c8711d9 SHA512 3377a07f646501d37f30da66e70954894e39c8b5b948cd230263bfeeec4483b4fb2fec7d00aa020fff4459df5d376a1861dea63fc1b0a2a90757066a210a5be8
-EBUILD ksokoban-0.5.0_pre20190225.ebuild 761 BLAKE2B e191846ff46f4144daee2bf482a840501216028ca40e293687b7187ed8eb3f76c6cac5c70e4214793fd31520bdf8f043c1d0ae2eff0b6fe55745f37993c2847d SHA512 2b80b238253a754fed1781c517fe9dbe6f9b45ece7e1a04553b5a1aa868ef498549cf7a4ef4cfce08bd0cc63ce78a61661bec0dd72f8de3213c3b5f0dcaf608c
+EBUILD ksokoban-0.5.0_pre20190225.ebuild 848 BLAKE2B ec0e1b2490dbc1e22cd275acc64609ab2708128bcf59f4ed2a762d418f1c2097eff6195979403203ae049701bcee13a66cba1663ae8e95d3023499769e8c63b4 SHA512 158b7786c7409382d4b01d5ecb6b93afe5c2d50d7dc3dda6a7939525b0f0b3470313ad42fd8600fb952843bc286325d2521aa8d7682ce28ca700e2f036e460f5
 EBUILD ksokoban-9999.ebuild 676 BLAKE2B 7cb1dcb64d9d132aff66f019e8f1d8282bc582bc2fc250690fd7cc129e142c21ea0ed01b1be4d5f55bc124f217d76dcf6df84330f43b0af360120000e8d3ea2f SHA512 38c1c8e8924ae5f75d56c0cdc89dc1530a774da8e2bacc9bc703c3e42df08749939f36763a6a9729d883da6afdc39161e3f14b6b84fadc3d5bdb5786092edd0e
 MISC metadata.xml 296 BLAKE2B 8abfdabec906c0024c978d0df7911b26d1df5c21269f78f6b327da8ae9a3955e0a091540741553cd9b805cdae52c09c713d868df83fa92c59e43b203d5db3219 SHA512 50facad52c9acec67642e499d377ccd05b7a18f578f0d71b6b8b222e6ac6a310b24913d9374bb9ba995fbc3cd55612f79ae562c8fe9ecd1e451d472505bd8e14
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
index 23c1e22ce638..026aaf265943 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
@@ -4,8 +4,10 @@
 EAPI=7
 
 COMMIT="317b1e70a87224c94cac85955a3d666a43527812"
-KDE_HANDBOOK="optional"
-inherit kde5
+ECM_HANDBOOK="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="The japanese warehouse keeper game"
 HOMEPAGE="https://cgit.kde.org/ksokoban.git"
@@ -16,17 +18,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 DEPEND="${RDEPEND}
-	$(add_frameworks_dep kiconthemes)
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
 "
 
 S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 4c1913d4d63f..37946f60ca9f 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,3 @@
-DIST lightsoff-3.30.0.tar.xz 714072 BLAKE2B 9e8c2354b2ccedc10a00e32f9809f2c7ad653da8cb3d6af2156ad701f64b8e9405c705a2424ca549f475d57182981d536a225075f5b8c2bc7596f28317ae40e7 SHA512 b7868b26d81c1dc91dbfbb25ed260c35fef5ad63310818c68716cabbbc583d6f22697de50d6aa739852ab0f42b217bd2a670e3774e1c541bfc5e16a2c46ac1e2
 DIST lightsoff-3.34.0.tar.xz 683944 BLAKE2B bd9c1c8cd29ac46e40bb164a9d5fdea66d2933b0b9ebb8022a7c1370f572da9b89bd5e70cd8bd01aad32c6cc43d5a2e10542c91f42bfb811d85598329847bafe SHA512 dafdb121810f931dcc795decf6d94f3b9fb4c67b0ea2362451f1a73fe96ff8278682ac32dd3db4d0653d530e75ec4b37effa6ee55c916b72ea8d3de618ecf7a9
-EBUILD lightsoff-3.30.0.ebuild 1048 BLAKE2B 123df05935a004768cad0981df03d5877695e93615ab67afaf8c61759b307950b7ea8a9d9c390ed10781dc98dbf07f1ab730698f678c9c14be9a19665caf2ad4 SHA512 167f68a7787be2456ac3176d1b75e2406e581b86696fcfc116bea13491600b531f34d4cfa6e1506390c891e38362296a60e74f779730efab5f552985dcb0fa1d
 EBUILD lightsoff-3.34.0.ebuild 951 BLAKE2B 973e4dcb713d519161552822c722d4823813c47e1956def2cde4734bda3cccdf54450331a3c2b80c0fc2270bc4c4b2c640732862116f42c544001ed58dda7e3e SHA512 c2edc5a34929bd37f169b2044b0f8433c86c1be62cf706a1cbb52d74e9f498782f92f6bfc10a1eec1241cf5b7ded135336e74afe7a618f473b3300e08d0af379
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild
deleted file mode 100644
index 0cdbf07e9567..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.30.0.ebuild
+++ /dev/null
@@ -1,48 +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.40"
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2
-	>=x11-libs/gtk+-3.13.4:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=gnome-base/librsvg-2.32.0:2
-"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-	mv data/icons/hicolor/symbolic/apps/lightsoff-symbolic{,.svg} || die # fixed upstream in commit 360bfb9564
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 7f42c1695386..d92fd32b5f84 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,6 +1,5 @@
-AUX monsterz-0.7.1-64bit.patch 1093 BLAKE2B a27d602e4087926e053abd4f1cefb22a88fa37f8a3a773e13ea2f5db0914d6589db5fb09c78551da2f6f5b78d5cfd6c46bf08b9d77e6cfed99a451ffb9311c24 SHA512 3098e5a287c2b3e5e415a06e9e671fb4e56ebd4405a4580c5bb3529c1708ada9efdb40b1369040c7dba50ee1e0c33b6f088da898a8eec7f2997e4d376b67dea4
-AUX monsterz-0.7.1-blit.patch 1298 BLAKE2B ef1c5961a0a1c48ab01a289f7504355b445beae6f7387f68a901b75d403c2422b53fd1c7a4923d954320de73555fd649ff913ddd68336fc1233f94655fb34b8b SHA512 682542801240d7b32497105774ed240b08eefd9a92dfd20caf66d00fb1d77ec563c97262ed323c96a71fa19e5c2f9a13cffd7a8698aae92b2dfd858d35d8ed98
-AUX monsterz-0.7.1-gentoo.patch 970 BLAKE2B 658224adbc150cf01dfe72a3f1ea5fd14d0122eb1ac3b55f1d52c1f89ecbefeafa88e3aff08d4d832f8b2b6b2922890514609652e0c8f3cee26889f66b0ca5bc SHA512 1dc1994cb03f794b9f015d8d812b8519c826b0a0d02ecb3a9f4bb0e25d69aeb8f3784dcf1fbc1624ca18f645b55e0889f0d2ce8f1339639e8ed55d305af0f3e1
+AUX monsterz-0.7.1-gentoo-r1.patch 390 BLAKE2B 4cd80a3b5ff0d0c67326a811e92637b5006d37b5a00e87ae8dbb9432060ca65e3754b5e75bca023e8822854613bad9fbec0aa3dc7a1040a804bdab0f1204b135 SHA512 6b8eb58d5610d0e15c9598b6bd92a98690b4fdfa663f9d84be0c77c727a8ad8c48caa946f8ea4060e895984d9e28b5cd4caa9acb6385c2c4f045fa5987a6b8da
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-EBUILD monsterz-0.7.1-r4.ebuild 1100 BLAKE2B 9eee9e6e0cb08ac23cc78abea1981877d017046ea3dbe3136bc3ac2ff1c6ce53752729a5b53ee2ca12bd6853dc930154954596621e2f6ce9f147f34a8a44a8ab SHA512 6d83c1ad052d362b6e364fec40eb321696e68a70fdeb2138018f1a316dd9c2d4b528bea8e54777022d50ab6ed82274af4d2106bba0ae634bce30b3995ad96808
+DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
+EBUILD monsterz-0.7.1_p11.ebuild 1296 BLAKE2B c16b30283729d7cdad6e9ae39108b9e97c6ea0ceb39bd509ed5cbcc52ddc1f4464ad427dd390fc4f8f0db8dca03aa21676b8ebd1c5f63c028478167bb9b64e3a SHA512 d569ab350f9a11875aaf36cd67793bb9d9607fb13cb951004ff41dff016e2ab63971c9cc808006fb343e7adbeb8d4b439a3f2d44dd88725d7b0dcc2280254c11
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
deleted file mode 100644
index 64d6527768f8..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: monsterz-0.7.1/monsterz.py
-===================================================================
---- monsterz-0.7.1.orig/monsterz.py	2008-05-09 16:35:25.000000000 +0000
-+++ monsterz-0.7.1/monsterz.py	2008-05-09 16:35:33.000000000 +0000
-@@ -108,7 +108,9 @@
-                 M = int(max(r, g, b))
-                 m = int(min(r, g, b))
-                 val = (2 * M + r + g + b) / 5
--                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
-+                p[0] = (val + r) / 2
-+                p[1] = (val + g) / 2
-+                p[2] = (val + b) / 2
-                 if alpha[y][x] >= 250:
-                     alpha[y][x] = 255 - (M - m) * 3 / 4
-         del pixels
-@@ -129,7 +131,9 @@
-                 r, g, b = p
-                 M = int(max(r, g, b))
-                 m = int(min(r, g, b))
--                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
-+                p[0] = (m + r) / 2
-+                p[1] = (m + g) / 2
-+                p[2] = (m + b) / 2
-                 if alpha[y][x] >= 250:
-                     alpha[y][x] = 255 - M * 2 / 3
-         del pixels
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
deleted file mode 100644
index d0847d6c2c10..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/monsterz.py
-+++ b/monsterz.py
-@@ -829,10 +829,10 @@
-             pass
-         else:
-             for x in range(4):
--                for y, p in enumerate(alpha[x]):
--                    alpha[x][y] = p * x / 4
--                for y, p in enumerate(alpha[406 - x - 1]):
--                    alpha[406 - x - 1][y] = p * x / 4
-+                for y in range(len(alpha[x])):
-+                    alpha[x][y] = alpha[x][y] * x / 4
-+                for y in range(len(alpha[406 - x - 1])):
-+                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 4
-             for col in alpha:
-                 l = len(col)
-                 for y in range(4):
-@@ -1287,10 +1287,10 @@
-             pass
-         else:
-             for x in range(10):
--                for y, p in enumerate(alpha[x]):
--                    alpha[x][y] = p * x / 12
--                for y, p in enumerate(alpha[406 - x - 1]):
--                    alpha[406 - x - 1][y] = p * x / 12
-+                for y in range(len(alpha[x])):
-+                    alpha[x][y] = alpha[x][y] * x / 12
-+                for y in range(len(alpha[406 - x - 1])):
-+                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 12
-             del alpha
-             scroll.unlock()
-         system.blit(scroll, (13, 437))
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
new file mode 100644
index 000000000000..bd8a825c3c46
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
@@ -0,0 +1,11 @@
+--- a/monsterz.py.old	2019-12-25 20:25:16.680365172 +0100
++++ b/monsterz.py	2019-12-25 20:25:50.606666122 +0100
+@@ -1991,7 +1991,7 @@
+     global system, data, settings, fonter, monsterz
+     override = {}
+     scorefile = None
+-    sharedir = dirname(argv[0])
++    sharedir = "GENTOO_DATADIR"
+     outfd = None
+     try:
+         long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
deleted file mode 100644
index 6920e0e36971..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
-+++ b/monsterz.py	2006-05-12 18:57:44.000000000 -0400
-@@ -1907,7 +1906,7 @@
-     print '          (C) Mike Kershaw <dragorn@kismetwireless.net>'
- 
-     print 'This program is free software; you can redistribute it and/or modify it under'
--    print 'the terms of the Do What The Fuck You Want To Public License, Version 2, as'
-+    print 'the terms of the WTFPL, Version 2, as'
-     print 'published by Sam Hocevar. See http://sam.zoy.org/wtfpl/ for more details.'
-     print 'The sound effects are released under their own licences: applause.wav and'
-     print 'pop.wav are covered by the LGPL, the others are covered by the GPL.'
-@@ -1932,7 +1931,7 @@
-     global system, data, settings, fonter, monsterz
-     override = {}
-     scorefile = None
--    sharedir = dirname(argv[0])
-+    sharedir = "GENTOO_DATADIR"
-     outfd = None
-     try:
-         long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index 4cff31b75f8c..87cecf30833e 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -1,14 +1,17 @@
-# 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-r1
 
 DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
 HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
-SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
+SRC_URI="
+	http://sam.zoy.org/projects/monsterz/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
 
 LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
 SLOT="0"
@@ -23,16 +26,23 @@ RDEPEND="${PYTHON_DEPS}
 	media-libs/sdl-mixer[mod]
 "
 DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/_p*}"
 
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-blit.patch
+
+	# Debian fixes
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
 	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+        	-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
 		monsterz.py || die "sed failed"
+
 	rm Makefile || die
 }
 
@@ -43,5 +53,5 @@ src_install() {
 	newicon graphics/icon.png ${PN}.png
 	make_desktop_entry ${PN} Monsterz
 	einstalldocs
-	python_replicate_script "${ED%/}"/usr/bin/monsterz
+	python_replicate_script "${ED}"/usr/bin/monsterz
 }
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 1d9194351507..f861e94c8792 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
-AUX pathological-1.1.3-build.patch 527 BLAKE2B eb58b42104ee13d4f438800656ac056e2b404c48615472ad18eda144c6976828e1ea3f58551d4ee9dc8032299bab492fc7c8af12048bbd6807b84af26822357a SHA512 d18b8e55d3f40fa69d0a551749b1242ba055ba8eb5bde517d7df8a46414d81232836bf232b28e77b1dcab8f0d049b3ee46ef666621674ac1be68e343e53f1c34
-AUX pathological-1.1.3-music-py.patch 475 BLAKE2B f73a83c4feba6810a39bca173845dd3b5c24ce752414f03e626879185ee53ee073c249136d9568f4866a337111d22f3aea2d13aeaeaed5b1da22a7cf520d26a5 SHA512 4a96a35d299f10ba90ff979ec77c7b117228d6e593be0b5858233fd44a0c746ad3abd52fe2751496e2ace813afc95ae7ee76c2e3d940678236de973cdae7aa87
+AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
-EBUILD pathological-1.1.3-r3.ebuild 1965 BLAKE2B 9a1856c81705fd53a79e00b847ae89e510a4f038039fe939cf94269a51ee7674a0d5ff82ca787ed78fde174276e9bea74a4554a24dd8c4a3193b3aac61e12898 SHA512 bc36d2f3f012273c2c3cdc9f74c656bfe40d51c568a3e916fd35b31d45a428717ffa9c7b6fe99de08940d66cd112912781cbaa15cb4967c822be996ccdb9801f
+DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
+EBUILD pathological-1.1.3_p16.ebuild 2213 BLAKE2B 673cdb9598c7a0fc215d90239aeda921619c75c2d78e224952dd530814e3c3a90f3a921a6cfbbeae39c0791e292f69eaf53c744a68151d564fb642749b5bc44d SHA512 be4a4108301c7a9f4001a96c4df78810f3bc24d29a877df6323a93cc620f633a340910080d3e26ffafc7f14463c0854e2852bad5264509bc352dbaec700ce888
 MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
new file mode 100644
index 000000000000..48038df00036
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-build-r1.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.old	2019-12-25 20:55:37.932303932 +0100
++++ b/Makefile	2019-12-25 20:55:58.584530808 +0100
+@@ -4,9 +4,6 @@
+ 
+ all: write-highscores docs
+ 
+-write-highscores: write-highscores.c
+-	gcc -s -o write-highscores write-highscores.c
+-
+ docs: html/wheel.png
+ html/wheel.png:
+ 	./makehtml
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build.patch b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
deleted file mode 100644
index d8793a6aef6e..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use implicit rules to build write-highscores so we dont have to worry
-about CC/CFLAGS/LDFLAGS/etc...
-
-Include stdlib.h to get exit() prototype
-
---- write-highscores.c
-+++ write-highscores.c
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- 
- #define BUFFER_SIZE 1024
- 
---- Makefile
-+++ Makefile
-@@ -4,9 +4,6 @@
- 
- all: write-highscores html/wheel.png
- 
--write-highscores: write-highscores.c
--	gcc -s -o write-highscores write-highscores.c
--
- html/wheel.png:
- 	./makehtml
- 
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
deleted file mode 100644
index 9d67085dd13a..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make sure music_pending_song is defined before we try using it
-
-http://bugs.gentoo.org/109272
-
---- pathological.py
-+++ pathological.py
-@@ -28,6 +28,7 @@
- colorblind = 0
- sound_on = 1
- music_on = 1
-+music_pending_song = 0
- for arg in sys.argv[1:]:
- 	if arg == '-s':
- 		screenshot = 1
-@@ -194,7 +195,7 @@
- 	sound_on = sound_on ^ 1
- 
- def toggle_music():
--	global music_on
-+	global music_pending_song, music_on
- 	music_on = music_on ^ 1
- 	if music_on:
- 		if music_pending_song:
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
deleted file mode 100644
index 88e3d609d04c..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-shells/bash
-	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	doc? ( media-libs/netpbm )"
-
-pkg_setup() {
-	games_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./${PN}.6.gz
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-music-py.patch
-
-	if use doc ; then
-		sed -i -e '5,$ s/=/ /g' makehtml || die
-	else
-		echo "#!/bin/sh" > makehtml
-	fi
-
-	sed -i \
-		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:exec:exec ${EPYTHON}:" \
-		${PN} || die
-
-	sed -i \
-		-e 's:\xa9:(C):' \
-		-e "s:/usr/lib/${PN}/bin:$(games_get_libdir)/${PN}:" \
-		${PN}.py || die
-
-	python_fix_shebang ${PN}.py
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe write-highscores
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r circuits graphics music sounds ${PN}.py
-
-	insinto "${GAMES_STATEDIR}"
-	doins ${PN}_scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
-
-	dodoc changelog README TODO
-	doman ${PN}.6
-	use doc && dohtml -r html/*
-
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} Pathological ${PN}
-
-	# remove some unneeded resource files
-	rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		echo
-		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
-		elog "no background music will be played."
-		echo
-	fi
-
-}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
new file mode 100644
index 000000000000..f1e7df2a7630
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
@@ -0,0 +1,106 @@
+# 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 python-single-r1
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( media-libs/netpbm )
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./${PN}.6.gz
+}
+
+src_prepare() {
+	default
+
+	# Debian fixes
+	# We don't face this bug, this way we skip needing to convert the
+	# files at build time
+	sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
+
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	# Fix prestripped files
+	eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
+
+	if use doc ; then
+		sed -i -e '5,$ s/=/ /g' makehtml || die
+	else
+		echo "#!/bin/sh" > makehtml
+	fi
+
+	sed -i \
+		-e "s:/usr/share/games:/usr/share:" \
+		-e "s:exec:exec ${EPYTHON}:" \
+		${PN} || die
+
+	sed -i \
+		-e 's:\xa9:(C):' \
+		-e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
+		${PN}.py || die
+
+	python_fix_shebang ${PN}.py
+}
+
+src_install() {
+	dobin ${PN}
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe write-highscores
+
+	insinto /usr/share/${PN}
+	doins -r circuits graphics music sounds ${PN}.py
+
+	insinto /var/games/
+	doins ${PN}_scores
+	fperms 660 /var/games/${PN}_scores
+
+	doman ${PN}.6
+	use doc && local HTML_DOCS=( html/. )
+	einstalldocs
+	dodoc changelog
+
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} Pathological ${PN}
+
+	# remove some unneeded resource files
+	rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
+}
+
+pkg_postinst() {
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
+		echo
+		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
+		elog "no background music will be played."
+		echo
+	fi
+
+}
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 9db727905a12..71c77685b9b6 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -6,5 +6,5 @@ AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0
 AUX pingus-9999-no_libexec.patch 895 BLAKE2B 2cdbf1faffe66c4b6a9fe3518cbecbfce292995cc08f28ef4929a72d1df00a4f937a0c270d932ab724946986104f59a00af58676496950a429d14b1436386f39 SHA512 91bdecf06f47dca2ff3c019b6bafdbdba560ac05c49389b1fd9d59ab89f20b7251c3cfea62857b6f6de4720a2cba405e1c7bb8df5b36c76b2e2c0bf36fc7a5e4
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
 EBUILD pingus-0.7.6-r2.ebuild 1291 BLAKE2B 1b5289f4ad87dd695fb0dcf14decdcf3362849bddade4b1163bb0153a1a6cb56cf64a94d9c13b1143dc2007be3b3c40ee7f0059439ba94f336cade955159149e SHA512 ead53dde486252dfcd2fc59e49b9694f186982b2e415453f5d00272c639267b10d211cebd4b0acc9e5de2eaeaed5a4b633f1b46f0c75c71c65d27e8e61c6923a
-EBUILD pingus-9999.ebuild 1037 BLAKE2B 2d8d544b06df2ba894cdc04a2eef9a4fe22f1e7cb937cb5a111fcc9cd71b214d7303849178241671e8293475e53ddfa8ab4f97e8d4b7543ce939bc438f2eb72f SHA512 1f7fc762508c3d599c1a560f69397c617f552d76317cd6386b29bc1d6019023a7cec4e782b70199788e4f6bd1f7cb89d272e444e2406a5b2362cdedffc999980
+EBUILD pingus-9999.ebuild 1025 BLAKE2B 2f0aa00ebd88e6f23f811d92291287c5aa582b3410876d8f9a7d3a65a6ddd277c29dc5aea68d8bd822dfeefd7a223666b58b3107af676fa1d95a45613e4d59d5 SHA512 4957121fbb64dbbd3ce983e83dab396fd4ab6aab64a7ff202316dee3298a1ee37c20dadd56fde25206e57d669ae544d978098b1a85d4b6aa4f3bf0f8eb8aba04
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
index 545884819804..ad3f83ccf4fa 100644
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
+inherit cmake toolchain-funcs flag-o-matic xdg-utils
 
 DESCRIPTION="free Lemmings clone"
 HOMEPAGE="http://pingus.gitlab.io/"
@@ -37,7 +37,7 @@ PATCHES=(
 
 src_prepare() {
 	sed '/find_package(Boost/s@ signals@@' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	strip-flags
 }
 
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 1b4c1c018f56..ffa1add2f974 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,5 +1,3 @@
-DIST quadrapassel-3.22.0.tar.xz 1737252 BLAKE2B fb3d611f59b4b42d1e3278e562b5d537bbd3fa5de9d433d8445c291971a777b674ec384d7faf6c3b09fd6187555fc448fb38d2a379ea3c2bb7f7b321e6a9346a SHA512 82cbac9b8bc1e7d0bc7958807037893c2dd0286fdc63c2f35ffc7fdcfd839cc6ddd115bada057aa9a3694fbb2736c0c7b852e0156be6fd59a85f6eb06f6f9a84
 DIST quadrapassel-3.32.0.tar.xz 478332 BLAKE2B c685ecdc542ea29dea145fb93409d951a058a7451cc0f6795a6c7e61387d891f6941e8569f4e61b4f473f72b4045d348669920d5847ba6165e891fac58bfa42c SHA512 c618d4b35888122fcdecb6085773d30198907d09dd234283650c96f1e7a5994f51e1ef33f7df2732c1ab28cf73f5fb3a4e35bd8780e782714c3faeb0eb46d24d
-EBUILD quadrapassel-3.22.0.ebuild 728 BLAKE2B 747e1471a3baff653c49494de33e61c053ed2fc11b4fe343c6b3ffad22cab3aec3f330f18f34cd8452fed4eae7599ab3cb0a6de5bf8d46745287abd9af301405 SHA512 20d2a423017a933a882efacac9869dc38460d36f666171e73555b45bfa646803c03846406742d26caf0263f78cf05c965dcd68627843d50c578b61dfedeccb95
 EBUILD quadrapassel-3.32.0.ebuild 938 BLAKE2B 077a7dd4a6ed7413090298ee134e54114abf41bb6dfcf52c46f88c4644d6afa3c411ce47dcbbe798293a2eccd837441da024888221fed5cd363ef62aa13826c9 SHA512 575353193a9aa6ea200edae46e73b97dfeb207bdca8b946c7d8cc22ef728805cf9e088a631ff2149cf76a8c5d013039ffc94e6902705591d278d4d7643b12eba
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
deleted file mode 100644
index 8cb616260546..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
+++ /dev/null
@@ -1,37 +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.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index bad8fe0a9199..61cca005e673 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,3 @@
-DIST swell-foop-3.30.0.tar.xz 1117832 BLAKE2B 4cbf829140bd3ff14c09c83b8ebf8a82a00e97d8f73f82ad3fe11220d9ef89a1bdd116ec28235e5ae02bf258021ff6fceb968f1e39598ea606a4c613e0a43f8f SHA512 233ffd2acec9590e97d410a4084e2fa6f9e1b9dc80aec643c8a20de008410930a3cbda901dee63180c6ea469c91db489d513d9bc34edc4e3448cc53a3c76e029
 DIST swell-foop-3.34.1.tar.xz 732008 BLAKE2B e41527ce485fc7d41b3b8667fba1100fc79a1683adbe7948ecb0f73b418f5e8bcd8c5eeb15c1083cfcbb0237294016ea49510ae6103e2cfc6bc93b508a61a02f SHA512 53625882a755959349f259f5527a48f926e6b8e0493eb81ac257fed6869b87d48e789e4a2141bee7aa8910fb061ca9d7541ceef7f3bdb7a5138068cc6dd16b81
-EBUILD swell-foop-3.30.0.ebuild 843 BLAKE2B 8581e0727f00be526778fcfceada74c2a59ebd29ec52484883450838f30d2915c2f34497756b86926d42d468a7b33939dd589b078d7c42fa5254d89eda15aa41 SHA512 dd4bee8c6d8c2ae10a9297a3b5b6912f570fc6738c62e1fccc7371453962c1d99b2d24df7ba78d1c350fa6a93ca3c68b53dc2ba961ff5f45667ffa2a0014e3c9
 EBUILD swell-foop-3.34.1.ebuild 806 BLAKE2B 06d62d325011ef75b857bc92cf0240bf14fcfd7203dc969458e2c472df31c1a4afe8296d73d97d73030141b1bac0de9918729fb9089999d706c1406008f72b72 SHA512 edb409ca716211e2646c19d6eca82f738161e1b264b5b8c1f8ae7d5614e345544a6a9ad29d53bbc7164d0070e741edfb456eadc84f4f62efa62837d5c6df1a0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
deleted file mode 100644
index 3e9411eb7bc5..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.30.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.12:3
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5:1.0
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}