commit: 699f16e5fd9737cd381ca5781dfb1e22e268786c Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 27 10:10:07 2023 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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
