gentoo resync : 31.05.2021

7 files changed, 107 insertions, 3 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index eb5da2ccc5dd..a1981db3889b 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
new file mode 100644
index 000000000000..70d8c8c95e8c
--- /dev/null
+++ b/games-action/minecraft-launcher/Manifest
@@ -0,0 +1,6 @@
+DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
+DIST minecraft-launcher-928.tar.gz 547096 BLAKE2B 8a47c62b5aa313a476cb6fb95e2993f609d3d1adde67802f3ef95df6385938dca424a3037ddb3303615323d10d0cd395807182ac75bae839502f13eb3faf2287 SHA512 57deacc588e8d90c90259841045a3df3b2b4861cb2d95b38e417daa34eee6aad4eebb601c2160627d5d5cd34f309aed854fb78872379cecfc8b976f3e14c8f91
+DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
+EBUILD minecraft-launcher-1.6.93.ebuild 917 BLAKE2B 2d9bdc8209022a0bf140dd38cc0c7afbe063596d9d62f17207f37fce79d3ac8ebf5b30ddec9f7f98695bfe8376d5ba9e21b9522b26e8b19647d30e11c1c55e99 SHA512 c219bdc9fa912a9ddf30da207dd9fcdd998a0c16fe93d88a759298a5541693246fd8ebfd6a34c52d5a88b98b84abc1ec1ff2e53284888579c192ed8ff41f03dc
+EBUILD minecraft-launcher-928.ebuild 1171 BLAKE2B 3d2a83aa30e65692f8c9d091462aa416577c70dc6ada53bb02a5a85420a3f5d65d44e0fa58acf43568883b96e4f9567b5de197505923ea309f1f56b06085b3bf SHA512 fc5809d1f10b44663ba416a2aa1cc6ec60a450a366cbf175c2dca969df753ab2a40e9f1157f201da6ae38bd49857bbba0fbe977d03a66f5b1fa4568fbcd888a9
+MISC metadata.xml 258 BLAKE2B cd6fd4c07f3e7f2e0f007951caac5ebe7d7ccf088d769ce2cd6e38172134c2f898145c77fa9d1efb9288e08b23a189be8dd87708400cbd8e5f926c54a17d756d SHA512 d6e8fa223415d98a85a3be244ce19417ffa534e92ddceab73aa0f6c7c4d329c80db74c918121ff274e7f86e9f26246584a688aefe0e3e6142ca84d20572b127b
diff --git a/games-action/minecraft-launcher/metadata.xml b/games-action/minecraft-launcher/metadata.xml
new file mode 100644
index 000000000000..2878794054cd
--- /dev/null
+++ b/games-action/minecraft-launcher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
new file mode 100644
index 000000000000..5a590a02ca45
--- /dev/null
+++ b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 xdg
+
+DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/v1/objects/eabbff5ff8e21250e33670924a0c5e38f47c840b/launcher.jar -> ${P}.jar
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
+
+KEYWORDS="~amd64"
+LICENSE="Mojang"
+SLOT="legacy"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# do not unpack jar file
+	true
+}
+
+src_install() {
+	java-pkg_newjar "${DISTDIR}/${P}.jar" ${PN}-legacy.jar
+	java-pkg_dolauncher ${PN}-legacy --jar ${PN}-legacy.jar --java_args "\${JAVA_OPTS}"
+
+	newicon -s scalable "${DISTDIR}/${PN}.svg" "${PN}-legacy.svg"
+	make_desktop_entry ${PN}-legacy "Minecraft (legacy)" ${PN}-legacy Game
+}
diff --git a/games-action/minecraft-launcher/minecraft-launcher-928.ebuild b/games-action/minecraft-launcher/minecraft-launcher-928.ebuild
new file mode 100644
index 000000000000..847536eabe27
--- /dev/null
+++ b/games-action/minecraft-launcher/minecraft-launcher-928.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV}.tar.gz -> ${P}.tar.gz
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
+
+KEYWORDS="-* ~amd64"
+LICENSE="Mojang"
+SLOT="0"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	>=x11-libs/gtk+-2.24.32-r1[X(+)]
+	dev-libs/nss
+	dev-libs/libbsd
+	dev-libs/libffi
+	dev-libs/libpcre
+	media-libs/alsa-lib
+	media-libs/openal
+	net-libs/gnutls[idn]
+	net-print/cups
+	sys-apps/dbus
+	virtual/jre:1.8
+	virtual/opengl
+	x11-apps/xrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+"
+
+S="${WORKDIR}/${PN}"
+
+QA_PREBUILT="
+	/usr/bin/minecraft-launcher
+"
+
+src_install() {
+	dobin minecraft-launcher
+
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} "Minecraft" ${PN} Game
+}
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 29991d8f0ca3..607e9bf44c8f 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -6,5 +6,5 @@ AUX minetestserver.logrotate 71 BLAKE2B 9189610adc6e78be5249163e3daa02ebcb73822b
 AUX minetestserver_default.service 371 BLAKE2B a52989d01e7df20facac1796079e38d2145e72eb43868f19ba7ea573cf025d4aea346f7ddfc5e7001d70c6d43609d877be5af95956cc344df2b5c7e318bf07f1 SHA512 dbca1a2cc4b615310ff179f4fb803e05d856e04d8316c9d30807d12788b41e8f1ef87f510ff2db0114237a8d0640c3af3d31cc77a2bd23395e247d86710606e9
 AUX minetestserver_template.service 353 BLAKE2B 8f4231481a23c1ef29523533955e373b50669d6a61a818fe5c36b29be54ec21669f6c0e17ea6675795eb2630be08dcb053ae1843789d615dddb1664ec96f6c55 SHA512 ff9584b709df5f8f6a8544954da7a6ef593ac0b8bad2352a459c6eb97c684104f47708952882bf6b7216b7636328a1ff533b97bbc08cd300f1a47d2af71ac895
 DIST minetest-5.4.1.tar.gz 11209289 BLAKE2B a8517309ee98c3991e7ce2d67bb8d14a5697a299b480835c79b1e3c7161ebc94f6245f36c09d88903c052fca1de52fe0253f055059c3d72745c724d117d9753a SHA512 8f9985c6a658c868ed8971f112eae3c71c2b1535fd433689920be6d42ac2c7eb8453d58ec2825573764ee2f56b651c5e27895b7fd58fada61fbaf4758fc69471
-EBUILD minetest-5.4.1-r1.ebuild 3368 BLAKE2B e5b5e84f77c57a313c4f5c8859e74efc340949cc0331374f4498d6b09d28ef878860344e9ae892305df45974a271039de6fa1dc038769dda8eccffa6557705d6 SHA512 e00070979c30c808ca760a40b8eb98d8a077f63b05d0aec68f010933e0c79ed9f753e67c52f0d79852ca6b55447617b1968a91a32235797c386f467a34e89c89
+EBUILD minetest-5.4.1-r1.ebuild 3407 BLAKE2B eb32bb2b08b146ebf6a11a03ce594c22f2d31f053a906cc7c45afe94b1e8e0310b87959e7f1c284ee256ab53a86240a707857b965014ee5eab8963e0eff4b50d SHA512 02666bedf7a541bb9d294d9ad41553617b13a9e691f3bfc32f709c5e12a26ab902c8475c7d3634c7e0fa0b3fb7757998f14a08fd88f53cc455ad835bdd2bd574
 MISC metadata.xml 2173 BLAKE2B acf6384d65075fd5a9ea29365777e29a450b19e7f10d0a97791c3a5b86c624987d027190b4f8d67edf458255cfd8242060829bd5cfb050e6d6f731373e20cc5c SHA512 02b71f33bc8ffecc62f8cac1e82c21bcaaf5c9369ed6dd8b7e99e5dbc9b77d613d2106677e1538789956646d7050b56cc40a2b5bde0117f66ac2319defb5f2b5
diff --git a/games-action/minetest/minetest-5.4.1-r1.ebuild b/games-action/minetest/minetest-5.4.1-r1.ebuild
index 401043e97758..a47aa21d3786 100644
--- a/games-action/minetest/minetest-5.4.1-r1.ebuild
+++ b/games-action/minetest/minetest-5.4.1-r1.ebuild
@@ -20,8 +20,8 @@ REQUIRED_USE="
 	|| ( client server )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	${LUA_DEPS}
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_impl_dep 'deprecated' lua5-1)
 	dev-db/sqlite:3
 	dev-libs/gmp:0=
 	dev-libs/jsoncpp:=