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

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

commit:     0e4906ebebdcdd8c6f9f896d6585203c54c83615
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Mar 25 13:41:12 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Mar 25 13:41:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e4906eb

games-action/minecraft-launcher: use the java-utils eclass

it makes the whole thing a bit nicer

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

 .../minecraft-launcher/minecraft-launcher-1.6.93.ebuild     | 13 ++++---------
 .../minecraft-launcher/minecraft-launcher-2.1.13086.ebuild  |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

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 177ea0e..c455de1 100644
--- a/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg
+inherit desktop java-pkg-2 xdg
 
 DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks"
 HOMEPAGE="https://www.minecraft.net"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="Mojang"
 SLOT="1"
 
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 RDEPEND="virtual/jre:1.8"
 
@@ -26,13 +26,8 @@ src_unpack() {
 }
 
 src_install() {
-	dodir /opt/${PN}
-	insinto /opt/${PN}/
-	newins "${DISTDIR}/${P}.jar" ${PN}.jar
-
-	insinto /opt/bin/
-	doins "${FILESDIR}/${PN}-legacy"
-	fperms +x /opt/bin/${PN}-legacy
+	java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}-legacy.jar
+	java-pkg_dolauncher ${PN}-legacy --jar ${P}-legacy.jar --java_args "\${JAVA_OPTS}"
 
 	doicon -s scalable "${DISTDIR}/${PN}-legacy.svg"
 	make_desktop_entry ${PN}-legacy "Minecraft (legacy)" ${PN}-legacy Game

diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild
index b9d69ad..22ed07e 100644
--- a/games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild
+++ b/games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="Mojang"
 SLOT="2"
 
-RESTRICT="mirror"
+RESTRICT="bindist mirror"
 
 RDEPEND="gnome-base/gconf
 	sys-apps/dbus