gentoo resync : 30.05.2020

7 files changed, 4 insertions, 108 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index c5d2222bef30..50795feacfd9 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 fc362048eea5..71a3aec2fb1a 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,6 +1,4 @@
 AUX bedrock-server.initd-r1 1558 BLAKE2B 5d65fe612092777002e9e4b0b62041aa1637e6c6aaaebb64c1be956cfa7ceb355afb337c4d84ef6e66c25167a3544c9bb0791843cb2bf98aca7c712eef02e143 SHA512 fa2c99461650d99ad45e63d7b2166431882e6fb5a73795a468a837a46a3ab47ce641ce0aee8e4ca220f25422af128746f24125da6a3fbb35829f27c1bd397c23
-DIST bedrock-server-1.14.1.4.zip 49395245 BLAKE2B 987de7d8e009dedb87e01b14e81ba857dd374f7d6621d3f13e137d7a51ad763d952452a1f8d34ff943add8ae3df8c7aff7fc5fe315d2ee29986fe967926a3969 SHA512 765d31aa3fd75c3e654ae65e5888ef3fc094fb12a49d9f0d5b0d94c58dfb508884218288dd4bb1cbda007305bff969219d6d438db4d9732295590678561bfcc3
 DIST bedrock-server-1.14.60.5.zip 288044278 BLAKE2B 11fa18f892b95eac8fa2108adce6af14b213f4a409c82d4a59b9cf17ce2d8921f1ef1d6e74cc53757f5453daa84298c36230884f15e56408b74e3a70ca50b74b SHA512 d295f7090fb26c87d8259cd5e7581699d59292425362139035929548e27055e78c3a8c64b02f99c3da24d8edf8657f3ca656253c7979d30b1495ebf6000b9308
-EBUILD bedrock-server-1.14.1.4.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
-EBUILD bedrock-server-1.14.60.5.ebuild 1059 BLAKE2B 3fbbf9ffd6f069b71d48bf9e85509e44464b1367a32b6acae96089b7deb09883db297a567efb00f5d6ab8de9a573f4b7ee21f63e745bdf74676759bebf8a9d6b SHA512 7cdd954f368fb288383f8e256dcabb000f18046fe5d627c166bc7d95fbd8f142089d02d1edc9b30ad2c3d7e73f282375df48f164c3846d8905784b04bc6a5ac3
+EBUILD bedrock-server-1.14.60.5.ebuild 1058 BLAKE2B aa58efb9b838a7f9c1f0659d0687fd985fc210ade149b0f64f89f3da19e6ea248cf98e7b9b9cfad6d1345ee4032ef8db67d962d95981c366a5a7c8c04da8fc77 SHA512 4eebb8ac43662595706b80d06d0844ec083f44478554073e4843b548eeddebf11ce890d66f160b0b205a2f1c2d20e76ef9f7627d8dc397594816619cd49122df
 MISC metadata.xml 675 BLAKE2B 3ec51700c778a9fc9aaf65c9d1a3eac6f55a7db55a24a63c6c1e3890a0e84ab0cf85eadb9b6044529841d87570a47e8674dfe94405587ee2a54f496aedbde374 SHA512 4c1236b575d84e2cb657477c446b0a09e150e19db654acc24ff5fa9e6ad5953c5b14901192845714476c8a3c894e6a32f570c17aedd68e244bd4d93d13fd92b5
diff --git a/games-server/bedrock-server/bedrock-server-1.14.1.4.ebuild b/games-server/bedrock-server/bedrock-server-1.14.1.4.ebuild
deleted file mode 100644
index ceeced788eae..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.14.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 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"
-
-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]
-"
-
-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
-"
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server libCrypto.so
-
-	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-r1 bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild b/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild
index c7229a9f1d2e..ceeced788eae 100644
--- a/games-server/bedrock-server/bedrock-server-1.14.60.5.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.14.60.5.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/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index c665695def99..9af9e6c8c251 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 602 BLAKE2B 53d39bd63283a570b0de64481de26a4eb481b84f00619f34fceb7b2293c837ea6dc0aa057da45450c2157c65164d8b567d84df1abc96b570225c0bd756f4f601 SHA512 16100671cdb2885aec89f725d1061eb17090a7df2fdc4fb9717012f119c975e026d42a68fd721ec6fd6947af11fd2712af807eaa34a28a31e6d9ee980d93ff60
 AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
 AUX minecraft-server.initd-r3 1542 BLAKE2B c0c3a173b0f5b30bbe75c753ccd6759264298782bae8b268caa8936d4e293df1aaa7453a086c97bd5336fa9537565ddacd96b8ab3b7ecf35265476e4b5e665ba SHA512 ff6d6ed5cfae16e6db25664c4476b5335b566248b05dd92e6761aa6023aabf1191d43c5730fc3ac8242e7035887b7ab5114ea45910991a805a2c27b8b5a80077
-DIST minecraft-server-1.15.1.jar 36164938 BLAKE2B 21ee30c92b3060810fb766a54924b5273f44bfb906592770c101bed3f41cd65fc0cd05b9610fce805860f71088ccf89ac6cbf6a364eb8ca16047b39b8f0aa69f SHA512 4458daa6cd87b04ddbf0819dfc0538d24b8d08c529a94f1abff9b894d24ffb4eb3d0b23b8bfb088b2b6f43fb6f71d17700d9f80dab2ed56dc51c5bef329ba6bb
 DIST minecraft-server-1.15.2.jar 36175593 BLAKE2B f226a029a9ef2efea955fd44f915d5956fd24bb7c69d35bbbe132fcafc87cfcf023dbe834d9e973dafc25505b59d34b21ca6e36a0ad262316929f98807e47072 SHA512 21f5e77a58ac1e357425c99e259d3a688cf825483d391907403c7c9939abcf5b4a8fc73ff8d6277eaa373f376299027d6d7e0d8a5dd59d5791947efa1695490b
-EBUILD minecraft-server-1.15.1.ebuild 1046 BLAKE2B 1e3fa6e57e1ad4c2aa6c564b3ed666a7c92c75994f88d88c270f996961cc31211f415eea7f53dadefad2c60272635c323650a5aefd632428ce911dbb5abca363 SHA512 1251694e7b91506f3deab7714a835a953e6ee46e4c6a82ad2f0499c6dcdebe40b5d1a31ba1fcb5cae9d6fc04094cf1180252dbc47eebb30d74d6139a4e536244
-EBUILD minecraft-server-1.15.2.ebuild 1048 BLAKE2B 9b7a0cc83ad3c61acc29256bb6d6e687e5f74c479dad4fc47e3d9eaec63641545888eed57ccd2600dbef0a55ad5317c55c8662ea910e9bbc06971ecd831cac48 SHA512 55f167c37c0de0e1e9d0741a68eff50cd1d736e1a1b8cfb90a3c791b3ceb8d837aafa0a4d14e9fa22b841081d8a544b52e0332b712d9ca87e3cc3f5c2dd273e0
+EBUILD minecraft-server-1.15.2.ebuild 1046 BLAKE2B 0b693c1ad5f038b385343719a824ea4c9a7068905aba59dfbbcddc201c7ae1b7a6db2242aaeab4be972b4c138f405f62ea876d9d9f460cd5133bc642035f5323 SHA512 3287ed6a60b9b21fd993ad4a59c9f2217330385146c71002ebd451050d0ad6fab1a9cae1ca0885702dcf6ba937dd2c0c11712294dc6ac697fe4f6f327fb9d403
 MISC metadata.xml 495 BLAKE2B 9a4008401b01bce93293509fbba7d7f63eb1669f99cc0d2a372629230f7562f2f9357f952c148f27f9651d074270689cae19973b9c8ff255e8b3613122a8806c SHA512 00f1591c734e81e6289d086e1e9dde272d0548c512fef8b205a09d945dc1262d46a68014eb156c3ea2ff93eb052c2b3e28494fbf103a34220bf854a0df618e2b
diff --git a/games-server/minecraft-server/minecraft-server-1.15.1.ebuild b/games-server/minecraft-server/minecraft-server-1.15.1.ebuild
deleted file mode 100644
index 9737790a25e5..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.15.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="4d1826eebac84847c71a77f9349cc22afd0cf0a1"
-
-inherit readme.gentoo-r1 java-pkg-2
-
-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"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_install() {
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r3 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.15.2.ebuild b/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
index a5c1ec3b50c6..d846eba514fc 100644
--- a/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.15.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	acct-group/minecraft