gentoo resync : 16.04.2022

15 files changed, 86 insertions, 155 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index ad06f27fcdde..c90308c9c52a 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index c7103b81ea91..dbfe1a59f842 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,4 +1,4 @@
-DIST FlightGear-2020.3.11-data.txz 1736954520 BLAKE2B d5f3fd8facc93fab140171fad04ee0c331c4ab35c893ee762bb0b6250ee632c820e7570de57d2dfd6348fb9aaefdba209e845d00f67737b24eff17b025b30aa4 SHA512 b46193d4e9138ec58da048d9c3a36d47ae7204673fb9524f23b3d52dab02db8ef52fe8d67b7fd648222aac8585dd7e2fa5484317fdd07e07a58f3816f1378702
-EBUILD flightgear-data-2020.3.11.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
+DIST FlightGear-2020.3.12-data.txz 1787955196 BLAKE2B 648994bb8a70416d9fbf9fbb71c91d6652db4f915ce39938ad870f6de4a745c7f6df36025726fe29d67a598f1ce64718d12b7be5b81ebb83318246cd991fac1a SHA512 7bb97c0b2ee59b300a95f331bfd12e39aaaa7d3320e33cc4e72ea3c5fae196af52e97d9ed7f6af274162ecdd00642e729d96165df5dcbcb95e2853cf7c1df463
+EBUILD flightgear-data-2020.3.12.ebuild 409 BLAKE2B f818a83911a28b22811e65c4eb154ce1a23056a2c5a226954c461c0041df94fde90ccde3f8f0b3872b47c624943f071cb70c7534a689a68a036c2d7edd944e4c SHA512 4ae3615be1a1e0c96c27b6853f81315286295371f2481487b6aa42853cc573ebe71105832a322c8e70b90b56105aebbf6393a6e324a9c6777fab027538278128
 EBUILD flightgear-data-9999.ebuild 441 BLAKE2B abb508976894bf77fe2fa60c817920481a5dc0487a1379e71ff3104b9ca8cbe19953adc5f4a14ff5a74a0e6900fea89741b446137664104daf8eb119508225da SHA512 f0c40c5eff961a0d8680cf844a1fae4eff777469ae0fbbf9aed6ff088db1ae85a95b6494c7d06539b697d317a4567c534fd8bbe2173f6516e7747d58baded284
 MISC metadata.xml 446 BLAKE2B 47c1c761df5dc2bbbf1972f9541aae416b6758b520f429309fd81e91bc332d78e497c9e6b2504c979fbf6a79287452ba86f060746c57436ec22bba65f177f283 SHA512 f1dc6aa3888410f471884143f136178c890a7bf31c67d61ab049587dca205b966a21a57c670d4c047703264f470955899ccc5f42d8cde5412be8bfc6f52abcaa
diff --git a/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
index f6a2970e8ba8..f6a2970e8ba8 100644
--- a/games-simulation/flightgear-data/flightgear-data-2020.3.11.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2020.3.12.ebuild
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index bcbb8c4b5f7e..1032673ca064 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -1,8 +1,7 @@
 AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2020.3.11-fix-assert.patch 490 BLAKE2B 4bfeaa11b36568080a0e68787899eeb7e9f9737c8fd15beb5e3346a9bddf04d0d92d00722986eff791fd485de577c15efadd390814851299e7c410e9ab1cfad9 SHA512 595f63fd7ccaab8ea38ce0367f2cbde765154ef0ae1d104f439d15eb5e1ec49480ea48c469f194ae0e3d156ebf6a1d976f0f2b581d218f95870aacad5750ac09
 AUX flightgear-2020.3.8-cmake.patch 2050 BLAKE2B 8fa39bd0041556620f79088b6f9ff29eec4b445911f664ac1d3b4a71af479292538d0c44d55b71fa1fbb87771ad9d4917b8c874d5270f716ac63406ec62098aa SHA512 5c1c744c135f422786cab37c0425a143b5e5f078442a051122586fd9fe299bdc953cc6cf9c9c7ab9fb1e5731f3e1f1dac33653e132b95d5ef390a6bc06a1ed2a
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2020.3.11.tar.bz2 8926212 BLAKE2B 03b3203fb688fe842247f8ac11957f438f02154cbc992bb98076ab3dd6fcac5f3241509cc1c621f3b647487b772257763d154c756792ce8ff738ff5396fe07ef SHA512 9a7c6f262da8daf3d954df7a2a8a96e555f3212c1d949211d0dbddd08a8f7380fa8f4986d60f48e17db563154d250184ee772b79b10277a2c5819fabec3930ee
-EBUILD flightgear-2020.3.11.ebuild 4346 BLAKE2B c414a8fecdbe98d83d8d97fc4b8dbca8f4826861fad41b4256fb1c41c6db0356124ffa78b6766d1109f68c35d001501da0dab47d114c9a89bc0df55e84089a9a SHA512 0bf78c006c2fe16c9b873968bd406b30a316cedebed3512673bb1f6fac5b97cdec315ef6eaab98ba61fd07ca99450d7a3fd4cb73240eebe5a643f5abb4bdc02f
+DIST flightgear-2020.3.12.tar.bz2 8929319 BLAKE2B e84b0519d69f46d5951372deed59f9b1219739710b3374d0bc0041127f8e4b7869c43b20169a9ac3a89d4e121f9da27d01c6db98e683bc3f80da6b1930e1a7c0 SHA512 91e04ae6dc5d12e799bab10b3c4321e77f8d995469453453fdff26a9858f40056dbe8c095423397fcbef307994042c377eb37532af2732674f39e5624c950e9c
+EBUILD flightgear-2020.3.12.ebuild 4298 BLAKE2B 971ff3d8fe90368bc9f4280087937930749adeab00610626c7283823eeffc9682324f2704960e428d49e248f638da04a03d5c8a0256d07f18a67b165d76f2730 SHA512 e05b7835a46c0e837572ae00eb0b990c2998eb869ef19669dbaca646143603f9a8ba935c3cb5caf73a31e9c1452a83027e4c46ea0db05319bb23195ee564c814
 EBUILD flightgear-9999.ebuild 4348 BLAKE2B 0f084f038d9b973fc9fa1fb652e1388d31ecfdc9740e9b6ce83aeca262809fa7c8acbe1fff7a16fb08cfd77fc4d46249b01efcc6ad21e27d6692b385bcdd786c SHA512 764f056eb4935d2562df4dab29d393aed0884f3568c414ed36e55ab647747c039151a5d9353747cd1aa4e86479df9097e9a4ffbf698fa63a53adcced270139b5
 MISC metadata.xml 868 BLAKE2B 304c520696a5a370762f5748b0e90282e7faed02afd2771805f4e842c10e26e7979456e7141caa407edbeead252c3fc959c50aaebe82bdad65d1509b447f7dea SHA512 56373af9228b7943e6be81ca73b1660a4818aaf800f9d3ad02cafe85bdd8e02f3f939a7d5f397396d78f1fe1207f05cdce70da883613c546040e5a7921e2548f
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch b/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
deleted file mode 100644
index f35cf2c426a4..000000000000
--- a/games-simulation/flightgear/files/flightgear-2020.3.11-fix-assert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx fgfs-my/src/Navaids/PositionedOctree.cxx
---- flightgear-2020.3.11/src/Navaids/PositionedOctree.cxx	2021-07-29 11:35:40.000000000 +0200
-+++ fgfs-my/src/Navaids/PositionedOctree.cxx	2021-09-16 23:01:20.989931176 +0200
-@@ -148,7 +148,7 @@
- 
- void Leaf::insertChild(FGPositioned::Type ty, PositionedID id)
- {
--  assert(childrenLoaded);
-+  assert(_childrenLoaded);
-   children.insert(children.end(), TypedPositioned(ty, id));
- }
- 
diff --git a/games-simulation/flightgear/flightgear-2020.3.11.ebuild b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
index 5467dd59b859..baafbbda8846 100644
--- a/games-simulation/flightgear/flightgear-2020.3.11.ebuild
+++ b/games-simulation/flightgear/flightgear-2020.3.12.ebuild
@@ -65,7 +65,6 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2020.3.8-cmake.patch"
-	"${FILESDIR}/${PN}-2020.3.11-fix-assert.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README Thanks)
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 9cea8ebb6d2a..0ed120d6c70a 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -10,6 +10,6 @@ DIST openrct2-objects-1.2.4.zip 3392474 BLAKE2B 5f539cbbdd93828cebfa6977c6c11ac8
 DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
 DIST openrct2-replays-0.0.62.zip 1466858 BLAKE2B 651e46a554e90d7692c2dc0f8dcffaadb58ffaf7f9a282d499f4c032c8412730da58f660d03b0e73d26893ce7b9a3a437029893acd7f3fd4e9267ce85eb0ee68 SHA512 69705858ebde1dc9a698915c0d5ed56e1c9d5cb29b919d99eebefe81fdb68d9c17acc58431618410b69cf67ad14e1994ec9ac86530127ca87cdc5603de899137
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.5.1.ebuild 3949 BLAKE2B ff1e50c299ddd02b2023d64a88936bd6bab8275d4eb741254b2c950f9fa7d3b637142329c87e387deb0f52f58ddf55f460ef16bde68a9072df6ebf9b0408551c SHA512 1db0260e13881475f4740bbeb3521c437ef64335795f971b77bae001301e559b72d75944a841b1660df7e1885089e2db83a71e7792ad81bc95ac8986bb0d7717
-EBUILD openrct2-9999.ebuild 3865 BLAKE2B ccfed3406c145a9388d9a954a3f24473f1d24411c66b9fd2678137e911621a7dd43db6e56755783f35e44cbd4cfee04e62e3d66d74c14aa1a392de960325d8ef SHA512 98a3d805bb6b5283fd28d0397171938c54e9ee2ff801a321fe50d3e62c67074b3daff6ca788cdcf88795db848cc7403d40e4064daeda8456a86a39efc27220a7
+EBUILD openrct2-0.3.5.1-r1.ebuild 3968 BLAKE2B e489d7be25d664fd73efdb62e3551cb3eb537545ec8f4f83b1ca06f073872bfc56ff343e08725a33a8fa5ef4918daf40dc3710c04e0fb4ac57d9e54a07721158 SHA512 951b457cde394a64c7cacb05b854312855a6b4b3ff06fb7c2777019a79c7b4f18b8b6de52da5eddc77e935ad13990189ea24c5a624e499a8c66dd38f5b7c6721
+EBUILD openrct2-9999.ebuild 3884 BLAKE2B ef9bcdba674eee668c0ceaeea3d2ba5f817754d0e480c90a3beda641777a19b31638581ef039ac0af4a8e83647be50dcf80e3f115ae19ee881f433ad83821e0a SHA512 bc77222dcbe772579566cc5e677bdc54748e88681e45ac50a53f6765ee620600c2eb576bfb47570377cf44c32d4ed93f76c57d042fce14401a0eeec4b11aea3d
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
index da1cbb9b5e25..e02fe6c1811b 100644
--- a/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -107,6 +107,7 @@ src_configure() {
 		-DDISABLE_GOOGLE_BENCHMARK=ON
 		-DDISABLE_GUI=$(usex dedicated)
 		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
 		-DDISABLE_NETWORK=OFF
 		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
 		-DDISABLE_TTF=$(usex !truetype)
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index a6613207075e..293da48f84c1 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -108,6 +108,7 @@ src_configure() {
 		-DDISABLE_GOOGLE_BENCHMARK=ON
 		-DDISABLE_GUI=$(usex dedicated)
 		-DDISABLE_HTTP=OFF
+		-DDISABLE_IPO=ON
 		-DDISABLE_NETWORK=OFF
 		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
 		-DDISABLE_TTF=$(usex !truetype)
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 67a002412c2d..a6471baa6ab9 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,7 +1,6 @@
 AUX openttd-1.11.2_dont_compress_man.patch 999 BLAKE2B 5a2e9d91cb0f60723ef198723b07793c1909e55e68493733ed3cc0ce66441be0e970b7bd8cd6ade43c0090bcc0b2d68cde6230306a55f857ca9d3c0406ccaf17 SHA512 a7b312995000abf5a4bc4418bb466aead75fc3f8dbd4ed7cc3d2914dc96beb815a4cf422e9ca24e41dbbf545dfef8c8cdeeec68f9390e2f6465d1eb80fcaf358
-AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-12.0-source.tar.xz 7307832 BLAKE2B 12ffd0978e1f735f4a1d9eb63876a6f4a38867f11e5cbfbb7386f34564ef8b79f394b782c99f28e8a65196b7311aee28427d0485abd2e16dd69f36beb40fa3b1 SHA512 a1042fe52892cf301d3a2c7e972d9c091829638119d2ca9b55165a6b5568660f178e808db4b0bf2d3e4538dbdaea7b0683d4de9333defbcd95e109d591c05a78
-DIST openttd-12.1-source.tar.xz 7357316 BLAKE2B 653a511416b0d75af696eae96cf730e95747b476f9b1957759a6d3941eff2d6194dfb4bdb8e5e6cb645b81278ac4d48cf886daaa5796d1f995da490bcd046514 SHA512 bf58dbe308c64736973b92d66c3973081867e93f02e3b345556f5e74aea00fe0bbbb8b826f4bb59440b593d2a2d3be4f36321fb8a44be89bfa390fe6afe40bfc
-EBUILD openttd-12.0.ebuild 3126 BLAKE2B b018c78c0ee734a613b4a57714d2ac692dc3ba47033b5d9a0803c6ef9ef608a27e1557ed391a905a17b7a9dbceda1f8b01adaad78c552641d060fd51c5256f14 SHA512 9700cb64038e6ef17227862a11d794d499c6e372cba8ad01f4d830513fb4acb02595694174ddd995a98997c8698af355e6b7af2a438715c086163a84d1711cd9
-EBUILD openttd-12.1.ebuild 3126 BLAKE2B b018c78c0ee734a613b4a57714d2ac692dc3ba47033b5d9a0803c6ef9ef608a27e1557ed391a905a17b7a9dbceda1f8b01adaad78c552641d060fd51c5256f14 SHA512 9700cb64038e6ef17227862a11d794d499c6e372cba8ad01f4d830513fb4acb02595694174ddd995a98997c8698af355e6b7af2a438715c086163a84d1711cd9
+AUX openttd.confd-r1 376 BLAKE2B 9208c9da8c90d74d36204c2c78f14b28fa3bf5ec730e2f56b6ae163b474b2169b003fb4d869810a2404cc0ad2e0e5bf9c78417057a762e965787b955431db629 SHA512 a3ca192781b0bf4a1105f13890bc34b3d68a365637adb2254b7b048fa5a1fde80b95415711010b8144135465c2a9cd1a8822cc3bbd2e0161a728c16acb1d0509
+AUX openttd.initd-r3 1055 BLAKE2B d9b1508137375c95bd2cb0be06515a816fa46f91b7fb260fef820c465b52f88312fb41079b42c4360b2538979a2fad186aff588cb9cf0f9333214e5e0de65395 SHA512 04e881e2baaa8bab02f00653c885bf51374687a8d3c8aef019e58ebcc84e22e472c716f5419020ec75f26d674439832862ea595e7754362adb697a0d0064174e
+DIST openttd-12.2-source.tar.xz 7377496 BLAKE2B a2c0192a2d4ed149f7c6584032b46483eb74d2d7d2ced16f1d0d3e638c4acef184cd8b013b855a01750dbb570d37bb6ed95f04d16c1580e4b3777ea3b90cfee1 SHA512 577792faee1d5e0c19fbfe31501dab3359f8e1327caa87e6378bb3e616ab6b2c64d02044c6ac99f7c40397df7bc6847a6b432852a5318a2db574203ddebfaef6
+EBUILD openttd-12.2-r1.ebuild 3377 BLAKE2B 9868c0b4cdc818b63cdf4e4fc89ce706287fc5537346006ccaca2d094a5ced579b9a880fbed8b8ef92a5ea02e1ec545767054eee7a3d1a7a7abeaa5c020be12b SHA512 1706e2ad60bd31d70e1a553025048acb34ff638679959c779c660b7c26a97ee83c6f05576cf474aefc4961c572f3e161a5544d63f00cdd4996b7cf85b229e799
 MISC metadata.xml 857 BLAKE2B e65bf683a6d5beb3c99ae8d83771e5312e00cf40dbbd2dbf9545d7f7134b5df25d58057f23f5afd101a9f2e13396c57bfda59b427896455205ed6e272574f643 SHA512 fa13b5059202687ded428b6670b6a84f1187e767da4a51ef4fca435e8b0c10f900cc60ba7207d690888e442cbc27b03f8ea142e93138fa1b4da4411c13d1b6bf
diff --git a/games-simulation/openttd/files/openttd.confd-r1 b/games-simulation/openttd/files/openttd.confd-r1
new file mode 100644
index 000000000000..47cae2fda01a
--- /dev/null
+++ b/games-simulation/openttd/files/openttd.confd-r1
@@ -0,0 +1,10 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Dtach options, which will used, when the `attach` extra command is called.
+# By default, CTRL+D is used, and no signal is send,
+# when you want to detach from the attached console.
+dtach_opts="-e '^D' -r none"
+
+# Options for your started OpenTTD server
+openttd_opts=""
diff --git a/games-simulation/openttd/files/openttd.initd-r1 b/games-simulation/openttd/files/openttd.initd-r1
deleted file mode 100644
index 0bfeefddf6d6..000000000000
--- a/games-simulation/openttd/files/openttd.initd-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-description="OpenTTD dedicated game server"
-pidfile="/run/${SVCNAME}.pid"
-command="/usr/bin/openttd"
-command_args="-D"
-command_background="true"
-
-depend() {
-	need net
-}
diff --git a/games-simulation/openttd/files/openttd.initd-r3 b/games-simulation/openttd/files/openttd.initd-r3
new file mode 100644
index 000000000000..89680f91d267
--- /dev/null
+++ b/games-simulation/openttd/files/openttd.initd-r3
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+description="OpenTTD dedicated game server"
+dtach_tmpfile="$(mktemp -u)"
+name="OpenTTD dedicated game server"
+openttd_command="/usr/bin/openttd"
+pidfile="/run/${SVCNAME}.pid"
+
+description_attach="Attaches to the session (interactive console) of the OpenTTD game server"
+extra_started_commands="attach"
+
+command="/usr/bin/dtach"
+command_args="-N ${dtach_tmpfile} ${openttd_command} -D ${openttd_opts}"
+command_background="true"
+command_group="openttd"
+command_user="openttd"
+
+depend() {
+        need net
+}
+
+attach() {
+        pidnumber="$(cat ${pidfile})"
+        dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
+
+        if [ -S "${dtach_tmpfile}" ]; then
+                eval "${command}" -a "${dtach_tmpfile}" "${dtach_opts}"
+        else
+                eerror "The determined socket file for dtach could not be found!"
+                eerror "Did the process crash?"
+        fi
+}
diff --git a/games-simulation/openttd/openttd-12.1.ebuild b/games-simulation/openttd/openttd-12.1.ebuild
deleted file mode 100644
index 73990ea5a054..000000000000
--- a/games-simulation/openttd/openttd-12.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A clone of Transport Tycoon Deluxe"
-HOMEPAGE="https://www.openttd.org/"
-SRC_URI="https://cdn.openttd.org/openttd-releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-IUSE="allegro cpu_flags_x86_sse dedicated +fluidsynth icu +lzma lzo +openmedia +png +sdl timidity +truetype +zlib"
-REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
-
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="
-	!dedicated? (
-		allegro? ( media-libs/allegro:5 )
-		fluidsynth? ( media-sound/fluidsynth )
-		icu? (
-			dev-libs/icu-layoutex:=
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		sdl? ( media-libs/libsdl2[sound,video] )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib:=
-		)
-	)
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo:2 )
-	png? ( media-libs/libpng:0= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=games-util/grfcodec-6.0.6_p20210310
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			>=games-misc/openmsx-0.4.0
-			>=games-misc/opensfx-1.0.1
-		)
-	)
-	openmedia? ( >=games-misc/opengfx-0.6.1 )
-	timidity? ( media-sound/timidity++ )"
-
-DOCS=( docs/directory_structure.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_BINDIR=bin
-		-DCMAKE_INSTALL_DATADIR=share
-		-DOPTION_DEDICATED=$(usex dedicated)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Allegro=$(usex !allegro)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Freetype=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=$(usex !truetype)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Fluidsynth=$(usex !fluidsynth)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ICU=$(usex !icu)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		# N.B. regarding #807364: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
-		# with USE="allegro -sdl" combination flags. There no other way to
-		# completely disable SDL1 support.
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=$(usex !sdl)
-		-DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-}
-
-pkg_postinst() {
-	if ! use openmedia ; then
-		elog
-		elog "OpenTTD was compiled without the 'openmedia' USE flag."
-		elog
-		elog "In order to play, you must at least install"
-		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 shared or personal location."
-		elog "See /usr/share/doc/${PF}/directory_structure.md for more info."
-		elog
-		elog "From the Windows version you need: "
-		elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-		elog "OR from the DOS version you need: "
-		elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-	fi
-}
diff --git a/games-simulation/openttd/openttd-12.0.ebuild b/games-simulation/openttd/openttd-12.2-r1.ebuild
index 73990ea5a054..2c6d18c4b2c4 100644
--- a/games-simulation/openttd/openttd-12.0.ebuild
+++ b/games-simulation/openttd/openttd-12.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake xdg-utils
 
 DESCRIPTION="A clone of Transport Tycoon Deluxe"
 HOMEPAGE="https://www.openttd.org/"
@@ -19,6 +19,11 @@ REQUIRED_USE="!dedicated? ( || ( allegro sdl ) )"
 RESTRICT="test" # needs a graphics set in order to test
 
 RDEPEND="
+	dedicated? (
+		acct-group/openttd
+		acct-user/openttd
+		app-misc/dtach
+	)
 	!dedicated? (
 		allegro? ( media-libs/allegro:5 )
 		fluidsynth? ( media-sound/fluidsynth )
@@ -37,10 +42,13 @@ RDEPEND="
 	lzma? ( app-arch/xz-utils )
 	lzo? ( dev-libs/lzo:2 )
 	png? ( media-libs/libpng:0= )
-	zlib? ( sys-libs/zlib:= )"
+	zlib? ( sys-libs/zlib:= )
+"
 DEPEND="${RDEPEND}"
-BDEPEND=">=games-util/grfcodec-6.0.6_p20210310
-	virtual/pkgconfig"
+BDEPEND="
+	>=games-util/grfcodec-6.0.6_p20210310
+	virtual/pkgconfig
+"
 PDEPEND="
 	!dedicated? (
 		openmedia? (
@@ -49,12 +57,11 @@ PDEPEND="
 		)
 	)
 	openmedia? ( >=games-misc/opengfx-0.6.1 )
-	timidity? ( media-sound/timidity++ )"
+	timidity? ( media-sound/timidity++ )
+"
 
 DOCS=( docs/directory_structure.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.11.2_dont_compress_man.patch" )
 
 src_configure() {
 	local mycmakeargs=(
@@ -69,7 +76,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibLZMA=$(usex !lzma)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LZO=$(usex !lzo)
 		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		# N.B. regarding #807364: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
+		# N.B. regarding #807364 and #828984: CMAKE_DISABLE_FIND_PACKAGE_SDL is used only
 		# with USE="allegro -sdl" combination flags. There no other way to
 		# completely disable SDL1 support.
 		-DCMAKE_DISABLE_FIND_PACKAGE_SDL=ON
@@ -77,15 +84,21 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_SSE=$(usex !cpu_flags_x86_sse)
 		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
 	)
+
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	if use dedicated ; then
+		newconfd "${FILESDIR}"/openttd.confd-r1 openttd
+		newinitd "${FILESDIR}"/openttd.initd-r3 openttd
+	fi
 }
 
 pkg_postinst() {
+	xdg_icon_cache_update
+
 	if ! use openmedia ; then
 		elog
 		elog "OpenTTD was compiled without the 'openmedia' USE flag."
@@ -102,3 +115,7 @@ pkg_postinst() {
 		elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
 	fi
 }
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}