commit: 90f68e556c38e1d98703c85c82ac0d53e2268959 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Wed Mar 25 14:08:24 2020 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Wed Mar 25 14:08:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=90f68e55
games-action/ATLauncher: use java-pkg-2 eclass Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> 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 63800d4..7d89298 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 4b6ed4c..234d8ed 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
