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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC3AB158089 for ; Wed, 27 Sep 2023 10:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34A9D2BC01E; Wed, 27 Sep 2023 10:10:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1C8432BC01E for ; Wed, 27 Sep 2023 10:10:20 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C81B335C87 for ; Wed, 27 Sep 2023 10:10:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A1B410AB for ; Wed, 27 Sep 2023 10:10:17 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1695809407.699f16e5fd9737cd381ca5781dfb1e22e268786c.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjfx/openjfx-8.1000-r1.ebuild dev-java/openjfx/openjfx-8.1000.ebuild X-VCS-Directories: dev-java/openjfx/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 699f16e5fd9737cd381ca5781dfb1e22e268786c X-VCS-Branch: master Date: Wed, 27 Sep 2023 10:10:17 +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: 98775f39-52a1-4de2-aeb3-2dd573ab11db X-Archives-Hash: d538f61b1e3625448e10d12aedc90fdc commit: 699f16e5fd9737cd381ca5781dfb1e22e268786c Author: Ulrich Müller gentoo org> AuthorDate: Wed Sep 27 10:10:07 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Wed Sep 27 10:10:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=699f16e5 dev-java/openjfx: Update to EAPI 8 Signed-off-by: Ulrich Müller gentoo.org> ...njfx-8.1000.ebuild => openjfx-8.1000-r1.ebuild} | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/dev-java/openjfx/openjfx-8.1000-r1.ebuild similarity index 95% rename from dev-java/openjfx/openjfx-8.1000.ebuild rename to dev-java/openjfx/openjfx-8.1000-r1.ebuild index 0864b67b0de4..66e046c74241 100644 --- a/dev-java/openjfx/openjfx-8.1000.ebuild +++ b/dev-java/openjfx/openjfx-8.1000-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 JAVA_PKG_IUSE="doc source" -inherit eapi7-ver flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs +inherit flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs EGRADLE_VER="4.10.3" EHG_COMMIT="9f49e3b6147f" @@ -15,14 +15,17 @@ HOMEPAGE="https://openjfx.io" SRC_URI=" https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2 - https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip + https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip " +# eclass overrides it, set back to normal +S="${WORKDIR}/${P}" LICENSE="GPL-2-with-classpath-exception" SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~ppc64" - IUSE="debug doc media cpu_flags_x86_sse2" +REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" +RESTRICT="test" # needs junit version we don't have, fragile DEPEND=" app-arch/unzip @@ -43,13 +46,6 @@ RDEPEND=" virtual/jre:1.8 " -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" - -RESTRICT="test" # needs junit version we don't have, fragile - -# eclass overrides it, set back to normal -S="${WORKDIR}/${P}" - # FIXME: majority of flags are honored, needs a bit more patching QA_FLAGS_IGNORED=".*" @@ -191,7 +187,7 @@ src_compile() { src_install() { local dest="/usr/$(get_libdir)/openjdk-${SLOT}" - local ddest="${ED%/}/${dest#/}" + local ddest="${ED}${dest}" dodir "${dest}" pushd build/export/sdk > /dev/null || die cp -pPRv * "${ddest}" || die