gentoo resync : 28.04.2021

18 files changed, 222 insertions, 72 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 6a7f43912905..598ca67e9199 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index 8f09ee6d2237..51c18788dcea 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
-DIST bedrock-server-1.16.201.02.zip 89832697 BLAKE2B 055d19866daabf8479fa051dd9ddec0b89e620c02713cf6b98299eaa9b1423c92fa15bdf0a2203e9580ce38e82321e2f2b5420ad11ea45bb01606487c5477a01 SHA512 6238dfccde26780d22337a7f0a1e1fbe75b86e43c4ecd77a551dc7d31bf22fad3705f0f9e328c00cf5ffbee252a70e94f586606aa26e23b32101e3e6a23636a3
 DIST bedrock-server-1.16.210.06.zip 90731004 BLAKE2B a3fcdbb55d4394ae2239efa7ecb6160dce05e72f407695f4e5d39f0184d4b054f73dc362df9354f67bcd99d02a98c6a873754ed8938c3942be7ff2c4a64a37a2 SHA512 bb1bad199d22cd02c4496be811a7e2d3c8ae27ad7283837332a9a3fd3f7fe79402350dca09076b53f452da90a3a30fd74b592615986865b582d404e2f21fae04
-EBUILD bedrock-server-1.16.201.02.ebuild 1118 BLAKE2B 934d922ad930135c070f2c56bad09e89b434841f189ffc76fb6ad68738d0668dca9bd19ec49877af3e3f5eb26cee5a17fe6936f260549cf3772aac7af1dbd72e SHA512 71aadf668d37aa046c17659d43128df3d21bdc37edbd5c9e98682f80b9e801160d05d78c8eb3ab2124e469e8ff285d03c8a950a8f219781a6caf74dfe0a68311
-EBUILD bedrock-server-1.16.210.06.ebuild 1119 BLAKE2B 5f6b84de32d07a3a455534f9f42edf002fc677f0e7193902e85710f08f5de15388d9465d885aaa934936ccf6e84d124f90fd4a57bcca003f0325b81ddb800bf4 SHA512 0a4ae8e00cca802048a10309afd3d4d1254cd1c771a94b13367fd8c82e44c6db1cfb3336d63036ee26d647ed04d3d76baf7b30114b371d994efd2d03962f559b
+DIST bedrock-server-1.16.220.02.zip 54271561 BLAKE2B 41d1a082299220952960231bf40601043d81129bc168aec75c73eeb14707ae5c7d94498cbdf49a2bac73c700d06bd80c1e5245e49958702e8651239eb0f20f56 SHA512 caee2c9932157f2dd68fb8cd72a1442c95b36ad333762b84979ac8625a758a6c78d776787ac67a0b479c0918d008d288cfaee32a5a2ba426448f4cd4c64ed3a0
+EBUILD bedrock-server-1.16.210.06.ebuild 1118 BLAKE2B 934d922ad930135c070f2c56bad09e89b434841f189ffc76fb6ad68738d0668dca9bd19ec49877af3e3f5eb26cee5a17fe6936f260549cf3772aac7af1dbd72e SHA512 71aadf668d37aa046c17659d43128df3d21bdc37edbd5c9e98682f80b9e801160d05d78c8eb3ab2124e469e8ff285d03c8a950a8f219781a6caf74dfe0a68311
+EBUILD bedrock-server-1.16.220.02.ebuild 1107 BLAKE2B 48d4027f69f5fc30399321fd1da6a2f5242261ab0b8a93c353010d070bea23f13d49990e7b3d5d782a991f70b8fa3e67026bd4429ee69ed6879e1cceccbd0a89 SHA512 54463078e9018f69c99a6db453f20cc6ba6bf9b2bdea3fcdf01565e5db6efea22a105b565e1d3f3359d491e82f63f0fb79b933305125930a9a4eb4ab9e72634d
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
index 57b7a7bb616d..63ced0dc4c9e 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.210.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild b/games-server/bedrock-server/bedrock-server-1.16.220.02.ebuild
index 63ced0dc4c9e..8b3bf146f776 100644
--- a/games-server/bedrock-server/bedrock-server-1.16.201.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.16.220.02.ebuild
@@ -6,10 +6,11 @@ EAPI=7
 DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
 HOMEPAGE="https://www.minecraft.net/"
 SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	acct-group/bedrock
@@ -17,27 +18,27 @@ RDEPEND="
 	app-misc/dtach
 	dev-libs/openssl:0/1.1
 	net-misc/curl[ssl]
+	sys-libs/zlib
 "
 
 BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist mirror"
 
-S="${WORKDIR}"
-
 DOCS=(
 	"bedrock_server_how_to.html"
 	"release-notes.txt"
 )
 
-QA_PREBUILT="
-	opt/bedrock-server/bedrock_server
-	opt/bedrock-server/libCrypto.so
-"
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
 
 src_install() {
 	exeinto /opt/bedrock-server
-	doexe bedrock_server libCrypto.so
+	doexe bedrock_server
 
 	insinto /opt/bedrock-server
 	doins {permissions,whitelist}.json server.properties
diff --git a/games-server/etqw-ded/Manifest b/games-server/etqw-ded/Manifest
index 4d6e7556cba0..5a407de82ae6 100644
--- a/games-server/etqw-ded/Manifest
+++ b/games-server/etqw-ded/Manifest
@@ -1,3 +1,3 @@
 DIST ETQW-server-1.5-full.x86.run 452679053 BLAKE2B 01721b7a288671873a87164e438cb4bf3483f86fe282fc0a306043bb44e18bf126736e57f6ee5ec0880057b7f53119e1b2f6c9ddd625f9083a01f3e12c613bef SHA512 8daa5f192330be09b476d9633af79085f8b45d64e99fb50f6dc2ded085171f3d310218308b813bc7fc9a56b5fb34d52d72248a1e926a0e499ce096690407b0cd
-EBUILD etqw-ded-1.5-r1.ebuild 928 BLAKE2B 018c7ad53e5f590ff8afc94f7695b2b29018e7304ad764426db4f5079a1c87eca13e6b301366955063d8a56a77d7e21bbc6ffe7153aa68880ccf1c0440cbfabd SHA512 1944ae5df33c3728c731af7c5b2b16d137322666512c73e0a6dc0d64976ae2262cd51a4d5a6eb947f75013c51a0c5c3b5aeb8b9d47e72b418e63dcd5f1bd8f00
+EBUILD etqw-ded-1.5-r1.ebuild 929 BLAKE2B 9990770c1ba5d483cd4532aea3ad73d0c3ce7aa532ffcb2f7c1de7f2a48b14bc07bba9fb3dba91f7ae36b59d30fc2fa359e0313a1d4deaafad3d897b52cedfde SHA512 1fcaa829658cc61bc7a24edd34e01d8fafa265885eb751c42f2af38123d4a5868c225e23ede2e5d8777136a68642c8940d1edd4d3ce02d42a5f1bc7997cc11d7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild b/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
index 414f11df15d7..52c453f64cc0 100644
--- a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
+++ b/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
@@ -1,8 +1,8 @@
-# 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
+inherit wrapper
 
 DESCRIPTION="Enemy Territory: Quake Wars dedicated server"
 HOMEPAGE="https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux"
diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
index 6350488fecd3..e01ea5dec368 100644
--- a/games-server/monopd/Manifest
+++ b/games-server/monopd/Manifest
@@ -1,4 +1,4 @@
 AUX monopd.in 391 BLAKE2B 8bf1681e070ef5240ced7cf15dae52ee2c690f93f9dd5c94ba4ae3390fe9b79c2084d83129d1add3e24ee05a81a54bd8de8315f170b448e48d8ade9d5c513805 SHA512 55b9fd625039b72032b4d0ea6769c2b5a2690ede1f5445e72900a4d423a2ea51c768cdc1f08f69577f7776f9638983d23a1e0f5afe20a174ccc2d44ef77271ab
 DIST monopd-0.10.2.tar.gz 180317 BLAKE2B a2955149963b63d4839cc65be464c8989f2816bccf8e122833cd5be8be9ded7789e72f59c5f3bb6e2c20d4565cb3553e64dfd2670b003fc5868c40da02948731 SHA512 f47d9623e110a98d9d32b522484944998fb6e7e8644e1f2b439428a1e12b3b514b902e52e7135150135a3e3251aa38604434347d06533f3cf3ffb28a2a81ede3
-EBUILD monopd-0.10.2-r1.ebuild 955 BLAKE2B 1bd67145b7b9df06d5a1f067a7aeab5e059bf772269a2ec479bc7900297d70825f3e1e90ad0c82ed2f5129c8cbc5833ab52818837f5e79281388a627cfa58206 SHA512 3c87216004be2c57b7961ca1a73120603787945120caa264b53c470a6489a79711b17e118d120b6442efdc1b8f48cf68f0b27c1ea340cadaf78d89ed3a4326d2
+EBUILD monopd-0.10.2-r1.ebuild 948 BLAKE2B 438cf373b1ff16d06340c5b93fdc3e94b15f09042f38d1e43b379fb947500f22731b25a811baac07586780a43b3f3c6452f9988a6470e5a2b6f5e2609b4d735a SHA512 8ec03ff31d7b96fa98412667f972df7e6182afa5a9bb55679f64862c93de96cadbcdd1d1e5ace4973098feda7553db1770d602fa7ced9f0941642bfcc445725f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/monopd/monopd-0.10.2-r1.ebuild b/games-server/monopd/monopd-0.10.2-r1.ebuild
index 83037a0574f6..da2bf28824fe 100644
--- a/games-server/monopd/monopd-0.10.2-r1.ebuild
+++ b/games-server/monopd/monopd-0.10.2-r1.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=6
 
-inherit autotools eutils flag-o-matic systemd
+inherit autotools flag-o-matic systemd
 
 DESCRIPTION="server for atlantik games"
 HOMEPAGE="http://gtkatlantic.gradator.net/"
diff --git a/games-server/mtavc/Manifest b/games-server/mtavc/Manifest
index b1f8b39b010f..0862386b7d2f 100644
--- a/games-server/mtavc/Manifest
+++ b/games-server/mtavc/Manifest
@@ -1,4 +1,4 @@
 AUX mtavc 46 BLAKE2B 0f35cd14bac92c2f761a152b1f9b895de9ca4b8c86cca34c982e1cfd3d0d8205d4eefdd5e0c9a188311db207201f1b6db385ec3341b2146b36921d792dc7056a SHA512 e71aed1a05ade048665c9ffd4c272a8a9eb74a14b05ff95baa4ac61cd53d5d67d0c6dd7a1d0798cd89ff70cf12f7153e7dbf31e9f10df55e773f01313458430e
 DIST MTAServer0_5-linux.tar.gz 229056 BLAKE2B d46784a532046bfe28bb2110470ad8c07dc2c9d1f68366663bdce519f3214bcf74bf4975495a4013b8f9c104921a52a42fe7d6599bf6a012171a1d120e6678b1 SHA512 eed0ec109427c53c9627826f1977b4a2454be0130d445b2ff7288e3f93b93d76d21b22ffdb706d306009baffd37bd317f9573a9650477e25146ff5d3b49f9c1f
-EBUILD mtavc-0.5-r2.ebuild 908 BLAKE2B be3d2062d3e9b6b866b48637a9e802c71e722295e809853a254b9b884d570e8d70d2b7a9d9ffa8efb22b5668db28116407953b13a6a16cfcacee8049f9a3a045 SHA512 f6c8d296ddbc9a10158417cff8e4c70184423cd20f7d0166cc99b0abea153d4b8687df7da12c91b1d31c866f657ef6e075fa4d5e5c193aafd4ed78810cba16d8
+EBUILD mtavc-0.5-r2.ebuild 902 BLAKE2B 42a7c84543b57c0e0d2dc969c5595869110e992c277c9977ba00ee6048e8efcbd19d7bcfefefa271bedd88e2f0fbd40bccccbf59b585d9629047061adf55cde7 SHA512 75f9e55f2f7c2e6b380e4e7c9fc1a84168273c40d108c6cc3c4ccbb6031ff8650a67708cb509749b3f6c6fde76f7fe5fc27153e01f2d20a68c44c403ad616545
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/mtavc/mtavc-0.5-r2.ebuild b/games-server/mtavc/mtavc-0.5-r2.ebuild
index 4d828a967955..cef256bf4f5e 100644
--- a/games-server/mtavc/mtavc-0.5-r2.ebuild
+++ b/games-server/mtavc/mtavc-0.5-r2.ebuild
@@ -1,22 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
 
 DESCRIPTION="dedicated server for GTA3 multiplayer"
 HOMEPAGE="http://mtavc.com/"
 SRC_URI="http://files.gonnaplay.com/201/MTAServer0_5-linux.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="MTA-0.5"
 SLOT="0"
 KEYWORDS="-* ~x86"
-IUSE=""
+RESTRICT="bindist mirror"
 
 RDEPEND="sys-libs/libstdc++-v3:5"
-DEPEND=""
-
-S=${WORKDIR}
 
 QA_PREBUILT="/opt/${PN}/MTAServer"
 QA_EXECSTACK="/opt/${PN}/MTAServer"
diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
index cf594c2c7e76..b2f60cdf480a 100644
--- a/games-server/pvpgn/Manifest
+++ b/games-server/pvpgn/Manifest
@@ -1,6 +1,9 @@
-AUX pvpgn-1.8.5-fhs.patch 11549 BLAKE2B 7776e8df3d97238084664f6b3edca525445d7d4aafa3049897fbe2b4b069e768acbab9daf474f8ffcbd4e5375e2fcfca4b8bea0ec42ab62f557c08c708033933 SHA512 9842120682df08c34eada97712246b3c492be66e3e3bd10dfe744896f7c1c461da530ea90c819dff2de436017836bf4b107d46b0960d928e00004ab6381dbbd1
+AUX pvpgn-1.8.5-fhs.patch 10813 BLAKE2B 849e2094ec0d313494046310028c63d01fdf5f377a33ec0779968a9d509d42fa7dcfd58fc23fa13809eff7d6e0baf25d97a88822c4a4d41c1f97a087e1077ed8 SHA512 4bb6f66f8499fce973ec9de2f6d30fe82c3965fa8aba2c257063abe8bc65a274f35ad1cd0ddedf9915747be0361d7a33ca1dae5faf2e71227c85d64f28aa6ed5
+AUX pvpgn-1.99.7.2.1-path.patch 1038 BLAKE2B 126f82bc49978c495688e4609ea7a001bbe77cf8b9a80f66b71181fb28ef1d897958f6c9ffee17b5b4bd6297e23ba25e7d4d4413b433f3d136330b22387b7a1b SHA512 012445bc577cce40a6b1799d5b02d7403fd73e54830f5576eb373d781ec487d0cc2743f4ab3f22cf523119ffaa472f4584ba2108c7f803fbe204f066d866f638
 AUX pvpgn.rc 885 BLAKE2B c0739177a13a2bddbe3cc82ad7bf87ff313faf0882159f7475c223ec76ef164ba572b048d05683bd02756d121e97efb04ec34fbd53ad856a54f6c23663fec6a3 SHA512 4b0a5d52e50bfde317ab3d9689aef6491b0dc8e3e94576c8ee7376c2118e3a315555a66b2aecb086914aec055011b7687eb1bdfea266423071098ac1151d0cdf
 DIST pvpgn-1.8.5.tar.bz2 982931 BLAKE2B 73c84278c5a7a13b781541f49a77af45d05950f0e378237ec0bfce3b4a55a94f91cfc2f994f56046e76c3dfb5d390427ee9cecbc21d1da048d2c503bfa21cf7b SHA512 7cbe141efe03efa4ce0fc1cc3b4e15afe2e85e3c83a27afdf36fec9e2dadf1c7b9aca1773e6a3e6566b62f5a7999cc040c9517786ca70eeb70f86eea84e9218e
+DIST pvpgn-1.99.7.2.1.tar.gz 1515818 BLAKE2B b4f5017b58e91785b199b700ced9e54bc7d953f2fe12696c931d44e5cad93f86eb77cff8fdc429e7d033f19d93ae895c192ce4c5a73beb7812c2f27f94bbeaf3 SHA512 b3b042c739b15b8460d9e0da1ed9f1fb6fb2db39046a23d7d30290b47b31e41de6c152023f0ab6dd92ce0c7b7483e6933509bda216cb0cb1260b5eed0bc874dd
 DIST pvpgn-support-1.3.tar.gz 123805 BLAKE2B dc051265c6d4c5a2ab69379f7ac4a57f402d25e8898020217f2ae5f12cb2ca4db860df47efe38ed6494eb040cbd52a7ed495bc3dab59c9e9e48a8e1386500d6e SHA512 9002fcdb7da92e84af97319b9f1e38f5cf97466aef88549b1fe81b9070643f321011adf674424e2c4acc22f847c7fc61ca2cbf2da0223842e9b9e6c8f1427d76
-EBUILD pvpgn-1.8.5-r2.ebuild 2516 BLAKE2B c6cdad1ac897b79d9739efc3c9ae35ab4735808e194e4e55b07c36f85c327d2a8794297aa6890da4d5cee3fa2d9e7abcf3510aee9fb47e1e04e002a336d8977a SHA512 390d84cc85c5880c63d4daf794381b986cb11cdf4cee45d98828d389440dcc0cc2aaf627d1483400d058e9dc1e537d4af910879891de339bd3102322feaef2c5
-MISC metadata.xml 336 BLAKE2B c11b3fef92305d55a4881dddeb386549100c4e7b74227b12a19f59c720fe502e4ff4e55681150d5b24471ed1a27230c2e8fe5162ffda30812f66195ae541c5f0 SHA512 5f28f8c449006d87effadc3d9e8dc234fede927b9487dc1efa5c9912913b23c752fb7e7589dc3f466cdd91894a5d5b7ca8d155460e73f0ac9280ddaf011412aa
+EBUILD pvpgn-1.8.5-r4.ebuild 2434 BLAKE2B f466ddb175b3af77d8cd5c4d45fdeb32dba1eecb76c8f60b7997f339068cd66a7082d0e460da1b1fe38d073f37650fdfd806930b5ebd58b7ca00b1cf9ebdbfdc SHA512 8797306e15cff306a20bbf9b23b3d6e9634b58c8285b5c5aa77b02005804e70fa44aab955e88c809e76443473ae500fcc92179b8939c6415d948faef78367f4e
+EBUILD pvpgn-1.99.7.2.1-r1.ebuild 2746 BLAKE2B c6f8a790b11f475b2b48767aeea31c23ec6cfa948d14c67f948dd56153ae39eafca5c94632997863d485e3ec39a58d0adafc0685c3b5b129b2d09ab13202c168 SHA512 2e3df7446451608c5a9c2c1bd007b7aa115f70c6c39b4ddd1447d82a5e14ba25214b0e8b19cc589d7a0b6c5648a1165a3264b41c57f922b3bf0b9c066339623f
+MISC metadata.xml 394 BLAKE2B 8fa51071a8ae7a74a842361e1ea914e8416e32e585dbb67586f52c3ea85c4d807e6d7cd91071098718735445066301fbb0a745ce98bf2756ab071489774f1f82 SHA512 fe01053a24f4694184cd1c1e91a1536cf7d98ba7ba2d6fce597d092a339bee1f9ad87464a8cc79e14ab3ab2cabc1db9f7b23f5e8cc3bcb261beb987a3da6a170
diff --git a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch b/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
index d1450b3ad178..f4238450c414 100644
--- a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
+++ b/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
@@ -1,6 +1,5 @@
-diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.in
---- pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in	2005-09-19 08:17:50.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/bnetd.conf.in	2006-08-16 23:34:10.000000000 -0400
+--- a/conf/bnetd.conf.in
++++ b/conf/bnetd.conf.in
 @@ -50,22 +50,22 @@
  # - "prefix" : prefix to use for all pvpgn tables (default "")               #
  #                                                                            #
@@ -94,9 +93,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.
  
  fortunecmd  = /usr/games/fortune
  
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in	2005-09-29 01:37:33.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2cs.conf.in	2006-08-16 23:35:43.000000000 -0400
+--- a/conf/d2cs.conf.in
++++ b/conf/d2cs.conf.in
 @@ -86,16 +86,16 @@
  # Use absolute paths in these lines to avoid problems!				#
  #-------------------------------------------------------------------------------#
@@ -124,9 +122,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in
  
  #										#
  #################################################################################
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in	2005-08-24 23:58:18.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2dbs.conf.in	2006-08-16 23:36:58.000000000 -0400
+--- a/conf/d2dbs.conf.in
++++ b/conf/d2dbs.conf.in
 @@ -49,14 +49,14 @@
  # File and Path section								#
  # Use absolute paths in these lines to avoid problems!				#
@@ -151,9 +148,8 @@ diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.
  #										#
  #################################################################################
  
-diff -ruN pvpgn-1.8.0rc2.orig/src/Makefile.in pvpgn-1.8.0rc2/src/Makefile.in
---- pvpgn-1.8.0rc2.orig/src/Makefile.in	2005-07-29 02:11:38.000000000 +0600
-+++ pvpgn-1.8.0rc2/src/Makefile.in	2005-09-23 15:10:02.968342144 +0600
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -23,22 +23,23 @@
  bindir		= @bindir@
  sbindir		= @sbindir@
diff --git a/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch b/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch
new file mode 100644
index 000000000000..8cfa94610b55
--- /dev/null
+++ b/games-server/pvpgn/files/pvpgn-1.99.7.2.1-path.patch
@@ -0,0 +1,33 @@
+--- a/cmake/Modules/DefineInstallationPaths.cmake
++++ b/cmake/Modules/DefineInstallationPaths.cmake
+@@ -37,8 +37,8 @@
+   )
+ else()
+   SET(LOCALSTATE_INSTALL_DIR
+-    "${EXEC_INSTALL_PREFIX}/var/${APPLICATION_NAME}"
+-    CACHE PATH "The ${APPLICATION_NAME} local state install dir (default prefix/var)"
++    "/var/${APPLICATION_NAME}"
++    CACHE PATH "The ${APPLICATION_NAME} local state install dir (default /var)"
+     FORCE
+   )
+ endif()
+@@ -75,4 +75,4 @@
+     CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
+     FORCE
+   )
+-endif()
+\ No newline at end of file
++endif()
+--- a/cmake/Modules/DefineInstallationPaths.cmake
++++ b/cmake/Modules/DefineInstallationPaths.cmake
+@@ -71,8 +71,8 @@
+   )
+ else()
+   SET(SYSCONF_INSTALL_DIR
+-    "${EXEC_INSTALL_PREFIX}/etc/${APPLICATION_NAME}"
+-    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
++    "/etc/${APPLICATION_NAME}"
++    CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default /etc)"
+     FORCE
+   )
+ endif()
diff --git a/games-server/pvpgn/metadata.xml b/games-server/pvpgn/metadata.xml
index a7406f387a17..c8348c402eb4 100644
--- a/games-server/pvpgn/metadata.xml
+++ b/games-server/pvpgn/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">pvpgn/pvpgn-server</remote-id>
 		<remote-id type="sourceforge">pvpgn.berlios</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-server/pvpgn/pvpgn-1.8.5-r2.ebuild b/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
index 67ba4ceed177..8d587fde8934 100644
--- a/games-server/pvpgn/pvpgn-1.8.5-r2.ebuild
+++ b/games-server/pvpgn/pvpgn-1.8.5-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch games
+EAPI=7
+
+inherit toolchain-funcs
 
 SUPPORTP="${PN}-support-1.3"
 DESCRIPTION="A gaming server for Battle.Net compatible clients"
@@ -15,19 +16,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="mysql postgres"
 
-DEPEND="mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql[server] )"
-RDEPEND=${DEPEND}
+DEPEND="
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:*[server] )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/pvpgn
+	acct-group/pvpgn
+"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fhs.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-fhs.patch
+)
 
 src_configure() {
-	cd src
-	# everything in GAMES_BINDIR (bug #63071)
-	egamesconf \
-		--sbindir="${GAMES_BINDIR}" \
+	cd src || die
+
+	tc-export CC
+	# Was: "everything in GAMES_BINDIR (bug #63071)"
+	# Not anymore.
+	econf \
+		--sbindir="/usr/bin" \
 		$(use_with mysql) \
 		$(use_with postgres pgsql)
 }
@@ -45,43 +55,43 @@ src_install() {
 
 	emake -C src DESTDIR="${D}" install
 
-	insinto "${GAMES_DATADIR}/${PN}"
+	insinto /usr/share/${PN}
 	doins "${WORKDIR}/${SUPPORTP}/"*
 
-	# GAMES_USER_DED here instead of GAMES_USER (bug #65423)
+	# Was: "GAMES_USER_DED here instead of GAMES_USER (bug #65423)"
 	for f in bnetd d2cs d2dbs ; do
 		newinitd "${FILESDIR}/${PN}.rc" ${f}
+
 		sed -i \
 				-e "s:NAME:${f}:g" \
-				-e "s:GAMES_BINDIR:${GAMES_BINDIR}:g" \
-				-e "s:GAMES_USER:${GAMES_USER_DED}:g" \
-				-e "s:GAMES_GROUP:${GAMES_GROUP}:g" \
-				"${D}/etc/games/${PN}/${f}.conf" \
+				-e "s:GAMES_BINDIR:/usr/bin:g" \
+				-e "s:GAMES_USER:pvpgn:g" \
+				-e "s:GAMES_GROUP:pvpgn:g" \
+				"${D}/etc/${PN}/${f}.conf" \
 				"${D}/etc/init.d/${f}" || die
 	done
 
-	keepdir $(find "${D}${GAMES_STATEDIR}"/${PN} -type d -printf "${GAMES_STATEDIR}/${PN}/%P ") "${GAMES_STATEDIR}"/${PN}/log
-	prepgamesdirs
+	keepdir $(find "${ED}/var/lib"/${PN} -type d -printf "/var/lib/${PN}/%P ") /var/lib/${PN}/log
 
-	chown -R ${GAMES_USER_DED}:${GAMES_GROUP} "${D}${GAMES_STATEDIR}/${PN}"
-	fperms 0775 "${GAMES_STATEDIR}/${PN}/log"
-	fperms 0770 "${GAMES_STATEDIR}/${PN}"
+	chown -R pvpgn:pvpgn "${ED}/var/lib/${PN}" || die
+	fperms 0775 "/var/lib/${PN}/log"
+	fperms 0770 "/var/lib/${PN}"
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-
 	elog "If this is a first installation you need to configure the package by"
-	elog "editing the configuration files provided in ${GAMES_SYSCONFDIR}/${PN}"
+	elog "editing the configuration files provided in /etc/${PN}"
 	elog "Also you should read the documentation in /usr/share/docs/${PF}"
 	elog
 	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
 	elog "and update your configuration accordingly."
+
 	if use mysql ; then
 		elog
 		elog "You have enabled MySQL storage support. You will need to edit"
 		elog "bnetd.conf to use it. Read README.storage from the docs directory."
 	fi
+
 	if use postgres ; then
 		elog
 		elog "You have enabled PostgreSQL storage support. You will need to edit"
diff --git a/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild b/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild
new file mode 100644
index 000000000000..cb12d0eddd4a
--- /dev/null
+++ b/games-server/pvpgn/pvpgn-1.99.7.2.1-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+SUPPORTP="${PN}-support-1.3"
+DESCRIPTION="A gaming server for Battle.Net compatible clients"
+HOMEPAGE="https://pvpgn.pro"
+SRC_URI="https://github.com/pvpgn/pvpgn-server/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-server-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql odbc postgres sqlite"
+
+DEPEND="
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( dev-db/libiodbc )
+	postgres? ( dev-db/postgresql:*[server] )
+	sqlite? ( dev-db/sqlite )
+"
+RDEPEND="
+	${DEPEND}
+	acct-user/pvpgn
+	acct-group/pvpgn
+"
+
+PATCHES=(
+	#"${FILESDIR}"/${PN}-1.8.5-fhs.patch
+	"${FILESDIR}"/${PN}-1.99.7.2.1-path.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e 's/-O3 -march=native -mtune=native//' \
+		-e 's/-stdlib=libc++//' \
+		CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	tc-export CC
+
+	local mycmakeargs=(
+		-DWITH_MYSQL=$(usex mysql)
+		-DWITH_ODBC=$(usex odbc)
+		-DWITH_PGSQL=$(usex postgres)
+		-DWITH_SQLITE3=$(usex sqlite)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local f
+
+	cmake_src_install
+
+	dolib.so "${BUILD_DIR}"/src/compat/libcompat.so
+	dolib.so "${BUILD_DIR}"/src/common/libcommon.so
+
+	# Was: "GAMES_USER_DED here instead of GAMES_USER (bug #65423)"
+	for f in bnetd d2cs d2dbs ; do
+		newinitd "${FILESDIR}/${PN}.rc" ${f}
+
+		sed -i \
+				-e "s:NAME:${f}:g" \
+				-e "s:GAMES_BINDIR:/usr/bin:g" \
+				-e "s:GAMES_USER:pvpgn:g" \
+				-e "s:GAMES_GROUP:pvpgn:g" \
+				"${ED}/etc/${PN}/${f}.conf" \
+				"${ED}/etc/init.d/${f}" || die
+	done
+
+	keepdir $(find "${ED}/var/lib"/${PN} -type d -printf "/var/lib/${PN}/%P ") /var/lib/${PN}/log
+
+	keepdir /var/pvpgn/{bnmail,chanlogs,charinfo,charsave,clans,ladders}
+	keepdir /var/pvpgn/{reports,status,teams,userlogs,users,userscdb}
+	keepdir /var/pvpgn/bak/char{info,save}
+
+	chown -R pvpgn:pvpgn "${ED}/var/lib/${PN}" || die
+	fperms 0775 "/var/lib/${PN}/log"
+	fperms 0770 "/var/lib/${PN}"
+}
+
+pkg_postinst() {
+	elog "If this is a first installation you need to configure the package by"
+	elog "editing the configuration files provided in /etc/${PN}"
+	elog "Also you should read the documentation in /usr/share/docs/${PF}"
+	elog
+	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
+	elog "and update your configuration accordingly."
+
+	if use mysql ; then
+		elog
+		elog "You have enabled MySQL storage support. You will need to edit"
+		elog "bnetd.conf to use it. Read README.storage from the docs directory."
+	fi
+
+	if use postgres ; then
+		elog
+		elog "You have enabled PostgreSQL storage support. You will need to edit"
+		elog "bnetd.conf to use it. Read README.storage from the docs directory."
+	fi
+}
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index 637691f217da..b1bb46537305 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -3,5 +3,5 @@ AUX ut2004-ded.initd 320 BLAKE2B 34e3fdf38eb9e5bc2623581c73fea3af040f9dca829c8c4
 DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
 DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
 DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-ded-3369.3-r2.ebuild 2621 BLAKE2B 1debe5247e9525470387330ed7ab93b007bcd6d2c261509762e588884653005e25bd64b9b72422f4a0e15d0d32946cfd504b28b7b1f45df5e38f340af008d1e8 SHA512 7536c3840a685fa0aeeb95b53ea47d32cc735697f1a6e8f3b995edebae06f5ccee0e43da980c791da1925191fbc1d8a65afa1437bec85468f1745d41a4809486
+EBUILD ut2004-ded-3369.3-r2.ebuild 2644 BLAKE2B d37232ef03a437e498946166ef59298278ae27dd25d882349d2ee2cf5ae0ef45154032b02da1e7ab8b4aaff2ba311039cd9b5add7514637cdfc520590585584b SHA512 f7c341ec050c3fa3f3885fba3d3df72895bcd2ede75161506d30eb26fcff61552f29bab382137b775e04bed46c955353425a7ff489b56e0503177b908c6d0fcf
 MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
index 2f6413ad120a..c46e1f1ae9b5 100644
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r2.ebuild
+++ b/games-server/ut2004-ded/ut2004-ded-3369.3-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=7
 
-inherit check-reqs eutils
+inherit check-reqs wrapper
 
 BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
 PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
@@ -24,13 +24,13 @@ BDEPEND="
 	app-arch/p7zip
 	app-arch/unzip
 "
-
 RDEPEND="
 	!games-fps/ut2004
 	!games-fps/ut2004-data
 	games-fps/ut2004-bonuspack-ece
 	games-fps/ut2004-bonuspack-mega
 	sys-libs/glibc
+	sys-libs/libstdc++-v3
 "
 
 CHECKREQS_DISK_BUILD="2G"