diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2023-06-28 09:39:44 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2023-06-28 09:39:44 +0200 |
| commit | 94be03bcab139afc404b38681d13238fbef941ec (patch) | |
| tree | a2a378bd0d45c0c3c7df53ff156295bc2e3affa7 | |
| parent | gradle.eclass: add gradle-src_unpack (diff) | |
| download | java-94be03bcab139afc404b38681d13238fbef941ec.tar.gz java-94be03bcab139afc404b38681d13238fbef941ec.tar.bz2 java-94be03bcab139afc404b38681d13238fbef941ec.zip | |
dev-java/openjfx: use new gradle.eclass functions
Signed-off-by: Florian Schmaus <flow@gentoo.org>
| -rw-r--r-- | dev-java/openjfx/Manifest | 1 | ||||
| -rw-r--r-- | dev-java/openjfx/openjfx-11.0.11_p1.ebuild | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 65b8ba4f..924608fc 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -1,5 +1,6 @@ DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11 +DIST gradle-4.10.3-bin.zip 78422006 BLAKE2B f565e591751acb5b05c261b3d8dbc8e07f76b48c73516f6cb1b2846ebf0bbf38000b9a61790e9b3055bddd9f9846d61979d187f4a30c317a1de98546891d9d2d SHA512 fd3f4cfbd5262cc8514b7fb3e303ef46b9ca4b22901f1fe848ec4679f8d6bc283bde12ec584437624f0acf5486e5663966ad0736bf8ab341ac3e2667f514ceec DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678 DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60c57489017985448ddff46bc8c527b72e615e5f28d0301c28dc8119f0e6c75f4e8a711df3e6aaa418190b8ac8d1857 SHA512 41a85eafde03718efba7cf22598a430efbc6a6a68cf68058988f9eff648d19faa6cc4cf68293fe6e39783a7636eae571f27e04006f4607250dd9f6642184c61d diff --git a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild index 563a9b26..a9911159 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild @@ -5,6 +5,7 @@ EAPI=8 MY_PV="${PV/_p/+}" SLOT="${MY_PV%%[.+]*}" +EGRADLE_BUNDLED_VER="4.10.3" inherit flag-o-matic gradle java-pkg-2 multiprocessing @@ -21,16 +22,14 @@ SRC_URI=" https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar + $(gradle-src_uri) " LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" +KEYWORDS="-* ~amd64 ~ppc64" IUSE="cpu_flags_x86_sse2 debug doc source +media" -EGRADLE_EXACT_VER="4.10.3" -EGRADLE_PARALLEL=false - RDEPEND=" dev-java/swt:4.10[cairo,opengl] dev-libs/atk @@ -71,8 +70,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -BDEPEND="~dev-java/gradle-bin-${EGRADLE_EXACT_VER}" - REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" PATCHES=( @@ -88,6 +85,9 @@ PATCHES=( S="${WORKDIR}/rt-${MY_PV}" +# Fails to build if gradle is invoked with --parallel. +EGRADLE_PARALLEL=false + pkg_setup() { JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" @@ -129,6 +129,7 @@ pkg_setup() { src_unpack() { unpack "${P}.tar.bz2" + gradle-src_unpack mkdir "${T}/jars" || die |