gentoo resync : 15.06.2021

25 files changed, 96 insertions, 471 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index a1981db3889b..8c703f481f92 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
index 31978d89f80c..7d41bb11c2ab 100644
--- a/games-action/armagetronad/Manifest
+++ b/games-action/armagetronad/Manifest
@@ -1,7 +1,4 @@
-AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 BLAKE2B af8f6ec0ab77839ced171e6002279952a1aa680115bf2985c69df8b973c67f8c6516a45608737b4e473175b5682b0a03ec2c089a70b47b34ffeb8ce9318aad9c SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44
 AUX armagetronad-0.2.9.1.0-AR.patch 242 BLAKE2B ac48c365a56cecfb148752949def751bb63d6bfab51e406da9c0ebcc495cd2ce5a3954f9eae7235bd4759d83b7a6eaf9d2c4038f649b321a777bbd113d790d0d SHA512 d1812fc8ca2292ad0536978cdba31f1e0806f729519767ff1a1c75b04ee49bf7fc0eed3b7c63a485600956455875dd5f270b0ecddcf021478b81a057f8746902
-DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 BLAKE2B 60a8fffe61903cb1fa4b188ae6c72ad842e5395b8a37276a6b84018e5393e1294e6ef5438fc7e029d02bfd7172eb81973781e7fbb670c3c7fbacae46d19de409 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
 DIST armagetronad-0.2.9.1.0.tbz 1943758 BLAKE2B ed4ecef19125d69faf402829b88288124dd364eafc836be3848727c2bfbd87ca29e18b48448dc868fb995947b2daae150c3b9f5dcf048d0d90d442f5bcf425f0 SHA512 8c2b9cba7d480dec6d7d60984327a5d45c8c87b968fb81a1e192973e6826ddb66c8d41ca82bb04d80da5c6fa2152d19dd890957dabc6cc5ce2d4dffbc45d1f65
-EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1322 BLAKE2B 17fac2f4eef2cf863f00dd5ef74fe97c7626eff8aa5891db4b6eebfcee6f2cf622f714eabbeece980b2d09214523ec5d0ef9239f1de3b7812e2c99b48b0b0b9c SHA512 1b3d8a2ae1ba78a13357358225d5a97de9ed9a725b347e72cc5cc5cb6c869eac1ce9a9015a450f762cf0c3cf1bc02327913ea0f1913456c6f956ffbd2b7766d1
-EBUILD armagetronad-0.2.9.1.0.ebuild 1211 BLAKE2B 073907830215a6629e8e3b991e762fe17f2c011676fcbb6669db2bf26187564bb6c6836f61e5404c8a88b40ea62d00d327f6fb2c51c17afc72b4178d579d29bd SHA512 e5d14cf2ec4899099e19415bb7510bf4e1df66307ca5a2e8639e9ac36ed140b0741641fe3681a1bd9e43edd451f0f79bc3167414ec0bfe0b800153437ffe0dde
-MISC metadata.xml 333 BLAKE2B 9e7f4657f3f025fbe42e09e9b64d191a79a125ad3df9ff007e1f6cbdbe40b9311ef257adac0a5861750c21c067bfe6165e80451ac211e06dd0dce542f126ca3f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead
+EBUILD armagetronad-0.2.9.1.0.ebuild 1363 BLAKE2B b00f8ed0b7aae8fda36b2141692ec0adb020afb9dd241628d621dc48b440f6fe72122ca0afe7c4274860d8d597dfaf65f27590302b78698644821243de07ed16 SHA512 bdeeabbed4ffb9cb3571410cf3c31694b30ec427da8fcc9ec7ee4454eae8a039dde746b9e1ae67eefbf542bb172ca88d21c03db2b7b488dea67fd139ae8a75bf
+MISC metadata.xml 398 BLAKE2B 92cde982b135f9835bb34e7f54aca2ace13b15d19554affdba772400c736a11ba497cf71931d08877e6ee899309e3595f7c242d60c295a5a071e404bb9b77268 SHA512 7f1a0c4ad44c799ba2af8fa95c122b155c5741ad08a89224fc7de381b7eb13affa6fa61e055618a1b987fc94556a7839c8bc0a5fbc733cd186f7c8e1c0d65c55
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
deleted file mode 100644
index 8c28621c0f8d..000000000000
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ /dev/null
@@ -1,66 +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="Fast-paced 3D lightcycle game based on Tron"
-HOMEPAGE="http://armagetronad.org/"
-SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated sound"
-
-RDEPEND="
-	dev-libs/libxml2
-	!dedicated? (
-		media-libs/libpng:0=
-		media-libs/libsdl[X,opengl,video,sound?]
-		media-libs/sdl-image[jpeg,png]
-		virtual/glu
-		virtual/opengl
-		sound? ( media-libs/sdl-mixer )
-	)"
-DEPEND=${RDEPEND}
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-src_prepare() {
-	default
-	sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
-}
-
-src_configure() {
-	# --enable-games just messes up paths
-	econf \
-		$(use_enable dedicated) \
-		$(use_enable sound music) \
-		--disable-sysinstall \
-		--disable-useradd \
-		--disable-uninstall \
-		--disable-games
-}
-
-src_install() {
-	default
-
-	# misplaced desktop-file/icons
-	rm -r "${ED%/}"/usr/share/${PN}/desktop || die
-	doicon -s 48 desktop/icons/large/armagetronad.png
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
index 53ba592280d8..93180672cd3d 100644
--- a/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
+++ b/games-action/armagetronad/armagetronad-0.2.9.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop xdg-utils
+inherit autotools desktop
 
 DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
 HOMEPAGE="http://armagetronad.org/"
@@ -24,9 +24,11 @@ RDEPEND="
 		virtual/opengl
 		sound? ( media-libs/sdl-mixer )
 	)"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
-PATCHES=("${FILESDIR}"/${P}-AR.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-AR.patch
+)
 
 src_prepare() {
 	default
@@ -35,29 +37,28 @@ src_prepare() {
 }
 
 src_configure() {
-	# --enable-games just messes up paths
-	econf \
-		$(use_enable dedicated) \
-		$(use_enable sound music) \
-		--disable-sysinstall \
-		--disable-useradd \
-		--disable-uninstall \
+	local econfargs=(
+		$(use_enable dedicated)
+		$(use_enable sound music)
+		# following options only mess with paths and users
 		--disable-games
+		--disable-sysinstall
+		--disable-uninstall
+		--disable-useradd
+	)
+	econf ${econfargs[@]}
 }
 
 src_install() {
-	default
-
-	# misplaced desktop-file/icons
-	rm -r "${ED}"/usr/share/${PN}/desktop || die
-	doicon -s 48 desktop/icons/48x48/armagetronad.png
-	make_desktop_entry ${PN}
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
+	# long history of being broken without -j1 (bug #330705,698020)
+	# do not remove (again) without a proper fix or extensive tests
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
 
-pkg_postrm() {
-	xdg_icon_cache_update
+	# handle misplaced .desktop / icons
+	if ! use dedicated; then
+		rm -r "${ED}"/usr/share/${PN}/desktop || die
+		doicon desktop/icons/48x48/armagetronad.png
+		make_desktop_entry ${PN}
+	fi
 }
diff --git a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
deleted file mode 100644
index 0cd6e5bc1d67..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768
-Commit: https://sourceforge.net/p/armagetronad/code/10845/
-
---- a/src/engine/eNetGameObject.cpp
-+++ b/src/engine/eNetGameObject.cpp
-@@ -85,7 +85,7 @@
- eNetGameObject::eNetGameObject(eGrid *grid, const eCoord &pos,const eCoord &dir,
-                                ePlayerNetID* p,bool autodelete)
-         :eGameObject(grid, pos,dir,NULL,autodelete),
--nNetObject(p->Owner()),player(p){
-+         nNetObject(Owner(p)),player(p){
-     lastClientsideAction=0;
-     if (sn_GetNetState()!=nCLIENT)
-         RequestSync();
-@@ -205,7 +205,7 @@
- 
- void eNetGameObject::SetPlayer(ePlayerNetID* a_player)
- {
--    tASSERT( !a_player || Owner() == player->Owner() );
-+    tASSERT( !a_player || Owner() == Owner(player) );
-     player  = a_player;
-     if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT )
-         laggometerSmooth = laggometer = se_GetPing( player );
---- a/src/engine/ePlayer.cpp
-+++ b/src/engine/ePlayer.cpp
-@@ -56,6 +56,7 @@
- #include "nConfig.h"
- #include "nNetwork.h"
- #include <time.h>
-+#include <climits>
- 
- int se_lastSaidMaxEntries = 8;
- 
-@@ -1689,9 +1690,9 @@
-         // foo (Red Team) --> Blue Team: some message here
-         eTeam *senderTeam = sender->CurrentTeam();
-         console << tColoredString::ColorString(1,1,.5) << " (";
--        console << *senderTeam;
-+        console << senderTeam;
-         console << tColoredString::ColorString(1,1,.5) << ") --> ";
--        console << *team;
-+        console << team;
-     }
- 
-     console << tColoredString::ColorString(1,1,.5) << ": ";
-@@ -1923,7 +1924,7 @@
-         else {
-             eTeam *senderTeam = sender->CurrentTeam();
-             say << tColoredString::ColorString(1,1,.5) << " (";
--            say << *team;
-+            say << team;
-             say << tColoredString::ColorString(1,1,.5) << " ) --> ";
-             say << senderTeam;
-         }
-@@ -3941,7 +3942,7 @@
-     sg_ClampPingCharity( ::pingCharity );
- }
- 
--static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
-+static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
- 
- static nSpamProtectionSettings se_chatSpamSettings( 1.0f, "SPAM_PROTECTION_CHAT", tOutput("$spam_protection") );
- 
---- a/src/engine/eTeam.cpp
-+++ b/src/engine/eTeam.cpp
-@@ -31,20 +31,21 @@
- #include "nConfig.h"
- 
- #include <set>
-+#include <climits>
- 
--tString & operator << ( tString &s, const eTeam & team)
-+tString & operator << ( tString &s, const eTeam * team)
- {
--    if ( !(&team) )
-+    if ( !team )
-         return s << tOutput("$player_spectator_message");
-     else
--        return s << team.GetColoredName();
-+        return s << team->GetColoredName();
- }
--std::ostream & operator << ( std::ostream &s, const eTeam & team)
-+std::ostream & operator << ( std::ostream &s, const eTeam * team)
- {
--    if ( !(&team) )
-+    if ( !team )
-         return s << tOutput("$player_spectator_message");
-     else
--        return s << team.GetColoredName();
-+        return s << team->GetColoredName();
- }
- 
- #define TEAMCOLORS 8
-@@ -75,7 +76,7 @@
- // static tList<eTeam> se_ColoredTeams;
- static eTeam * se_ColoredTeams[TEAMCOLORS]={0,0,0,0,0,0,0,0};
- 
--static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
-+static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
- 
- // class that creates config items for one team
- // TEAM_(NAME|RED|GREEN|BLUE)_X
---- a/src/engine/eTeam.h
-+++ b/src/engine/eTeam.h
-@@ -32,8 +32,8 @@
- #include "nNetObject.h"
- #include "tList.h"
- 
--tString & operator << ( tString&, const eTeam&);
--std::ostream & operator << ( std::ostream&, const eTeam&);
-+tString & operator << ( tString&, const eTeam*);
-+std::ostream & operator << ( std::ostream&, const eTeam*);
- 
- template<class T> class nConfItem;
- 
---- a/src/network/nNetObject.h
-+++ b/src/network/nNetObject.h
-@@ -128,7 +128,16 @@
- 
-     virtual void Dump( tConsole& con ); // dumps object stats
- 
-+    static unsigned short ID(nNetObject const *pThis)
-+    {
-+        if (pThis)
-+            return pThis->id;
-+        else
-+            return 0;
-+    }
-+
-     unsigned short ID() const{
-+        tASSERT(this);
-         if (this)
-             return id;
-         else
-@@ -135,7 +144,16 @@
-             return 0;
-     }
- 
-+    static unsigned short Owner(nNetObject const *pThis)
-+    {
-+        if (pThis)
-+            return pThis->owner;
-+        else
-+            return ::sn_myNetID;
-+    }
-+
-     unsigned short Owner() const{
-+        tASSERT(this);
-         if (this)
-             return owner;
-         else
---- a/src/tools/tLocale.cpp
-+++ b/src/tools/tLocale.cpp
-@@ -731,6 +731,13 @@
- 
- // and a special implementation for the locales and strings:
- tOutput& operator << (tOutput &o, const char *locale){
-+    return o.AddString(locale);
-+}
-+
-+tOutput & tOutput::AddString(char const * locale)
-+{
-+    tOutput & o = *this;
-+
-     int len = strlen(locale);
-     if (len == 0)
-         return o;
---- a/src/tools/tLocale.h
-+++ b/src/tools/tLocale.h
-@@ -81,7 +81,7 @@
- 
-     tOutputItemBase *anchor;
- 
--    tOutput& operator << (const tOutput &o);
-+    // tOutput& operator << (const tOutput &o);
- public:
-     tOutput();
-     ~tOutput();
-@@ -91,6 +91,7 @@
-     void AddLiteral(const char *);       // adds a language independent string
-     void AddLocale(const char *);        // adds a language dependant string
-     void AddSpace();                     // adds a simple space
-+    tOutput & AddString(char const * pString); // checks the string, delegates to correct Add...()-Function
- 
-     // set a template parameter at this position of the output string
-     tOutput & SetTemplateParameter(int num, const char *parameter);
-@@ -113,7 +114,7 @@
- 
-         SetTemplateParameter(1, template1);
- 
--        *this << identifier;
-+        AddString(identifier);
-     }
- 
-     template< class T1, class T2 >
-@@ -125,7 +126,7 @@
-         SetTemplateParameter(1, template1);
-         SetTemplateParameter(2, template2);
- 
--        *this << identifier;
-+        AddString(identifier);
-     }
- 
-     template< class T1, class T2, class T3 >
-@@ -138,7 +139,7 @@
-         SetTemplateParameter(2, template2);
-         SetTemplateParameter(3, template3);
- 
--        *this << identifier;
-+        AddString(identifier);
-     }
- 
-     template< class T1, class T2, class T3, class T4 >
-@@ -152,7 +153,7 @@
-         SetTemplateParameter(3, template3);
-         SetTemplateParameter(4, template4);
- 
--        *this << identifier;
-+        AddString(identifier);
-     }
- 
-     tOutput(const tOutput &o); // copy constructor
diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml
index 0a249e335798..377cf9573b03 100644
--- a/games-action/armagetronad/metadata.xml
+++ b/games-action/armagetronad/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">ArmagetronAd/armagetronad</remote-id>
 		<remote-id type="launchpad">armagetronad</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-action/badland/Manifest b/games-action/badland/Manifest
index 98011abf1935..7f170ce3ba25 100644
--- a/games-action/badland/Manifest
+++ b/games-action/badland/Manifest
@@ -1,4 +1,4 @@
 DIST Badland_GotY_121.tar 191872792 BLAKE2B ed1c75d378b742a9f2c82f2ca1055837ff302e1438d4d1a48118ff0caf0455ce0001bb3b90e7c80361672435d2a846d67c94d1c8f28e8ecf8afe87d4177aaa86 SHA512 db018e79fada80c2e6f4ce9dc1f23bf43a8b6257207e52dbb583c484bb71e4e6b0109f750ab8fb7b1e221e2618a1994828c4525d478b7d45bf7d60012f9cf13a
 DIST badland.png 42439 BLAKE2B 9439349c8f0a0133fdc042a373a4f625d0988ef4b9de71456ccc1dab4b0f8f56ab386e5f2ba5b322ca5f885c9784c325c9be25d691a740a89dc237afa2216451 SHA512 30387f1906fb35ff9684a8ad28535de7804e456ff545fd69bc6bad3d96c6e2149ca9c5fe19a6dc711f145191d72311538b402d3891971185fc07edabd61ba52f
-EBUILD badland-121-r1.ebuild 1527 BLAKE2B 6be33fce59c44cbf1ed153ea37259276575c361dcf25f4144ec9d21050703388e2118b133bbe236ace2ffceb854dd9ab84ecfd6b2d0142ee71bf5a507d1e98d2 SHA512 961165599d8d5847843c91597fc40b659dd87dbea310e2d6ade46bfb84dd0b9232f83bae9716d42c5b65e6d7253321c91a591ea532b855bbe4b5ccc38d130bc5
+EBUILD badland-121-r1.ebuild 1429 BLAKE2B 1540dfe40db1346e999efa800b5bfe2e7ccf0c147682ebc21167050001c9ef694df22d3c5471e42c46eb1b5ccadc29fdc90acaa2d9e843562fba3afb9cd26622 SHA512 5511a49a1651bdb964749b4e5aee5ae726293bef1d3f3f26d55645049e2f7d0efd25198baaf9a648dafbbb7534258dfa21b49dbc18d6f61d4b89ea755cc8d188
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/badland/badland-121-r1.ebuild b/games-action/badland/badland-121-r1.ebuild
index 99d55500299a..0203c806f0db 100644
--- a/games-action/badland/badland-121-r1.ebuild
+++ b/games-action/badland/badland-121-r1.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eutils gnome2-utils
+inherit desktop wrapper xdg
 
 DESCRIPTION="Atmospheric side-scrolling action adventure platformer set in a gorgeous forest"
 HOMEPAGE="http://badlandgame.com"
-SRC_URI="Badland_GotY_${PV}.tar
+SRC_URI="
+	Badland_GotY_${PV}.tar
 	https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -16,10 +19,7 @@ RESTRICT="bindist fetch mirror splitdebug"
 
 QA_PREBUILT="opt/${PN}/*"
 
-DEPEND="
-	app-admin/chrpath
-"
-
+BDEPEND="app-admin/chrpath"
 RDEPEND="
 	dev-db/sqlite:3[abi_x86_32]
 	media-libs/fontconfig:1.0[abi_x86_32]
@@ -33,8 +33,6 @@ RDEPEND="
 	x11-libs/libX11[abi_x86_32]
 "
 
-S="${WORKDIR}"
-
 pkg_nofetch() {
 	einfo "Please buy and download ${SRC_URI} from:"
 	einfo "  https://www.humblebundle.com/store/badland-game-of-the-year-humble-deluxe-edition"
@@ -62,6 +60,3 @@ src_install() {
 
 	doicon -s 128 "${DISTDIR}"/${PN}.png
 }
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/brutal-legend/Manifest b/games-action/brutal-legend/Manifest
index a0814740980d..0957eade10ac 100644
--- a/games-action/brutal-legend/Manifest
+++ b/games-action/brutal-legend/Manifest
@@ -1,3 +1,3 @@
 DIST BrutalLegend-Linux-2013-06-15-setup.bin 8999631895 BLAKE2B 08b9db194412f61618f318e63b7e94fd789e84fa4c8ca695b59c6b3afc511945075cf0916a806a0af71dab093038bddda15667d75e4f100275a5ab676fb69123 SHA512 4099ed07cf78d62617eeac7de396aa01e4e9b0514861a1b0e8988f383b458281be0b3c84c33e2a2e85f80fbbacf8a4b381fc880b138af2e73a226a492cf9620a
-EBUILD brutal-legend-20130615-r2.ebuild 1771 BLAKE2B 7e1a0d3e03e2436761bbc3be2d2d62f0591ca6c5a7dacac5c5a778bad4243f3038f8c2e46afca706dd2ed536fcca0182b125e0f0991cdd36679d24680515c485 SHA512 82a6826fd16ef7f68be3b4347045a87d251ca6922efc03d4a16dd404a707107138374fb6ba84a2421d5c565c9302e0c8146939cdcd4eca9511ab4e3c12c1870d
+EBUILD brutal-legend-20130615-r2.ebuild 1636 BLAKE2B 76ddb0847fa43248af5f2b20b21af09fa2d361de37632eaa5909cea256db680af2a7692909e6a7f98130cfeadaba061101574aef84312f4fbbe46f1048743331 SHA512 31427aa428479be11a074e0ac31e1ffced219cc178c1b9662c4c15b855b56ea62c3a4ae381b3753da097ce20ae7be3560f0dd5e108717424c8d5a182b3cd9f19
 MISC metadata.xml 1120 BLAKE2B 075f54c7e50c918a907006c99ecb331d2cef8b848fad0313282126bd65248666f4dc74fde7c04c17216681aa281c80816633b2e92ff279b96cdaf3ddfa03232c SHA512 63b8868817c396e7708aaf65da803cd26eb1fb55fb5bdd9b0a9f92bcf0e5c6bb1a3488287949098b587991541eef6c595395fdfcecddff0b0d91a5686654a296
diff --git a/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
index 1f80df831e04..9564d99fc905 100644
--- a/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
+++ b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: unbundle libsdl-2
 
-EAPI=6
+EAPI=7
 
-inherit eutils unpacker gnome2-utils
+inherit desktop unpacker wrapper xdg
 
 TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
 DESCRIPTION="Unleash the power of Heavy Metal to reign down fire from the sky"
@@ -14,8 +14,7 @@ SRC_URI="BrutalLegend-Linux-${TIMESTAMP}-setup.bin"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="bindist fetch splitdebug"
 
 MYGAMEDIR="/opt/${PN}"
@@ -44,9 +43,9 @@ RDEPEND="
 		x11-libs/libxcb
 
 	)"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/data
+S="${WORKDIR}"/data
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
@@ -65,19 +64,7 @@ src_install() {
 
 	dodir "${MYGAMEDIR}"
 	# this is over 9000!!!! ...eh, 8GB data
-	mv * "${D%/}/${MYGAMEDIR}" || die
+	mv * "${D}/${MYGAMEDIR}" || die
 
 	fperms +x "${MYGAMEDIR}/Buddha.bin.x86"
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/gltron/Manifest b/games-action/gltron/Manifest
index 51cde96bb7ef..89ad0fa9b1f7 100644
--- a/games-action/gltron/Manifest
+++ b/games-action/gltron/Manifest
@@ -4,5 +4,5 @@ AUX gltron-0.70-gcc49.patch 259 BLAKE2B 288d09fb2933a253ec2749ddff5170d4f1181f8f
 AUX gltron-0.70-prototypes.patch 629 BLAKE2B 0fbaf68a5bd481be42b7eb389875a017b82421bc0d913beff254a377bb058960d5aad63e53133e867062b5f2280d4449ea0993b82da782b2ebb32586110b080c SHA512 54db68b1d16be029db3314f11da25ee3d3ef1ed4197a702e8d12e753bf1a842268c129784d3d8706347281005a00607572e191fac5215060c1554b69cfee20e5
 DIST gltron-0.70-source.tar.gz 2182440 BLAKE2B ad58f6bca17f7eda1c2daadc395d6f1333926ed389d1a2f362fc5b27b37c4ce144cea7dcad4ec2abeee9197d3e944b71b1e903d5b79dfad5a4b26125a5461233 SHA512 297708a145d995bfd186f1745ffa674ab44238e8c2fb627245de3c1602f578afdd9223fae696107769b3b29da476cd9623ee37183618bfb13a9a9cfa59e41bf2
 DIST gltron.png 7570 BLAKE2B 30e71b3ebb269228e264bdd6dc45c08d25ffd8cba3f91fb36129820f8b79c40073b22a0d202d4d440d1f27106edfeb3723c2963178a6d9084af274015796ac8e SHA512 d83eb90b4d070d4dc5e93bf90cf81629b6a8bb200ca5e2963b757e282aeae62288560a6ded6159a170c301f0119592ac743a15ab604a6ba98a4ee93d00c02d0a
-EBUILD gltron-0.70-r2.ebuild 1098 BLAKE2B d9002102f5afc1bb735140359ba054c2f13f16107794359c5ef036381d2f28597dd1fe54177972e02bf43faf4eb6653bb5d1a505a826b53a578695240cb13cff SHA512 e070540738dd050ded62b8612da7000c644f109f2ed5cbb8aca5655230ba60c4c2bc911eb2d92074554527f9ef35f0bb7005a3639d86af8b873d4dce73c1e8ab
+EBUILD gltron-0.70-r2.ebuild 1103 BLAKE2B 7f3eb077518846bcb0eea3a71b481a801f77d7825efead9558f3ae7ac129cbadb634138e686d1d50c556610ae1ae708fe7043c4097addeee783a92934ba8b476 SHA512 d7f5f77c8c9929c6adf891aa336297b355ca2ef4bc70917bd779c4b71b0ea2e5a24f0df2c82af7f10ae36e1f2e74852108d02fbac601929af49a48f6804ce3ff
 MISC metadata.xml 329 BLAKE2B 1e70d0e1f5bb709921a826cdef9fb7bd7c600e91d3f9310efb77712eaa2e878a7b39d048e9c4785d9101d60d8be02ef83dc214f9f08e3e1e01f220b8b4531425 SHA512 118d8a5ce83c678a0a0e73b0a3932a24cffd2fef16949dfa986f16e34cad89929f9d0daed1db9945af0f515e9b5da7961cb9a61b19ea1846ed085fa414a24f80
diff --git a/games-action/gltron/gltron-0.70-r2.ebuild b/games-action/gltron/gltron-0.70-r2.ebuild
index da0109b26e78..60deb41a00fe 100644
--- a/games-action/gltron/gltron-0.70-r2.ebuild
+++ b/games-action/gltron/gltron-0.70-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop
 
@@ -13,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	media-libs/libmikmod
@@ -22,9 +21,9 @@ DEPEND="
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-sound[vorbis,mikmod]
 	media-libs/smpeg
-	virtual/opengl"
-
-RDEPEND=${DEPEND}
+	virtual/opengl
+	virtual/glu"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-configure.patch
@@ -35,6 +34,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e '/^gltron_LINK/s/$/ $(LDFLAGS)/' \
 		Makefile.in || die
@@ -51,6 +51,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} GLtron
 }
diff --git a/games-action/noiz2sa/Manifest b/games-action/noiz2sa/Manifest
index 913574bff3da..f9b6c6c41f61 100644
--- a/games-action/noiz2sa/Manifest
+++ b/games-action/noiz2sa/Manifest
@@ -1,5 +1,5 @@
 AUX noiz2sa-0.51a-gcc41.patch 621 BLAKE2B 834ba58a31f739009843e905235bb2bc9013258914aaf46edfe4675eac03ac601856fe21a69f7ca839091985d7b04a3928be1a09800fda6e9a6e269c89311365 SHA512 895c81865aefd54a20f9b22b07f6a1dd8a11034a20c62f08888d73cba5e106c30a78c4b11575a991e2c34d84911614e1b5a1d34231b52f8d55ff9751d5d18bdc
 AUX noiz2sa-0.51a-underlink.patch 971 BLAKE2B 0fe04349a4f5a5bf02c9f15d29750cf46f336c2e387c6dc1f0f67662469062e7748cd9cd799b5d8c17e77510f43f0cf6e9437ceba5395ae6fabedb0600e5adc1 SHA512 fcc3bc67fe1d06fdb8466112f6c3bd15b681ba3da83a0b70b09ebc734c53f390eb1f380cffb0d2753a7c42ca2d483255a39b1979e7b745ee9e63fbb0a65e506b
 DIST noiz2sa-0.51a.tar.gz 8861907 BLAKE2B e6b4747945fe15cdfd58f1a5cfa80ecae4e3bdabcdba9d7c2e826315ff90bed0a2f66e9e308ef621dd282b3809b13be7a8bf0115be3fa88dad35e6cf3f6a458e SHA512 be0893f96240c00c15073d99e0c73667f65bd4aa98a303d6b4e0b7d5ac9fa510843b37841f9cf6c98f602cb7a70c518107272df1f42682a74ec52a3221e10174
-EBUILD noiz2sa-0.51a-r1.ebuild 818 BLAKE2B b8f75b0ce09db189b391a1fdd36e18dd98601f477357f25bce46b0064f6af9e4f4ddc9e2fc4abbdea302a67890e6a3cd6ac15e68cc3e5d18f7a7acced3dfb852 SHA512 4162e5c737e258510b592f6de7bd5715f5eceb561206c5fa0a612d6daf0b589b807541d92b8bde69cfce324ea1684433dab981c047d59cd6e19111fef602167d
+EBUILD noiz2sa-0.51a-r1.ebuild 844 BLAKE2B 5f1fbef7d36755255d4b52a93727a99c762354c682ae99973b5899b5825ad49416a51265a1aea79b28311d9d2d6ea7627d6084d215a8ce993b3cdd27a8ad6469 SHA512 174033d706eaf394514729dc019fe97a70f27b332c63c6a9cc96816f5eedf6ff2e886bc051d611345037cd553e846f3b5319c5778375e8814b4622e703ac999d
 MISC metadata.xml 330 BLAKE2B 9aac324cda12c70950bcd954bffe87fea9b81243fc10922c20a01aa749f19c630f7e714cd3e10348b5eb6b5baa1db052d176fd9b322f609813230d3d6634bc1c SHA512 420c33888091af44a7fa2b8d8763cb1ab3748a23485d1c987cea2ea6d03589880d4a9d9b10ede7395e232b19c6be135755c6a495dfbf77b45482f5c85c36a9a9
diff --git a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild b/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
index 1b014d024c79..e53a3e1fbd3e 100644
--- a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
+++ b/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit user
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Abstract Shooting Game"
-HOMEPAGE="http://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/"
+HOMEPAGE="https://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/"
 SRC_URI="mirror://sourceforge/noiz2sa/${P}.tar.gz"
+S="${WORKDIR}/${PN}/src"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	>=dev-libs/libbulletml-0.0.3
@@ -19,8 +20,6 @@ DEPEND="
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}/src
-
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc41.patch
 	"${FILESDIR}"/${P}-underlink.patch
@@ -28,7 +27,10 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	cp makefile.lin Makefile || die
+
+	tc-export CC CXX
 }
 
 src_install() {
diff --git a/games-action/postalplus/Manifest b/games-action/postalplus/Manifest
index eaa91cb6f346..14b3c584aa7f 100644
--- a/games-action/postalplus/Manifest
+++ b/games-action/postalplus/Manifest
@@ -1,2 +1,2 @@
-EBUILD postalplus-1-r1.ebuild 826 BLAKE2B bf22ec1c8dacc52ea276e77c10ea598c2e89692177fb66dbd35676ff2dcc555c9c6df3f53f5af0b4b82cf310fb8372e93b113cd35fb0b6c8cf79dc7b4a2df960 SHA512 030f5b9b32419a116acbbb2e265b00b8ed4b46379af44ad426cc6c9c4f63aada386f55df37338e07d99de07fe356908981f31e7b3575aa685c3b5555f4c3036f
+EBUILD postalplus-1-r1.ebuild 820 BLAKE2B add8f09b86b3aa13611e01cdf4046a50bc0df06e81002dade611c2a77fa237a069e28093fa5dfb2d01729602cc35473a9faa9c30d505a967fc591b196e4f3790 SHA512 e81a3f6a7c129de9ad54a84afc89d3db4a4ba6d162c1d6dc9c837e42d89899d5de1e2d5e322ca3cc75b1f7b07e6943e0c46ad82423c52ffd5512ba8f4a6ddeae
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/postalplus/postalplus-1-r1.ebuild b/games-action/postalplus/postalplus-1-r1.ebuild
index 223d0a7931d1..5f8b4e341f15 100644
--- a/games-action/postalplus/postalplus-1-r1.ebuild
+++ b/games-action/postalplus/postalplus-1-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils cdrom
+EAPI=7
+
+inherit cdrom desktop wrapper
 
 DESCRIPTION="Ultraviolent and controversial game featuring the Postal Dude"
-HOMEPAGE="http://www.lokigames.com/products/postal/"
-SRC_URI=""
+HOMEPAGE="https://www.lokigames.com/products/postal/"
 
 LICENSE="LOKI-EULA"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
 RESTRICT="strip bindist"
 
-S=${WORKDIR}
+S="${WORKDIR}"
 
 src_install() {
 	local dir=/opt/${PN}
diff --git a/games-action/powermanga/Manifest b/games-action/powermanga/Manifest
index 803885e8fd7f..36ef12fe054b 100644
--- a/games-action/powermanga/Manifest
+++ b/games-action/powermanga/Manifest
@@ -1,4 +1,4 @@
 AUX powermanga-0.93.1-flags.patch 394 BLAKE2B c86e0b22f8f856300f37d6e2e17d712769820314ce820ec625e38ca3d4123ad22e6de2097487fefc31ced8536640d0f7431ac831cfde858b88458a7d85413391 SHA512 16cb19ea59cd632b7d9c7b2b61f74e664e81160d9bfd25604613057e2dd08d84e112cb355a0e18e76069fcf2693bffb381ce467f8d86218850659cb6ce5bd756
 DIST powermanga-0.93.1.tgz 11855703 BLAKE2B e1fe88ded02e49538891472ef009bb58151ecece0c3df518d42ba2efd206b66f3aa556ddea5a8a26eb8365ebf1ba2ba9b3f69da7434cb435254d33ba88386ace SHA512 852c0b4550db6c9e4ecd380077d390327f6649b6e8ab4cad246f23e7335e8622008f9fc753e2f474bf9cf7a5654b071e3f117f6a2b5be72ea53709912f4a0f41
-EBUILD powermanga-0.93.1-r1.ebuild 1605 BLAKE2B 4dc25caa255fe6e36477539f4f89cbfd19aaaac91aae014f728d79383013d252b7b2ffdf54c1d942d0155eaa5530aa9c8d5834085a564bbc6e6e9aad25c8bfda SHA512 4a1b025760fd3430424f9084c752995228c5ae12e304ec4bf97cab3a50b72c37b9b754710fce06503982263c4894c00687bccdcc4b5a43ec29fdc82ecc53b375
+EBUILD powermanga-0.93.1-r1.ebuild 1599 BLAKE2B e9a19f2bf7f51284560c7ebdd93428c05ca5fd26f2e8f29adbf2e1426ff0985806a6e9afd8bcc504e5e23823af4cca1feb94b074cc6680e5692f8209ee425b3a SHA512 e893a96d641e60b3eacbacad63d3431a305d2bcf661793c73e6a5386deab74d07b2e50f212602da8755c81a0e92bf5ba9806fd8ac7d4f05d234f58bedb289f4d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/powermanga/powermanga-0.93.1-r1.ebuild b/games-action/powermanga/powermanga-0.93.1-r1.ebuild
index ff47efa5ea30..c24c2b8692a2 100644
--- a/games-action/powermanga/powermanga-0.93.1-r1.ebuild
+++ b/games-action/powermanga/powermanga-0.93.1-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools desktop eutils
+EAPI=7
 
-DESCRIPTION="An arcade 2D shoot-em-up game"
-HOMEPAGE="http://linux.tlk.fr/"
-SRC_URI="http://linux.tlk.fr/games/Powermanga/download/${P}.tgz"
+inherit autotools desktop wrapper
 
-LICENSE="GPL-3"
+DESCRIPTION="Arcade 2D shoot-em-up game"
+HOMEPAGE="https://linux.tlk.fr/"
+SRC_URI="https://linux.tlk.fr/games/Powermanga/download/${P}.tgz"
+
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="acct-group/gamestat
 	>=media-libs/libsdl-1.2[sound,joystick,video]
diff --git a/games-action/super-hexagon/Manifest b/games-action/super-hexagon/Manifest
index 387d1d5d9235..cc72dd501ac0 100644
--- a/games-action/super-hexagon/Manifest
+++ b/games-action/super-hexagon/Manifest
@@ -1,3 +1,3 @@
 DIST superhexagon-02172016-bin 27481878 BLAKE2B bae4d841cd3a03923b92c511a963ea836bf67b79b23dd800fb2731f33344981ad0f8392025173e2840ad3291646427ce42ba6ebd4b4920a29edb68cf9579103b SHA512 ffb54a9c3fd2e78efcdbf491e995f242ea10da40f32d36c17a0e29f6ac5d684426b542abc1dcdc8c281fa62b6a267642f834b8007686c35f54a445568808eb1e
-EBUILD super-hexagon-20160217.ebuild 1371 BLAKE2B f8a7eccd25c322b2f0a66e5f4f774df0d4fbbf0d2496c5ce10b335d7042727b9812f7f5da6e31e45251cdc0eec1365a6fdb7484b3364c5816e9883eb6c71cb8b SHA512 5b5039241bd83a32ee573f85d3300e592ce1c7a1f6beff8b8798aa281b7b44eed4a7e082d9a09159427a0ea95e72514635aeaa6970c346f771718cf8d3381f7f
+EBUILD super-hexagon-20160217.ebuild 1224 BLAKE2B 2a57d22ae226328af8d1afa0d28fa65ebbe5a990d65f2957daea43498259d0f307df58c745b06afbada4e380d7f63a2540cd39d9da020c2be06f0f05cc9d9bab SHA512 19c145c289a83d69b611157be10108c9b243e0d392be51eff5598e43a990877a755b29502b759a20d83f637b3a12f982fe87c296d25994450a6b69b40cc35658
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/super-hexagon/super-hexagon-20160217.ebuild b/games-action/super-hexagon/super-hexagon-20160217.ebuild
index a985d2bed49c..e186977422bb 100644
--- a/games-action/super-hexagon/super-hexagon-20160217.ebuild
+++ b/games-action/super-hexagon/super-hexagon-20160217.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eutils gnome2-utils unpacker
+inherit desktop unpacker wrapper xdg
 
 TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-DESCRIPTION="A minimal action game by Terry Cavanagh, with music by Chipzel"
-HOMEPAGE="https://www.superhexagon.com/"
+DESCRIPTION="Minimal action game by Terry Cavanagh, with music by Chipzel"
+HOMEPAGE="https://superhexagon.com"
 SRC_URI="superhexagon-${TIMESTAMP}-bin"
+S="${WORKDIR}/data"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
@@ -18,8 +19,7 @@ RESTRICT="bindist fetch splitdebug"
 MYGAMEDIR="/opt/${PN}"
 QA_PREBUILT="${MYGAMEDIR#/}/superhexagon"
 
-DEPEND="app-arch/unzip"
-
+BDEPEND="app-arch/unzip"
 RDEPEND="media-libs/glew:1.6
 	media-libs/libsdl2[opengl,sound,video]
 	media-libs/libvorbis
@@ -27,7 +27,6 @@ RDEPEND="media-libs/glew:1.6
 	virtual/glu
 	virtual/opengl"
 
-S="${WORKDIR}/data"
 DOCS=( Linux.README )
 
 pkg_nofetch() {
@@ -54,7 +53,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trine/Manifest b/games-action/trine/Manifest
index 7db21e5d4541..7be6433fe176 100644
--- a/games-action/trine/Manifest
+++ b/games-action/trine/Manifest
@@ -1,3 +1,3 @@
 DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
-EBUILD trine-1.08-r3.ebuild 2401 BLAKE2B c81708cf345a2a67e7ef0e0edc570bcb95946145dc78408aa2d03d5f365efc269df9c8a69c40d97037853f6efa860ba9a6bf0cd2cffe2adb65a592cf6459e715 SHA512 cebbd8d3a103cf6fa5e363b2f504a45b20f2dd3dbf071071fd3b003a45aba2f2f955f16e32d679a8406504eb46f37fbcd85cf06c99bad9d9a2de0eda82f89525
+EBUILD trine-1.08-r3.ebuild 2260 BLAKE2B ca3697cb644aa7112a22c17f48fe6a1a20bd9706b083349c449daba1a8d8f5eed87e0ef154594d74a55970850dff36f1d44a2da2059564745df5f12be8daabce SHA512 1943919a5ab6b58363b77f8d84e07fdac08fcafd5b4b0f9e97dcd2c01e6f17082117af90102ff1e63534013ede1259b708cfd7bb9de28b020b9a6b571722c311
 MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine/trine-1.08-r3.ebuild b/games-action/trine/trine-1.08-r3.ebuild
index f9b9673cdd45..44b54e039f6b 100644
--- a/games-action/trine/trine-1.08-r3.ebuild
+++ b/games-action/trine/trine-1.08-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop eutils gnome2-utils unpacker
+inherit desktop unpacker wrapper xdg
 
-DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
+DESCRIPTION="Physics-based action game with character-dependent solutions to challenges"
 HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
 SRC_URI="TrineUpdate4.64.run"
 LICENSE="frozenbyte-eula"
@@ -17,7 +17,7 @@ RESTRICT="bindist fetch strip"
 QA_PREBUILT="opt/${PN}/${PN}*
 	opt/${PN}/lib/*"
 
-DEPEND="
+BDEPEND="
 	app-admin/chrpath
 	app-arch/unzip
 "
@@ -91,7 +91,3 @@ src_install() {
 	newicon -s 512 Trine.xpm ${PN}.xpm
 	dodoc Trine_Manual_linux.pdf Trine_updates.txt
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trosh/Manifest b/games-action/trosh/Manifest
index 291f5dc0f1a2..54a3e204c9cd 100644
--- a/games-action/trosh/Manifest
+++ b/games-action/trosh/Manifest
@@ -1,5 +1,4 @@
 DIST trosh-20.zip 5182303 BLAKE2B b22d0e5138c5d5ce3bbbe8e3fe8cdc732b9002d67ceccf636b93c6c48acc8a32898de978ccb752742a3be0e8e1bdee97507a469d87d30af8a493ad4104fc657c SHA512 2a8988f5715340850a61acde54403c968947d41d5f0a1ac098c4cc3959f69f150cee567933fd5148a2c23c237210c10dc58005de1bd949d6db59cd794a0003ec
 DIST trosh.png 242 BLAKE2B 3f9a2fcd08669004f40f5ade1c4f119d18b1983b2d0ff73fb61fdd9764aa9903c5b053267507ec5cc3f4a8dd5d2246df6830b96fbfaa3f536fd7cad458f09436 SHA512 85ff46c8c75b018a59a8e7dace85fc5ccf2439babedb0e4d134301eb9f7edfe5d7f4f3af1329f04257c16d978f27df38f10cb3ffbc4b424808a5f3c5c78bfc69
-EBUILD trosh-20-r1.ebuild 902 BLAKE2B c76c484f4c60c1474c0fb7dec1cab27a96383ae8d8513cfd48c88a49669d08d7215d09160c9d7f34502652bd875e43126be0e70b2b4d79de8caf8cb566ca80d1 SHA512 e7cda13fde3e0c46f6ab8520cc0d4bf4c738c6c1b5f19c360a089b0b81f5b13037c183dfea5127b96ad06aeeaf6dff61479687888202e9ee053b8eed4d1997f2
-EBUILD trosh-20-r2.ebuild 923 BLAKE2B 8c086d74910cbf6e504ee5a13e2888b399274f6d3b2852758b305ec0d5a3106f209b25e332b2a4b5899eec616747546f351461d1a2f9ec7c20769f8f041a299b SHA512 f01f2e93717a591ca16374da3f99ad8d3b0803a1de522346a0f19b2862bd94478ae6750eedc49b935aa93e3557bb9c889804744420b1fda0fe00e31eb9671ed5
+EBUILD trosh-20-r2.ebuild 785 BLAKE2B 3821d7cdfcdba786b568274b294ce76302613346c144462aabef4ff5127080172e24d3d0c25595d3628a82cd765366ad87a3726f81c18a7409dc50773ddb757d SHA512 5eb3cfe97d2817ecee7b6f0199950981423b28a613af2c7e2c081962a3aa2799e0c88036f34aa671ba4f1a98b3e2ccbf3ce26abca62d10a6aa7ccb98ef4f5067
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/trosh/trosh-20-r1.ebuild b/games-action/trosh/trosh-20-r1.ebuild
deleted file mode 100644
index 874648908a66..000000000000
--- a/games-action/trosh/trosh-20-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils gnome2-utils
-
-DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
-HOMEPAGE="https://stabyourself.net/trosh/"
-SRC_URI="https://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> ${P}.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=games-engines/love-0.8.0:0
-	 media-libs/devil[png]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	doexe ${PN}.love
-
-	einstalldocs
-
-	doicon -s 32 "${DISTDIR}"/${PN}.png
-	make_wrapper ${PN} "love ${PN}.love" "${dir}"
-	make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/trosh/trosh-20-r2.ebuild b/games-action/trosh/trosh-20-r2.ebuild
index 328de7284521..a610e273eda3 100644
--- a/games-action/trosh/trosh-20-r2.ebuild
+++ b/games-action/trosh/trosh-20-r2.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 desktop eutils gnome2-utils
+inherit desktop wrapper xdg
 
 DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
 HOMEPAGE="https://stabyourself.net/trosh/"
@@ -18,7 +18,7 @@ LVSLOT="0.8"
 RDEPEND="
 	games-engines/love:${LVSLOT}
 	media-libs/devil[png]"
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}"
 
@@ -34,15 +34,3 @@ src_install() {
 	make_wrapper ${PN} "love-${LVSLOT} ${PN}.love" "${dir}"
 	make_desktop_entry ${PN}
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}