gentoo resync : 06.04.2022

8 files changed, 7 insertions, 118 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 35d6bec46f3e..3d38358978a9 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 106e3ef794da..06f92925ba36 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,7 +1,5 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
-AUX bedrock-server.initd-r2 2026 BLAKE2B ed212537e0a0d1a5e714aa0f4e72915ba3142580a1c1e46f9f88d06b8d8176de0bd5ab5134e915537583d20e4e3dbfba9e10ab1281bd84b8361f6ca01d1eab81 SHA512 8a6ab7277604cdc4677fde5d745e0c02a557538a4d73adc44873f49a01715eb878b48a56e51b6019aa814325543b509f8403cf351570d1b35ef1e07e98828c9c
+AUX bedrock-server.initd-r3 2026 BLAKE2B dcc17638e3c6bcb62a3a88e975fe379efe17241e72c78718562216c7ab9321cf421035310b1afa90636645579b6143b36d20b99e56f05c6962c598febb9521d8 SHA512 f72902c0ca653a5867dca55e521d5229a58ececf50479eb0e46c3c10c3ed8bd4c9330416c88f4523988bda0191fcbe6eedf881ffabb97e625f9854190defc964
 DIST bedrock-server-1.18.12.01.zip 67706215 BLAKE2B 8047a014d01fef4e5e438ecfe5886b154fe424599d72e6c3405c8a7663df883e250e20ffa46e0eb6e9df5e867d22e5e193a0e389049cd67d355873cb0e68a798 SHA512 fe0bade92143759b4d0eccd4586a15b62083d95606cd62a7fb1fe5ec1a36496512a4414493c210f09c42b8c117db760236861913bbf6d17bc024cdfb83e5d1e2
-DIST bedrock-server-1.18.2.03.zip 63042052 BLAKE2B e996c8a49b9c25a77127097f5c9b23339b0eeaae26dc0b011bdb38a6627408eb805ffed070df68c147646a78c8a00f9b0121cea958b7e4ab23300f66ff034713 SHA512 353e525ad8db31616925f5e0947240542019bd2e9b3337c4f83329c4c530fad81754c53daf9e5c9b23cadbddafe7d84b887e5b682dec00a77e82aa34b4bd2f43
-EBUILD bedrock-server-1.18.12.01.ebuild 1087 BLAKE2B 1386388dcd74cf88ab3982ff30846b1e3fad3819703ed963c8e745aaf1a69abca41b666652938848ad80f82c5de5bb5f13a52ecfe1b5f93e21b2efd294bc150d SHA512 5dd60a6db85655b92eb56f6cbe3eba391ad742e87c1be26886a774aef2378466bdd1c8bf5aff101db065ef39684642164976be05cb31566bd4e89e234b2e292a
-EBUILD bedrock-server-1.18.2.03.ebuild 1106 BLAKE2B 822c69b602af4e9a4cde85ec38b4d72f37d0b098f028c57ea98ae526bc39f90113222fc9b822d8a6be6253f72c76b7660404fccf1d3ce0f23a4e18a15a5ef668 SHA512 c9931f05dff80337f5a17e0d8f47cb8a0b87dcc64f86b6e4c71b4cb04cd89234fd3ffa8b532b0815c066b6cdc769040ef2c6ac2372e86b6f8c78660d16b8a361
+EBUILD bedrock-server-1.18.12.01-r1.ebuild 1086 BLAKE2B bd0561324ddf88b42a8a537671467a1e1302fcdbfb70fb247b163fc9e8070e122ff66ada43fa27b859e7f1e1bcd0ee1eb13f5cbe386d96311b4ea13504966f98 SHA512 42d8b65f10853230dd748e5578f837fb0a00e30c93e0ccf44790a2da3583b684056ddc5aa497c83a62c730d23b70f04f24e740246fc630678274488d24f3a33c
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
index 27a0e1aed100..13bf440c68d3 100644
--- a/games-server/bedrock-server/bedrock-server-1.18.12.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.18.12.01-r1.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
@@ -46,7 +46,7 @@ src_install() {
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
 
-	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
+	newinitd "${FILESDIR}"/bedrock-server.initd-r3 bedrock-server
 	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
 
 	einstalldocs
diff --git a/games-server/bedrock-server/bedrock-server-1.18.2.03.ebuild b/games-server/bedrock-server/bedrock-server-1.18.2.03.ebuild
deleted file mode 100644
index 89c88c8498f8..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.18.2.03.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	net-misc/curl[ssl]
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {permissions,whitelist}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r2 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/files/bedrock-server.initd-r2 b/games-server/bedrock-server/files/bedrock-server.initd-r3
index 1ff60aa7816f..6c2e7cb5e9f9 100644
--- a/games-server/bedrock-server/files/bedrock-server.initd-r2
+++ b/games-server/bedrock-server/files/bedrock-server.initd-r3
@@ -33,7 +33,7 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${bedrock_path}" "${bedrock_path_instance}"
 
-	local bedrock_configs=( "permissions.json" "server.properties" "whitelist.json" )
+	local bedrock_configs=( "allowlist.json" "permissions.json" "server.properties" )
 	for bedrock_config in ${bedrock_configs[@]}; do
 		if [ ! -f "${bedrock_path_instance}/${bedrock_config}" ]; then
 			cp "${bedrock_path_data}/${bedrock_config}" "${bedrock_path_instance}"
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index f86949e4b106..3c49bd3c3235 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -3,8 +3,6 @@ AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-DIST minecraft-server-1.18.1.jar 46324407 BLAKE2B bc974116c00692910955fab6fff2f21f4363c575b28e03af5e7750d98d8f0b9ed52123ac7fffbb0739c775f22190ace2ea7ebe916e1b4deafca82278c4f6a5af SHA512 cb306772c06e88b70475961ec1f057a9edfcef8db334479ec5c28e8b07287b3209bc54d83f7da7e8c63a8581e7ddbb93109acbf491ff74806b27486368640e71
 DIST minecraft-server-1.18.2.jar 46592587 BLAKE2B 1a6a1092fad0133a23a91e1db8d8057d418f52c23d04bcbe8e3578582bffe7d8c0e653c8893b78978fed05b2fc7b5f99643c35cae2c427d9ca76ff19aa6f8b58 SHA512 efc804cdce8b616126f1e0bb0bc43538571da85cd8cf25e8b0c9d787be6b2149319801389a90841b5450b029c248dda89de5d8295e93d0b58004d519c09b91a8
-EBUILD minecraft-server-1.18.1.ebuild 1166 BLAKE2B d90365eb2d6ffa30d0a435f639d5dad54b6fdb977500883d49ea2676e1651b06e4f160b607f491c6813a07a4b89bcbffcd5bba0e6097938fa0d87458e54d2e46 SHA512 af3ea5b92a5d1149df1947bf90285c732219ef4877cc2a38c79844ad3597851270e629cd39b2cd7a0b07161a93837acf7faf50167b09ab6cafc504cf84e65296
-EBUILD minecraft-server-1.18.2.ebuild 1167 BLAKE2B 3b321c206661819f1197251e8ac8071607aa6643bc7df5440bc835576b4b0baceea782955e8cfb70ee9cffabee7b88ecfedf761b92d18ed15727e1bc1d8bec3b SHA512 ae100ffb84d2a767f9a219333b0a8decc547070892725a8f70f6c6b40003ebe37aebf79ac531ba64fa1347d73ee656368c68c1d829b396a9b04f37aa0a1f2b8e
+EBUILD minecraft-server-1.18.2.ebuild 1166 BLAKE2B 9a69f43036617189db0ab7881ed5f82f0ce2e768eb98c8046c77ec7a2072660448d2619c97c73593ec0c83336496a24dc6c5999f8fe795c450f5410040bf6034 SHA512 9df16a90467c80e062a297db2151d749a1629f93923582a0fe24bf24fb4eaeb4ed1b4e43c2bda29d85c6de0a0f63c30b15e221b32592bf47c5c40c8e91975444
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild b/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
deleted file mode 100644
index 9bf1afc8e306..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="125e5adf40c659fd3bce3e66e67a16bb49ecc1b9"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2 systemd
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		dev-java/openjdk:17
-		dev-java/openjdk-bin:17
-	)
-"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	newbin "${FILESDIR}"/minecraft-server-bin minecraft-server
-
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r5 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild b/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
index 9eef37665ed4..3bd55f345cc8 100644
--- a/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.18.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="