diff options
Diffstat (limited to 'dev-java/openjfx')
| -rw-r--r-- | dev-java/openjfx/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/openjfx/openjfx-8.1000-r1.ebuild (renamed from dev-java/openjfx/openjfx-8.1000.ebuild) | 22 |
2 files changed, 10 insertions, 14 deletions
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index be35f93c3df8..8242855ff0df 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -39,5 +39,5 @@ DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 EBUILD openjfx-11.0.11_p1-r1.ebuild 6602 BLAKE2B abd5e2d7757b5ada08f8e5998e64c8cd1e2ca5d92cf41d5e8d17b4385d31359d1147fc77586d32825ae3fc58cf898078b461143bc2e2c8f2721cb28d49617ad6 SHA512 7fd2faea34f8e99ff83baf57eaf15ef95c1d7556bbd354c85dfeac3e3563b4b04ddfcd7a444e8aaf8241541dc7831276fda3d19f92c5a2a356c964de04796b59 EBUILD openjfx-11.0.9_p0-r1.ebuild 6568 BLAKE2B 42d0eb52bc6844bff3215597ff061e2baacf497261b37559f1a824b12a247c2cd3583888dff6a9165c4cf21564b64a505842ba84972759ef6ed0b99df89bc4b3 SHA512 73a4a8a453825a28b72f0e05861d7c8b0f0f66ccf459e1fd3f49f470231850a2baa0851c25f0826d3c7883b5dfb3916cdd7e211845607fe1fdcc6af568666cf8 -EBUILD openjfx-8.1000.ebuild 5601 BLAKE2B f943ebac3cf75b02648e4337506e141043d9eeb0eb4832c797db9af23345526b5fc9fffad5efb332a0954a359ca7fe60220c5037a60770e8784e5c3c9700e915 SHA512 9282f56a829d76c483eaa897a2d4f6bcee8e808bb811971829f3f94f781b8a0dbe3079ba731b9ec162ad3d5466b78724c13f323dd8beeea9d88eda80a78d2d56 +EBUILD openjfx-8.1000-r1.ebuild 5583 BLAKE2B 14e6cfe9ecf3d0a8d80593a7ef99b5f4fe0122270dd94fc4e01d868ddc2b6879b071fcd85f16a82af4efde828858bc2e8de8986639fc218e475a1a8186ed2167 SHA512 47ee853dc65f892c087ace044ff40d0d13b133fcfc3129835c8a710ac90eb903bbba523ea60b71e6d0c4e8cb8751d9c5e3b0fa674d595658baed469a26c68600 MISC metadata.xml 679 BLAKE2B 6197810f33cab61e844a41acb183754f4034020116507ae07db6ab81cf91e9088a4359b6c37d85de9130d835ad12f33da597f514248d6abe000ab2f5a1127627 SHA512 81e44c868178fb48e8182bc7b4eae21abd43ac561f0d819617d8fb1b5ed69d2cc02c2b97790ac957a3c9c07083c3ad93744294b52b971955a521596eb2421b0b diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/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 |