gentoo resync : 03.11.2018

6 files changed, 6 insertions, 105 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 60ec9467f5ca..1e3c6847d9a0 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/steamcmd/Manifest b/games-server/steamcmd/Manifest
index 4511064751b1..1d1045a20f13 100644
--- a/games-server/steamcmd/Manifest
+++ b/games-server/steamcmd/Manifest
@@ -1,9 +1,6 @@
 AUX README.gentoo 1420 BLAKE2B 470f3a40acf5eb150c583697a5dc2b80b6a8d1814b8c4e2c74757479e24540c5f38297b27096e8edd57b685fa0458f5175d75e34d08bd2acf45f4d7aa2c12fa8 SHA512 103ebd60a5e8c9bce0ba742ed945734d19330f5567e738317a0d8e37b2625b852c6606678487c8aa27937c7cd25a05680a7d165cc8f33a0044a993d801e5a65d
-AUX steamcmd.confd 570 BLAKE2B fc2fb283a9cfa8786d46c7c5820decdb6c939912bb09d5d7619f229d44994c191e97c869a79a04f9579f90f7496d38e5a026eb20377b01c39dc388dcca3633ed SHA512 223cc5890669911047ee30d97551004d3023c423d5566bf70393f6601c60b8300ccd5049bd5149b2d629dbb35861a331d43aaabc2d10c945aab4327e9435366a
 AUX steamcmd.confd-r1 576 BLAKE2B 6e944d2a707c1428a73dccd51abbd07732d622707aad00ccad79e796c313fcbdb4b7f484b82a05774c08c403526a09ae7387da4b2b744f4ec8fbd79062d6c0d0 SHA512 73fe7f4be500628e89f9905263b032e86c7e2792971ddc5f6d27b911f9c3a13601fb2d3dcd5a3a6dd4926d04c14fd6b3b297e55343ce5f5c2372e69c315df3f0
-AUX steamcmd.initd 814 BLAKE2B bdf07f0a14751d7d94d65e567f741f73388277dd7a2d084e1ad696f23e1f1081188ec6008c06a078a0850c7a096a0a5a6566d455cad7d333b8a27c334f0e1d4d SHA512 591302e570e01de27684e6abef8e89716b211b48e3993bef323e17b351f07834435acf4abfae7fedc44669ab002847657794db2aada65385b1d8fb347b6d633d
 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 1184 BLAKE2B 063de0320b9f6a43778387d46cad2c6aca33197d0f7557a8041ebfa7cf3c7e904074e45505ec690f30063f33d65c8e20889eb9542f8f0c1f2a126f96095daa05 SHA512 d3c690bae5b5244325a75a1c380cf3adfc1300e885d72ef600d0898dd2cd3ab836741b89e5a9d224e07678461cb204f4711a3e88b1b07def5e01e68eba6c863c
-EBUILD steamcmd-1.0.ebuild 1176 BLAKE2B b3523614535721626b77a03189b3f20a23b1f9ee1fc57956d807b01a58739ddd0ae572287457b9b331dc390129db1ea47951c07792250ebf7e017963de3f4a2c SHA512 3e07ad7ae9e51dbaa52443ac781fd51a5a2c30247b684945758ec3437085056a6e2ec7c267dd66d85fcee9f043c860d6825d0b61bb4ff541845758794c9d4b3a
+EBUILD steamcmd-1.0-r1.ebuild 1184 BLAKE2B 48d58f0e326555dba66313c8e39047455aa0a2073804fcdfb67e178c75783560307be6755ba46f11a9f28ca79e4f18332fef15312fa5d5e29b1b3a6f0df5db05 SHA512 a561c9dd0f9213ec4ee61a9312576a58fc49576731a0385315106a6722454dc53fb25d82ec83efddf1e68f188ff69fa8d4024b9b9fc4a6b82bfd666530784892
 MISC metadata.xml 754 BLAKE2B 0e5610ae928ebb8324f903b6a4429e53c503f604400f09cf40faf721c9187536e1b9412dcbbfa5b79d44ac6f2efa2bc87ba7dc5f54ccf87388691c287ab7478c SHA512 eac3fb10da1a2b27986c75465b5e7ff7e2c74ca09b396053715d9e403ad6bb190eb7747c65dee54b6555e4ae8a014574a26bd7eb10a047e00ee733a90b3b217a
diff --git a/games-server/steamcmd/files/steamcmd.confd b/games-server/steamcmd/files/steamcmd.confd
deleted file mode 100644
index dcaf8036b88a..000000000000
--- a/games-server/steamcmd/files/steamcmd.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Specifies, which server binary is used.
-# This could be 'hlds_run' or 'srcds_run', depending on your game.
-STEAMCMD_BINARY="hlds_run"
-
-# Path to the files of your started server.
-# It's recommended to use:
-# '/opt/steamcmd/hlds' for older HL1 based mods.
-# '/opt/steamcmd/srcds' for newer HL2 based mods.
-STEAMCMD_PATH="/opt/steamcmd/hlds"
-
-# Options for your server binary.
-STEAMCMD_OPTS="-game valve +ip 127.0.0.1 +maxplayers 32 +map crossfire -pingboost 3"
diff --git a/games-server/steamcmd/files/steamcmd.initd b/games-server/steamcmd/files/steamcmd.initd
deleted file mode 100644
index fecd30e3079b..000000000000
--- a/games-server/steamcmd/files/steamcmd.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "steamcmd" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#steamcmd.}"
-fi
-
-name="SteamCMD (Mod: ${instance})"
-pidfile="/run/steamcmd.${instance}.pid"
-screen_name="steamcmd.${instance}"
-start_stop_daemon_args="--chdir ${STEAMCMD_PATH}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${STEAMCMD_PATH}/${STEAMCMD_BINARY} ${STEAMCMD_OPTS}"
-command_background="true"
-command_group="steamcmd"
-command_user="steamcmd"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -z "$STEAMCMD_BINARY" ] || [ -z "$STEAMCMD_PATH" ] || [ -z "$STEAMCMD_OPTS" ]; then
-		eerror "One or more STEAMCMD_* variables in /etc/conf.d/steamcmd.${SVCNAME} are not set!"
-		return 1
-	fi
-	return 0
-}
diff --git a/games-server/steamcmd/steamcmd-1.0-r1.ebuild b/games-server/steamcmd/steamcmd-1.0-r1.ebuild
index 15a46975d104..8cb70bf6e5e0 100644
--- a/games-server/steamcmd/steamcmd-1.0-r1.ebuild
+++ b/games-server/steamcmd/steamcmd-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,8 +19,10 @@ RESTRICT="bindist mirror"
 
 S="${WORKDIR}"
 
-QA_PREBUILT="opt/steamcmd/linux32/libstdc++.so.6
-	opt/steamcmd/linux32/steamcmd"
+QA_PREBUILT="
+	opt/steamcmd/linux32/libstdc++.so.6
+	opt/steamcmd/linux32/steamcmd
+"
 
 pkg_setup() {
 	enewgroup steamcmd
diff --git a/games-server/steamcmd/steamcmd-1.0.ebuild b/games-server/steamcmd/steamcmd-1.0.ebuild
deleted file mode 100644
index 0d2067a30692..000000000000
--- a/games-server/steamcmd/steamcmd-1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="app-misc/screen"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/steamcmd/linux32/libstdc++.so.6
-	opt/steamcmd/linux32/steamcmd"
-
-pkg_setup() {
-	enewgroup steamcmd
-	enewuser steamcmd -1 -1 /opt/steamcmd 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 steamcmd
-	newconfd "${FILESDIR}"/steamcmd.confd steamcmd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}