gentoo resync : 02.02.2022

7 files changed, 3 insertions, 175 deletions

diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index e652dea54a82..e04b56eb22d4 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 ff585e6716ae..967753c96ab4 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,13 +1,8 @@
 AUX README.gentoo-r1 776 BLAKE2B 3c514a09e07524568c8cbe6045069b569005c7754bdff0f2e6087a7ef5e166298b80306cf67158d6a2dcd0548b95ef3a11db6c747bf23e8dcd28e81fb00c195f SHA512 b11193f9738aa513190e4735057e8e551c1028e02fc711bad9dcb2f64a412f85cfad0a833871edc78fef850e382c761c9bbdbdf4d1d1c1cfc45063f4d3690c1a
-AUX log4j2_112-116.xml 1131 BLAKE2B 11389ca933282c286a0deff547503b716415160168f9d997bacd391adf79a223ad95c7da48e54728625ab93cf993b481fab7893f5b3ef4f14d589ac607553708 SHA512 867968f6a1f6d5a79ab934f68166d7568c7a001c03a07d49a0e6c9a3b9a8370730ad2c8bcfdde8d6ae4e9e9f50643e3ca2b312faa0df6c2ed6f62d5820d8db80
 AUX minecraft-server-bin 427 BLAKE2B b02c5d3ee1256cc41b5e369cc0ed2f082e8045c1189b3f222688eb09aba6a677211c359b66c68a043f305ea84983937a4dcdeb0847f09a39bbaf96823ac573d5 SHA512 633b797d8476c75efaea7217870c2b51b54342614d5bdfb5f9f4c3f612ded6fe6627c1cc1cf02a3db1a798274ac26dfb3dc0733ff60381ecdbee5bec9e175922
 AUX minecraft-server.confd-r1 528 BLAKE2B 77155dc2d0878495419d141feeafcd34bb04a82859f7dbf3e637975b3c9ded4e034dbd7cc4c8b20eb7155a0621927e97f67d8a26890f90b5825512317ed3570c SHA512 caf5afe59b0efd57034585b255a3b3f4ca14f752f9961f4b438bb6bc0b7b096e8cb76883d1aa26a2b57725338808cb2961f86bc15293ed515b0dd3e61a18cf11
 AUX minecraft-server.initd-r5 2014 BLAKE2B f38e398a0772918349797c9ffa46ee6ac0a14bbd48cdfe61ba88c54785f290f6f4643498bec5aac8943f45b5e4cc9c1af4af99577284c87442d73b827e141ab7 SHA512 b49f615d823e35545797d21430f33674f1345a059279dcaccd2a4a91d63a4b90b278739827c6af2c57de083c440f84edce684d28d6eb04d5a8d1f7e5699ea658
-AUX minecraft-server.initd-r6 2202 BLAKE2B 0a09855b7a72292f8853500e780abf465f2df7a6c5070b7db238b0a5bde1b7ec85ce57ed65b7748fbe31dc212c1863b9df541762eb93a6ced24c6556a092a57d SHA512 a2459fb09748f516d3107ea71d127d4322597d00c9a642740fd42e03e1ade35e30635b0ae5c9fff7afbfbcadc1d69460a9f8c7d194d0333a6f27dc53a9c701c6
 AUX minecraft-server.service 530 BLAKE2B 37b68213b4f15199ef999aff45b0ff0b2b12c8485c75871fbd034b167c440640ad4542daaf73c99fa63152d7fcf086d26f7241622f186ed48a59fafce8f72671 SHA512 b33926d866ad73d108bf6cabb9981fc072ae899ac4284c7e3219a08f3d2cd01197f2325b7051b071cee6c238ea8f9fd37b3eba956367504079de1a2bc8b047de
-AUX minecraft-server.service-r1 631 BLAKE2B 1d8fefdbcaaeb2c4d1cc501c381e32277c624c4586079c2c6e2e2aeab1f325516c04b57752e71cc063d0956bb1048a6cbcf0c5d0576f6906ab4266af5122c778 SHA512 1967dc5cbe6abaa73f2b75156bc293517f3efc110fe4e551e0fbd34587db9ff4fd01a61d438882534ec067742b6f64796bbef9f9dac73235a6295bbde0eb543d
-DIST minecraft-server-1.16.5.jar 37962360 BLAKE2B 355715b809c09581e457f54618bd6ddab91b1c488d709d402fa6690d32244298d44191d439b8d9f27f4853f7e7658bfa2db88b61697a1caeb66da76ab211d9f8 SHA512 8321c50d788c6a3a3e8b2146bf1b20f6a3da87dd21ec4bd1fda0031d26f728d64e56a6a230ba5d857f4d500d7ba281eb4e3c28b6715f29d8dcba79d8c0ddf03f
 DIST minecraft-server-1.18.1.jar 46324407 BLAKE2B bc974116c00692910955fab6fff2f21f4363c575b28e03af5e7750d98d8f0b9ed52123ac7fffbb0739c775f22190ace2ea7ebe916e1b4deafca82278c4f6a5af SHA512 cb306772c06e88b70475961ec1f057a9edfcef8db334479ec5c28e8b07287b3209bc54d83f7da7e8c63a8581e7ddbb93109acbf491ff74806b27486368640e71
-EBUILD minecraft-server-1.16.5-r1.ebuild 1337 BLAKE2B 73a4cbbc7c224b273607680ea6c1fa297326cb030f72a3b7601639f48ae4b4bc3208d12a4901a03dfab5a8885515f61d765fbc4425f081e285bbe52172b029f3 SHA512 b609706869f29dc0372eff351a3217114d28d8aded258bebe88836ff89d8580b39d6172b084ef2fd834a312671749ad23a8fcc88a9d80354a7e5777bb691cb72
-EBUILD minecraft-server-1.18.1.ebuild 1167 BLAKE2B 58a69b9b93390273422ce9c164a9a511e433f3b946e6e7d443dfc41f0e1c5fe14d8aa3fd9b16130d32a5f57b021dded90432a722218f16c0a1326e7e20c6ba35 SHA512 28373f11e62a9209fd6379e01047183da769cce7df16ba3d856829177298da5c3843c4d1aa0b6a190f946d3552b8ed9c429a72f6d02572c9060dd84fd29e6aff
+EBUILD minecraft-server-1.18.1.ebuild 1166 BLAKE2B d90365eb2d6ffa30d0a435f639d5dad54b6fdb977500883d49ea2676e1651b06e4f160b607f491c6813a07a4b89bcbffcd5bba0e6097938fa0d87458e54d2e46 SHA512 af3ea5b92a5d1149df1947bf90285c732219ef4877cc2a38c79844ad3597851270e629cd39b2cd7a0b07161a93837acf7faf50167b09ab6cafc504cf84e65296
 MISC metadata.xml 935 BLAKE2B 7147903a9b3a7405889a8ef3282569aa953574339af51aa27d1deea266795546defd6ff89e93aee06c82f2b5bee34a8aa3a9756f4fdf2bac0ff5565a7165e17b SHA512 46d768d34f586b1e148657f108b4a852dd6708d340a53c5b6fedbfe4dc4770f44313510a04d58ccdb59b13257a7d30801c38c6fa94dcbb16e3d438179fd6b3d4
diff --git a/games-server/minecraft-server/files/log4j2_112-116.xml b/games-server/minecraft-server/files/log4j2_112-116.xml
deleted file mode 100644
index 569223572f64..000000000000
--- a/games-server/minecraft-server/files/log4j2_112-116.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Appenders>
-        <Console name="SysOut" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
-        </Console>
-        <Queue name="ServerGuiConsole">
-            <PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg{nolookups}%n" />
-        </Queue>
-        <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
-            <PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg{nolookups}%n" />
-            <Policies>
-                <TimeBasedTriggeringPolicy />
-                <OnStartupTriggeringPolicy />
-            </Policies>
-        </RollingRandomAccessFile>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <filters>
-                <MarkerFilter marker="NETWORK_PACKETS" onMatch="DENY" onMismatch="NEUTRAL" />
-            </filters>
-            <AppenderRef ref="SysOut"/>
-            <AppenderRef ref="File"/>
-            <AppenderRef ref="ServerGuiConsole"/>
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r6 b/games-server/minecraft-server/files/minecraft-server.initd-r6
deleted file mode 100644
index dc4ecc84a997..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd-r6
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-dtach_tmpfile="$(mktemp -u)"
-minecraft_command="/usr/bin/minecraft-server"
-minecraft_log4j="log4j2_112-116.xml"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_logs_instance="${minecraft_logs}/${instance}"
-minecraft_path="/var/lib/minecraft-server"
-minecraft_path_instance="${minecraft_path}/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-start_stop_daemon_args="--chdir ${minecraft_path_instance} --env JAVA_OPTS='${MINECRAFT_OPTS}'"
-
-description_attach="Attaches to the session (interactive console) of the Minecraft server"
-extra_started_commands="attach"
-
-command="/usr/bin/dtach"
-command_background="true"
-command_args="-N ${dtach_tmpfile} ${minecraft_command}"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}"
-
-	if [ ! -L "${minecraft_path_instance}/${minecraft_log4j}" ]; then
-		ln -s ../../../../usr/share/minecraft-server/"${minecraft_log4j}" "${minecraft_path_instance}"
-	fi
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt
-	echo "eula=true" > "${minecraft_path_instance}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}" "${minecraft_logs_instance}"
-
-	if [ ! -L "${minecraft_path_instance}"/logs ]; then
-		cd "${minecraft_path_instance}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z "${MINECRAFT_OPTS}" ]; then
-		eerror "You must define 'MINECRAFT_OPTS' in '/etc/conf.d/${SVCNAME}'!"
-		return 1
-	fi
-}
-
-attach() {
-	pidnumber="$(cat ${pidfile})"
-	dtach_tmpfile="$(cat /proc/${pidnumber}/cmdline | tr '\0' ' ' | awk '{print $3}')"
-
-	if [ -S "${dtach_tmpfile}" ]; then
-		eval "${command}" -a "${dtach_tmpfile}" "${DTACH_OPTS}"
-	else
-		eerror "The determined socket file for dtach could not be found!"
-		eerror "Did the process crash?"
-	fi
-}
diff --git a/games-server/minecraft-server/files/minecraft-server.service-r1 b/games-server/minecraft-server/files/minecraft-server.service-r1
deleted file mode 100644
index fac26368a043..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.service-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Minecraft Server (World: %I)
-After=network.target
-
-[Service]
-User=minecraft
-Group=minecraft
-WorkingDirectory=-/var/lib/minecraft-server/%I
-PIDFile=/run/minecraft-server.%I.pid
-ExecStartPre=!/bin/mkdir -p /var/lib/minecraft-server/%I
-ExecStartPre=!/bin/chown -R minecraft:minecraft /var/lib/minecraft-server/%I
-ExecStartPre=!/bin/ln -s /usr/share/minecraft-server/log4j2_112-116.xml /var/lib/minecraft-server/%I
-ExecStartPre=/bin/sh -c 'echo "eula=true" > /var/lib/minecraft-server/%I/eula.txt'
-ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /usr/bin/minecraft-server'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/games-server/minecraft-server/minecraft-server-1.16.5-r1.ebuild b/games-server/minecraft-server/minecraft-server-1.16.5-r1.ebuild
deleted file mode 100644
index d66a93f97015..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.16.5-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="1b557e7b033b583cd9f66746b7a9ab1ec1673ced"
-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 x86"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-src_unpack() {
-	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} -Dlog4j.configurationFile=log4j2_112-116.xml" --pkg_args nogui
-
-	insinto /usr/share/minecraft-server
-	doins "${FILESDIR}"/log4j2_112-116.xml
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r6 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-	systemd_newunit "${FILESDIR}"/minecraft-server.service-r1 minecraft-server@.service
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild b/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
index ef5ec5501504..9bf1afc8e306 100644
--- a/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 RESTRICT="bindist mirror"
 
 RDEPEND="