gentoo resync : 25.11.2020

27 files changed, 93 insertions, 407 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index a16964f35124..42e16bbb0f80 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index 343e344d6777..b1d55961c9c6 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-klotski-3.34.4.tar.xz 847220 BLAKE2B d9abfcadfa770caa5fe7896b33a5e576022fd04dc6cb8eca49069988db16fbf50f36b296fc8cef985a42eb26e071595295e527dcbb04466c56bbe030af076914 SHA512 eccdfb40d386f873ccb49b9034807917b647338c339afacd419b3b83d8f3a5171427ac9dae8ce5e61c9484a726d009ec87819bd148d721d6d5cbcfcee5c57688
 DIST gnome-klotski-3.36.3.tar.xz 903456 BLAKE2B f8890d3e3c20fdd3df1933c5abfe81f4a7aa55678b62285c8992e899612c8ed361a57328b9a1b3ac190b9cbb6492f2cfd8b9dc93d77deea5752c4ca0552a19d2 SHA512 7e47ecad366e3c43108422263de0c1c01692f9eacd27622c2db8e673782b0f20c5e3085fbc4f33490c0a48e8b537141537bcd9fba4284a47ab151449034398a9
-EBUILD gnome-klotski-3.34.4.ebuild 847 BLAKE2B 572b04dc75e7c9daf4b0d69e697ad6549c5f9cc0bf99b550eaf33ff6a0a6b3731c84400ed58a988568ef2ab11c57cea9b31ee934c3648ad15ff407bf81937707 SHA512 ffe275ceeb2f25a10eff881c86abe53198646d7dcb46d41b5309454b8ef93be7169db6c3c8b06f07972392f5210026c4190144198a7aa3dcc70472a3d69bfb5d
 EBUILD gnome-klotski-3.36.3.ebuild 848 BLAKE2B 860ab0cf8b57610fbfa3fa80ef8748faebaba39c97b23331a46b66eba36711f2222e41c17843bc6915f57c9e2c6cacaa155f240c6a1b996c7e979d5290bb3366 SHA512 2eeb0cd520ec56c5f286ee7849b13396469537f73df933ec8a950a3073aa7813b6ad5a7bc26971ab08ab7a9494475f8b466f4d1e6afc2fd9774088a6a9fd6189
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.ebuild
deleted file mode 100644
index e8391bca376f..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-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/libgee:0.8=
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgnome-games-support:1=
-	>=x11-libs/gtk+-3.19.0:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	$(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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index b35f57ef20e8..ab777d247d4f 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-sudoku-3.34.1.tar.xz 355424 BLAKE2B fcf8a175e1b2dbbb4498d185ee4b628766fe4c112c5126d253ecf16430a8e1b647fd9b4779b8dea24fb6bd8460d2b8824f087b077c7b91d8764ddfae97d72d46 SHA512 a1967098d10a28fd5e49e6e63c9c0aec7f2c80dbe5973ef4fafe175f39e3d885c4c428953e528ee0fa3eea05c644f0aafea133b195acdf7e495314fe3d8d090c
 DIST gnome-sudoku-3.36.0.tar.xz 357916 BLAKE2B fa56f8a1aaa87d7fac6c1df182ec8a3572aefe6a2693b3c2784afc0fd050a4085082b2ff6b0bfe8733d4b1d6e28e2e0927270b43a5708fd259d00f8803cb5e93 SHA512 617477b884d9ffb08571b25c76b52f2a418064f7af324673e32f43e8b3327c995ab4ace26feb5edeeadc79a1f7f1a0ef7d7fb39ef9397fc855e476bad29a50dc
-EBUILD gnome-sudoku-3.34.1.ebuild 918 BLAKE2B cdf450b8115e7564d92cf13ae1bba7f8a5caa032cb1cd554511a1b86efcb085696e4e53149699c2056c4d5fdf8e5caf6b8c5dce90231d2c6d2590bf68fe131b1 SHA512 5db53414ea66e70e8081db1f8cf38dbf3fe0e911a98c8f9c670650566e2f10a019beaf580f57a6c960feb7eaf5583ed120ed5203d49fb8c6f45056a0dd432e36
 EBUILD gnome-sudoku-3.36.0.ebuild 918 BLAKE2B 5710e04a013be7ea5231a035a9da54f825500bad59d9218a366b53cbd932954a47983bf9bc4943d87ff3990accd6fd7996e9983795a1d48cca2b7f6fee1ccb97 SHA512 8045e2ca7de7f188c703c143ba830f1d95d432bd4342248a2129968b1be5728ecbda8c4d83ad44160d92e6570ec7724df288aeef90fd7179fba1fd465c258670
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild
deleted file mode 100644
index 1729e98fe793..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.34.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-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]
-	>=x11-libs/gtk+-3.19.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index ffaee6ac69f6..59d4ed1921bd 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-taquin-3.34.4.tar.xz 5242780 BLAKE2B 9763d77f77ddfc0c283663be22258b7baa2529f0d3efc05200f1735ca8766008451e648b6fb7b15e4f06887a6c040b5f25e5e63291b00036180a134854bcc57c SHA512 15da9ebc8c1aa89b350132efe034b977d96a62e686d01cfe8547b47541f1c2d30d564ba3eed35e3c80818835703cf4f33552d373908a2e8287c3982c041d7eef
 DIST gnome-taquin-3.36.4.tar.xz 5253972 BLAKE2B ddeacc57e52e434c5f3f7956226c4dc3c25416c61d8e920116dafebd89a3b442c01c54840bacdb93d5ee6ca4b6428c36f77c56f53651fe90ee8fda9026b23db5 SHA512 72e28698e292ec198c77f4f56624bafd88220157582d220ace363e29bb2f3bdbe7198c30348a6aef12e07dce275be6280fd4dc8a6bcc58f31d1e5ef54d0f3f7d
-EBUILD gnome-taquin-3.34.4.ebuild 947 BLAKE2B 938f0107e1a52579c401f91ab825bbf77cd4bedee88aecc97cf26f22cc1bb53b021884298a808d8be31362f7ea7afc6db4e364defce59b3c903933877abffe59 SHA512 908cf16167004a5a07687a8f230bfcb7252434e6d44e2b5e8b9c2afbd6fd69d39895dc85703b3e691f8f0a30939057a0eb2e7d19da194360a76665fd66e60c52
 EBUILD gnome-taquin-3.36.4.ebuild 975 BLAKE2B 5241680fe5dae9b5a31f7ba90efd7a62de324c3ac9541c39d8673edd1564974e8da94f32c6139003466aca6348af7e1fbbacae1c3c539ca09cd54c186c2c7f8c SHA512 76d933e6948b16a8022a64dab6e4bdc8ee4f0e0a184a7437ff8aac9a02552de3014f14a27400fc509bd7f610587b43ac4444527eb0e9346028c1868bd0d30a26
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild
deleted file mode 100644
index 2bf04a590c03..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-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.0:2
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.22.23:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	$(vala_depend)
-	media-libs/gsound[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index fe0bf36b1be0..4c45fda652b8 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-tetravex-3.34.4.tar.xz 914456 BLAKE2B 93fb2711c750feff80af8fb671e69aacb10241009855f268b90e333870f71a82a73344486fdb5612aec69b7c1f5d0a628fc31094fd3aee97bb6c5f68cbc825ac SHA512 4affa8823482d901cd2accc9cab43ebf7054f9550778e3b460ea4915e4eef5937ff74430399610101f1e8c06d8e6aa111e9ae240a19043c0907d0a1d013f5f67
 DIST gnome-tetravex-3.36.4.tar.xz 1005996 BLAKE2B 9647f3db8e60c6cccc243d3da798265fc51eb16a463ef37b8259689b6cc36b81391616f36b665f28c108bb0d70bc42ebe2fc1feafbbc77cb3256f78d1bc4c016 SHA512 a3c163ae61b312b94ed32c02eb13ccaf9aa2f5eefede1a0735b4240e3127be0bd6e827fda47b1bc2987f793fc5927ee63cc836bf1e2a149f958acb1946dba954
-EBUILD gnome-tetravex-3.34.4.ebuild 712 BLAKE2B 116fd266617e835966a202702e913583fa4cd98f08e69a35acf84b24a74b449bddcf8bfa5e5d3ef48927a6d2b108e7638dbf70c22e704f21358b1b27cf3b73ae SHA512 f91a2ee8eb48e59189cbfe05ea30043c87c6640699a015b24aa53095001adbe5ba5b0e0dc73d50caa0097e6745f19cf0385b274b8e1251bed28898ec86cc389f
 EBUILD gnome-tetravex-3.36.4.ebuild 897 BLAKE2B 4d62a9bcd51804dc375bd33acc02c4383514b0273e4da1f97d9fc4873a30aa9e6bab7f2dee93407d261eb267e6b91d96410d72f5aff140d90656c036987442c8 SHA512 dcb13c1e1df3ee8bc8762eb35c394bc190e77e425aec7d9c586890b8a0cc881e95907def0fee2c641460b5c05e6f6795aea1f161eabaa819bcb7193d7c879d74
 MISC metadata.xml 418 BLAKE2B 9722632bf30d5cd8920572c229e6344ebb73aee42104644351f8a512db0cfe890203328d063f6108a75cfaced93c7f680f296a2993b2ee0a7335ea483a9baaf3 SHA512 4cad964a8d4e4b0fa2c8161d867ba9683eaa591069b29a0aba877ab8deec55ab2d3a5d4b36aa37fa8314b93a31dde799e87cc0c54a7edde2aec139e567bd6913
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild
deleted file mode 100644
index 536d552045ce..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-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.0:2
-	>=x11-libs/gtk+-3.14:3
-"
-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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 44a395b2365d..b84674b54146 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,5 +1,3 @@
-DIST hitori-3.34.0.tar.xz 163152 BLAKE2B a52446fe62c2d09e9f1f97e77dc82a2902c05013e6c13d64ef58c4b9fcb500cc8533ea094bc91c1c933f5923e3dc889b5db23b1050d8809c0f405ba81917bfe2 SHA512 f4c67da619fdefe03492dacee81bb7972ec40e003c51a1363c19b6eb2690505a0a14e7402ddb61ef0487605d91a7674654ecc470e01febe649b25e173a889354
 DIST hitori-3.36.0.tar.xz 166404 BLAKE2B 851653744c8fcd200576e93753fa3c4a5a166caf7a6efd8048f5755f3a5b096b1387db73a6e39bc4a87815a2c0f39e71cacd95d0ca9940b3a0fb734cb95f36ed SHA512 fab2f1475895e26ac540c6302902c72b4e1bf68935fd88b216e3be37990d8dc2791b15e84d9eac69d1abd43ac01e40cbe238acabbdd686bf7abb96eb59b90265
-EBUILD hitori-3.34.0.ebuild 702 BLAKE2B 148a78cea45a19d47dd46372419c94c26e6905593a86a432a41b9e9255dfcb04efe230117755b31c344c0463a690c8f0f3aee5f7b15e55cde8ea0905a9917394 SHA512 b0757befb91f8a53ffffbd93b08d04aee7c8af3d9d64a7f7c059833a298d9dea67364e30e0138a5f9dd5197c0facde011acd188d77f7d42d1161a0cb386eacf0
 EBUILD hitori-3.36.0.ebuild 702 BLAKE2B aaadc16dff772c34c21cceb09e2d9576856b8142705662c22da13c00ba5e0bf14d6708596a53ddbbf5d6d7cd876cbc1bdfc8190175bb00d1521dcf1e318781b6 SHA512 b7c44694a9c7a765e5bc00f5da60a58d6c73e07f62200c62c2f10c14d375c524eaa23e8ed00d7329dac7a05029a709fcd6de316846171795d98f4881da8427c2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.34.0.ebuild b/games-puzzle/hitori/hitori-3.34.0.ebuild
deleted file mode 100644
index 7708514c9f78..000000000000
--- a/games-puzzle/hitori/hitori-3.34.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=7
-inherit gnome.org gnome2-utils meson xdg
-
-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.0:3
-	>=x11-libs/cairo-1.4
-"
-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/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index ed05e7a7ef74..1df4035a9917 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,3 @@
-DIST lightsoff-3.34.0.tar.xz 683944 BLAKE2B bd9c1c8cd29ac46e40bb164a9d5fdea66d2933b0b9ebb8022a7c1370f572da9b89bd5e70cd8bd01aad32c6cc43d5a2e10542c91f42bfb811d85598329847bafe SHA512 dafdb121810f931dcc795decf6d94f3b9fb4c67b0ea2362451f1a73fe96ff8278682ac32dd3db4d0653d530e75ec4b37effa6ee55c916b72ea8d3de618ecf7a9
 DIST lightsoff-3.36.0.tar.xz 497756 BLAKE2B 1765f848608a40feda87e7e950675febcccb307639b6aeec3f12001516f80766a815e8989ba9c18813a397759efedd251921d988091be2bdd7c8c887a296bfe5 SHA512 9d026432bf059fb72aa8aab7b52c22e81acca12c8ba6a26350970a22a760a5d113958288196acc38d6ecba1096155323ecef86406e94d35e9ed82f26f9e30eae
-EBUILD lightsoff-3.34.0.ebuild 951 BLAKE2B 973e4dcb713d519161552822c722d4823813c47e1956def2cde4734bda3cccdf54450331a3c2b80c0fc2270bc4c4b2c640732862116f42c544001ed58dda7e3e SHA512 c2edc5a34929bd37f169b2044b0f8433c86c1be62cf706a1cbb52d74e9f498782f92f6bfc10a1eec1241cf5b7ded135336e74afe7a618f473b3300e08d0af379
 EBUILD lightsoff-3.36.0.ebuild 951 BLAKE2B dc2169345331e43ad287da88c4577edc991679e1ad0b703988bfc3c82528962a5148063bfd743e84cb0fcfb49e527065ba7f33c9c21871cb06b21a46aa27089c SHA512 c816ec5142f1fde195cd9af0376abf74f4743b11c4f3f5209122f40d2b7bcebff4141a968284f73e1fd918229b85d805076b2cdabab70059b4010d1b20947535
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.34.0.ebuild
deleted file mode 100644
index 4b2be5e28599..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.34.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=7
-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
-"
-DEPEND="${RDEPEND}"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-BDEPEND="
-	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
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index b41a13fedce0..6322c047f852 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1,4 +1,3 @@
-AUX lmarbles-1.0.8-gentoo.patch 560 BLAKE2B e4eb5153feb40d53ac831fc7f53e5673a49a546f9ee8b4020f8fabc9643661f78e74ed12756409598f2e25def084376cbab762dc534d0243270110fa48efaee6 SHA512 158a253d346fc5bec9eb8ecdd8541df04fdd9946bc2f59d7404e5ae08415a161079f38697ecfde2b22065708c8704b2fd9232f13872c394ab8274063166d0d41
 DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
-EBUILD lmarbles-1.0.8.ebuild 714 BLAKE2B 5cdfb7482198c8c1c03b77fb9f20d8a9ea5a8c46af804c06080d6da2a451c19685f169ede54b0a443693eb55e83ae6037f7bcae47b3a6b6676602c16b9cc8d87 SHA512 172643957b074d7b285b69c2e477493584e9fb2b57542f02a2d0accd32083c596dd746031b8b78302dec1d266c7bc799973c52f775a230e7fa7099d417bf1d7c
+EBUILD lmarbles-1.0.8-r1.ebuild 589 BLAKE2B b4f0fbf0aa4d778e05352f1d9f5a37d0a8e914a2af18819f5a445c59243ca0fe0cc19a61ad13c18654dd4c7c0bcd7ceef8ebe99471c292d78d55dda71c6a9503 SHA512 f3efb10c8c5f95784631146a87b7edd04ab4d4aad1b0189bf08778cd600c57e9e662dea0de1b987b19f9a89a5ff7f80fb9fa857a830e4fe49b0d235466058efc
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch b/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
deleted file mode 100644
index 160b6d0f79d5..000000000000
--- a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru lmarbles-1.0.8.orig/Makefile.am lmarbles-1.0.8/Makefile.am
---- lmarbles-1.0.8.orig/Makefile.am	2009-10-26 16:01:08.000000000 -0400
-+++ lmarbles-1.0.8/Makefile.am	2009-11-07 13:23:55.994140203 -0500
-@@ -4,11 +4,6 @@
- README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif \
- lmarbles.desktop.in
- 
--desktopdir = $(datadir)/applications
--desktop_DATA = lmarbles.desktop
--icondir = $(datadir)/icons
--icon_DATA = lmarbles48.gif
--
- AUTOMAKE_OPTIONS = foreign
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt TODO marbles.spec
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..e92811a4437c
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
+SRC_URI="https://download.sourceforge.net/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	default
+	dodoc src/manual/*
+
+	fperms 660 /var/lib/lmarbles.prfs
+	fowners root:gamestat /var/lib/lmarbles.prfs
+}
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
deleted file mode 100644
index 59381278471a..000000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv configure.{in,ac}
-	rm *.m4
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon lmarbles48.gif ${PN}.gif
-	make_desktop_entry lmarbles LMarbles /usr/share/pixmaps/${PN}.gif
-	dohtml src/manual/*
-	prepgamesdirs
-}
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 506288bc5c1f..725e5f86aa9e 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,5 +1,3 @@
-DIST quadrapassel-3.36.00.tar.xz 308000 BLAKE2B 9decfce3573cd301d716cd0e5433113869118efc6935bcf1f1ed38a2c8cd26aec3b84d782f1b907a972cf9aeaf940d10c85de45e2d111e19c215a06e49aced15 SHA512 4e27011855e29b4703d5d1b82d9cc5a334ee60bd8e2a9ee8cdebd931a029df76407da02edffc9c1bdf5e845aee92291d09fe3c17fd0622a4e77d6eddd2ed5a4e
 DIST quadrapassel-3.36.05.tar.xz 309160 BLAKE2B a9db4572a128ae0b965f29f83206dfa272ec6e5ad6316b0b0135d7424fdf6ea96c8ed602b4c6908b9ef7185c7821a658982398ea7a003de3c9714cbbb129fe59 SHA512 4219129a65d604e11cb1ef6ba38926311e7f32fb5bfebfc723236277fe0b779c5f1ddfca27db43f40d059291e2a4f9ff2552de6332002cb11b965136a946340e
-EBUILD quadrapassel-3.36.00.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
 EBUILD quadrapassel-3.36.05.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
deleted file mode 100644
index 368d3a28e733..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-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="
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	media-libs/cogl:1.0=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.12.0:3
-	>=dev-libs/libmanette-0.2.0
-	x11-libs/pango
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	dev-libs/libmanette[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
index 3a57c79814b9..83af69888aa5 100644
--- a/games-puzzle/rezerwar/Manifest
+++ b/games-puzzle/rezerwar/Manifest
@@ -1,3 +1,5 @@
+AUX rezerwar-0.4.2-gcc-CC.patch 367 BLAKE2B e5da75ae47666450309d35c5ba909ffc12abaf0b9a6adaad3cd87ab14c6630a1673590137351a7c3fd12396561776846f93acb6bcaa74a8b510358aaf29556e2 SHA512 d701bd079a0bed9974a5b39cbd72b3c422500262d324c3a2bbe2b2b1565e3b52d2e8931087fbeef9f162251c97142ce15d8659f2e54f0cf6f1b50cf5d53ad1b4
+AUX rezerwar-0.4.2-gcc10.patch 307 BLAKE2B 4a7d48b98c3d932db43cfb1b5b0155e591bbdff80f16cb075c1de5a7082074511b4a5d70c02cfb56ef14fee5eb0e7cc53a01f802e2b01d5b348042a01ebc5914 SHA512 e9dbe0a8fae0f1068cf0e6c0469dc530f07f4cb3bc7027819bd4ad4fd2d4b34be570fd52f2085349db4112c96426382a8dfa6a585d5bd7225cc5fb3fa8a0ab19
 DIST rezerwar-0.4.2.tar.gz 4332498 BLAKE2B d1eab4137fe56ba39c81c04ab75b9b0b9dac7baaf01e861d84801aee255074c4dc0c24662aa61993af7b80f0dbe831dfef1574fd1b2686ecb8500aaa68b6c279 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee
-EBUILD rezerwar-0.4.2-r1.ebuild 1063 BLAKE2B 9ede59c7616f3f397e476e10fe8a9589ae38512d0f613300ec7bd35f973652b1fcc00d94c6baeeb7120033273b58bd8568179b2ac520823652349a745fbe320f SHA512 ff9bcd00ab7dde9ac9f740eafcd21921ffb3df533c4c6cb755038f40a03ac725646da5dbfb7fa301008f28c71ec2bc088a7d5b18a31b703c1672c71ea06ce0cf
+EBUILD rezerwar-0.4.2-r2.ebuild 1198 BLAKE2B a4df042bbc23ec7088f2e6e30acaad5982b39327d15cbff42c3c9bcd5ffe602f1132e0744abd9b4df1b8ef7ac5ced25037d6647fd355b8f17a9a4624afddbdfe SHA512 de6a8a9c2c9a9e0bc40a3ed7749c652661daa9fa71505f0df9f7763e1a770b1286c9825b8f239ae231e9fb3ab99603c06b90cc37ee84f9e4ecf0509686a17c4d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
new file mode 100644
index 000000000000..18471a8d3007
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc-CC.patch
@@ -0,0 +1,12 @@
+diff -r 4e0421547ae0 configure
+--- a/configure	Sat Oct 03 14:28:50 2020 +0000
++++ b/configure	Sat Oct 03 14:41:42 2020 +0000
+@@ -58,7 +58,7 @@
+ }
+ EOF
+ 
+-	if ! gcc `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
++	if ! $CC `sdl-config --cflags` test_sdl_mixer.c -o test_sdl_mixer; then
+ 		echo "SDL_mixer not found =/"
+ 		rm -f test_sdl_mixer*
+ 		exit
diff --git a/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
new file mode 100644
index 000000000000..d219301b8aa1
--- /dev/null
+++ b/games-puzzle/rezerwar/files/rezerwar-0.4.2-gcc10.patch
@@ -0,0 +1,12 @@
+diff -r 3f22f3a0051b src/events.c
+--- a/src/events.c	Sat Oct 03 14:42:28 2020 +0000
++++ b/src/events.c	Sat Oct 03 14:42:42 2020 +0000
+@@ -38,7 +38,7 @@
+ 
+ extern Board *board;
+ extern Configuration *conf;
+-SDL_Surface *screen;
++extern SDL_Surface *screen;
+ Cube *speedy;			// currently accelerated cube
+ 
+ 
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
index 042921d7df86..bead5c2cecc7 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2-r2.ebuild
@@ -1,22 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Puzzle game like the known tetromino and the average pipe games"
-HOMEPAGE="http://tamentis.com/projects/rezerwar/"
-SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
+HOMEPAGE="https://tamentis.com/projects/rezerwar/"
+SRC_URI="https://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,joystick,video]
+DEPEND="
+	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-mixer[vorbis]"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-CC.patch
+	"${FILESDIR}"/${P}-gcc10.patch
+)
+
 src_prepare() {
 	default
 	sed -i \
@@ -31,10 +37,12 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC
+
 	SDLCONFIG=sdl-config \
-	TARGET_BIN="/usr/bin" \
-	TARGET_DOC=/usr/share/doc/${PF} \
-	TARGET_DATA="/usr/share/${PN}" \
+	TARGET_BIN="${EPREFIX}/usr/bin" \
+	TARGET_DOC="${EPREFIX}/usr/share/doc/${PF}" \
+	TARGET_DATA="${EPREFIX}/usr/share/${PN}" \
 		./configure || die "configure failed"
 	sed -i \
 		-e '/TARGET_DOC/d' \
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
index 668a714270f9..8303b2cb89f2 100644
--- a/games-puzzle/xblockout/Manifest
+++ b/games-puzzle/xblockout/Manifest
@@ -1,4 +1,4 @@
 AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
 DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
-EBUILD xblockout-1.1.6-r1.ebuild 1216 BLAKE2B 1fbed71ba49c6a5851d9934faec162692cd77250d9bf61e42cb663685b56df055ced6c7f3d0fdc776c7e8ce4595ee396a435b063f6488f1c2c848906bbab36b2 SHA512 ddc6e41fbe580d99d48dbe69407720b5dd50fdaca6ad9fe149b5d8c141373b880654f2a7dac98e1e143adaa15845eddfde52349b87128613b647253048dc7134
+EBUILD xblockout-1.1.6-r2.ebuild 1306 BLAKE2B 9ab7a3c65fca5b98d06b8db03e2ab2d957e3253de6a0e916782eb94d808b4e4a778aef4250ee93b3900456fecdf421f872a96fd8fb0d2897d7a663e6e41ba2f9 SHA512 43b4d8c77cfa59d6af9b811b256d931d87adcf9628e1ca01f088cc9fd797e53d173c191f33a06286baab360bbd3792a1ef644ab3cf28dcd1de44de0860f1bf44
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild
index 71a44a6d8c39..914ab6d1ac1c 100644
--- a/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
+++ b/games-puzzle/xblockout/xblockout-1.1.6-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop flag-o-matic
+EAPI=7
+
+inherit autotools desktop flag-o-matic toolchain-funcs
 
 DESCRIPTION="X Window block dropping game in 3 Dimension"
 HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
@@ -11,7 +12,6 @@ SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
 LICENSE="GPL-1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
@@ -21,14 +21,17 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/xbl-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-font.patch
+)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-font.patch
 	sed -i \
 		-e '/^CC/d' \
 		-e 's:-lm:-lm -lX11:' \
 		-e '/DGROUP_GID/d' \
-		-e "s:-g$:${CFLAGS}:" \
+		-e 's:-g$:$(GENTOO_CFLAGS):' \
 		Makefile.in || die
 	# Don't know about other archs. --slarti
 	use amd64 && filter-flags "-fweb"
@@ -40,9 +43,11 @@ src_prepare() {
 src_compile() {
 	emake \
 		USE_SETGID= \
-		SCOREDIR="/usr/share/${PN}" \
-		RESOURCEDIR="/usr/share/${PN}" \
-		LDOPTIONS="${LDFLAGS}"
+		SCOREDIR="${EPREFIX}/usr/share/${PN}" \
+		RESOURCEDIR="${EPREFIX}/usr/share/${PN}" \
+		LDOPTIONS="${LDFLAGS}" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
index a1d94c298b34..653fadbfaea1 100644
--- a/games-puzzle/zaz/Manifest
+++ b/games-puzzle/zaz/Manifest
@@ -1,4 +1,4 @@
 AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
 DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
-EBUILD zaz-1.0.0-r1.ebuild 1104 BLAKE2B b3a625b95df5abc7de588d49b78da79da8fa5df4272026e115fa79f6c611c458cf8887afe0d40073bdde16c5e20ececde1ea819e9b5ca3b86cac9ec82965f3f6 SHA512 6cd2843a7fda0ec2ff34c6618ba924ab30fd3ad0bf84bd6c095f50857a7e7a2805e1a648f2c0add6fb77d96905bdfc6b2fecd6ef0334f031efde3757feb898ec
+EBUILD zaz-1.0.0-r1.ebuild 1105 BLAKE2B d79453bc1dbcfabf0eee120792212f7bdd79a3e220fba0cef6bafbe8d00cfc9863cca9f3d3bf0a7efa52c9039e94bb41b72e1d0d489c6294eb69712c6ee2603e SHA512 2c820759048fc5e53ea2c1d250d93b2886b8e1ffff85fd86e18470c93963a2f9cb0383b0e3ceaec5280be4a491732023c5b17239a829c120e3033aa645f103b4
 MISC metadata.xml 326 BLAKE2B 962f166dc4d93ffdf146a76d3e45bb96284a47bb845755e1f7450d2de5ad662abb1a2d63c21ad4e23e5e8cc16a8a2d9fa36503049262205666168c5486d86ff6 SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
index 1ea20bafcd65..4a3321038e57 100644
--- a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic xdg
 
 DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
 HOMEPAGE="https://sourceforge.net/projects/zaz/"