gentoo resync : 28.04.2021

25 files changed, 49 insertions, 217 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index d9b6238fdfed..62d909819ee8 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/bcs-demo/Manifest b/games-simulation/bcs-demo/Manifest
index dbf41fd88123..c43af842ddac 100644
--- a/games-simulation/bcs-demo/Manifest
+++ b/games-simulation/bcs-demo/Manifest
@@ -1,4 +1,4 @@
 DIST bcsdemo_v1_3.sh.bin 5965217 BLAKE2B ba69858933c5ff1fbd966cc5038ecf891abea70cb6a7f09e40e698da495a7f3578460f90e033c1455918f7d188e37839ae0f140be8c419911d520e4cef13cd48 SHA512 b3916ac72d21e80a09b80a406ea18ab4365d9c1b8139eec848f2e5d697d3d5afb6f27de5dac31c6b6fd860e3b406a3eae8a28aac0e00134629dbd5906bde816d
 DIST openal-alan-hack-0.0.1.tar.gz 86168 BLAKE2B 77ab97ef9b31b4c3ab00c89afaad7094b6ecc388e296b31969bfbbe3953b812036c1cb4a04a09ad0ca986941d2508469c40f5ab7d458c1ceb5fa78b1f9ca7c81 SHA512 1794461cb917dcf2130977bd0ac9f09bf93cd235dd742d29e50a3e2666e6db60865bacd1927fc4607a4b308dcdf421fa2a186ad2a06eea778069ce712a89d943
-EBUILD bcs-demo-1.3-r1.ebuild 1380 BLAKE2B 7d91114725777944c45b43c6051b27473a7000a708bb8a84ab67d87c9cb7b0c7c8fdf4d7d1a22e5a13d5b716f899d8675372147bc197c99ced40f0c9dd902941 SHA512 a0073df4c848a2c33827072348d1ad2c7de3fdaf5a2b9f3270dae3eadd8fdf2a9ff832b7e32b3ff53a834af4ecf3dcda35250100543834fa81918dbbf3048b5d
+EBUILD bcs-demo-1.3-r1.ebuild 1386 BLAKE2B e753e0d2787b34fe13249e917942774b6b473089166f374ebf6655aaa7c82c0b454bd4f4ec31fb83cf5602506d92409e3ad24b6d22482fdcaab28a9529672343 SHA512 ee872f42ac112252f41e892c3caa6fd471d3379f0fad6107f0dce8a2b5007f3fed22792d701dc0fb31a04f946d8a48a0801a7aa8b107bd1aecb4bb4ae5a76952
 MISC metadata.xml 1473 BLAKE2B 98ce5cff21aaefe1ebe09f390be6e01780902ef652e3f0ddee815b0018652678719c061ef7a88dae81824170f2bdc7fa8b7b024227a2c71f03f04f783d831504 SHA512 2813c65cdae4aa2f8e0d0cb15e3b45af6d842e2ad02bc45783d3eb9fc8acbbd8467241ce7af2fa420bedc39b7c449b398f339cdc868fb6e45e0b5cec68b538c2
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
index 106a657357f5..af09bc0dcf69 100644
--- a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
+++ b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils unpacker
+inherit wrapper unpacker
 
 DESCRIPTION="design and build bridges and then stress test them with trains"
 HOMEPAGE="http://www.chroniclogic.com/pontifex2.htm"
@@ -12,8 +12,8 @@ SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
 LICENSE="BCS"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
+
+RESTRICT="bindist mirror strip"
 
 RDEPEND="
 	media-libs/libsdl[abi_x86_32(-)]
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index acbb30361551..632b2c1efc3f 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,6 +2,6 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2d
 AUX flightgear-2020.3.5-cmake.patch 2031 BLAKE2B 2e0bfefca54a43db8b1053d1798de84594fcc58bc442df7c3bf0347f5ed458cbe966ce35af3e57f2982f6f7bb23943e04c4c21d421ca076d101ee0dc223b764d SHA512 bc06cd08564032f88206acb5cabb1c07e666aee72c2a0d5e19aaa82ca49ff4347a3a17b3e2d0f158398d6fb0006a0ab8deb9eac38d4269e0bbd9ed9b2e7e2724
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2020.3.6.tar.bz2 8837251 BLAKE2B 28b8032bd2b6da91f72ae19d4c0c3a6d38122ec2ce7e2e8d1bc3022003551c6c5887711d67868fd9546d79eb6def6c0f0571e62361e73deb6f0edc9c3159c8fa SHA512 b0bfa6e02cf5c2e64aea85fb7433e583141471e15a7dff69dbc12c227835c6e52dcf5b2947a30847c2b291442878eee6265217311e441abb32c5f95bbf7df990
-EBUILD flightgear-2020.3.6.ebuild 4311 BLAKE2B 3541b75b3207f3797731eb34b4e66c58ecc91dc9c0032f2bc87df8229699fad84cb05716d974b11dc52013ca745ac03971346ac3dba3a595047db765a44569fa SHA512 fb000a0b52607725a1036ef4b934c013fd96a2c3391bf71fbda89fd3004fb4676d4920839fbefee0b00b6e2c159ae8599688dedffe9583146586092b739546f3
-EBUILD flightgear-9999.ebuild 4361 BLAKE2B 280da54950e30e196699998d2e7476463c456f0a8856b73a49fce5c72635c5d3c526d5dfdbc9f8cda98cba27328609cb7382aca9f60ecaae768d023728cee84e SHA512 c77ef924e0c401183ec31993bc6556ee515526147cbfc316250d9eef0f17fac4600b0221a9a4b6db88c7ba68920536dd4e9b5e74da6b6660610f86056626c571
+EBUILD flightgear-2020.3.6.ebuild 4298 BLAKE2B 76af01fdd27fe1f84d23b713e6cb169be2a38a28a47b92cb97505a5bb5e70cdecf128ed7919bdeef1d771cd042f5dc505afc8fcb059958fd99b2e1eacd37a997 SHA512 3da0fa2bc885a6f9e8a7d4c546e89c572233699b5f017e5453de8aee82e2b92c0e43b94ff9a5b1a6cdb982d4cd1bbe3d5e6c829065aad4826e19e4b9a2499634
+EBUILD flightgear-9999.ebuild 4348 BLAKE2B 612e0e71deb278b5ccdcff04a815a8fb0813ee0680e76234bec5d55bb1c4368c24fc825a4775f6073423ba66ef02534200ef9d38ed5c24f64e211d8846e414b7 SHA512 ff32d8cf76d6f719b7469919cf3c441653208903b26557e6609871596e45429c4d3a15acd0a720a67e63f80df3bde198d56bc282a3a43a5ae800c72ed7f37f74
 MISC metadata.xml 867 BLAKE2B f628ff317f4137a90a6fc741a11e4afeea7110c9fae89e83371be80f6d0cf4ba25bb88449cc2136792a37f73c9f6fdbbab0103aec0a284193f1b3a72d8022e45 SHA512 a3912a3cd8eacae7a214dfddf9f7a857b88d16bedb7a40c3c464958a83690879e968085c99241146714962927a3adacbec1454eea1e310f8905718ff1f8bf42a
diff --git a/games-simulation/flightgear/flightgear-2020.3.6.ebuild b/games-simulation/flightgear/flightgear-2020.3.6.ebuild
index 23f6c894ed34..58c4fd7033ee 100644
--- a/games-simulation/flightgear/flightgear-2020.3.6.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.6.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=7
 
-inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs
+inherit cmake bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 551102d90c57..849f3001385a 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.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=7
 
-inherit cmake bash-completion-r1 flag-o-matic toolchain-funcs git-r3
+inherit cmake bash-completion-r1 toolchain-funcs git-r3
 
 DESCRIPTION="Open Source Flight Simulator"
 HOMEPAGE="https://www.flightgear.org/"
diff --git a/games-simulation/micropolis/Manifest b/games-simulation/micropolis/Manifest
index 034f894fe218..c3707d711b22 100644
--- a/games-simulation/micropolis/Manifest
+++ b/games-simulation/micropolis/Manifest
@@ -1,3 +1,3 @@
 DIST micropolis-cc31822e4ebe54c0109623ac0c5cdf0e3acad755.tar.bz2 6725746 BLAKE2B a916389a1ccf63e1a13b5b6ea533939fdb14d814480c9e528c8b1bb89cbefbbad9ad067821c1de199f337692e226d35b3219354dc32612486d013cc20f21c5bc SHA512 1b5f644f6d7d7cb78965d0e0edcfcc0bdab7a103dd5dc3ce97a0048da9fa29d8757063d6681febab3d03182433cfe8a7bf1b8145a21e067a4c754af3b5af8e00
-EBUILD micropolis-1.0_p20180313.ebuild 1164 BLAKE2B ad222548576acc4e17f297559d33e1b5d5ea0efee5d7637ce773f372981ed71d5ad81ecca3c7a54c6d74597c401aee776cf9d635c8bb8ed52717321f60fb4cd8 SHA512 18808c53a279bbf9bdde272a83c63fdf13cfba01686cca253e4f4df13c00dd63cf31797e41f9a65f75c2eb14809a6a96c6495ac152fb0af325157574118bf6c6
+EBUILD micropolis-1.0_p20180313.ebuild 1166 BLAKE2B 9af31056309b7f175ebb907c95d40ad29a1fb2b73c9c0174cda7f5741fd419241a39beec0854888b07833824d318b73b69b4d5328995d6763c24f80e5f8032b0 SHA512 88f04bb93159a08473412f254c230fb2fd9e80237a3cf1927fb5d9015b7d8991065602ecdefd29b3c70c45ae9fb3e1c318e58b7064098598fe88a74009cff53a
 MISC metadata.xml 412 BLAKE2B 9a862272fd0dfb39e611f7c2aa89a697569b6faaa7ef004f72a58490ef125f7bbd154decc77cce6f389fec7659543b49405674eed377331853bcadf95138dc8d SHA512 2ae5bdc576bb5ba37d5bfb87fd20926e12b66d36947a327e1835af5dced9046acaed250a188b10eebba7f4f1a7c13f82ba7d87fb3bc99a294db89600e427f2a1
diff --git a/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
index 9b54f5d50580..5b869591075b 100644
--- a/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
+++ b/games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils toolchain-funcs
+inherit desktop toolchain-funcs wrapper
 
 COMMIT="cc31822e4ebe54c0109623ac0c5cdf0e3acad755"
 DESCRIPTION="Free version of the well-known city building simulation"
 HOMEPAGE="https://www.donhopkins.com/home/micropolis/"
 SRC_URI="https://gitlab.com/stargo/micropolis/-/archive/${COMMIT}/micropolis-${COMMIT}.tar.bz2"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 8e66f4f5b345..86a5fb3351e0 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,14 +3,11 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
 DIST openrct2-0.3.3.tar.gz 14107179 BLAKE2B 9c19bf8f88ef7aa33c345ec46c3dc70ae1221fcad075880a86bd3a577835640002126018d2a5251e063d6259cdd3cd4bde58097feb9095b793538b363b827c5d SHA512 de270f043aa9c0c8955eda060c52e430556f212443f4ebb01d2a19012ad84ae81547b65a906bbcf4f04e7a816477abbd05866ddd635903194f6444e8c3cc58f8
-DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
-DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
 DIST openrct2-replays-0.0.31.zip 1783829 BLAKE2B 70ef5a5ad89b531baefecfa4c673a4d41e18c4ef5586f045a2174bf39d61bc59ebd5deee23abbba138bd9b943f056134845c8710397b84fc388a5e268025b7d2 SHA512 cb26543ad44a9d2c5d4a22e666c9efce605b0de34ac7cc8f42853792f50b8eda9eb551d2e6d0724fc4d282c83043718fa074cdd5081a9f12aebdc62efd2c082c
+DIST openrct2-replays-0.0.38.zip 1765056 BLAKE2B b42fcca434c353e2d5a58e81bfc867221e23e357d334474f5c71d82b6046b7c8fee7e2b41f8c1e3180169125ba897c49af954e3074ca17499dec778e4c7be0ae SHA512 625249b1708bc5530699c1e9b7afee409d42691c0b6214c6a8f8acb2bcdcd3cf28468496d5b56e3ae1620af8e865d314bbdc65209ed1392a84ad62ea0ffd8900
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.2-r1.ebuild 3962 BLAKE2B b729a666bef756a63e6473b9a6cac608690311f08a9bdd25a90d9a644e1122e38f3d23d9cc3bf41c4b0090dc61b24b392fef6cf248487f99a50a64324dc0d89b SHA512 61f6577fb382260851bc22e87e41181973b58b2cd5cb835b58687fbffa814e7c833bf6aa3fe4b51b2d5025de157f0b02e6f0b642b7c3fc3f199407138a7dd1f5
-EBUILD openrct2-0.3.3.ebuild 3969 BLAKE2B c98d2e3eeb8b5a7ebea482f9542acba6277bcab8191147a125737651788ad1cabef26197ab7f868af70efe3c9a612db5bfaedd4b7991bdb8c5437ac7db2543a6 SHA512 f1e682c3a3aaa9a4e5df7ab3d3e07a38a2424385a55ed54b48da977b4fee6e9e57d1603d1fc135de7fba847945586528563b9b352fab2c36ec51debc89471a56
-EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d6af84320469f67b4b1f494c9cc7b16041e43434cb8b30f091ce202565402faa09ac18611834d7da1170372266a904333c3e59b2407f960f1ce581d3cb49f25 SHA512 2b67063b3434caa5e5163f5884e95ffb3a0cf8f716ff390bcbc2bfefb05ec2745af9b84421446dd3016a91bdd7e0f90ab21140e5bbba21f5ea6ee319eff5d4ad
+EBUILD openrct2-0.3.3.ebuild 3967 BLAKE2B c491d473edbd3957c9b0bd6da341c6d5608b08646fcae66aa5a93e35bcf6047fd581ff460e6fcf6eaecb9714f5c58abea0151d9e5d0e3c81bbe4c8c5a78f644c SHA512 6752f524da5a4a219818ffa0b732d60c7304ee4799e9113554dbc3e9e1df525d4ef1f7ea482d0dc2e0b9d4056f0975a74cfc2b009a45ceab2e83f1e3a37b769d
+EBUILD openrct2-9999.ebuild 3924 BLAKE2B b043871630c269258e57d5a38faa9518a2774f5380ebe636053ec72459f312591e1e095c7f9f6af91b5817c0dc0543f4fd94c9c743fd7a533582e49858da4875 SHA512 84f24cbb6e48f306eae91236820c7d09f7445585999c36989f9e63daaccc013e6d392032ae470ecea1bf0338bc0c280b9213b9ce889bdf71fa6bab5ee9a78a78
 MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
deleted file mode 100644
index ab825ca0f215..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.18"
-MY_PV_RPL="0.0.19"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.3.3.ebuild b/games-simulation/openrct2/openrct2-0.3.3.ebuild
index 54af75482582..820c8e5deb39 100644
--- a/games-simulation/openrct2/openrct2-0.3.3.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
 
 COMMON_DEPEND="
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index 67f3ef57ee5a..bce8ca40fdd6 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -13,7 +13,7 @@ MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
 MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.31"
+MY_PV_RPL="0.0.38"
 MY_PV_TS="0.1.2c"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 689f424d0dd5..08a6b7154bfc 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -3,6 +3,6 @@ AUX openttd-1.9.0-cflags.patch 1418 BLAKE2B 4c279bca0360d202d183488f61a19a5abc76
 AUX openttd-1.9.0-dont_compress_manpages.patch 1137 BLAKE2B aa03bf141f1dac450b90ad9b54f4022dc981e041f40cd5ad9b7b522910788fcf30c85ac8ee3ba480c76df67f11b8258de7fe785259796b67bebc1a49ce1ed6e3 SHA512 0985a5826dddfb9a03bfc686de5ae2a36362d635865fde9ec2ee340672556d82517db94197d7de04630ba7558bee5ad4543debafd46e5dfd2bbec2eaa9354a18
 AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
 DIST openttd-1.10.3-source.tar.xz 6815924 BLAKE2B f700304e723fe5c3fa9781432a387e061595bbc8de42f565ad57ac265d9e4bc14cbc659a3f6551019bfb31b8b56b180c272c6753a12b4cd2e13016a98dfe1679 SHA512 d1cd535e8e49f0ac147704341287af1b16bde6725fd9152dd36dcb780559b400da8bb31c4e8eb665a0d11e9b1f5bf8a96be0f97f7a85bd967eec534fdd3dd0d4
-EBUILD openttd-1.10.3.ebuild 4960 BLAKE2B c0938b7f7e90ec22636942540f1afc2f5eaea2e57904064cff32eb1f021229aa312f84a24394023b8238cb22a14785b1d907659a15fbc9a152477f511ec60b4c SHA512 cd7c4a81cc53e58efc372d80c11322c49d1448054be30a352a8c45b4fb2d45c288a7da79c2ff31eb6d858400eb61f2416ba89b24f16445f9d8695a90d37f648f
-EBUILD openttd-9999.ebuild 4928 BLAKE2B 4c0524725573054c4209e67c8c668e04a175ffdf739dae514b2a34f754dc7722cab8b58382b60e89296300a199af40f29960f26e8c5cc208351f3d0e99c78982 SHA512 84b23f11ff8823944ebca485e98f94985e6dde85af65f49c750d861f280d808b9cdf2e409c2e7f126f3f0576fe4d2bbf9a9de72a575a417a09b2cb6c9d6beeda
+EBUILD openttd-1.10.3.ebuild 4954 BLAKE2B 4fe0c6e5b94387410cd4f682f73e7ab15538bfca9643b99efefe7e727a985176fc74973c57821399f01e8d3269a2a1bb487dde9dfc6979707d0dace1c302ef12 SHA512 b3bcca0ab9ff9238d2e154bb96f80fc4da572c389fd12881ed62e84ed0cbedd37b26b0465f191188b20238bad9e5e48f87595951e42107296acfaabc95477a94
+EBUILD openttd-9999.ebuild 4922 BLAKE2B 0fe87c1ee04360bf558ffc19219307d97337bd995e861f620f2247bb77c0e27799e7306f7ff6be4a19cdeb45e655a05e89abd1b48528e85dd9b474919cc98c31 SHA512 3c9c8169c1c95af46f6b1c34593a18ad7923df9cce35ec1803d8128c4b552a742b9ac27daa140f59bb14d4847ee3b784e03fda9715e8a6c030aeb72ecd12912c
 MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/openttd-1.10.3.ebuild b/games-simulation/openttd/openttd-1.10.3.ebuild
index bd35f84f89bf..0af63df64cff 100644
--- a/games-simulation/openttd/openttd-1.10.3.ebuild
+++ b/games-simulation/openttd/openttd-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -158,7 +158,7 @@ pkg_postinst() {
 			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
 			elog "following 6 files from a version of Transport Tycoon Deluxe"
 			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog "/usr/share/${PN}/data/."
 			elog
 			elog "From the WINDOWS version you need: "
 			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
diff --git a/games-simulation/openttd/openttd-9999.ebuild b/games-simulation/openttd/openttd-9999.ebuild
index d3e0bdea7018..c685cc3c5763 100644
--- a/games-simulation/openttd/openttd-9999.ebuild
+++ b/games-simulation/openttd/openttd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -157,7 +157,7 @@ pkg_postinst() {
 			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
 			elog "following 6 files from a version of Transport Tycoon Deluxe"
 			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
+			elog "/usr/share/${PN}/data/."
 			elog
 			elog "From the WINDOWS version you need: "
 			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
index 5820deac0110..045e330d3be9 100644
--- a/games-simulation/senken/Manifest
+++ b/games-simulation/senken/Manifest
@@ -1,5 +1,5 @@
 AUX senken-0.3.0-as-needed.patch 947 BLAKE2B 0de09e827bf94bd9a4e2f289a3a685dfcbfa8860e9f2d3f343fb29ff4e345984b88f7c731add1f58a9a179061cee1e93ec3a4ec718e8c3f0dd80a4a4730e79c9 SHA512 6f1f5ae454b9f186624a2ac9d3d5d802c973fadcedf236d83b47020302645c197683ee8765c9b3536866d5281fd37ce94ebdafebde5b5653c1a2188a81fd6a44
 AUX senken-0.3.0-warnings.patch 1099 BLAKE2B 845bca95ba6ef003a751a096e3895386efe7920ac707249c229cfdd5593dd23c44adb96f985890a353233c7fd38f5f705b21a1e31b53b3dc6ae21523a01b2adf SHA512 5e48805adcec08e8deab671df7bf5a8303c29d8d2679bf9ce6608674d225e5acafc3f0f66b07c0362f9da735263773259db8f77dfe7028f268dbe13ce67e6b10
 DIST senken-0.3.0.tar.gz 1391010 BLAKE2B ac55f61c6a1c86ca3a891190f562e91aaed56f19f08dffe2a17016dd8ef5e35a3e1c6188b402506d063c4ee812a43f63bfd45b58e102c4a1199a733ab336a8dc SHA512 df0c15cabf667fb7b56db40baf03fcae6695aa9ec0e42a7db682ff20877a5b89ee67e7799e762b4a78cf0f3fdee7f001419091f0683df74ba1bbe6b9501f0272
-EBUILD senken-0.3.0-r1.ebuild 1060 BLAKE2B 47b7a86ea77ce4ae749c949443251e5ae8351552a4c23623b5e0e453e7c192a25a8ebaf7d628aaf3246e10360343ba0d2b900ee6b6f439b1f318a73136c1740d SHA512 7e472b25ed6b5a45bf287dde998787117a2399b4092669ffef9954c5b401b37ce61d8c5734e9667ddeaf72b7e6f9df82e9bf6ee8226973189015cc9e41d042d8
+EBUILD senken-0.3.0-r1.ebuild 1042 BLAKE2B 7ecaf1e570aafe0330125f839c32cea6e19a101b36a6154394850d113aa402dbffbe4eba54a3248da82de8d6a53a36132175bcb736a038edf6cae7052310404b SHA512 787ba69b0fd4fae23977c2b2668c1bd07a2536dca0d4fa53926e8f4a8f052bb6ee9902cdea117c9befbbff27c8e76096589389af623b38a20515af9b98ef24d0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r1.ebuild
index 9b4e0cb1e242..206d6b75324d 100644
--- a/games-simulation/senken/senken-0.3.0-r1.ebuild
+++ b/games-simulation/senken/senken-0.3.0-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="city simulation game"
 HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index bec0532bbecb..fa5b286b5d91 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -2,5 +2,5 @@ DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be86068
 DIST singularity-1.00.tar.gz 1944972 BLAKE2B 1ca2b120311a19f175014835930610583e8f605dbda3ca3ca96d7e0da86bddeb4b0a264f50a003aa51e05b86ce971255ffda5f498598dde6be370b9a953eb1d0 SHA512 f3581048c5a535fdbd28d2af1ac596f5396fd712b716931f17de75f8b170f0e226deb2c113023357e21e7de1294e4a632515962df9ee43768baf0fb4bbaa08da
 DIST singularity-1.0a1.tar.gz 1927083 BLAKE2B aeed099dd33c135f5b2e21f5e907646f32aaa0879a1b2e1f09c19045499ae52b004a8f52fee72bfe0977805899e4c7cdff6abf36e9fd3604f73cba7e395c265e SHA512 8ce624a50819e0abc04fd81a1d7658eab64ea8325de0a5790ec2a92e5fa6b62cfef8fe705fe8b209194c05927e3cf5adfc6f48934e0a70edf8b251c24084fc25
 EBUILD singularity-1.00.ebuild 1250 BLAKE2B 8be42e500a5fda8f637e735e05f855810aa01bdfade0dce55c31ce1a58f7b25491b3eb95a1cd62a4ee575bfb0f5a5fcd7bea80726c2b948fefb2b2241bd3e9d1 SHA512 eea697f55a9212793dd044cb73475a9910cc27cf6bdc7eb20359e5212c909994c4d33c8730a14b2b37caab1d8ab36d993e593a640dcdaf6729bf5eb19bc17674
-EBUILD singularity-1.0_alpha1-r2.ebuild 1418 BLAKE2B 6a423edfa115554d268432d43384d6252640a11e233a7eda735e95814224b44ab897e915706dabe092c984ca3a477b6b77e0929dee232a6abc3e4c0bd3d9f2ce SHA512 ecd2e07da45e4372e3a0f5d7ae075eb1ececb93aff5280717978a88b046a64be4f6caafc6d6dd88b9984d58fa1f7809de43f9ce60dd7fdf12cf09cdbdef62d16
+EBUILD singularity-1.0_alpha1-r2.ebuild 1418 BLAKE2B 8d5ee833f3c881dab16109a0250037fb87a28eab8828dc9b52d5df8b60807ddbe1d9b28c21058825ba0f3534cda2b7d0f601d0c500cfff5c14cbceb94589e227 SHA512 405a9099f071ac3de064798f9a6d6d07d82973bbd7e836ced3bf2a5a610a92122b352c97ebb9b6e06c1a24849914636f4315b1c1339825182104905bba397eab
 MISC metadata.xml 342 BLAKE2B 599486446074178c42f941d12e8babc285e015798d4c925f93d52040278ebba1d538223639d0d03d387901fbf216d0adb5c514f2a49318da3571509e03b52ec5 SHA512 558b706d3e1ac877859ef93f34cebbca1e477a8dc92ef7448b288c8794fc8ae9e5a62b54e9ec8f553637db7a6b051c3908c036bf704bcbd4d44a030aa7fde983
diff --git a/games-simulation/singularity/singularity-1.0_alpha1-r2.ebuild b/games-simulation/singularity/singularity-1.0_alpha1-r2.ebuild
index 15b223751af5..f9ce06c85c2b 100644
--- a/games-simulation/singularity/singularity-1.0_alpha1-r2.ebuild
+++ b/games-simulation/singularity/singularity-1.0_alpha1-r2.ebuild
@@ -4,13 +4,14 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit desktop eutils python-single-r1
+inherit desktop python-single-r1 wrapper
 
 MUSIC="endgame-${PN}-music-007"
 DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
 HOMEPAGE="http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity"
 SRC_URI="https://github.com/singularity/singularity/releases/download/${P/_alpha/a}/${P/_alpha/a}.tar.gz
 	http://emhsoft.com/singularity/${MUSIC}.zip"
+S="${WORKDIR}"/${P/_alpha/a}
 
 LICENSE="GPL-2 CC-BY-SA-2.5"
 SLOT="0"
@@ -34,8 +35,6 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${P/_alpha/a}"
-
 src_install() {
 	insinto /usr/share/${PN}
 	doins -r "${PN}" "${PN}.py"
diff --git a/games-simulation/sky-rogue/Manifest b/games-simulation/sky-rogue/Manifest
index 013be070755e..01a1c0cc5bf2 100644
--- a/games-simulation/sky-rogue/Manifest
+++ b/games-simulation/sky-rogue/Manifest
@@ -1,3 +1,3 @@
 DIST sky-rogue-linux.zip 153094990 BLAKE2B 2129f624a7b56ec0ddbf6869a75f94468d4efe9efade4d47549b2ae1eebfb4b6e4939190d97acd820c2f46a1a9b2d52614e5a1c7ace717071d482db21b1bd1e1 SHA512 f25dfed7d78355fdbd5a643ec11f948020256fce38e80f9bb8084b875203b26490af6b0164684c187493697a132c7fdc9b40af6b793fd50c9a176285c508d8df
-EBUILD sky-rogue-1.3.ebuild 1162 BLAKE2B 006b02940ce404a8b80f917e2fa535769628156564bfa4c00cfbdb808833045e8b50eb377122581c02baff0716e739dc97ddf6592f4dd1c864d821132da77e82 SHA512 50f17aa1d2fe604f71a02813eb0b43d30a007042181e964419e4087deca9feaa08b000f74794caf80f904c7e03bda01ad67540dfa88b9c570f1bea87ba36f9e0
+EBUILD sky-rogue-1.3.ebuild 1163 BLAKE2B c786f5bded94e90dce41734979f3f7bafb3995d92d7fa93831cb7bf1c6ef54824bf0dcd3ed9eb94e59f7267c4c7d2634504aebf833208abb67fd346538813821 SHA512 cfa26e881a8fd16b9682f11ab99d7548abc63d44f11bf75c72327b0583bad584f689138d16c7ccf2078d3b8d28c456d241c246ef59bb2ebfedcdb98319449806
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-simulation/sky-rogue/sky-rogue-1.3.ebuild b/games-simulation/sky-rogue/sky-rogue-1.3.ebuild
index d5ad8217583b..8f7e9f217ce8 100644
--- a/games-simulation/sky-rogue/sky-rogue-1.3.ebuild
+++ b/games-simulation/sky-rogue/sky-rogue-1.3.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=7
 
-inherit eutils desktop xdg
+inherit desktop wrapper xdg
 
 MY_PN="${PN//-}"
 DESCRIPTION="A fwooshy rogue-lite action flight simulator"
diff --git a/games-simulation/slime-rancher/Manifest b/games-simulation/slime-rancher/Manifest
index ffc743a2034f..f5e1e2d26bcf 100644
--- a/games-simulation/slime-rancher/Manifest
+++ b/games-simulation/slime-rancher/Manifest
@@ -1,3 +1,3 @@
 DIST slime_rancher_1_4_1c_34605.sh 637631767 BLAKE2B e3742178acfb9b80429117a37e8c7ec226345fb20b762ef80ca7ff7d58bcde039a199db5f352e78ce6935b6b261924780f54c84dd706a8031b427c9bd52de2a7 SHA512 c9124a7685c12dab942cde3e4b7e4140156c9d1551043d450c0c2f2eb02d1db61b99f22803b1058634abff86e783c889badf5834f0c2f7048a97dc168c962908
-EBUILD slime-rancher-1.4.1c_p34605.ebuild 1193 BLAKE2B da4062b3f19a369ed4ff092bc5b70af12ba05810734f7a76d4d1d7d699f272317ce212ca000fec0d9666a2f91c9109b1cb02561fb771a1c1b6f903bd81660c57 SHA512 a257db39f7fd3442d995a4730bad04124a95accf40fda7aa5ab0c6075a438805a5f843275a12aa2000811d108bef9cfa655b2a705d07d0495e3381a50507613a
+EBUILD slime-rancher-1.4.1c_p34605.ebuild 1193 BLAKE2B cb44c1fdf80ccc1b90052625e09b522853a5b94a219a8d8a8d49ea03525992d07a8f9323b0a77b7f0b55006610f0c1ef4e2db68baaaac52502609af2e68d06c3 SHA512 96b5ab016c603491eebcace2382268ae1889ea8373b74fa93e9c925df8b6eed7084bd7a4459d376825e55275aac879560848474881d3a0f49495c5e5d97ecd26
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild b/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild
index f69d7ad44247..a27ed01cb70f 100644
--- a/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.ebuild
+++ b/games-simulation/slime-rancher/slime-rancher-1.4.1c_p34605.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=7
 
-inherit eutils desktop unpacker xdg
+inherit desktop unpacker wrapper xdg
 
 MY_PN="SlimeRancher"
 MY_P="${P//[-.]/_}"
@@ -12,6 +12,8 @@ MY_P="${MY_P//_p/_}"
 DESCRIPTION="Cute game where you cultivate slimes on a distant planet"
 HOMEPAGE="http://www.slimerancher.com/"
 SRC_URI="${MY_P}.sh"
+S="${WORKDIR}/data/noarch/game"
+
 LICENSE="GOG-EULA"
 SLOT="0"
 KEYWORDS="-* ~amd64"
@@ -21,11 +23,8 @@ RDEPEND="
 	sys-libs/glibc
 	virtual/opengl
 "
-
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/data/noarch/game"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR}/*"
 
diff --git a/games-simulation/train-valley/Manifest b/games-simulation/train-valley/Manifest
index c62f3904951d..119a15666551 100644
--- a/games-simulation/train-valley/Manifest
+++ b/games-simulation/train-valley/Manifest
@@ -1,3 +1,3 @@
 DIST train_valley_1_3_31403.sh 196066169 BLAKE2B fe9e6ae5b0ef76794823dc86ed100fdac355d3929d85a9a12096f79cf9e6f946e2c85b5b737ebcab813ceef29094734f74546fff06124fe4bf07ef224d5842ff SHA512 16fd627f8ca6399579b17d7a4ce29caba554fbfb0dc72b40827f1c3a061d8c238a7faeb1b5171917362d381642e8cb066cdad5556fb71f4d27225bf227d735cd
-EBUILD train-valley-1.3.31403.ebuild 1334 BLAKE2B 65f41fa2f8576858de21554fec9160bbed27ebe5ed1c73953b170721602f5ca890ad22f14e848809f44a0fbb82e281319698b4842ec9b57e6743e6985a783a2c SHA512 55c3acd1498800f3e78e78e220a3328eb93c1b0c48d60e5ab38e7128f1f7906d5277b970ac16e7e2e5919b0bff711acccb8b299a1d2c0f95ec66b5933a2c5676
+EBUILD train-valley-1.3.31403.ebuild 1336 BLAKE2B 18ad6bf78caf1d3ea41e73ba8068ba1a25242c084ce66532a1118457c872852032eef85b25f7ba16d1268b31158db4309b1b1a0857a1b78db37380b449f526ce SHA512 60f6a5d23feda96e4f4e66bd40ed8e0c494be49eb4ed65844e59a213647391584489ea89435a559b2501fb2a34650bc4a882e3a2561d94199efe066bfefeb80c
 MISC metadata.xml 354 BLAKE2B 620415356736dd403be27ef2547bd0d23a3812b3c16b7976125c582118af837336c258d7c0657dbe70b254ee773041f7e169939a34cc616870a5f54ad8429c31 SHA512 6ae66494681059ab163da720d574906da7db8facc7c383db8b8dd0d5ea78f41deb5f19389b1fd8fc2848cfb7ae5c11bd3ba2750a90799b382f0bfe8f70d48637
diff --git a/games-simulation/train-valley/train-valley-1.3.31403.ebuild b/games-simulation/train-valley/train-valley-1.3.31403.ebuild
index eeda5d017b72..a1e958982c2d 100644
--- a/games-simulation/train-valley/train-valley-1.3.31403.ebuild
+++ b/games-simulation/train-valley/train-valley-1.3.31403.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop unpacker xdg-utils
+inherit desktop unpacker wrapper xdg-utils
 
 DESCRIPTION="Build railroads in order to connect cities, tunnels, and bridges"
 HOMEPAGE="http://train-valley.com/tv1.html"
@@ -57,5 +57,10 @@ src_install() {
 	make_desktop_entry ${PN} "Train Valley"
 }
 
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}