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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81F6C1581F3 for ; Mon, 25 Nov 2024 07:57:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CDA7E08F0; Mon, 25 Nov 2024 07:57:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F344E08F0 for ; Mon, 25 Nov 2024 07:57:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3330A335D77 for ; Mon, 25 Nov 2024 07:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFF6512D4 for ; Mon, 25 Nov 2024 07:56:59 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1732521353.8998e9cd25f7eba6d4e1198f7942be5b885a4836.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-visualization/gcalc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild X-VCS-Directories: sci-visualization/gcalc/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 8998e9cd25f7eba6d4e1198f7942be5b885a4836 X-VCS-Branch: master Date: Mon, 25 Nov 2024 07:56:59 +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: 348eaf6f-ca62-43c2-b5d8-24f9d44dedc8 X-Archives-Hash: 08397e1031a7fd703ed744ebb4621524 commit: 8998e9cd25f7eba6d4e1198f7942be5b885a4836 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Nov 7 17:14:08 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Nov 25 07:55:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8998e9cd sci-visualization/gcalc: style update, update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/39233/commits/5fe47fd0f9be63794fc52a4875262833da20f49c Signed-off-by: Miroslav Šulc gentoo.org> ...c-3.1_rc1-r2.ebuild => gcalc-3.1_rc1-r3.ebuild} | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild similarity index 56% rename from sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild rename to sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild index f5a27970376f..825f3b99f106 100644 --- a/sci-visualization/gcalc/gcalc-3.1_rc1-r2.ebuild +++ b/sci-visualization/gcalc/gcalc-3.1_rc1-r3.ebuild @@ -1,38 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop java-pkg-2 java-pkg-simple MY_P="GCalc-${PV/_/-}" DESCRIPTION="Java Mathematical Graphing System" -HOMEPAGE="http://gcalc.net/" -SRC_URI="http://gcalc.net/files/${MY_P}.tar.gz" +HOMEPAGE="https://gcalc.net/" +SRC_URI="https://gcalc.net/files/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" -KEYWORDS="~amd64" SLOT="0" +KEYWORDS="~amd64" -RDEPEND=">=virtual/jre-1.8:*" DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -S="${WORKDIR}/${MY_P}" +JAVA_MAIN_CLASS="net.gcalc.calc.GCalc" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" src_prepare() { + java-pkg-2_src_prepare java-pkg_clean - default -} - -src_compile() { - java-pkg-simple_src_compile - java-pkg_addres ${PN}.jar src ! -name "*.html" + mkdir res || die + mv {src,res}/resources || die + cp {src,res}/pluginlist.xml || die } src_install() { java-pkg-simple_src_install - java-pkg_dolauncher gcalc --main net.gcalc.calc.GCalc - - newicon src/resources/gicon.png ${PN}.png + newicon res/resources/gicon.png ${PN}.png make_desktop_entry ${PN} "GCalc Java Mathematical Graphing System" }