Merge updates from master

This commit is contained in:
Repository mirror & CI
2020-03-25 14:36:17 +00:00
7 changed files with 15 additions and 39 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,5 +0,0 @@
#!/usr/bin/env bash
java -jar /opt/minecraft-launcher/minecraft-launcher.jar

View File

@@ -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

View File

@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
LICENSE="Mojang"
SLOT="2"
RESTRICT="mirror"
RESTRICT="bindist mirror"
RDEPEND="gnome-base/gconf
sys-apps/dbus

View File

@@ -1,4 +0,0 @@
#!/usr/bin/env bash
java -jar /opt/technic-launcher/technic-launcher.jar

View File

@@ -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