gentoo resync : 17.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-17 19:04:28 +0100
commit: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree: 555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /games-puzzle
parent: 4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)
42 files changed, 463 insertions, 818 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index e3416c0de4cb..a7f2b852f3de 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
index 0e8324bf300b..80b0c975c001 100644
--- a/games-puzzle/cuyo/Manifest
+++ b/games-puzzle/cuyo/Manifest
@@ -1,6 +1,4 @@
-AUX cuyo-2.1.1-gcc44.patch 161 BLAKE2B f6b288dfdf81ac39d0c58e144e36ed554bbec67c5533eb57ae9458fc73f0ca2348b3a3d65170a9c62ff5c8734b61b8e90d631a3044b171981feb27c42a04fc90 SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149
 AUX cuyo-2.1.1-gcc6.patch 1024 BLAKE2B 12331f090b146d9f26b1a1300830153a599354c302cbe6d400eb3b39b403071853fcdc0a9559da23a0167d863794499e97f9a1f409333b722d9b95cfa9492e3c SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c
-AUX cuyo-2.1.1-gentoo.patch 851 BLAKE2B 70c082a9e19ca1a093810c810825986390abe5a0b0c671eb97dd95e731ee529a9aea1491f3c59651648ad0e9c451ecb269a66d0b17b4f0b237b961e47117e9a7 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a
 DIST cuyo-2.~-1.1.tar.gz 3005426 BLAKE2B af83365568b16d230b8f253589c0300e1ba29471c8a406bd161da20b8282da4ca845aa1a06b8c5b2bf076828a71e0add9c317b710c476f56540a29f87dc53194 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787
-EBUILD cuyo-2.1.1-r1.ebuild 939 BLAKE2B f0a4e0ace2567214dc54a515f9201b1d1eacb04d9c515f6d6b3f685d29232ded99af8c3bd230b3693de4c2ae1fd5a7a9fe6550e467fb9d775588b6d8b2e016b1 SHA512 c006a34ef2753b956413b1b8731167ead40f28eee08c5abd6f2e8cea9ed0422a731e33859946bea309acbd2cd6ed5013b94d57122473d40c20611a9ec0c4b5f6
-MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
+EBUILD cuyo-2.1.1-r2.ebuild 743 BLAKE2B ee205185322b18623ca9fe509bef841b4dd84cacffbf6f35fe872e1fab0fcff9698915df8292ed8da4aa2b0c4f30db4653fe03c437d67322fbc9f230aff6eebe SHA512 c38ec714675a76f21c76276d56c95efbcbdc1798f0e1873966c11fef58b5df921ee23f7a833ce06921df3ce89e1bd470d82e68d653f263e5b0fe3a5e8a21ea23
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
deleted file mode 100644
index c614a3ea2aa4..000000000000
--- a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils versionator
-
-MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)"
-DESCRIPTION="highly addictive and remotely related to tetris"
-HOMEPAGE="https://www.karimmi.de/cuyo/"
-SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+music"
-
-DEPEND="sys-libs/zlib
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	music? ( media-libs/sdl-mixer[mod] )
-	media-libs/sdl-image
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild
new file mode 100644
index 000000000000..1b3790d034ef
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.1.1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+# This version (2.~-1.1) should've been 2_pre11 or so, i.e. >=2.0.0 is newer.
+# Optimally need upstream to release >=2.1.2, or will need own custom version.
+MY_P="${PN}-$(ver_cut 1).~-$(ver_cut 2-3)"
+
+DESCRIPTION="Highly addictive and remotely related to tetris"
+HOMEPAGE="https://www.karimmi.de/cuyo/"
+SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer[mod]
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc6.patch
+)
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
deleted file mode 100644
index 9ad50b067fb5..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cuyo-2.~-1.1.orig/src/stringzeug.h
-+++ cuyo-2.~-1.1/src/stringzeug.h
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- #include <string>
--
-+#include <stdio.h>
- 
- 
- 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
deleted file mode 100644
index 78bafe2ded47..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cuyo-2.~-1.1.orig/icons/Makefile.am
-+++ cuyo-2.~-1.1/icons/Makefile.am
-@@ -1,4 +1,4 @@
--desktopdir = $(datadir)/applications
-+desktopdir = /usr/share/applications
- desktop_DATA = cuyo.desktop
- 
- 
-@@ -25,7 +25,7 @@
- # Das vorige war falsch: die png sollen alle cuyo.png heissen
- # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version:
- 
--iconsdir = $(datadir)/icons/hicolor
-+iconsdir = /usr/share/icons/hicolor
- icons_DATA = cuyo-32x32.png cuyo-64x64.png
- 
- install-iconsDATA:
---- cuyo-2.~-1.1.orig/icons/cuyo.desktop
-+++ cuyo-2.~-1.1/icons/cuyo.desktop
-@@ -3,9 +3,8 @@
- Icon=cuyo
- Type=Application
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
- Categories=Game;BlocksGame;
--Encoding=UTF-8
- Comment=A tetris like game with many levels
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
- Exec=cuyo
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
index 1329ada5712f..26079e608bed 100644
--- a/games-puzzle/cuyo/metadata.xml
+++ b/games-puzzle/cuyo/metadata.xml
@@ -1,11 +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>
-<use>
-	<flag name="music">Enable playing of background music</flag>
-</use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
index 39ef45aa8121..6939d734e940 100644
--- a/games-puzzle/gfifteen/Manifest
+++ b/games-puzzle/gfifteen/Manifest
@@ -1,3 +1,3 @@
 DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
-EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
+EBUILD gfifteen-1.0.3-r2.ebuild 705 BLAKE2B 2373f9cc3a93c7db2b3b791ca47330539078098c4552e9effc194279155e5a388cc8a2cf960c6c6e442f2a398f07717a49c02628575882e2c65c79bc53badac0 SHA512 91590b2462c9ec5e12086da69251c204c0579e79f6a57778c34ebd731de096529e1ab524677529a972e0aa992d46f82e248d8f9ff652309583cc455b5be128af
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
deleted file mode 100644
index 863fc84ff7f1..000000000000
--- a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
-HOMEPAGE="https://frigidcode.com/code/gfifteen/"
-SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# make it compile against newer gtk+:3 (bug #536994)
-	sed -i \
-		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-assembly
-}
-
-src_install() {
-	default
-	doicon -s scalable ${PN}.svg
-	domenu gfifteen.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..d5c8a0497046
--- /dev/null
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# allow using newer gtk+:3 (bug #536994)
+	sed -i 's/-DGTK_DISABLE_DEPRECATED=1 //' Makefile.in || die
+}
+
+src_configure() {
+	econf --disable-assembly
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.svg
+	domenu gfifteen.desktop
+}
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
index 6322c047f852..3a8cf5347539 100644
--- a/games-puzzle/lmarbles/Manifest
+++ b/games-puzzle/lmarbles/Manifest
@@ -1,3 +1,4 @@
 DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
-EBUILD lmarbles-1.0.8-r1.ebuild 589 BLAKE2B b4f0fbf0aa4d778e05352f1d9f5a37d0a8e914a2af18819f5a445c59243ca0fe0cc19a61ad13c18654dd4c7c0bcd7ceef8ebe99471c292d78d55dda71c6a9503 SHA512 f3efb10c8c5f95784631146a87b7edd04ab4d4aad1b0189bf08778cd600c57e9e662dea0de1b987b19f9a89a5ff7f80fb9fa857a830e4fe49b0d235466058efc
+DIST lmarbles.png 3300 BLAKE2B fb18495174da23370ea85e053b298c0c0d0f682aea9e2c76c60a9b58964d4e365a00c700388f6a59f12e664b5e58646ad7661001372efb37e32c35e0240858df SHA512 722c9d3149a97320d8cf43f4d02c2b7c3a78e7fef945037bd712108ed66d31e012f2f6d3ecad1b572279592ed106e1f028a7f5045793c1bdd4f8b5e5f554063d
+EBUILD lmarbles-1.0.8-r2.ebuild 985 BLAKE2B c318b8fcdd50c938b2729fb85ad3982aa026c19b6e8c427ef583dfaad3b03be6b75dea0fb248ae92f3da2333976447930d55647c0cc292543e86363e6f88a40b SHA512 6395cca97f2e6c8883a121044c585f90d932304faabfe6f4e0abac6b17882d18768198c0ef014444bf7aada86203227c6dc6e051cd16684485618020304c48de
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
deleted file mode 100644
index e92811a4437c..000000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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-r2.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
new file mode 100644
index 000000000000..0e294386e905
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+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
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( src/manual/. )
+
+src_configure() {
+	econf --localstatedir="${EPREFIX}"/var/games
+}
+
+src_install() {
+	default
+
+	fowners :gamestat /usr/bin/${PN} /var/games/lmarbles.prfs
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/lmarbles.prfs
+
+	# gif format is not valid for XDG icons, and .desktop hardcodes icon path
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} LMarbles
+	rm "${ED}"/usr/share/{applications/${PN}.desktop,icons/lmarbles48.gif} || die
+}
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index b37763b18d21..d704fe965bd3 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,4 +1,4 @@
 AUX neverball-1.6.0-gcc-10.patch 1174 BLAKE2B 21c1c9ef20bea6a4912b6195ec470342a64ee0105748bffefefac49f3cc53ea21555f234c944b9ac6c3a484402cb41bb777f932f6809731d2b5407dab8b2dbf4 SHA512 b48a657ab19b3249bbc5ee556ade4b2539cacab116f2e315f53b7aba1d0d13cace4483263e0b9ccafeee03fa78190cb9ea421349f89a6ddbb58cb95b193b14f2
 DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
-EBUILD neverball-1.6.0-r1.ebuild 2034 BLAKE2B 76e6fa7b897223befeb518fd0bede2d5a266a67e815a3957b47657c1385bafd65319f5743d0512c6892bb987958a23941b8ac9d60f995992a52d31848400bca4 SHA512 259fd9d22fa30802aece13358234a69c752beadb457f6e3e8f23e7265b37894411cfc55495cabb5af676386f69372758f8f3b9eec5f2c06f1ab0f7fac49d4bc9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD neverball-1.6.0-r1.ebuild 1872 BLAKE2B 1cc42ca4080966a2f51a13b6ba1e6f565f94e4e783f9413281279a95ddd1db0d10f57557f96661b1f92f2e583d710fd0fd6b11069094277d7587a8be0929525a SHA512 4feb3f4ac777c0a78200304387d1379f518388b275bd135685dc2c99c5dcb43d6de16b66395540372fdd64dcd6a29a5ff2c745f877b1dc91225964cf877a5e45
+MISC metadata.xml 337 BLAKE2B af32f5331f54316c7b35106589f3db6fd2c27eeda0fc741e1e9411c89711d9103fd491dff9ba28cdbda8f32f29a48a716aa5eb4c02c652faf32b43472a1a7673 SHA512 06c1c87117d2787ea80fbe0e574ce9398e586c1fbf8b581ee8851601f4c79a2a38961de51c9eec1781db43c2aefa3ca5ef28a5ffc9d1fed81aecfd65cebad73c
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
index 78274e0fa550..57ab140de1ae 100644
--- a/games-puzzle/neverball/metadata.xml
+++ b/games-puzzle/neverball/metadata.xml
@@ -1,8 +1,11 @@
 <?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>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Neverball/neverball</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
index de40b601028e..abb40a2d14ca 100644
--- a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop gnome2-utils
+EAPI=7
+
+inherit desktop eapi8-dosym toolchain-funcs xdg
 
 DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
 HOMEPAGE="https://neverball.org"
@@ -12,87 +13,72 @@ LICENSE="GPL-2+ IJG"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
-RESTRICT="test"
+RESTRICT="test" # not a test suite, only starts ./neverball
 
-RDEPEND="
-	media-libs/libsdl2[sound,joystick,opengl,video]
-	media-libs/sdl2-ttf
-	media-libs/libpng:0=
-	virtual/jpeg:0
+DEPEND="
+	dev-games/physfs
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
 	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	virtual/jpeg
 	virtual/opengl
-	dev-games/physfs
+	nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
 	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+	media-fonts/wqy-microhei"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's:mapc:neverball-mapc:g' \
-		-e 's:MAPC:NEVERBALL-MAPC:g' \
-		-e '1 s/ 1 / 6 /' \
-		dist/mapc.1 || die
-	sed -i \
-		-e '/CFLAGS.*O2/s:-O2:$(E_CFLAGS):' \
-		-e '/CXXFLAGS.*O2/s:-O2:$(E_CXXFLAGS):' \
-		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
-		Makefile || die
+
+	# adjust man page for namespaced mapc executable (bug #50538)
+	sed -i "s/mapc/${PN}-mapc/;s/MAPC/${PN^^}-MAPC/;1s/1/6/" dist/mapc.1 || die
 }
 
 src_compile() {
-	emake \
-		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
-		E_CFLAGS="${CFLAGS}" \
-		E_CXXFLAGS="${CXXFLAGS}" \
-		LOCALEDIR=/usr/share/locale \
-		DATADIR="/usr/share/${PN}"
+	tc-export CC CXX
+
+	local emakeargs=(
+		DATADIR="${EPREFIX}"/usr/share/${PN}
+		LOCALEDIR="${EPREFIX}"/usr/share/locale
+		ENABLE_NLS=$(usex nls 1 0)
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+	)
+	emake "${emakeargs[@]}"
 }
 
 src_install() {
-	local font
-
-	dobin ${PN}-mapc neverball neverputt
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
-		rm -f "${ED}/usr/share/${PN}"/ttf/${font}
-		dosym /usr/share/fonts/*/${font} \
-			"/usr/share/${PN}"/ttf/${font}
-	done
-	if [[ -d locale ]] ; then
-		insinto /usr/share
-		doins -r locale
-	fi
-	dodoc doc/{authors.txt,manual.txt,release-notes.md} README.md
+	dobin neverball neverputt
+	newbin mapc ${PN}-mapc
+
+	doman dist/{neverball,neverputt}.6
+	newman dist/mapc.1 neverball-mapc.6
 
-	local res name
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	# unbundle fonts
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/ttf}/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/wqy-microhei,${PN}/ttf}/wqy-microhei.ttc
+
+	insinto /usr/share
+	[[ -d locale ]] && doins -r locale
+
+	dodoc README.md doc/{authors.txt,manual.txt,release-notes.md}
+
+	local name res
 	for name in ball putt; do
 		for res in 16 32 64 128 256; do
 			newicon -s ${res} dist/never${name}_${res}.png never${name}.png
 		done
 	done
-
-	doman dist/*.6
-	newman dist/mapc.1 neverball-mapc.6
-	make_desktop_entry neverball Neverball
-	make_desktop_entry neverputt Neverputt neverputt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	domenu dist/{neverball,neverputt}.desktop
 }
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
index f8ff58f9a497..48a6c5503e4a 100644
--- a/games-puzzle/nightsky/Manifest
+++ b/games-puzzle/nightsky/Manifest
@@ -1,4 +1,4 @@
 AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
 DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
-EBUILD nightsky-20111222-r1.ebuild 1808 BLAKE2B 7b3ebb26f4a009915a5c84cb9bf7cdfc49be9551d1dd99f35561049cf1f463cf25952f2d22b9463ea5d7c43c41e419930b0041c4ca1ff4db85545a51d6b752a5 SHA512 1951dfe40296e805bea858af9a117a9bc82b95e06483f0084cd64d7357b0cd6a02c181a28b46f047b68c552fc7bc5d3614ad59bad08e6b46ff97e6aa6fbe8852
+EBUILD nightsky-20111222-r1.ebuild 1658 BLAKE2B 2a7d2a745f1b7c2508e1d6358b84cdee1e8703c232699dbbcca232fc671891c7d4628a2dac230e81d27a196693f0890fc794d26a90068c1dd28fdff9ee36ff94 SHA512 1cf3bb313f4416721911ce359e7cd268c30f915ded68d763cd162fadd47de71190a652ed05d230be31e80ca36740ab4e659ef60614e779b7f0d4bb6bf3e846f2
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/nightsky/nightsky-20111222-r1.ebuild b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
index f74d7895b84c..a28bb13ec292 100644
--- a/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit desktop gnome2-utils
+inherit desktop
 
 DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
 HOMEPAGE="http://www.nicalis.com/nightsky/"
 SRC_URI="nightskyhd-linux-1324519044.tar.gz"
-S="${WORKDIR}"/NightSky
+S="${WORKDIR}/NightSky"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+RESTRICT="bindist fetch"
 
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=opt/${PN}
 QA_PREBUILT="
-	${MYGAMEDIR#/}/NightSky*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*
-"
+	opt/${PN}/NightSky*
+	opt/${PN}/lib/*
+	opt/${PN}/lib64/*"
 
 RDEPEND="
 	virtual/glu
@@ -50,8 +47,8 @@ src_prepare() {
 	default
 
 	einfo "Removing ${ARCH} unrelated files..."
-	rm -v NightSkyHD$(usex amd64 "" "_64") || die
-	rm -rv lib$(usex amd64 "" "64") || die
+	rm -v NightSkyHD$(usev !amd64 _64) || die
+	rm -rv lib$(usev !amd64 64) || die
 
 	if ! use bundled-libs ; then
 		einfo "Removing bundled libs..."
@@ -61,35 +58,24 @@ src_prepare() {
 	# empty dir, we create symlink here later
 	rm -r Settings || die
 
-	sed \
-		-e "s#@GAMES_PREFIX_OPT@#/opt#" \
+	sed "s|@GAMES_PREFIX_OPT@|${EPREFIX}/opt|" \
 		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
 }
 
 src_install() {
 	dobin "${T}"/${PN}
 
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 128 "World/The Void/Physical"/Circle72.png ${PN}.png
-	make_desktop_entry ${PN}
+	insinto /opt/${PN}
+	doins -r .
 
-	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
-}
+	newicon "World/The Void/Physical"/Circle72.png ${PN}.png
+	make_desktop_entry ${PN} "NightSky HD"
 
-pkg_preinst() {
-	gnome2_icon_savelist
+	fperms +x /opt/${PN}/NightSkyHD$(usev amd64 _64)
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-
-	echo
-	elog "Saves and Settings are in ~/.nightsky/Settings"
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Saves and Settings are in ~/.nightsky/Settings"
+	fi
 }
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index 0c3bd7a619ac..2f435d24e6ec 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -1,26 +1,6 @@
-AUX numptyphysics-0.3.5-gentoo.patch 365 BLAKE2B 1281844bb72c77ddadc9b42f46cb444da4153bab872973ecc845e77bc065d49b7be9024c0b9aaee458cc3cb1a63d6089e7f86552308c6ec5d9c1f0d74e422297 SHA512 7554f725d18d5a800ac47d6c51c585ee05554d32df31be2c911de51c9146059c9090e2de95cc4ebb2a76c24a745c1858e5716485f4a3f7dd97bd76c70164ee34
-DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
-DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
-DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
-DIST dneary.npz 5041 BLAKE2B 6ee77c20808d4d4bef812ff5396ae33d4247978fbe1fdd19003ad5432929a94eafbe5ce987036f2d6723daf18cee5b109180785014ea88c9889ee46e99847b24 SHA512 94bf7238bda8c9ba4133bd4bb8f6c978bb06f42432a6854ba570466d3a4b780a737a2138702072fbb9d6b913307a52734b3747a255d3f611df8e8753751d1c55
-DIST gnuton.npz 3734 BLAKE2B cd3de0fa77202c275a0dcadc41e7d87ae412e7b24e9b4f74987f95fbfe053859d1eec322b219c31ce2998125b8a919bc33d01fdcdce8cdf82944f8268db61207 SHA512 f3c910ac426b8044400ff882c0f8e193a19d35d1de2f6a8b5729acb9cc2fe383b116f79854897d3162c9ce223df92c76981a676ffc83268716fb20d8fecca13c
-DIST gudger.npz 7101 BLAKE2B db05d8c733e247302dbc69811a4fa7f01981b3b8fa09259e4df8bb659a2417854ca96194accb9db8211ff4a1694c01b59db9f9b15bd66483c099ef40e6ed8c0c SHA512 507536e83ef99a135d187b54369e12ea585a0aaa354ee4e8cf50540ffcd9b12798f11807940ee487d759617379794d447ab06bc185cb1021d06cca51908f35aa
-DIST guile.npz 27182 BLAKE2B e1e679f7f1169c5fd018ca45a7abade20953fbc85b450a6bde288845ba9e015535b8c78e8ea4d15a82f7f814d67759a72f3367ee441a87349de9cb946140ddcd SHA512 62a98d028335ce0a2a78cec86ef0e9164d10d057f0d99e5c27352f604ca06c6f0634617517ffb5d4c2609859f4316367ce805669d70002058168d332dee2f81e
-DIST hurd.npz 7819 BLAKE2B 3c0154a3ac261bd813a355b02045f7bad497ec6839810bd66d834c1024a7639bdcf424f2eadea3f0ac9b37adc00e0d62075306bd7e4e90e4d264241d8b07c9be SHA512 5a7ce05af8c0cb8b63296a19827286bee46e41c876817cd4a190f8294be8c3c53fdfab63908c9d64b93c9e104d9b36f812fc3c3e05e47dcfdb7a47f9c0a15dab
-DIST ioan.npz 8672 BLAKE2B eff0e2affc5902817da94b2ea813968c093c0fc77943ad7220a2c96f77aea96bb4019cdd345d37d0a453970e0b4c388c668e4870743612473aa1d4b0b1b442d6 SHA512 aeb707ffa3a7fc64d1a401a9f1f2c59b5d031c4443e6b679cf534be0824493f54dc20e1ceb127352e7847ac403dc1971470b52369b0bb0933f0c8ade299961d4
-DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b082582c68395d7c7634fbcd2e7246f7dca35d34c836da781b539300dc5e131c7ca42179eea449d4 SHA512 4d060a35f18204509726db2f1cdfd8a69444bf10e784fcc32ce54a76aa541628903e5ce70d65a64b3ea079095cdc979475ff553e428bb321640d7a87e60f6384
-DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
-DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
-DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
-DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
-DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
-DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
-DIST siminz.npz 187396 BLAKE2B b7374c44aecf78ed6bf5347ff76b4cab142e2375504e48d86ebee4d6c193ebd46c337027d845a596048385c1d66edf2484e496cc6363f966275c267957dccdb9 SHA512 cedf3d90bc93adb2dac45ea69a8f87965002810527ce35122c5b1bcf1bf07fa1de9230f33bb84e542eeb0b4235216eb633d8a79cef1db34e24f8fff25f846758
-DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d196089f9838049cec4da1441f5e6fec2ea357820aa5e666124008b4c369f0102660c707aefb32ba9014a SHA512 b87be9d66cb3025a6168855fa473377609268c7d5fd6dbe53df7fc6156bc58dbb2d35c7e7a5d6caf88bbd92eb08ae2ac5b5d06dce6da9858e1ff1fa3553d3228
-DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
-DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
-DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
-EBUILD numptyphysics-0.3.5.ebuild 2296 BLAKE2B edaab618325ae81d97dac53e662acdc165dbb88121f5c23013ba308b0dba76451a7fc994d6a409374c26db820849e899bde332aa15b812d14ae73bb6a4506e4d SHA512 a66230e1c25bc2d6c84b4b8c00625c718e4f2b38d97b13cc349dad45ce9a64912efae53eb975ab04182329842698846be7cb8671ac50289c4e9c361a0ed948d2
-EBUILD numptyphysics-9999.ebuild 2263 BLAKE2B 89b943d77c93c4208dc4adc16a6feae0a317dd7dadc26aaecc40a45ed36da94ab73b13800c7795a049a34d32b3df04f1d6b57ea519d23bf2d76ed6d3ceff7284 SHA512 98f0af5e679eb7d295f22d40cf010dc64e4e5e4a7651edb5b3b976443d92730a4bc15d07bd8db0630a6f73f702cea804063e9fa56dbd75fcc7f88c0cb4511319
-MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
+AUX numptyphysics-0.3.8-empty-tr.patch 416 BLAKE2B 01248bb0b2dffcb230d4e83ffb6eeb1374c152051dc611ee390a2b7e8b61b7869494fe1b2fa7d2707696b6feaf8082ca00d517680565a538a438c2a0359af01e SHA512 6970c8fc464c83fb9a2601778b6d06bda1783f8fb2ea28c6ebc3c997dabcd2ece19fbbc6ef851f9c904c7f117ac55166e102ef66f736006091a50a71b8bfc9e6
+AUX numptyphysics-0.3.8-respect-flags.patch 1113 BLAKE2B 143d7ae1d83b556b1dbd2ec2385fa696578f25395d790163c1beeb5600260c842e01db88e2a1f9ccc1523328ecae520f4df5bb7c3ff6581f7f63ddb84638f884 SHA512 2d5e5997f1e52c9fe6b73e6889e8068791d918d20d9a1c6db127793ef3d0e718625b334ec4afdf700e91577c9e979ec60ed6e7874b53064fe51159646092200c
+DIST numptyphysics-0.3.8.tar.gz 1647661 BLAKE2B 07cd5fa77e48517bf7cd2b11d8bcd4a0878cf02860f4165d29a562191e529babcf9637b293d3670bd37f8dfb9db4423546f6eede405fa0ecf97187e0f408dbae SHA512 6f5c7783e9e09efda19ff00d369dca76e0dc8f574b1e8c9268459accf83e48a29f7caec7a4ec3a28da4fac3007d2137f0bf5426494118927cd7b944646c7c24e
+EBUILD numptyphysics-0.3.8.ebuild 867 BLAKE2B 2b7e54d4563c26fde932843b753018a44f3ba846bc572117052007642038e0f7d438ac93ec5efcd60c6a4861b620423eb37068d2a6df7c4cb412d3b137266114 SHA512 3968e341c7e1a5dfe385db9bd1ad35174b09f7b6767e01280cf3f944bbbe075b9ab92b05d2944c10efa06913c0c2f64ef25382b776847f02ece622cdd8f021bb
+EBUILD numptyphysics-9999.ebuild 881 BLAKE2B 0462044fbb3aadb9e004f69175c096eee05edaba49c6f6c2fd624bd67bfafd98b8380eab2b415a06b6cbd9de02b09a85f71222ed2a5f32391993e393ec4387ba SHA512 66a5edca4444c3da2f4849cebbe61d20d93ad04a74a54658b54e872a313382382e0bf33d52776e304ace4c9db1645b28ae5cdb3855b24bab8040a0797957486f
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
deleted file mode 100644
index 9a739ed5227c..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/makefile b/makefile
-index 8125a48..0ee4942 100644
---- a/makefile
-+++ b/makefile
-@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
- 
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- 	$(SILENTMSG) "\tLD\t$@\n"
--	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- 	$(SILENTMSG) "\tCLEAN\n"
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
new file mode 100644
index 000000000000..847092190d35
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
@@ -0,0 +1,10 @@
+On unrecognized LC_MESSAGES (e.g. C.utf8) the .empty() check
+fails and loads empty translations leading to constant:
+[ 1536ms] [I18n.cpp:34 WARNING] Untranslated: 'Gameplay paused'
+--- a/src/Os.cpp
++++ b/src/Os.cpp
+@@ -279,3 +279,3 @@
+         auto fn = thp::format("i18n/%s", lang);
+-        if (!Config::readFile(fn).empty()) {
++        if (!access(Config::findFile(fn).c_str(),F_OK)) {
+             Tr::load(fn);
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
new file mode 100644
index 000000000000..09b54e6ac739
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
@@ -0,0 +1,30 @@
+diff '--color=auto' -NarU 2 a/external/Box2D/Source/Makefile b/external/Box2D/Source/Makefile
+--- a/external/Box2D/Source/Makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/external/Box2D/Source/Makefile	2021-07-16 17:01:57.254825075 -0400
+@@ -7,5 +7,5 @@
+ endif
+ 
+-CXXFLAGS=	-g -O2
++CXXFLAGS ?=	-g -O2
+ 
+ SOURCES = \
+diff '--color=auto' -NarU 2 a/makefile b/makefile
+--- a/makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/makefile	2021-07-16 17:00:51.421009113 -0400
+@@ -38,5 +38,5 @@
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ 	$(SILENTMSG) "\tLD\t$@\n"
+-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+ 
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+diff '--color=auto' -NarU 2 a/mk/pkgs.mk b/mk/pkgs.mk
+--- a/mk/pkgs.mk	2021-06-18 07:19:06.000000000 -0400
++++ b/mk/pkgs.mk	2021-07-16 17:10:28.636268435 -0400
+@@ -1,4 +1,4 @@
+ ifneq ($(PKGS),)
+-CXXFLAGS += $(shell $(CROSS_COMPILE)pkg-config --cflags $(PKGS))
+-LIBS += $(shell $(CROSS_COMPILE)pkg-config --libs $(PKGS))
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS))
++LIBS += $(shell $(PKG_CONFIG) --libs $(PKGS))
+ endif
diff --git a/games-puzzle/numptyphysics/metadata.xml b/games-puzzle/numptyphysics/metadata.xml
index dc8c227d5260..26079e608bed 100644
--- a/games-puzzle/numptyphysics/metadata.xml
+++ b/games-puzzle/numptyphysics/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="user-levels">Install some fun user-created levels</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
deleted file mode 100644
index aed95f6655cd..000000000000
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils toolchain-funcs
-
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="https://github.com/thp/numptyphysics"
-
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+user-levels"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libsdl2[opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-ttf
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
-)
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
new file mode 100644
index 000000000000..9ff5318033cc
--- /dev/null
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://github.com/thp/numptyphysics"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thp/numptyphysics.git"
+else
+	SRC_URI="https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-3+ ZLIB"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libsdl2[opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-ttf
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-empty-tr.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_compile() {
+	tc-export AR CC CXX PKG_CONFIG RANLIB
+
+	emake V=1
+}
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index e9ab6b1a7e7d..738b4f617637 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -3,67 +3,38 @@
 
 EAPI=7
 
-inherit git-r3 gnome2-utils toolchain-funcs
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
 HOMEPAGE="https://github.com/thp/numptyphysics"
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
 
-LICENSE="GPL-3+"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thp/numptyphysics.git"
+else
+	SRC_URI="https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-3+ ZLIB"
 SLOT="0"
-IUSE="+user-levels"
 
 RDEPEND="
 	dev-libs/glib:2
 	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
-	virtual/opengl
-"
+	virtual/opengl"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+	"${FILESDIR}"/${PN}-0.3.8-empty-tr.patch
+	"${FILESDIR}"/${PN}-0.3.8-respect-flags.patch
 )
 
 src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	tc-export AR CC CXX PKG_CONFIG RANLIB
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	emake V=1
 }
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 8d5f48efe9d4..01792c835847 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,4 @@
-AUX picpuz-2.5-build.patch 5466 BLAKE2B c99edcd74cfdd606f10b8b579ab9daf718e43618a331251c5fbecd0e4166cc959e4eead0bc6a292c875b73126cb4602cf5f23fec75bdcbfe4c61d3d44cc00f8d SHA512 5029124dfc9ed9a338cbe8899831dff38bea28b44cee612bfc95cd1ea434a4f942d53a832a4769229e7f31244a278d6ceae27e499108d4fe3b9e7c7e3a518622
-AUX picpuz-2.5-pthread-underlinking.patch 785 BLAKE2B 6b25d10b1c545a96965667032fa0c39b892b634e069d13079c8993f3b0a3ba1e7d0c7ccf74ac40dd10aa3663f2d06fe017d8f6b7cb3241d5d7b16a0244699999 SHA512 d2dfc2c44599bd125124709f6ecbc24b02c24cf8d3129a54d5f4ad434044689953606e062c784ba8200f40bec3175d8fa8f4d1e3643a925884374ccca394c424
+AUX picpuz-2.5-docdir.patch 222 BLAKE2B 8cfb90707508dd9af8186ba42033948d64829eb7336d90856ef7c61bfe5bb71d73faa39a36be181cebfa3295bdc02560be880410827498eb1fe5ee9c7422df2e SHA512 6eba6a2c251191d69325660e2e40e6ed89aad928f317faf9e131430098bb49987129fda3b5d8e0a1d2e24f68705f4ec6af238049d7c6fab26beef1210b636984
 DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1081 BLAKE2B 198d039674871dcbb37bdf217b9b3a45711d29b169c7de3667c561a09a141505b90f151ec53b16c47104beededba8b53da85056402f09195e86b0f0e28df1754 SHA512 aeb931c5a26d595cb475af3293cd4651e869ddf6e65982a6a840e32de23a9359a1985363be1fa8fce28ef87da4f6ea01851c3661ef7f074a7f0df047a2d256c0
+EBUILD picpuz-2.5-r1.ebuild 1003 BLAKE2B 60199194c8b817bcf38b0717ee07f90e9baa7bfc65d6433b3b46fd7bb5b3b429186df18f5c7c3b26191d64e4cde84434e86f7874e3307d38561fcb1d32d55143 SHA512 cf10163d9da81e5b3443719cc38dc1e93e94fcd60d0557fcf35bbfe617292f1b1a58c2a29dc4f1c4a95870382e8d1b8d7436e51bc2a7877541c2b0873e249b40
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
deleted file mode 100644
index 6ca26e178bbf..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 21 17:03:11 UTC 2012
-
---- a/Makefile
-+++ b/Makefile
-@@ -11,24 +11,26 @@
- 
- # target install directories
- BINDIR = $(PREFIX)/bin
--SHAREDIR = $(PREFIX)/share/$(PROGRAM)
--ICONDIR = $(SHAREDIR)/icons
--LOCALESDIR = $(SHAREDIR)/locales
-+DATADIR = $(PREFIX)/share/$(PROGRAM)
-+ICONDIR = $(DATADIR)/icons
-+LOCALESDIR = $(DATADIR)/locales
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
- MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-+	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
- 
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
- 
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
- 
- install: $(PROGRAM)
- 	mkdir -p  $(DESTDIR)$(BINDIR)
-@@ -52,7 +54,7 @@
- 
- uninstall:
- 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
--	rm -R -f  $(DESTDIR)$(SHAREDIR)
-+	rm -R -f  $(DESTDIR)$(DATADIR)
- 	rm -R -f  $(DESTDIR)$(DOCDIR)
- 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
- 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- a/zfuncs.cc
-+++ b/zfuncs.cc
-@@ -3111,7 +3111,6 @@
-          /prefix/share/appname/locales/         translations: appname-de.po  etc.
-          /home/user/.appname/                   parameters etc. are copied here
- 
--   zprefix        install location              has /bin and /share subtrees
-    zdatadir       installed data files          .desktop, parameters, etc.
-    zdocdir        user documentation            README, changelog, user guide
-    zicondir       icons                         icon files .png
-@@ -3123,7 +3122,7 @@
- namespace zfuncs
- {
-    char        zappname[20];
--   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
-+   char        zdatadir[200], zdocdir[200];                                //  app directories
-    char        zicondir[200], zlocalesdir[200], zuserdir[200];
-    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
-    char        JPGquality[4] = "85";                                       //  JPG file save quality
-@@ -3132,7 +3131,6 @@
-    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
- }
- 
--cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
- cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
- cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
- cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
-@@ -3156,19 +3154,15 @@
-    
-    catch_signals();                                                        //  catch segfault, do backtrace
-    
--   strcpy(zappname,appname);                                               //  save app name
--   
--   #ifndef PREFIX                                                          //  install location                v.4.7
--      #define PREFIX "/usr"
--   #endif
--   
--   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
--   strcpy(zprefix,work);                                                   //  /prefix
--   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
--   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
--   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
--   
-+   strcpy(zappname,appname);
-+
-+   strcpy(zdatadir,DATADIR);                                               //  macros from build script
-+   strcpy(zdocdir,DOCDIR);
-+   strcpy(zicondir,zdatadir);
-+   strcat(zicondir,"/icons");
-+   strcpy(zlocalesdir,zdatadir);
-+   strcat(zlocalesdir,"/locales");
-+
-    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
-    err = stat(zuserdir,&statdat);                                          //  does it exist already?
-    if (err) {
-@@ -3366,9 +3360,9 @@
-    fputs(work,fid);
-    fputs("Type=Application\n",fid);                                        //  Type=Application
-    fputs("Terminal=false\n",fid);                                          //  Terminal=false
--   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
-+   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
-    fputs(work,fid);
--   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
-+   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
-    fputs(work,fid);
-    fclose(fid);
- 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
new file mode 100644
index 000000000000..d627d826e56e
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
@@ -0,0 +1,7 @@
+Simplify opening the html guide with right path.
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -3222,2 +3222,3 @@
+    using namespace zfuncs;
++   showz_html("file://" PREFIX "/share/doc/" DOCDIR "/html/userguide-en.html"); return;
+ 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
deleted file mode 100644
index f11f95cbf72b..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix underlinking on recent binutils:
-
-> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
-> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
- CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 2b1863eb8bbe..92a9c069b79a 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,60 +1,48 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop gnome2-utils toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
-DESCRIPTION="A jigsaw puzzle program"
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+DESCRIPTION="Jigsaw puzzle program"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pthread-underlinking.patch
+	"${FILESDIR}"/${P}-docdir.patch
 )
 
 src_compile() {
-	tc-export CXX PKG_CONFIG
+	tc-export CXX
 
-	emake \
-		BINDIR="/usr/bin" \
-		DATADIR=/usr/share/${PN} \
-		DOCDIR=/usr/share/doc/${PF}/html
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-3.0) -DDOCDIR="'\"${PF}\"'"
+	append-ldflags -pthread
+	append-libs $($(tc-getPKG_CONFIG) --libs gtk+-3.0)
+
+	emake PREFIX="${EPREFIX}/usr" CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" LIBS="${LIBS}"
 }
 
 src_install() {
 	dobin ${PN}
+	newman doc/${PN}.man ${PN}.1
 
 	insinto /usr/share/${PN}
 	doins -r icons locales
 
-	doicon -s 48 icons/${PN}.png
-	make_desktop_entry ${PN} Picpuz
-
-	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+	dodoc doc/{README,changelog,translations}
 
-	dodoc doc/{changelog,README,translations}
-	newman doc/${PN}.man ${PN}.1
-}
+	docinto html
+	dodoc -r doc/{images,userguide-en.html}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	doicon icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
 }
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index dbc9cc26265d..c28459d74b24 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,6 +1,6 @@
-AUX xlogical-1.0.7-gcc41.patch 833 BLAKE2B 6a43b04affe9cc4cd9456d52b369636b68276e86a31644edec85aefb2771d6fed90108da86f2f9759329c77a53e2176979fad353c929ad7f99e30bfa5ba10f27 SHA512 aeb239382a019a7fd186030543231c29b260af3faeeda67da72a56b8a778ba5f70b16b6e1dbd3c04c1251816b91aae9c23d39dc877fd63e7ae7032431c02533d
-AUX xlogical-1.0.7-gcc43.patch 935 BLAKE2B cea7455abc9c6c953c179984b43b124157320c7dc3e5b891940811bc5b3732acb592b914e64bedb2a93f8bce73f381cfecd8eb927bf2b88d18ea2dc698085fa2 SHA512 4a1c4e259cc798a5debe917ea4981f36f04d073ce33ed317008318a891fa5d68938e4b63e8c3166f31132251f2ed2696e46eb0799afbd808eace68c2895c0f96
-DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
-DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
-EBUILD xlogical-1.0.7-r1.ebuild 1644 BLAKE2B 8e43a6cea8ade6ade4ee77a612e9df5c88856e69a4861833dad50ce9c1c3f0283841be9e3a83b711101aed79c2ed17805f9cb1d0561f572105dee460767cf6f5 SHA512 9b9e27d903513c632542dd5dffd8bfc416ea319688999b7f47a8a571be7363e375737b79cdcd618bcaca1c46a9c247c4b1b898632b28b499f2c3d312880b030e
-MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
+AUX xlogical-1.0.8-gcc11.patch 270 BLAKE2B 05fce1cafbe6725fe0c17031dc07656047952c78062601130059f7b7ed47afd44ee959d5ba53feba215b6ad41feaed9c6cb865b89512994ce2d7471001e61375 SHA512 b4c0c3b8ae5032af69a0b6864d34393be4e948f797bed057635efc938d1187c0a927d968c428b820602bb1d5698708f4c12da039f78327b585d35059d1e88a5b
+AUX xlogical-1.0.8-gcc4.3.patch 628 BLAKE2B 283c6bc0ec032d4dddee928e41c9dd894e9ed96fb53aa653d1985ae7c654020e1fe510749444cb865ccd289813ee19bd03d555ecf4f2d081a038c5a329f6a2d0 SHA512 dab1685a0abfda4e17534327d46f89372132b4dc7be87873b23a9bfa41ebbab4868c46dff574deee6c5895722c05b6019547825b33ef76ccdc7dcd404c03e925
+DIST xlogical-1.0-8.tar.bz2 1789699 BLAKE2B 5d33cc7345c43a21bea8e899e36c87ccf57752f8b96aaa52b61a9042f6531adf6944dff9e57684a86a0f759a8e4e24253618fc2c2e3cdd3c70d20a9cb0a27398 SHA512 3cbba38c430b1f2a6786d1d6893249812e75941fd7ab336ca5d111ec526ef61bb7e09d5365dbcaae23f32a336d8ab840c0e343656054d252043c6c7962b39d18
+DIST xlogical.png 4477 BLAKE2B 276abddabc3b26c7b9a3322e34079073a517ae1c7477307ff3429739eb3a88f9cc23dc0e3c637cf0a7aed13c9cf5cf12b40cb8858eaa0c67246d5d1bf746dedf SHA512 761953cc61bf1cea1b0d306006b71cabee800c6ea74aae4ed31f2fcf2e5cb9fa672c6c226c5444ab6b0af858a54522dafe0a1eb0351bb0c9f359fa447d0fbfa0
+EBUILD xlogical-1.0.8.ebuild 1293 BLAKE2B 8c6542f285e8001cc21a4ced370e4e77d7f98cdd57e7bc444d8073a475e70f278877b986f24151a6f43289fae12039b0838745032644846e0b9fe00747d827e3 SHA512 9c710905c63dcddab00947dd4025feebf4bce4c7fa87bb49a21f602baf0ae45a71eb978a76a0b843227f2a6c45445cf93a18bb96957e4fe3ed62e382caf3a40c
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
deleted file mode 100644
index 5c77527dc598..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/properties.h
-+++ b/properties.h
-@@ -33,9 +33,7 @@
- #include <map>
- #include <string>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #include "defs.h"
- 
---- a/anim.h
-+++ b/anim.h
-@@ -27,9 +27,7 @@
- // Language Includes
- #include <list>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- // Application Includes
- #include "graph.h"
---- a/exception.h
-+++ b/exception.h
-@@ -27,10 +27,9 @@
- 
- // Language Includes
- #include <string>
-+#include <iostream>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #define CatchEx(aEx)		catch( CXLException aEx )
- #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -154,7 +154,7 @@
- 		levelFile = NULL;
- 	}
- 
--	currentMap = NULL;
-+	currentMap = gameLevels.begin();
- 
- 	playerName = new char[32+1];
- 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
deleted file mode 100644
index 594298c93d44..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/gamelogic.cpp
-+++ b/gamelogic.cpp
-@@ -25,6 +25,7 @@
- #include<fstream>
- #include<cstdio>
- #include<cctype>
-+#include <cstdlib>
- 
- #ifndef WIN32
- #include<unistd.h>
---- a/levelmap.cpp
-+++ b/levelmap.cpp
-@@ -21,6 +21,7 @@
- ////////////////////////////////////////////////////////////////////////
- 
- // Language Includes
-+#include <cstdlib>
- #include <cstdio>
- #include <cctype>
- #include <cstring>
---- a/mapedit.cpp
-+++ b/mapedit.cpp
-@@ -26,6 +26,8 @@
- #include<cstdio>
- #include<list>
- #include<vector>
-+#include <cstdlib>
-+#include <cstring>
- 
- #ifndef WIN32
- #include<unistd.h>
---- a/modlist.cpp
-+++ b/modlist.cpp
-@@ -22,6 +22,7 @@
- 
- #include <iostream>
- #include <fstream>
-+#include <cstdlib>
- 
- #ifdef WIN32
- #include <afxwin.h>
---- a/tile_spinner.cpp
-+++ b/tile_spinner.cpp
-@@ -24,6 +24,7 @@
- 
- 
- // Application Includes
-+#include <cstdlib>
- #include "audio.h"
- #include "properties.h"
- #include "defs.h"
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
new file mode 100644
index 000000000000..f225d41fea0e
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc11.patch
@@ -0,0 +1,12 @@
+--- a/sdl_audio.cpp
++++ b/sdl_audio.cpp
+@@ -60,3 +60,3 @@
+ 
+-	for( end=aPath+len; end >= 0; end-=1 )
++	for( end=aPath+len; end >= aPath; end-=1 )
+ 	{
+@@ -64,3 +64,3 @@
+ 	}
+-	for( start=end; start >= 0; start-=1 )
++	for( start=end; start >= aPath; start-=1 )
+ 	{
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
new file mode 100644
index 000000000000..967754265f46
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.8-gcc4.3.patch
@@ -0,0 +1,36 @@
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
+@@ -27,2 +27,3 @@
+ #include<cctype>
++#include<cstdlib>
+ 
+@@ -156,3 +157,3 @@
+ 
+-	currentMap = NULL;
++	currentMap = (list< class Clevel_map *>::iterator)NULL;
+ 
+--- a/levelmap.cpp
++++ b/levelmap.cpp
+@@ -28,2 +28,3 @@
+ #include <iostream>
++#include <cstdlib>
+ 
+--- a/mapedit.cpp
++++ b/mapedit.cpp
+@@ -28,2 +28,4 @@
+ #include<vector>
++#include<cstring>
++#include<cstdlib>
+ 
+--- a/modlist.cpp
++++ b/modlist.cpp
+@@ -24,2 +24,3 @@
+ #include <fstream>
++#include <cstdlib>
+ 
+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
+@@ -25,2 +25,3 @@
+ 
++#include <cstdlib>
+ // Application Includes
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
index e2b7cea129a5..26079e608bed 100644
--- a/games-puzzle/xlogical/metadata.xml
+++ b/games-puzzle/xlogical/metadata.xml
@@ -1,15 +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>
-<longdescription lang="en">
-XLogical is a puzzle game based on the Logical! game that was originally
-released by Rainbow Arts on the Commodore Amiga computer.
-</longdescription>
-  <use>
-    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
-  </use>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
deleted file mode 100644
index 835489919edc..000000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop edos2unix
-
-MY_PV=$(ver_rs 2 '-')
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
-SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
-	alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )"
-S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-DEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/gamestat
-"
-BDEPEND="alt_gfx? ( app-arch/unzip )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-)
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-
-	if use alt_gfx ; then
-		cd "${S}"/images || die
-		unpack xlogical_gfx.zip
-	fi
-}
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/d' Makefile.am || die
-
-	edos2unix properties.h anim.h exception.h
-
-	default
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# localstatedir is only used for the score file
-	# NOTE: Check on bumps!
-	econf --localstatedir="/var/games"
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r ${PN}.{properties,levels} music sound images
-	find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die
-
-	insinto /var/games/${PN}
-	doins ${PN}.scores
-
-	fowners root:gamestat /var/games/${PN}/${PN}.scores
-	fperms 660 /var/games/${PN}/${PN}.scores
-	fperms g+s /usr/bin/${PN}
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} "Xlogical"
-}
diff --git a/games-puzzle/xlogical/xlogical-1.0.8.ebuild b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
new file mode 100644
index 000000000000..d0cd804016ba
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+MY_P="${PN}-$(ver_rs 2 -)"
+
+DESCRIPTION="Puzzle game based on the Logical! game released on the Commodore Amiga"
+HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
+SRC_URI="
+	https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.3.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/^CXXFLAGS/d" \
+		-e "s|@localstatedir@/xlogical|${EPREFIX}/var/games|" \
+		-i Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r ${PN}.{properties,levels} images music sound
+	find "${ED}" -name "Makefile*" -delete || die
+
+	insinto /var/games
+	doins ${PN}.scores
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.scores
+
+	einstalldocs
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "XLogical"
+}
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
index 4177bee11980..9ed783866c6a 100644
--- a/games-puzzle/xye/Manifest
+++ b/games-puzzle/xye/Manifest
@@ -1,6 +1,6 @@
 AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
 AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
-AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
+AUX xye-0.12.2-fix-desktop-file.patch 424 BLAKE2B 9ab00bc1e2bc706556cb070e63e0c43090521ac8146bd5377834491c0b3c18374a21013a020a8664c46cd25fa48247e5d501a532ebb91d812a707c7fd9b1b0b1 SHA512 e94792912c0997226f2099057e5ad08fd0fbbd3bcb6a164ed0cab05c8d86337b381aac614dbfff6c36c0ca82af75011d8325ef63d343e6bb03fd7dfa8ee0f1fd
 DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
-EBUILD xye-0.12.2.ebuild 933 BLAKE2B b1057bf7efbf494560e061c1ff8c6340b6911405eedeee52cc6c238b06c59430bf1656c6f1ae022a60aa580af00a52e1061e732c3591c799ac22c922b0edce41 SHA512 c22d78ace9f2da94a7ca966b7b3b9579860b2e48f46d5c85ff787d10d1a7e773c9388453cbb56739692e824284e50ce5d77bae680ad6bb545ab06b5f2751af77
+EBUILD xye-0.12.2.ebuild 869 BLAKE2B d9411d4198db6f80168bbe7486e0586bb91f26d3c6d089e68e70f0dadce67348d9f059d56354ce551cf709e3e605c456ef13a16e192617fa365c1e40376d7479 SHA512 9bfa0eb75547299c53665ae0f29e33bde636f053e58a029427ba1defec2e557dc5012fca66e557bb76766d5651a09c5d09c2fa278e5b9c3067b7bd1145828fe1
 MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
index 99558ef28732..1f51bfb41336 100644
--- a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -7,7 +7,7 @@ Fix .desktop file to comply with FDO specifications.
  Exec=xye
  Type=Application
 -Categories=Application;Game;PuzzleGame
-+Categories=Game
++Categories=Game;LogicGame
  Name=Xye
  GenericName=Xye
  Comment=Solve puzzles and action challenges in order to get all the gems in the room.
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
index dd5d31b2b2a0..1dec87af8d3b 100644
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools xdg
+inherit autotools eapi8-dosym xdg
 
 DESCRIPTION="Free version of the classic game Kye"
 HOMEPAGE="http://xye.sourceforge.net/"
@@ -12,23 +12,23 @@ SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-fonts/dejavu
 	media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]"
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-buildsystem.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
 )
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
@@ -37,6 +37,6 @@ src_install() {
 	default
 
 	# create symlinks for previously bundled fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans.ttf
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/res}/DejaVuSans-Bold.ttf
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-17 19:04:28 +0100
commit	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (patch)
tree	555c194dbeb0fb2ac4ad3cde7c0f6a80fd330ce2 /games-puzzle
parent	4df3bf9762850b34cd1ead5c80374d1a0fc3362e (diff)