gentoo resync : 25.08.2020

32 files changed, 522 insertions, 287 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 47c5adc215dc..dc6aa3df90dd 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
index c2a7559d0db3..6adfae12cfbc 100644
--- a/games-puzzle/atomix/Manifest
+++ b/games-puzzle/atomix/Manifest
@@ -1,3 +1,5 @@
 DIST atomix-3.22.0.tar.xz 551424 BLAKE2B be2c9c60a5e526ce810d8742bf3b799edc8aea8b493ddc0beb356dce2aef9f4daa6b38c885c2b48e7ce7fff80685522d546fddc134cd2d06c6cb72128522a52e SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212
+DIST atomix-3.34.0.tar.xz 532096 BLAKE2B bec3e29b2a3ef92e86b4c6e3c68f31d80b4e5fae9c2fbf86229813a4ce4aef469c94a21a51a102b556cae0764eb553e18301246d94ed475f64ec6fcfe226c784 SHA512 e51e8b727c80a1ea7078ac16d15884c7c84b06aba456424e659c3965fe7c2b3d0c68e0d3d2dd40224afd07b4f7a261e7510327e58974a94fe58c9a81d67c0937
 EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb
+EBUILD atomix-3.34.0.ebuild 504 BLAKE2B d5fd121234796c880935bd101005e5daa664cd61b5069509d0ab4fe17bec7d6a7ba886c214e942e62cd8ae005c2c284bab16dbb0e1f46b90d0614c0427e418ad SHA512 47eb8c4b25b12ab4a33fd3cdacf94db99298e3a033a79f4430f294a4a251a54b36ad3c508e6f9095181833ee66249d5f2e5b8ec9b60973c39c81cabbe4b3e1fb
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/atomix/atomix-3.34.0.ebuild b/games-puzzle/atomix/atomix-3.34.0.ebuild
new file mode 100644
index 000000000000..567ab569393e
--- /dev/null
+++ b/games-puzzle/atomix/atomix-3.34.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org meson xdg
+
+DESCRIPTION="Mind game - build molecules out of single atoms"
+HOMEPAGE="https://wiki.gnome.org/Apps/Atomix"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/gdk-pixbuf-2.0.5:2
+	>=dev-libs/glib-2.36.0:2
+	dev-libs/libgnome-games-support:=
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/bff-or-die/Manifest b/games-puzzle/bff-or-die/Manifest
new file mode 100644
index 000000000000..41ff81201390
--- /dev/null
+++ b/games-puzzle/bff-or-die/Manifest
@@ -0,0 +1,3 @@
+DIST BffOrDie_Linux.zip 194773335 BLAKE2B a32d6b26e446d84110db13340d527ad1ccc423ddb1dfcdacabaf80c0b326f7c7c3d8315b26cc3a8cf4c403b4943e94cd954c77d01edc1963e4fc3b773a4f1042 SHA512 4767fea4c3a94fcf4ad6ca2a313ba1c10d9e6d0d593a63aa336f90f38599f1c43064f56c3e8fd18615ff08bd01dbc0cabe0bd01a798276075c160143f6102650
+EBUILD bff-or-die-20200614.ebuild 1195 BLAKE2B 4abecb0838a6b8365b0b33f35e310bac6bb0c939ec7780cdaef946f63360fa3d8cae67602cf28171a8e9e31d0db90abea100e288d7f1803e28b01ea01ee28a7a SHA512 e1d5cc3f4bd2ecbe3479d1b678756d9a8e39d8428203d73c181de1ba97cb0e6609d6eaa27e07d57a9c5948d4d9a9a5d06c61e3a5cf7a98493edc38288ff792a0
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
new file mode 100644
index 000000000000..1f5014cfab27
--- /dev/null
+++ b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop xdg
+
+MY_PN="BffOrDie"
+DESCRIPTION="Time travelling alien couch co-op puzzle game for 1-4 players"
+HOMEPAGE="https://www.bffordie.com/"
+SRC_URI="${MY_PN}_Linux.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/opengl
+"
+
+BDEPEND="
+	app-arch/unzip
+"
+
+S="${WORKDIR}/${MY_PN}_Linux"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://asa-studio.itch.io/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	exeinto "${DIR}"
+	newexe ${MY_PN}.$(usex amd64 x86_64 x86) ${MY_PN}
+	make_wrapper ${PN} "${DIR}"/${MY_PN}
+
+	insinto "${DIR}"
+	doins -r ${MY_PN}_Data/
+	rm -r "${ED}/${DIR}"/${MY_PN}_Data/*/$(usex amd64 x86 x86_64) || die
+
+	# Some Unity games have a GUI launcher but this one doesn't use it.
+	rm "${ED}/${DIR}"/${MY_PN}_Data/Plugins/*/ScreenSelector.so || die
+
+	newicon -s 128 ${MY_PN}_Data/Resources/UnityPlayer.png ${PN}.png
+	make_desktop_entry ${PN} "BFF or Die"
+}
diff --git a/games-puzzle/bff-or-die/metadata.xml b/games-puzzle/bff-or-die/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-puzzle/bff-or-die/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index 404d0323b9a3..f0dc56da5027 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,3 +1,5 @@
 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 850 BLAKE2B a3496f025c58c9b9f196eecd9676a2985f65d42d196dd3d441060359005f8aeb13a52288fd9e32c1a8abdf4243388f1facc325ca9c8aad8eb7277fa2a3e935c6 SHA512 36af12b38be16246e78508c594a15f498cc2913cfd3ef127993b8f3f73ffc785f97c7bda8bd85588cad7866e5becd227476d90d8f0d23072998d763a99d7d55d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild
new file mode 100644
index 000000000000..bbc53d583780
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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="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.42.0:2
+	dev-libs/libgnome-games-support:1=
+	>=x11-libs/gtk+-3.22.23: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 f985610bf080..291b23ff5d1d 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,5 @@
 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 920 BLAKE2B f743bca9a5751524b114ded34963a941b612575252e9253ab30c166eb75a823c9ed4b0b451a2caa7eed96764b98acd4a87b92e862b95b0457d0b3cbb89db8a5b SHA512 e09a9858bcc7d04d7b9bc439e76b7e0b36b9978ebb590b87f0e4006ce64b50cad9d7bca1534711f04e077a4123519d1d8387ffd4710c6b62b800c2e65e7ae175
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild
new file mode 100644
index 000000000000..18b22cf7fd40
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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 65feba1a4be8..e84d77a25edb 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,3 +1,5 @@
 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 977 BLAKE2B 37c1b70794017a0463a404af2b4264f27283257ddafac9c7476dcf8128df8b17bdff90c1634ba4935839e087bf93abdf63bb62568a39cd4d3f4cdf72cba8727d SHA512 cc7b95b2188058a862d7695c71f1fb5445c08fec54ec34529a497ffb85d47d2f0159abef9bb50314df469d0cf9f45d990cf7cb1e77f58c052324d9830084c101
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
new file mode 100644
index 000000000000..21f4f4ca3bba
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+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.42.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 c620fe698049..916a34cd8176 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,3 +1,5 @@
 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
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD gnome-tetravex-3.36.4.ebuild 899 BLAKE2B 83bd2dfcf5c77418d7c599ed905062272cbf8c62d652ca4545c3c9c32d41ac2da9cd1798fc29b40271a797cdc5d1b07f552742bae39c81dd076332323116974f SHA512 3b0406028e02f1a77a3d021ce0eaf489e5626c7d72f584d502586ce2b39f81add060fb7cd5555cc928ada426aeb73300109e8534d89749aad39026ffe5e73f78
+MISC metadata.xml 418 BLAKE2B 9722632bf30d5cd8920572c229e6344ebb73aee42104644351f8a512db0cfe890203328d063f6108a75cfaced93c7f680f296a2993b2ee0a7335ea483a9baaf3 SHA512 4cad964a8d4e4b0fa2c8161d867ba9683eaa591069b29a0aba877ab8deec55ab2d3a5d4b36aa37fa8314b93a31dde799e87cc0c54a7edde2aec139e567bd6913
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
new file mode 100644
index 000000000000..31c4ce7053ee
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 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="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="cli +gui"
+REQUIRED_USE="|| ( cli gui )"
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2
+	gui? ( >=x11-libs/gtk+-3.22.23:3 )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	gui? ( dev-util/itstool )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use cli build_cli)
+		$(meson_use gui build_gui)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/gnome-tetravex/metadata.xml b/games-puzzle/gnome-tetravex/metadata.xml
index 39980802b1da..329f3cf78012 100644
--- a/games-puzzle/gnome-tetravex/metadata.xml
+++ b/games-puzzle/gnome-tetravex/metadata.xml
@@ -5,4 +5,8 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+	<flag name="cli">Build the gnome-tetravex-cli command-line interface</flag>
+	<flag name="gui">Build the gnome-tetravex graphical Gtk user interface</flag>
+</use>
 </pkgmetadata>
diff --git a/games-puzzle/gnome2048/Manifest b/games-puzzle/gnome2048/Manifest
index cec22403e40c..8288b2c4c58e 100644
--- a/games-puzzle/gnome2048/Manifest
+++ b/games-puzzle/gnome2048/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-2048-3.36.0.tar.xz 117764 BLAKE2B cf8f1fab6c218921a1ca1e3d568a0ea3cea9d7e39cb6631c79a82540c2152f09f3b29726a6af03720c84f6973d8f1371d32819bfec077f08b0803184fc1cf256 SHA512 a61907f7d1fb728ded21b61c74cc5d20f56b19ac4a82d4e068c5b5a8bddc6bd69b5aea1e48b08a83a7942482983981171cf9a73421c98f45dd7aa47e3cee3cf0
+DIST gnome-2048-3.36.4.tar.xz 121084 BLAKE2B 2dc8ae415d246780781cee624ff54047534e8d7b25681f6b6ae1e5cd6b8b71668f405a6f78c1a53857def9eabd3f80ff4dbaf415f22432b1251dd2373d511a6f SHA512 4b2e564aaf304e8e97e364a02eb8faf3a0169eab7fe73e8d716f03fd0156fe2796dca1332f257f335c1e7574774d2eb7ed0b97c13925d3300598b34c96fcd561
 EBUILD gnome2048-3.36.0.ebuild 853 BLAKE2B 119cf937531fd4f1e845121dfaf1f0ca2ceaebf257051937960b44c97f7af13e007f5836d6e22b401a9c4ba928d043631656d4b76151949f5c905e4e6914c9e8 SHA512 dc53657402b8b0d5b0ac0afe1479f372ce4bb8e78651e223bca1fcc3eb5e0f4173fd0640bf8e0dddb51f9a244e0e7cb28415b4845bbbbf31b9d7c674ff33a8e6
+EBUILD gnome2048-3.36.4.ebuild 853 BLAKE2B 119cf937531fd4f1e845121dfaf1f0ca2ceaebf257051937960b44c97f7af13e007f5836d6e22b401a9c4ba928d043631656d4b76151949f5c905e4e6914c9e8 SHA512 dc53657402b8b0d5b0ac0afe1479f372ce4bb8e78651e223bca1fcc3eb5e0f4173fd0640bf8e0dddb51f9a244e0e7cb28415b4845bbbbf31b9d7c674ff33a8e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild b/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild
new file mode 100644
index 000000000000..5eae653dcd4c
--- /dev/null
+++ b/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="gnome-2048"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Move the tiles until you obtain the 2048 tile"
+HOMEPAGE="https://wiki.gnome.org/Apps/2048"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.42.0:2
+	>=x11-libs/gtk+-3.22.23:3
+	>=media-libs/clutter-1.12.0:1.0
+	>=media-libs/clutter-gtk-1.6.0:1.0
+	>=dev-libs/libgee-0.14.0:0.8
+	dev-libs/libgnome-games-support:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	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_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
deleted file mode 100644
index 25002f45de62..000000000000
--- a/games-puzzle/gtetrinet/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gtetrinet-0.7.11-desktopfile.patch 706 BLAKE2B 612988eb68f8bb1c8529ae7dfce1f9fb043887dc14e9729c26cfa8c3ea4216a82b464f676c7af0ecf1465b850311a21983876f7025c51640e5cfe8ec8bcd1b66 SHA512 d12b4f302388b3620ed77254916d3e3845b3da4bc3d1fc5b1c10c370e46088aea1a11603a8ce5ec844be5bf1026120d6b627170f4a09df663c5b579fe7ba937a
-AUX gtetrinet-0.7.11-format-security.patch 681 BLAKE2B ac89cac24dea4a350a0e79eb577bd288cbc371817023b516c2b66f02fc488798bf285265ae9dec9aaadad442a4e38bdf84a9c0b508bbee30768734195eb72573 SHA512 1f3236da7320249c6d8969a73d2d9f50c4dce68525e563958b52c3cfae5bd2c4fa0fda44960acce6bb9326a4b75560c60ab605aadce3b28d770c44c971209406
-AUX gtetrinet-0.7.11-noesd.patch 4007 BLAKE2B 446c6b3aa133ed29d96ff9735498575c32dc73e5eed750915c4409f7255a39441edd8b7af866fef8781aaf92dbea67b376e019f2826852c8ae9eca2e5c93cd5b SHA512 7674d4d54e4c4b0172e14c02036e88d08f8ebb7745ca7c34fff60dd1b2a46f54568fd89c77c19df12bce74296919bd5c6a7bd48a5ca4a427c6cc04d90384bfcc
-DIST gtetrinet-0.7.11.tar.bz2 416744 BLAKE2B f3bb72b307066e1af41de5c1483fa5b9c88377a3f70924520bc1e36206ad7b75c233d5fb10c0398aac4ed228d8cac6f26a1acaaf97c27858f1c24e4d0aebc4aa SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130
-DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 BLAKE2B 60ead98512ddd812cf1f95f041479f9dad9e7e0f3a55931779382b95fc7aada11498b6517cbd425547d3d46281bb6ec982325b0ad361ef339daa321d45a6ffe8 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d
-EBUILD gtetrinet-0.7.11-r3.ebuild 1233 BLAKE2B d2aa1906d70f9f501111068f46bda8be474980e762499fc21243a7ec42f084ff03142e4a4ba23d64bcbb4450344471574e41e8e16b3275eb3e7b4b59a32e9947 SHA512 7613d3054033d08043be560a025509e79bd51fcbd6d86d359f732963744eb6a755c749dd1e3d12f9bde6789a84efeb24b65b83de3ebf194ac13b7dbc0ba997d2
-MISC metadata.xml 923 BLAKE2B ed221250cd92620c983bdc77af5ec64483ae5cb34ca9c63d6d4445051a7766e104df6b8a2e48e0ae355cd01698807c3f1ef6aa59c8efc5803664d9f1ab33f323 SHA512 81b70c3f4973cd7664a064df27fbcfb8af1f2aa748b269c68d62d3def6f2aee829a0c965b6b93aca51176f60fc34cb170cc20984d5b3b2e1beeb26206fee4e9b
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
deleted file mode 100644
index 9bf7c2e506db..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Nov 30 20:02:03 UTC 2012
-Subject: desktop file
-
-	fix desktop file according to fd.o spec
-
---- gtetrinet.desktop
-+++ gtetrinet.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=GTetrinet
- Name[am]=GTetrinet
- Name[bg]=GTetrinet
-@@ -99,11 +98,11 @@
- Comment[zh_HK]=Tetrinet 的 GNOME 客戶端程式
- Comment[zh_TW]=Tetrinet 的 GNOME 客戶端程式
- Exec=gtetrinet
--Icon=gtetrinet.png
-+Icon=gtetrinet
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;BlocksGame;
-+Categories=GNOME;Game;BlocksGame;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gtetrinet
- X-GNOME-Bugzilla-Component=general
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
deleted file mode 100644
index 59389a18f7c5..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Jordi Mallach <jordi@debian.org>
-Description: Fix build when using -Werror=format-security, now default
- on Debian.
-Status: committed-upstream
-
---- gtetrinet-0.7.11.orig/src/tetrinet.c
-+++ gtetrinet-0.7.11/src/tetrinet.c
-@@ -232,7 +232,7 @@
-             dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                              GTK_MESSAGE_ERROR,
-                                              GTK_BUTTONS_OK,
--                                             buf);
-+                                             "%s", buf);
-             gtk_dialog_run (GTK_DIALOG(dialog));
-             gtk_widget_destroy (dialog);
-             g_free (data_utf8);
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
deleted file mode 100644
index b49758401298..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- gtetrinet-0.7.11/configure.in~	2006-11-15 17:02:36.000000000 +0000
-+++ gtetrinet-0.7.11/configure.in	2011-03-06 15:39:10.000000000 +0000
-@@ -30,7 +30,6 @@
- LIBGTK_REQUIRED=2.6.0
- LIBGNOME_REQUIRED=2.0.0
- LIBGNOMEUI_REQUIRED=2.0.0
--LIBESD_REQUIRED=0.2.36
- 
- dnl *****************************************
- dnl libgnome, libgnomeui needed for all utils
-@@ -40,21 +39,21 @@
- AC_SUBST(GTET_CFLAGS)
- AC_SUBST(GTET_LIBS)
- 
--dnl Check for libesd
--if pkg-config --exists esound ; then
--	have_esound=yes
-+dnl Check for libcanberra
-+if pkg-config --exists libcanberra ; then
-+	have_libcanberra=yes
- else 
--	have_esound=no
-+	have_libcanberra=no
- fi
- 
--if test "x$have_esound" = "xyes"; then
--AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.])
--PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED)
--AC_SUBST(ESOUND_CFLAGS)
--AC_SUBST(ESOUND_LIBS)
-+if test "x$have_libcanberra" = "xyes"; then
-+AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.])
-+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra)
-+AC_SUBST(LIBCANBERRA_CFLAGS)
-+AC_SUBST(LIBCANBERRA_LIBS)
- fi
- 
--AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
-+AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes")
- 
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
---- gtetrinet-0.7.11/config.h.in~	2006-11-15 17:03:53.000000000 +0000
-+++ gtetrinet-0.7.11/config.h.in	2011-03-06 15:39:31.000000000 +0000
-@@ -15,8 +15,8 @@
- /* Define to 1 if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
- 
--/* Define this to enable EsounD support. */
--#undef HAVE_ESD
-+/* Define this to enable libcanberra support. */
-+#undef HAVE_LIBCANBERRA
- 
- /* Define if the GNU gettext() function is already present or preinstalled. */
- #undef HAVE_GETTEXT
---- gtetrinet-0.7.11/src/dialogs.c~	2006-11-03 12:49:49.000000000 +0000
-+++ gtetrinet-0.7.11/src/dialogs.c	2011-03-06 15:40:45.000000000 +0000
-@@ -1054,7 +1054,7 @@
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable);
- 
--#ifdef HAVE_ESD
-+#ifdef HAVE_LIBCANBERRA
-     if (midienable) prefdialog_midion ();
-     else prefdialog_midioff ();
-     if (soundenable) prefdialog_soundon ();
---- gtetrinet-0.7.11/src/sound.c~	2005-03-18 21:19:18.000000000 +0000
-+++ gtetrinet-0.7.11/src/sound.c	2011-03-06 15:47:24.000000000 +0000
-@@ -36,33 +36,36 @@
- char midifile[1024];
- char midicmd[1024];
- 
--#ifdef HAVE_ESD
-+#ifdef HAVE_LIBCANBERRA
- 
--#include <esd.h>
--#include <libgnome/gnome-sound.h>
-+#include <canberra.h>
- 
--static int soundsamples[S_NUM];
- static int midipid = 0;
-+static ca_context *ctx = 0;
- 
- void sound_cache (void)
- {
-     int i;
-     if (!soundenable) return;
-+    if (!ctx)
-+        ca_context_create(&ctx);
-+    if (ctx) {
-     for (i = 0; i < S_NUM; i ++) {
--        if (soundsamples[i])
--            esd_sample_free (gnome_sound_connection_get (), soundsamples[i]);
-         if (soundfiles[i][0])
--            soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]);
--        else
--            soundsamples[i] = 0;
-+                ca_context_cache(ctx,
-+                    CA_PROP_MEDIA_FILENAME, soundfiles[i],
-+                    NULL);
-+        }
-     }
- }
- 
- void sound_playsound (int id)
- {
--    if (!soundenable) return;
--    if (soundsamples[id] > 0)
--      esd_sample_play (gnome_sound_connection_get (), soundsamples[id]);
-+    if (!soundenable || !ctx) return;
-+    if (soundfiles[id][0])
-+        ca_context_play(ctx, 0,
-+            CA_PROP_MEDIA_FILENAME, soundfiles[id],
-+            NULL);
- }
- 
- void sound_playmidi (char *file)
---- gtetrinet-0.7.11/src/Makefile.am~	2006-11-03 16:20:08.000000000 +0000
-+++ gtetrinet-0.7.11/src/Makefile.am	2011-03-06 15:57:32.000000000 +0000
-@@ -7,8 +7,8 @@
- 	   -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
- 	   $(GTET_CFLAGS)
- 
--if HAVE_ESOUND
--LDADD = $(GTET_LIBS) $(ESOUND_LIBS)
-+if HAVE_LIBCANBERRA
-+LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS)
- else
- LDADD = $(GTET_LIBS)
- endif
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
deleted file mode 100644
index 44052954303d..000000000000
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Tetrinet Clone for GNOME"
-HOMEPAGE="http://gtetrinet.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls ipv6"
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libcanberra
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-noesd.patch
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-	epatch "${FILESDIR}"/${P}-format-security.patch
-	sed -i \
-		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
-		src/Makefile.in themes/*/Makefile.in || die
-	sed -i \
-		-e '/^gamesdir/s:=.*:=@bindir@:' \
-		src/Makefile.am || die
-
-	rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die
-}
diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml
deleted file mode 100644
index a29c0a42dfee..000000000000
--- a/games-puzzle/gtetrinet/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-GTetrinet is a client program for the popular Tetrinet game, a 
-multiplayer tetris game that is played over the internet.
-
-Gee, Tetris?  Whats that?  Yeah, yeah, so it's been
-done 2 billion times before (give or take a few bil),
-but this is different!  Yes, all you tetris addicts
-out there be prepared for even MORE excitement..
-internet tetris!  Now you can play your five best
-buddies in one of the most well known games in
-existence!
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gtetrinet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 65ac7ff277b1..bf81598566e5 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,3 +1,5 @@
 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 704 BLAKE2B 4f8529bbe5240991de9a116100eca93b6f4cd98c9dd1d52c7929d4326d3537d83f523c64a3298dca7d8c510ac264cfecc04a6060d3f318cd30dd2990726b916a SHA512 493ba88cfa61d33290ee658990951e98260dcd2337a6415385fc6b4ab394715178edde6483f96af96b161a8ef2a9dce1bcd3248f0f30686767ed57d7f0b0e094
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.36.0.ebuild b/games-puzzle/hitori/hitori-3.36.0.ebuild
new file mode 100644
index 000000000000..af6bbc9274ae
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.36.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 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 37946f60ca9f..00e4c1dcaa67 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,3 +1,5 @@
 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 953 BLAKE2B cc252edc63f158eba0ddb3316d3a5a0f5a6fdd9557ec9f5dde715c8c05a538c64401a29e45851f7b709da9ab14f773c253ec7821f5b0e7a85cc2286443a6e2d8 SHA512 99af2dce0f39535905dc085d5f2827dcc06afad9103464ff0ddc221a482f685a5dddb021ca522e21433a0df1c839c70de9bf791872183306d7d72d957507bc35
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild
new file mode 100644
index 000000000000..346e932e9403
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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/pingus/Manifest b/games-puzzle/pingus/Manifest
index a824fda5b7bb..b81ed747fedb 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -3,8 +3,9 @@ AUX pingus-0.7.6-echo-e.patch 489 BLAKE2B 4268205c1c12bc5e8d4a4fb44b49b15b460763
 AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0e2ea7c00a0738915a92fd3dd4b5f51fe6dac3f7bd0cb84fea72f68f9e8edbac398b4d067dd7be2ff76560bb7be SHA512 7be7935ad664cde7c78d4363eef7391783ea868f096fc9dd03ce3e3eaaab69a839da5cb569449c106eae1779c41d9850f1a5683542bea4bf5cb98570f9d18e7d
 AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
+AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
 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-0.7.6-r3.ebuild 1283 BLAKE2B e7a05fa491ff63c3296f33c8cd08ebfba32eb60d286ef210ab9506465af06168f03603ff3f54d8f694f2a0d87834152b34f277532f5d5ecc76230f633dcb558d SHA512 3caa026bb9fa007cb248b51b192c93715a4f29a8c624a3ef7c9f3924c2770521e53bd1ebe23921e4518d5ee10b2e7abaf9207d3c3324baf514ed95e7d5dbb154
 EBUILD pingus-9999.ebuild 924 BLAKE2B c5ccb474cf9f56d636605c9826e0285519734ab0af9e0c3893de762f15ed5ae3495449e2ccf70e2e9f3540b0c95a0dce7552c7b92de8806cdbd6d96a4a6b0c54 SHA512 2d405c9c64afd9e3a0e2ff7bea2b84505bd4eb3bf2855f2203bf804b3637c0e79c2b0f6022aff1b985c6ace37fe5515d2168c0caa7c880397594dd66c8bca436
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-python3.patch b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
new file mode 100644
index 000000000000..7df3bc9e983d
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-python3.patch
@@ -0,0 +1,19 @@
+--- a/SConscript.bak	2019-08-01 12:45:16.937878393 -0500
++++ b/SConscript	2019-08-01 12:46:13.648803035 -0500
+@@ -126,12 +126,12 @@
+     def configure_end(self):
+         self.env = self.conf.Finish()
+ 
+-        print "Reports:"
+-        print self.reports
++        print("Reports:")
++        print(self.reports)
+ 
+         if not self.fatal_error == "":
+-            print "Fatal Errors:"
+-            print self.fatal_error
++            print("Fatal Errors:")
++            print(self.fatal_error)
+             Exit(1)
+ 
+     def configure_gxx(self): 
diff --git a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
index 7a222f34d4f2..466c772c3579 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r2.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
 
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="https://pingus.seul.org"
+inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
+
+DESCRIPTION="Free Lemmings clone"
+HOMEPAGE="https://pingus.gitlab.io/"
 SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-3"
@@ -13,15 +15,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
-RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+RDEPEND="
+	media-libs/libsdl[joystick,opengl?,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer
 	music? ( media-libs/sdl-mixer[mod] )
 	opengl? ( virtual/opengl )
 	media-libs/libpng:0=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-noopengl.patch
@@ -29,10 +33,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-echo-e.patch
 	"${FILESDIR}"/${P}-gcc7.patch
 	"${FILESDIR}"/${P}-boost_signals2.patch
+	"${FILESDIR}"/${P}-python3.patch
 )
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	strip-flags
 }
 
@@ -51,13 +56,5 @@ src_install() {
 	doman doc/man/pingus.6
 	doicon data/images/icons/pingus.svg
 	make_desktop_entry ${PN} Pingus
-	dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
+	einstalldocs
 }
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 15343c503c00..6620cdd05af8 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,3 +1,5 @@
 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 955 BLAKE2B c00bd5144035a0ea728e7f6e65aaa9f922dffe2bf666f07191e1d7662fdf37c0f53fa9343da4a460ce60515d4a0ca1b3c9b3766446f589c26c1e13cb48d037e8 SHA512 d95312b61543769f3a6c456d7c219473756187e85a26f800124bbb51e2efe676d394ed140b35c4be2c3de93c81be496eb79c99cd825d1b89f72c7242426d5ad3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild
new file mode 100644
index 000000000000..fb499bc50031
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild
@@ -0,0 +1,50 @@
+# 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
+}