[gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
Date: Sun,  1 Oct 2023 14:57:56 +0000 (UTC)	[thread overview]
Message-ID: <1696172108.6859fa44af0156c0f8ed43a3b40a585c15f3de3e.ulm@gentoo> (raw)

commit:     6859fa44af0156c0f8ed43a3b40a585c15f3de3e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  1 14:55:08 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 14:55:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6859fa44

dev-java/openjfx: Fix query functions in EAPI 8

Closes: https://bugs.gentoo.org/915019
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild | 15 ++++++---------
 dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild  | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
index 3263c68c1c08..34f91df33673 100644
--- a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
@@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 "
 
+S="${WORKDIR}/rt-${MY_PV}"
+
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="-* ~amd64 ~ppc64"
-
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -68,8 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
 PATCHES=(
 	"${FILESDIR}"/11/disable-buildSrc-tests.patch
 	"${FILESDIR}"/11/glibc-compatibility.patch
@@ -82,8 +82,6 @@ PATCHES=(
 	"${FILESDIR}"/11/ffmpeg5.patch
 )
 
-S="${WORKDIR}/rt-${MY_PV}"
-
 egradle() {
 	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
 	local gradle="${GRADLE_HOME}/bin/gradle"
@@ -128,14 +126,13 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version -b dev-java/openjdk:${SLOT}; then
 		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 		export JDK_HOME="${JAVA_HOME}"
 		export ANT_RESPECT_JAVA_HOME=true
-
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -183,7 +180,7 @@ src_configure() {
 	# build is very sensetive to doc presense, take extra steps
 	if use doc; then
 		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+		if has_version -b dev-java/openjdk:${SLOT}[doc]; then
 			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"

diff --git a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
index 7fca74112cfd..0f4c3e85b629 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
@@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 "
 
+S="${WORKDIR}/rt-${MY_PV}"
+
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="-* ~amd64 ~ppc64"
-
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -68,8 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
 PATCHES=(
 	"${FILESDIR}"/11/disable-buildSrc-tests.patch
 	"${FILESDIR}"/11/glibc-compatibility.patch
@@ -82,8 +82,6 @@ PATCHES=(
 	"${FILESDIR}/11/${PV}-version.patch"
 )
 
-S="${WORKDIR}/rt-${MY_PV}"
-
 egradle() {
 	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
 	local gradle="${GRADLE_HOME}/bin/gradle"
@@ -128,14 +126,13 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version -b dev-java/openjdk:${SLOT}; then
 		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 		export JDK_HOME="${JAVA_HOME}"
 		export ANT_RESPECT_JAVA_HOME=true
-
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -183,7 +180,7 @@ src_configure() {
 	# build is very sensetive to doc presense, take extra steps
 	if use doc; then
 		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+		if has_version -b dev-java/openjdk:${SLOT}[doc]; then
 			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"

next             reply	other threads:[~2023-10-01 14:57 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-01 14:57 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-18 11:05 [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/ Miroslav Šulc
2024-03-11 17:00 Sam James
2024-02-08  9:23 Miroslav Šulc
2023-09-27 10:10 Ulrich Müller
2023-09-27  7:11 Ulrich Müller
2021-11-18  4:42 Georgy Yakovlev
2021-08-05 15:00 Benda XU
2021-05-30  7:41 Georgy Yakovlev
2020-09-20  1:15 Georgy Yakovlev
2020-09-19  8:34 Georgy Yakovlev
2020-08-30 22:59 Georgy Yakovlev
2020-08-30 22:59 Georgy Yakovlev
2020-07-28 19:36 Aaron Bauman
2020-07-14 22:13 Georgy Yakovlev
2020-04-29 21:05 Georgy Yakovlev
2020-04-29 21:05 Georgy Yakovlev
2020-03-18 21:37 Georgy Yakovlev
2020-03-17 19:36 Georgy Yakovlev
2020-03-17  1:02 Georgy Yakovlev
2020-03-17  1:02 Georgy Yakovlev
2020-01-28  9:03 Georgy Yakovlev
2020-01-28  9:02 Georgy Yakovlev
2020-01-22  1:34 Georgy Yakovlev
2020-01-22  1:15 Georgy Yakovlev
2020-01-22  0:23 Georgy Yakovlev
2019-06-01 21:45 Georgy Yakovlev
2019-06-01 11:42 Georgy Yakovlev

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3263c68c1c0 dfblob:34f91df3367 dfblob:7fca74112cf
dfblob:0f4c3e85b62 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1696172108.6859fa44af0156c0f8ed43a3b40a585c15f3de3e.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox