gentoo resync : 30.05.2020

3 files changed, 2 insertions, 52 deletions

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