gentoo resync : 13.10.2019

6 files changed, 55 insertions, 61 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index fce27edb74a0..0f4629a1abc6 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 5a4a14e7c0fb..f8afbe212363 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-r2 1376 BLAKE2B 70dd8c49bee705e4e64ead008125af4b021ec205067c86a74fb197e66762fbd064672ef19d334ad3ad2486094bdaff74b1367b39c885a38f487f8d17aee40850 SHA512 1034cd5219f1cd1d9360138ab4fb1142f682db68abe66ae0e5bab3190b6606ec1976488420fa940b7467e7989c987e4520813b93bd86918cc1ed6f0a9b319fa9
-DIST minecraft-server-1.13.2.jar 33835116 BLAKE2B 4d92068d51555ab44a2efcdbb1676ef34a7085e4d666a7915c4c5a3d1f9502536df4bf67909d27b7b94cb8ebb483dc55f935f21930d4bc454645ed44ef8e6ed8 SHA512 c9a98f1d224519369d6c4882cfe93a94983661c0c0b8a7f0b2f271af752fde5693025b684a01665992b3c70b37ac891ce1747f062bd86354777c416219629b64
 DIST minecraft-server-1.14.4.jar 35958734 BLAKE2B 058d6609296394e4714a159976d4de0261a552a919e33db1e54d97e3d2ee90cd4356b60190b807050d3c7ab336149d1c9be55093ba002735ccc6a162706c6ee3 SHA512 b3d2852c6fa1b996bbf2fa9fc1fb860c6bca5136bcc5ddd3d236d85789c6bce81620f6b2d69eaa10c41d020fe0bb54de2fa601b3df3093af2691853a4445e1f8
-EBUILD minecraft-server-1.13.2.ebuild 1254 BLAKE2B e2b1de1726d0feb631623706437182fd52a680a2ff870d64b3ebd5e11c6ed9c9b5a88a3f747e0bd2358251b809c8e5025d1e1103c0222dfd70ff130cea3c9470 SHA512 a5fe566c74db03e98b25540de201cc600fe61bb6683b4e405083693db35f4984d162b3760580703a6cc43063c58a749aba189dd86c3d22f7216c474b3f77ce76
-EBUILD minecraft-server-1.14.4.ebuild 1233 BLAKE2B 79c878a9192e904e548273b910f5a18136902f7a442d098facaf3ac1ef2930394bf77bd4e9dab5a8df9828228e59b98cb34ffbfb44f0b0a7da7417de485b3f82 SHA512 08140b91537eeeed043ada970d2f93c5b22dcad61317dd60a9b06c39ddeffbebb948c6bcdba96b08edc9072ae2b5805ca337f095747d9747718ae41f850789df
+EBUILD minecraft-server-1.14.4.ebuild 1232 BLAKE2B 77d810e9c3c3ed136b6c8438f4370f9988c740a04cb36bd23ff0117ad84acbc3c586ff2f2393846e619669b1610e05ba76f473a045a30cdc737f6675653ae7e8 SHA512 6e85b30f8f36ca74407bea33698b1a8f8423f86dde0a6a2b36786695eddf0d5db2e9f9d042c6341aaa42a1cd2c988c995654998e9fe6356d6e9cd041de8d940e
 MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
diff --git a/games-server/minecraft-server/minecraft-server-1.13.2.ebuild b/games-server/minecraft-server/minecraft-server-1.13.2.ebuild
deleted file mode 100644
index f0d47cfb7a47..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.13.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PV="3737db93722a9e39eeada7c27e7aca28b144ffa7"
-
-inherit readme.gentoo-r1 java-pkg-2 user
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${MY_PV}/server.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-misc/screen
-	>=virtual/jre-1.8
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup minecraft
-	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
-	# Don't unpack that jar, just copy it to WORKDIR
-	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_compile() {
-	:;
-}
-
-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-r2 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-	diropts -o minecraft -g minecraft
-	keepdir /var/lib/minecraft-server
-	keepdir /var/log/minecraft-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild b/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
index 3aab33531e67..cfddb597af26 100644
--- a/games-server/minecraft-server/minecraft-server-1.14.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.14.4.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
diff --git a/games-server/steamcmd/Manifest b/games-server/steamcmd/Manifest
index 5cfc796bb2b1..6d8f3659c50b 100644
--- a/games-server/steamcmd/Manifest
+++ b/games-server/steamcmd/Manifest
@@ -3,4 +3,5 @@ AUX steamcmd.confd-r1 576 BLAKE2B 6e944d2a707c1428a73dccd51abbd07732d622707aad00
 AUX steamcmd.initd-r1 791 BLAKE2B 9ba1002a7faed781bd24f1e0534ec09ba0036b1fc97be3ba4a57aadc764c50573059b5c4cbe60808ddaa7e3cf808a5c8b43ec2bc25a0fd3039d41fa902962725 SHA512 56f8fa87d3cfc0de635fb95516b0e8e6c471155e3f397b8ab40e877ce770ff3aabc2846156f98de9ba8810e71f18a3fb202f9c098efaa1b97ecdca11ff689bbe
 DIST steamcmd-1.0.tar.gz 2428561 BLAKE2B c51dbb8c7731222eb748508b8a84a4cbda55168c85116078074bd0da85018a344ca088b7af41a07a96c15e64d0aeb28fb90cd85d99f444e9425f5a326c1823fe SHA512 b37debfa45e5578cc065924770258a026adad339aae86da1a66e71ac4ee80d2ddbca9060ca4c734affd2c6902635e7b32e2b3efe11bb600969654b3abeb3839e
 EBUILD steamcmd-1.0-r1.ebuild 1182 BLAKE2B b6d110366c58552af2346ebdd73419e3ba969f22235309ddd90a7561c9a5b904707a0e8d1153694687bab4fe8f20cd77c0f21d45930e79ac1fd1aa609657a42e SHA512 fbd52e3548789fad51642ea0b7059bf130daa1c7009b773053aeac7c8fd7eafa2c273078ac992303da41f082b8fc38a32eb23fe480e528b4b019ced00ff4e7a2
+EBUILD steamcmd-1.0-r2.ebuild 1141 BLAKE2B aaae600f9a1b5eed4d9e854154eb67ce1fee129d5588a8d02bb2429fca2000cef1fc72db5a945acee4370e3f886f634351a3ef1fcc54b7d4c42b1657c631896f SHA512 334d68b9a17e3ea2ea2de7cf3ac43e912a4c37926d8cca31ef23760c5e360d757a0f92f8b24cbb1c1c496f17faf1a3ab6b2aaad0da0b44e44944c643ee85c246
 MISC metadata.xml 754 BLAKE2B 0e5610ae928ebb8324f903b6a4429e53c503f604400f09cf40faf721c9187536e1b9412dcbbfa5b79d44ac6f2efa2bc87ba7dc5f54ccf87388691c287ab7478c SHA512 eac3fb10da1a2b27986c75465b5e7ff7e2c74ca09b396053715d9e403ad6bb190eb7747c65dee54b6555e4ae8a014574a26bd7eb10a047e00ee733a90b3b217a
diff --git a/games-server/steamcmd/steamcmd-1.0-r2.ebuild b/games-server/steamcmd/steamcmd-1.0-r2.ebuild
new file mode 100644
index 000000000000..3b5b42805394
--- /dev/null
+++ b/games-server/steamcmd/steamcmd-1.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1 user
+
+DESCRIPTION="This is the command-line version of the Steam client for dedicated servers"
+HOMEPAGE="https://developer.valvesoftware.com/wiki/SteamCMD"
+SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ Steam"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	acct-group/steamcmd
+	acct-user/steamcmd
+	app-misc/screen
+"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/steamcmd/linux32/libstdc++.so.6
+	opt/steamcmd/linux32/steamcmd
+"
+
+src_install() {
+	diropts -o steamcmd -g steamcmd
+	dodir /opt/steamcmd
+	keepdir /opt/steamcmd/{.steam,.steam/sdk32,linux32}
+
+	exeopts -o steamcmd -g steamcmd
+	exeinto /opt/steamcmd
+	doexe steamcmd.sh
+
+	exeopts -o steamcmd -g steamcmd
+	exeinto /opt/steamcmd/linux32
+	doexe linux32/steamcmd linux32/libstdc++.so.6
+
+	newinitd "${FILESDIR}"/steamcmd.initd-r1 steamcmd
+	newconfd "${FILESDIR}"/steamcmd.confd-r1 steamcmd
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}