[gentoo-commits] repo/proj/guru:dev commit in: games-action/minecraft-launcher/

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     e841fb030cd6e516dd40809df088ca47d13a19bc
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Mar 12 10:15:21 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Mar 12 10:15:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e841fb03

games-action/minecraft-launcher: version bump

also fixed the matching checksum while at it

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 games-action/minecraft-launcher/Manifest           |  4 +-
 .../minecraft-launcher-1.6.93.ebuild               | 10 ++--
 .../minecraft-launcher-2.2.2012_beta.ebuild        | 64 ----------------------
 ...2.1867.ebuild => minecraft-launcher-915.ebuild} | 14 +----
 4 files changed, 9 insertions(+), 83 deletions(-)

diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest
index 7544d123..bec33b55 100644
--- a/games-action/minecraft-launcher/Manifest
+++ b/games-action/minecraft-launcher/Manifest
@@ -1,5 +1,3 @@
 DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125
-DIST minecraft-launcher-2.2.1867.tar.gz 76767905 BLAKE2B 62af6c11a8ea483cb87b59022ffbfd1d6972aabb4323509452a486afc9de81008872f74d53ea039b1b8ce5adbc9f13bba1937236598f529556ced2d29442f063 SHA512 1a252aab832c5e3fae13a462c22c44fdb0a5727465f643616201ee60ce3810fa9ea3ab59aabfa5a8d0b10976672e8187df9275f3f23d1c42021b8cd5336ec00e
-DIST minecraft-launcher-2.2.2012_beta.tar.gz 76656331 BLAKE2B 318c23b665b5442108e56bca08f4d6401778666f103af7e1fd884466a3ccc32f04736b1e935488e31c028972c111eb8b84b3a18d54a92a4c8ca6200957dfee3f SHA512 2c22a698ce124bb81d82c24a749cf40e333de2b776087378aa21817d4c5f1b71796fea307a50db8e2f3fb692ee79a148b7b241e8fee9b3aa2ab98dbd6e1b8c07
-DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a
+DIST minecraft-launcher-915.tar.gz 1322800 BLAKE2B f239afc82705b840413b9e07a0f48b00f74ff601e106d166cc4d522477c077fd9ecbdabf83b902367be9e622155467fa37bb749f68d0d08407f2a052b04f838b SHA512 2eda76a65852317aa926a6113eea478892370cea79c1778bb3b4d20aee2a6ab9b2bb09510ed51c7c42013f50f27f091c00f919c21a8ff5765429c41d7ef96681
 DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a

diff --git a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
index 1aaef014..8e27c33a 100644
--- a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,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 -> ${PN}-legacy.svg"
+	https://launcher.mojang.com/download/minecraft-launcher.svg"
 
 KEYWORDS="~amd64 ~x86"
 LICENSE="Mojang"
@@ -26,9 +26,9 @@ src_unpack() {
 }
 
 src_install() {
-	java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}-legacy.jar
-	java-pkg_dolauncher ${PN}-legacy --jar ${P}-legacy.jar --java_args "\${JAVA_OPTS}"
+	java-pkg_newjar "${DISTDIR}/${P}.jar" ${PN}-legacy.jar
+	java-pkg_dolauncher ${PN}-legacy --jar ${PN}-legacy.jar --java_args "\${JAVA_OPTS}"
 
-	doicon -s scalable "${DISTDIR}/${PN}-legacy.svg"
+	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-2.2.2012_beta.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.2012_beta.ebuild
deleted file mode 100644
index edd29b65..00000000
--- a/games-action/minecraft-launcher/minecraft-launcher-2.2.2012_beta.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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//_beta}.tar.gz -> ${P}.tar.gz
-	https://launcher.mojang.com/download/minecraft-launcher.svg"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="Mojang"
-SLOT="2"
-
-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_PRESTRIPPED="
-	/opt/minecraft-launcher/libcef.so
-	/opt/minecraft-launcher/liblauncher.so
-	/opt/minecraft-launcher/minecraft-launcher
-"
-
-src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/
-	doins -r .
-
-	fperms +x /opt/${PN}/${PN}
-
-	dosym ../${PN}/${PN} /opt/bin/${PN}
-
-	doicon -s scalable "${DISTDIR}/${PN}.svg"
-	make_desktop_entry ${PN} "Minecraft" ${PN} Game
-}

diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.2.1867.ebuild b/games-action/minecraft-launcher/minecraft-launcher-915.ebuild
similarity index 81%
rename from games-action/minecraft-launcher/minecraft-launcher-2.2.1867.ebuild
rename to games-action/minecraft-launcher/minecraft-launcher-915.ebuild
index de19830d..5074c57c 100644
--- a/games-action/minecraft-launcher/minecraft-launcher-2.2.1867.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-915.ebuild
@@ -44,20 +44,12 @@ RDEPEND="
 
 S="${WORKDIR}/${PN}"
 
-QA_PRESTRIPPED="
-	/opt/minecraft-launcher/libcef.so
-	/opt/minecraft-launcher/liblauncher.so
-	/opt/minecraft-launcher/minecraft-launcher
+QA_PREBUILT="
+	/usr/bin/minecraft-launcher
 "
 
 src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/
-	doins -r .
-
-	fperms +x /opt/${PN}/${PN}
-
-	dosym ../${PN}/${PN} /opt/bin/${PN}
+	dobin minecraft-launcher
 
 	doicon -s scalable "${DISTDIR}/${PN}.svg"
 	make_desktop_entry ${PN} "Minecraft" ${PN} Game