From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 919DB138350 for ; Wed, 25 Mar 2020 14:11:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 420DEE0C08; Wed, 25 Mar 2020 14:11:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 267CAE0C08 for ; Wed, 25 Mar 2020 14:11:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED03F34F6BB for ; Wed, 25 Mar 2020 14:11:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 935C4150 for ; Wed, 25 Mar 2020 14:11:36 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1585143672.0e4906ebebdcdd8c6f9f896d6585203c54c83615.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-action/minecraft-launcher/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild X-VCS-Directories: games-action/minecraft-launcher/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0e4906ebebdcdd8c6f9f896d6585203c54c83615 X-VCS-Branch: dev Date: Wed, 25 Mar 2020 14:11:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9453f5c-8e3a-4bf5-92ef-13ae779e1485 X-Archives-Hash: 7f301483046d9650dc9a60034cdafa2e commit: 0e4906ebebdcdd8c6f9f896d6585203c54c83615 Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Mar 25 13:41:12 2020 +0000 Commit: Andrew Ammerlaan riseup 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 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11ECA138350 for ; Wed, 25 Mar 2020 14:17:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51159E0A49; Wed, 25 Mar 2020 14:17:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B375E0A49 for ; Wed, 25 Mar 2020 14:17:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B1DA34F6D8 for ; Wed, 25 Mar 2020 14:17:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 190FE1AE for ; Wed, 25 Mar 2020 14:17:02 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1585143672.0e4906ebebdcdd8c6f9f896d6585203c54c83615.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-action/minecraft-launcher/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-action/minecraft-launcher/minecraft-launcher-1.6.93.ebuild games-action/minecraft-launcher/minecraft-launcher-2.1.13086.ebuild X-VCS-Directories: games-action/minecraft-launcher/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 0e4906ebebdcdd8c6f9f896d6585203c54c83615 X-VCS-Branch: master Date: Wed, 25 Mar 2020 14:17:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69c3c0bd-72bb-44b0-8530-8ae115d362d7 X-Archives-Hash: 20e238d9640a0397dbaaddce052d3125 Message-ID: <20200325141702.3WtTzHZ6SqD-nkHlmiZNpt58T16VFH-aWDbPTy1fSK8@z> commit: 0e4906ebebdcdd8c6f9f896d6585203c54c83615 Author: Andrew Ammerlaan riseup net> AuthorDate: Wed Mar 25 13:41:12 2020 +0000 Commit: Andrew Ammerlaan riseup 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 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