From 0e4906ebebdcdd8c6f9f896d6585203c54c83615 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 25 Mar 2020 14:41:12 +0100 Subject: [PATCH 1/4] 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 --- .../minecraft-launcher-1.6.93.ebuild | 13 ++++--------- .../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 177ea0eea1..c455de1437 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 b9d69adeb7..22ed07e417 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 From a13ff032a52385cceadef60ff3c7296aef4718c9 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 25 Mar 2020 14:42:12 +0100 Subject: [PATCH 2/4] games-action/minecraft-launcher: remove unecesairy files dir Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan --- .../minecraft-launcher/files/minecraft-launcher-legacy | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 games-action/minecraft-launcher/files/minecraft-launcher-legacy diff --git a/games-action/minecraft-launcher/files/minecraft-launcher-legacy b/games-action/minecraft-launcher/files/minecraft-launcher-legacy deleted file mode 100644 index 9e4c96899b..0000000000 --- a/games-action/minecraft-launcher/files/minecraft-launcher-legacy +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -java -jar /opt/minecraft-launcher/minecraft-launcher.jar - - From b699f8c3242bede0793a1bccd0e5115080a30819 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 25 Mar 2020 14:48:16 +0100 Subject: [PATCH 3/4] games-action/technic-launcher: use java-pkg-2 eclass Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan --- .../technic-launcher/files/technic-launcher | 4 ---- .../technic-launcher/technic-launcher-4.510.ebuild | 13 ++++--------- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 games-action/technic-launcher/files/technic-launcher diff --git a/games-action/technic-launcher/files/technic-launcher b/games-action/technic-launcher/files/technic-launcher deleted file mode 100644 index 5d98fac3f4..0000000000 --- a/games-action/technic-launcher/files/technic-launcher +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -java -jar /opt/technic-launcher/technic-launcher.jar - diff --git a/games-action/technic-launcher/technic-launcher-4.510.ebuild b/games-action/technic-launcher/technic-launcher-4.510.ebuild index 1cf3fc772d..9ac25c3def 100644 --- a/games-action/technic-launcher/technic-launcher-4.510.ebuild +++ b/games-action/technic-launcher/technic-launcher-4.510.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop xdg +inherit desktop java-pkg-2 xdg DESCRIPTION="Minecraft launcher for community-made modpacks on the Technic Platform" HOMEPAGE="https://www.technicpack.net/" @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86" LICENSE="technic" SLOT="0" -RESTRICT="mirror" +RESTRICT="bindist mirror" BDEPEND="media-gfx/imagemagick" @@ -32,13 +32,8 @@ src_compile() { } src_install() { - dodir /opt/${PN} - insinto /opt/${PN}/ - newins "${DISTDIR}/${P}.jar" ${PN}.jar - - insinto /opt/bin/ - doins "${FILESDIR}/${PN}" - fperms +x /opt/bin/${PN} + java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}.jar + java-pkg_dolauncher ${PN} --jar ${P}.jar --java_args "\${JAVA_OPTS}" newicon -s 16x16 ${PN}-0.png ${PN}.png newicon -s 32x32 ${PN}-1.png ${PN}.png From 90f68e556c38e1d98703c85c82ac0d53e2268959 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 25 Mar 2020 15:08:24 +0100 Subject: [PATCH 4/4] games-action/ATLauncher: use java-pkg-2 eclass Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan --- games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild | 10 ++++------ games-action/ATLauncher/files/ATLauncher | 7 ++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild index 63800d4592..7d89298be0 100644 --- a/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild +++ b/games-action/ATLauncher/ATLauncher-3.3.4.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop xdg +inherit desktop java-pkg-2 xdg DESCRIPTION="Minecraft launcher which integrates multiple different ModPacks" HOMEPAGE="https://atlauncher.com @@ -31,13 +31,11 @@ src_compile() { } src_install() { - dodir /opt/${PN} - insinto /opt/${PN}/ - newins "${DISTDIR}/${P}.jar" ${PN}.jar + java-pkg_newjar "${DISTDIR}/${P}.jar" ${P}.jar - insinto /opt/bin/ + insinto /usr/bin/ doins "${FILESDIR}/${PN}" - fperms +x /opt/bin/${PN} + fperms +x /usr/bin/${PN} newicon -s 256x256 ${PN}-0.png ${PN}.png newicon -s 128x128 ${PN}-1.png ${PN}.png diff --git a/games-action/ATLauncher/files/ATLauncher b/games-action/ATLauncher/files/ATLauncher index 4b6ed4c627..234d8ed474 100755 --- a/games-action/ATLauncher/files/ATLauncher +++ b/games-action/ATLauncher/files/ATLauncher @@ -2,9 +2,6 @@ # we need to execute this in a user writeable directory -if [ ! -f ${HOME}/ATLauncher/ATLauncher.jar ]; then - mkdir -p ${HOME}/.local/share/ATLauncher - cp /opt/ATLauncher/ATLauncher.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar -fi - +mkdir -p ${HOME}/.local/share/ATLauncher +cp /usr/share/ATLauncher/lib/ATLauncher-*.jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar java -jar ${HOME}/.local/share/ATLauncher/ATLauncher.jar