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

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

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2019-06-01 11:42 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2019-06-01 11:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d9f430eba8d81a54b00da6250d2ab0da866337a1
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 11:40:59 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 11:42:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9f430eb

dev-java/openjfx: fix typo in description

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 24ca44ce797..b22021a3d61 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -9,7 +9,7 @@ EGRADLE_VER="4.8"
 
 inherit java-pkg-2 multiprocessing
 
-DESCRIPTION="Java OpenJFX 8 client application platform"
+DESCRIPTION="Java OpenJFX client application platform"
 HOMEPAGE="https://openjfx.io"
 
 SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2019-06-01 21:45 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2019-06-01 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     663da9667916dbb60bdbca097e1b559d6b39bfa9
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 21:43:02 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 21:44:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663da966

dev-java/openjfx: fix installing without docs

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index b22021a3d61..02d8964eaea 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -173,13 +173,15 @@ src_configure() {
 	#FIXME: should we enable webkit? doubt so
 
 	# build is very sensetive to doc presense, take extra steps
-	local jdk_doc
-	if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
-		jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-	elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-		jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+	if use doc; then
+		local jdk_doc
+		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
 	fi
-	[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
 
 	cat <<- _EOF_ > "${S}"/gradle.properties
 		COMPILE_TARGETS = linux


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-01-22  0:23 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-01-22  0:23 UTC (permalink / raw
  To: gentoo-commits

commit:     3d0131de340a7e439d5d7a1b919de40a41b22c81
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 00:21:54 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 00:22:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0131de

dev-java/openjfx: bump to 11.0.6_p2

Package-Manager: Portage-2.3.84, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   2 +
 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 219 ++++++++++++++++++++++++++++++
 2 files changed, 221 insertions(+)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index f582a7dc84d..703a2bb2892 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 antlr-complete-3.5.2.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
+DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11
 DIST gradle-4.8-bin.zip 75885015 BLAKE2B eb6592afe122690f5e013abec2821beabac070563556ceec67ce02506582d4d9ac9c5d9f97ad2c464e442446f26ff90e9ead2c04e462a564411259564e3332c6 SHA512 4b351c9c5b0970bafb3b2b9b9e2ec9f37ff681cc3ac30004852d712cf8bb83061211a58e5b1f101813cde6a0aec914badf4ef0a806eec603418b851b64a06882
 DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
 DIST lucene-core-7.1.0.jar 2779248 BLAKE2B 9edea1cfdeca2f2ec9e5c014e575774dc32fa5cf12ba02fd419fc252da10c03cd9f6cda989203211de4bc2ffcd2e79e8b97914e9792951bb0877a203760f07ad SHA512 0cd96016de2bc7ad94779e30348c443cf6028119fdae42c6f29e33d84495876a7519640f20680762324ea40c42e21b595f79cd606a6142b9875501f1e9179678
@@ -8,3 +9,4 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
+DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
new file mode 100644
index 00000000000..29fbe1b3206
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+EGRADLE_VER="4.8"
+
+inherit java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	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
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.5-r2:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# 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
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		insinto /usr/share/doc/"${PF}"/html
+		doins -r build/javadoc/.
+		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-01-22  1:15 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-01-22  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     be822d9c5e47878dda2e822d3fdef5eac034c84f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 01:13:37 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 01:14:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be822d9c

dev-java/openjfx: require fixed ant-core

Bug: https://bugs.gentoo.org/698876
Package-Manager: Portage-2.3.84, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 29fbe1b3206..56d7070bfdf 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	app-arch/zip
-	>=dev-java/ant-core-1.10.5-r2:0
+	>=dev-java/ant-core-1.10.7-r1:0
 	dev-java/antlr:0
 	dev-java/antlr:3.5
 	dev-java/hamcrest-core:0


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-01-22  1:34 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-01-22  1:34 UTC (permalink / raw
  To: gentoo-commits

commit:     be06545d2d2236d716e2911d5b024881b1dc3f8e
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 01:33:01 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 01:33:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be06545d

dev-java/openjfx: QA: fix dosym usage

Package-Manager: Portage-2.3.84, Repoman-2.3.16
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 2 +-
 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 02d8964eaea..8298a8316d0 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -215,6 +215,6 @@ src_install() {
 	if use doc; then
 		insinto /usr/share/doc/"${PF}"/html
 		doins -r build/javadoc/.
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 56d7070bfdf..e262aab4929 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -214,6 +214,6 @@ src_install() {
 	if use doc; then
 		insinto /usr/share/doc/"${PF}"/html
 		doins -r build/javadoc/.
-		dosym /usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-01-28  9:02 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-01-28  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9723970977c16f34d64ddbdac5a9a6550bbee07c
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 09:00:47 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 09:02:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97239709

dev-java/openjfx: QA: use dodoc and unqoted variables

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 8 ++++----
 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 8298a8316d0..0041d39f735 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -194,7 +194,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
+		JFX_DEPS_URL = "${T}"/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
@@ -213,8 +213,8 @@ src_install() {
 	doins build/javafx-exports.zip
 
 	if use doc; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r build/javadoc/.
+		docinto html
+		dodoc -r build/javadoc/.
 		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index e262aab4929..956622e2e14 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -193,7 +193,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
+		JFX_DEPS_URL = "${T}"/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
@@ -212,8 +212,8 @@ src_install() {
 	doins build/javafx-exports.zip
 
 	if use doc; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r build/javadoc/.
+		docinto html
+		dodoc -r build/javadoc/.
 		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-01-28  9:03 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-01-28  9:03 UTC (permalink / raw
  To: gentoo-commits

commit:     24854c95c4524b2b43bb6aebd38a3be22e0db564
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 09:03:51 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 09:03:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24854c95

dev-java/openjfx: QA: fix absolute dosym usage

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.3_p1.ebuild | 2 +-
 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 0041d39f735..a41615a7a6a 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -215,6 +215,6 @@ src_install() {
 	if use doc; then
 		docinto html
 		dodoc -r build/javadoc/.
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 956622e2e14..8132340592e 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -214,6 +214,6 @@ src_install() {
 	if use doc; then
 		docinto html
 		dodoc -r build/javadoc/.
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-03-17  1:02 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-03-17  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     2ac0fec2d3bcc9dab28de92d501f890afc87c931
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 00:57:16 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 01:01:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac0fec2

dev-java/openjfx: bump to 11.0.7_p0

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   1 +
 dev-java/openjfx/openjfx-11.0.7_p0.ebuild | 219 ++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 8506d389f9b..123ba264c19 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -8,3 +8,4 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
+DIST openjfx-11.0.7_p0.tar.bz2 63969275 BLAKE2B 50f30cf736ff8713f0be5c4404d6494a96bdaf23082eff8b83ecd704fb417d7e54502f0e0fff9a993d814d9ed9cec98f152487bc96bf929a67b74ec08615f053 SHA512 54b1b010800d3edfc9bb1319860fceab2083d77cbcb45ebe4baefbecf7e0ac2756cb24470cf4c9e7f53d44d7bf345c5f869f9d50748da6bb9d8be8bf1e325ec3

diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
new file mode 100644
index 00000000000..6c8ea0f688d
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_p/+}"
+SLOT="${MY_PV%%[.+]*}/${PV}"
+EGRADLE_VER="4.8"
+
+inherit java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	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
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="$(ver_cut 1)"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.7-r1:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# 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
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		docinto html
+		dodoc -r build/javadoc/.
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-03-17  1:02 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-03-17  1:02 UTC (permalink / raw
  To: gentoo-commits

commit:     80c41a511e6c80e1a2f542e360addb4bee553c5e
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 00:13:06 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 01:01:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c41a51

dev-java/openjfx: fix path to jars

Bug: https://bugs.gentoo.org/707798
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 8132340592e..9d0a5cf0546 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -193,7 +193,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = "${T}"/jars
+		JFX_DEPS_URL = ${T}/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-03-17 19:36 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-03-17 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a3273abca62776b6f6859d30922934c024fb2cbe
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 19:35:39 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 19:36:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3273abc

dev-java/openjfx: fix slotting

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 1 -
 dev-java/openjfx/openjfx-11.0.7_p0.ebuild | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 9d0a5cf0546..49791b2a62a 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -25,7 +25,6 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-SLOT="$(ver_cut 1)"
 KEYWORDS="-* ~amd64"
 
 IUSE="cpu_flags_x86_sse2 debug doc source +media"

diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
index 6c8ea0f688d..3a331f16e21 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}/${PV}"
+SLOT="${MY_PV%%[.+]*}"
 EGRADLE_VER="4.8"
 
 inherit java-pkg-2 multiprocessing
@@ -25,7 +25,6 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-SLOT="$(ver_cut 1)"
 KEYWORDS="-* ~amd64"
 
 IUSE="cpu_flags_x86_sse2 debug doc source +media"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-03-18 21:37 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-03-18 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a1bc884157367d9a8781b578e4b8abb02e705d53
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 21:33:08 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 21:36:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1bc8841

dev-java/openjfx: append -Wno-error

Closes: https://bugs.gentoo.org/713274
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 4 +++-
 dev-java/openjfx/openjfx-11.0.7_p0.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index 49791b2a62a..23574d61505 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -7,7 +7,7 @@ MY_PV=${PV/_p/+}
 SLOT=${MY_PV%%[.+]*}
 EGRADLE_VER="4.8"
 
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
 
 DESCRIPTION="Java OpenJFX client application platform"
 HOMEPAGE="https://openjfx.io"
@@ -167,6 +167,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -Wno-error
+
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so
 

diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
index 3a331f16e21..e09a3d360f6 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
@@ -7,7 +7,7 @@ MY_PV="${PV/_p/+}"
 SLOT="${MY_PV%%[.+]*}"
 EGRADLE_VER="4.8"
 
-inherit java-pkg-2 multiprocessing
+inherit flag-o-matic java-pkg-2 multiprocessing
 
 DESCRIPTION="Java OpenJFX client application platform"
 HOMEPAGE="https://openjfx.io"
@@ -167,6 +167,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-flags -Wno-error
+
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-04-29 21:05 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-04-29 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     2bd0588cf0d8ed636a5b86a8d6e8bf081a663c49
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 21:03:03 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 21:05:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd0588c

dev-java/openjfx: drop old

Closes: https://bugs.gentoo.org/698876
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   2 -
 dev-java/openjfx/openjfx-11.0.6_p2.ebuild | 220 -----------------------------
 dev-java/openjfx/openjfx-11.0.7_p0.ebuild | 221 ------------------------------
 3 files changed, 443 deletions(-)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 2a58e0d3b3d..4b7bc888df5 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -7,6 +7,4 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60
 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
-DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
-DIST openjfx-11.0.7_p0.tar.bz2 63969275 BLAKE2B 50f30cf736ff8713f0be5c4404d6494a96bdaf23082eff8b83ecd704fb417d7e54502f0e0fff9a993d814d9ed9cec98f152487bc96bf929a67b74ec08615f053 SHA512 54b1b010800d3edfc9bb1319860fceab2083d77cbcb45ebe4baefbecf7e0ac2756cb24470cf4c9e7f53d44d7bf345c5f869f9d50748da6bb9d8be8bf1e325ec3
 DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564

diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
deleted file mode 100644
index 23574d61505..00000000000
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-EGRADLE_VER="4.8"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}

diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
deleted file mode 100644
index 957104f45e1..00000000000
--- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.8"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-04-29 21:05 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-04-29 21:05 UTC (permalink / raw
  To: gentoo-commits

commit:     a3613d5eee1cdaa0c8465a924818bb1348d39918
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 21:00:40 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 21:05:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3613d5e

dev-java/openjfx: fix build with uncommon TERM, add -fcommon

Closes: https://bugs.gentoo.org/719606
Closes: https://bugs.gentoo.org/719958
Closes: https://bugs.gentoo.org/688894
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.7_p1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
index 957104f45e1..5f211eba215 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
@@ -97,7 +97,8 @@ egradle() {
 	unset ANT_HOME
 
 	einfo "gradle "${gradle_args[@]}" ${@}"
-	"${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
 }
 
 pkg_setup() {
@@ -168,7 +169,7 @@ src_prepare() {
 }
 
 src_configure() {
-	append-flags -Wno-error
+	append-flags -Wno-error -fcommon
 
 	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
 	#FIXME: should we enable webkit? doubt so


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-07-14 22:13 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-07-14 22:13 UTC (permalink / raw
  To: gentoo-commits

commit:     65246fa0096d75694e23f00f584b1f116c9fcf1e
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 22:12:15 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 22:12:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65246fa0

dev-java/openjfx: bump to 11.0.8_p2

Bug: https://bugs.gentoo.org/732624
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   1 +
 dev-java/openjfx/openjfx-11.0.8_p2.ebuild | 222 ++++++++++++++++++++++++++++++
 2 files changed, 223 insertions(+)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 4b7bc888df5..a57d245b994 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -8,3 +8,4 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564
+DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d

diff --git a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
new file mode 100644
index 00000000000..5f211eba215
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
@@ -0,0 +1,222 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_p/+}"
+SLOT="${MY_PV%%[.+]*}"
+EGRADLE_VER="4.8"
+
+inherit flag-o-matic java-pkg-2 multiprocessing
+
+DESCRIPTION="Java OpenJFX client application platform"
+HOMEPAGE="https://openjfx.io"
+
+SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
+	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
+	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
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="-* ~amd64"
+
+IUSE="cpu_flags_x86_sse2 debug doc source +media"
+
+RDEPEND="
+	dev-java/swt:4.10[cairo,opengl]
+	dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/freetype:2
+	media-libs/fontconfig:1.0
+	media-video/ffmpeg:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/cairo[glib]
+	x11-libs/libX11
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango
+	virtual/jpeg
+	virtual/opengl
+	|| (
+		dev-java/openjdk-bin:${SLOT}[doc?]
+		dev-java/openjdk:${SLOT}[doc?]
+	)
+"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	>=dev-java/ant-core-1.10.7-r1:0
+	dev-java/antlr:0
+	dev-java/antlr:3.5
+	dev-java/hamcrest-core:0
+	dev-java/stringtemplate:0
+	virtual/ttf-fonts
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="cpu_flags_x86_sse2"
+
+PATCHES=(
+	"${FILESDIR}"/11/disable-buildSrc-tests.patch
+	"${FILESDIR}"/11/glibc-compatibility.patch
+	"${FILESDIR}"/11/respect-user-cflags.patch
+	"${FILESDIR}"/11/use-system-swt-jar.patch
+	"${FILESDIR}"/11/wno-error.patch
+)
+
+S="${WORKDIR}/rt-${MY_PV}"
+
+egradle() {
+	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
+	local gradle="${GRADLE_HOME}/bin/gradle"
+	local gradle_args=(
+		--info
+		--stacktrace
+		--no-build-cache
+		--no-daemon
+		--offline
+		--gradle-user-home "${T}/gradle_user_home"
+		--project-cache-dir "${T}/gradle_project_cache"
+	)
+
+	export GRADLE_HOME
+
+	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
+	unset ANT_HOME
+
+	einfo "gradle "${gradle_args[@]}" ${@}"
+	# TERM needed, otherwise gradle may fail on terms it does not know about
+	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
+}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
+	JAVA_PKG_WANT_SOURCE="${SLOT}"
+	JAVA_PKG_WANT_TARGET="${SLOT}"
+
+	# The nastiness below is necessary while the gentoo-vm USE flag is
+	# masked. First we call java-pkg-2_pkg_setup if it looks like the
+	# flag was unmasked against one of the possible build VMs. If not,
+	# we try finding one of them in their expected locations. This would
+	# have been slightly less messy if openjdk-bin had been installed to
+	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
+	# file but disable it so that it would not normally be selectable.
+
+	local vm
+	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
+			java-pkg-2_pkg_setup
+			return
+		fi
+	done
+
+	if has_version --host-root dev-java/openjdk:${SLOT}; then
+		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
+		export JDK_HOME="${JAVA_HOME}"
+		export ANT_RESPECT_JAVA_HOME=ture
+
+	else
+		if [[ ${MERGE_TYPE} != "binary" ]]; then
+			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+			JDK_HOME=${JDK_HOME#*/}
+			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+			export JDK_HOME
+			export JAVA_HOME="${JDK_HOME}"
+			export ANT_RESPECT_JAVA_HOME=ture
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack "${P}.tar.bz2"
+	unpack "gradle-${EGRADLE_VER}-bin.zip"
+
+	mkdir "${T}/jars" || die
+
+	local line jar
+	for line in ${SRC_URI}; do
+		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
+			jar=$(basename "${BASH_REMATCH[-1]}")
+			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+
+	local d="${T}/jars"
+
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
+	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
+
+	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
+}
+
+src_configure() {
+	append-flags -Wno-error -fcommon
+
+	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
+	#FIXME: should we enable webkit? doubt so
+
+	# 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
+			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
+			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
+		fi
+		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
+	fi
+
+	cat <<- _EOF_ > "${S}"/gradle.properties
+		COMPILE_TARGETS = linux
+		COMPILE_WEBKIT = false
+		COMPILE_MEDIA = $(usex media true false)
+		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
+		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
+		BUILD_LIBAV_STUBS = false
+		GRADLE_VERSION_CHECK = false
+		LINT = none
+		CONF = $(usex debug DebugNative Release)
+		NUM_COMPILE_THREADS = $(makeopts_jobs)
+		JFX_DEPS_URL = ${T}/jars
+		COMPANY_NAME = "Gentoo"
+	_EOF_
+}
+
+src_compile() {
+	egradle zips $(usex doc "" "--exclude-task javadoc")
+}
+
+src_install() {
+	if ! use source ; then
+		rm -v build/sdk/lib/src.zip || die
+	fi
+
+	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
+	doins -r build/sdk/.
+	doins build/javafx-exports.zip
+
+	if use doc; then
+		docinto html
+		dodoc -r build/javadoc/.
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+	fi
+}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-07-28 19:36 Aaron Bauman
  0 siblings, 0 replies; 28+ messages in thread
From: Aaron Bauman @ 2020-07-28 19:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6b702a85b5e664145a037cf99eb7d1670098238d
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 19:36:04 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 19:36:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b702a85

dev-java/openjfx: drop vulnerable

Bug: https://bugs.gentoo.org/732626
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   1 -
 dev-java/openjfx/openjfx-11.0.7_p1.ebuild | 222 ------------------------------
 2 files changed, 223 deletions(-)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index a57d245b994..7884a5b8cb1 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -7,5 +7,4 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60
 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
-DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564
 DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d

diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
deleted file mode 100644
index 5f211eba215..00000000000
--- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.8"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-08-30 22:59 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-08-30 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     9690cd3adfcbc8866037ddc81d80775ce7918a96
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 22:54:51 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 22:58:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9690cd3a

dev-java/openjfx: drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/Manifest                 |   1 -
 dev-java/openjfx/openjfx-11.0.8_p2.ebuild | 222 ------------------------------
 2 files changed, 223 deletions(-)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 108107cc51d..1b63e285337 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -7,5 +7,4 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60
 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
-DIST openjfx-11.0.8_p2.tar.bz2 64151301 BLAKE2B 045dcfa35c52fe6f293713420147dd1a69b1851c8e1a1d09f0be1e0237d510e8d7b67d8c0ad36bcf23e1504a540c905a95c706faf0919da4de5005f3046e6cce SHA512 d693e1f4215e9ba42b3241f50581dbc3e7a3e6bf8ccda6f3c43c6a976389d321e6ca3d393138b62f6defd240b9d1aaef7ab26083520ed404d0d439ac9478341d
 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236

diff --git a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
deleted file mode 100644
index 5f211eba215..00000000000
--- a/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.8"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	|| (
-		dev-java/openjdk-bin:${SLOT}[doc?]
-		dev-java/openjdk:${SLOT}[doc?]
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="cpu_flags_x86_sse2"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
-
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
-		elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then
-			jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-08-30 22:59 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-08-30 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b5f10f9e818ff21a58476933fd4c60906a7a1d78
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 22:58:32 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 22:58:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f10f9e

dev-java/openjfx: fix typo

Closes: https://bugs.gentoo.org/728790
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.9_p0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
index be554f4fb9c..d9fd79845b4 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -126,7 +126,7 @@ pkg_setup() {
 	if has_version --host-root dev-java/openjdk:${SLOT}; then
 		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 		export JDK_HOME="${JAVA_HOME}"
-		export ANT_RESPECT_JAVA_HOME=ture
+		export ANT_RESPECT_JAVA_HOME=true
 
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
@@ -136,7 +136,7 @@ pkg_setup() {
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
 			export JDK_HOME
 			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=ture
+			export ANT_RESPECT_JAVA_HOME=true
 		fi
 	fi
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-09-19  8:34 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-09-19  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     5162d49ba90ec61d343087ba2c250b8543a6039d
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 08:33:31 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 08:33:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5162d49b

dev-java/openjfx: fix SRC_URI

Closes: https://bugs.gentoo.org/743484
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-8.202.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-8.202.ebuild b/dev-java/openjfx/openjfx-8.202.ebuild
index 75fd19046cc..11c3ab1cb41 100644
--- a/dev-java/openjfx/openjfx-8.202.ebuild
+++ b/dev-java/openjfx/openjfx-8.202.ebuild
@@ -13,7 +13,7 @@ EGRADLE_VER="4.8"
 DESCRIPTION="Java OpenJFX 8 client application platform"
 HOMEPAGE="https://openjfx.io"
 SRC_URI="
-	http://hg.openjdk.java.net/${PN}/8u/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
+	http://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
 	https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
 "
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2020-09-20  1:15 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2020-09-20  1:15 UTC (permalink / raw
  To: gentoo-commits

commit:     43e7f0671f6c8e0136554c310da862205db10c55
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 01:13:50 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 01:15:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e7f067

dev-java/openjfx: explicitly depend on openjdk:8 for now

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-8.999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.999.ebuild
index 71f180d6d92..b7520c0307b 100644
--- a/dev-java/openjfx/openjfx-8.999.ebuild
+++ b/dev-java/openjfx/openjfx-8.999.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 	>=dev-java/ant-core-1.8.2:0
 	>=dev-java/antlr-2.7.7-r7:0
 	dev-java/antlr:3
+	dev-java/openjdk:8
 	dev-java/stringtemplate:0
 	dev-java/swt:4.10[cairo,opengl]
 	sys-devel/bison


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2021-05-30  7:41 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2021-05-30  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     c665d659daf1132a58a79af79e29bc0c12fe48bf
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 07:40:22 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun May 30 07:40:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c665d659

dev-java/openjfx: EROOT -> EPREFIX

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.9_p0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
index 119aa94597c..489a905614c 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -184,7 +184,7 @@ src_configure() {
 	if use doc; then
 		local jdk_doc
 		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
-			jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api"
+			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
 	fi


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2021-08-05 15:00 Benda XU
  0 siblings, 0 replies; 28+ messages in thread
From: Benda XU @ 2021-08-05 15:00 UTC (permalink / raw
  To: gentoo-commits

commit:     07ebce7443d74ad797d1f644783dec60d46014c7
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  5 14:58:27 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Aug  5 15:00:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ebce74

dev-java/openjfx: do not strip / from swt_file_name.

double / in swt_file_name is between EPREFIX and JAVA_PKG_JARDEST.
Stripping the leading / confuses gradle in finding swt.jar.

The ultimate fix should be done in java-utils-2.eclass.

Reference: https://archives.gentoo.org/gentoo-dev/message/96db539ae412aab36491987d4e424dd3
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-java/openjfx/openjfx-8.1000.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild
index 4763fb1c16e..026a67b5e2e 100644
--- a/dev-java/openjfx/openjfx-8.1000.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000.ebuild
@@ -130,7 +130,7 @@ src_prepare() {
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar
 	java-pkg_jar-from --build-only --into "${d}" stringtemplate  stringtemplate.jar stringtemplate-3.2.jar
-	sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name#/}\")#" "${S}"/build.gradle || die
+	sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name}\")#" "${S}"/build.gradle || die
 
 	sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2021-11-18  4:42 Georgy Yakovlev
  0 siblings, 0 replies; 28+ messages in thread
From: Georgy Yakovlev @ 2021-11-18  4:42 UTC (permalink / raw
  To: gentoo-commits

commit:     da43ae2ecdebc8eb13b1d3aec9cb5f9bf3a05165
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 04:40:05 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 04:40:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da43ae2e

dev-java/openjfx: directly inherit eapi7-ver

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-java/openjfx/openjfx-8.1000.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-8.1000.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild
index 026a67b5e2eb..0864b67b0de4 100644
--- a/dev-java/openjfx/openjfx-8.1000.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs
+inherit eapi7-ver flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs
 
 EGRADLE_VER="4.10.3"
 EHG_COMMIT="9f49e3b6147f"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2023-09-27  7:11 Ulrich Müller
  0 siblings, 0 replies; 28+ messages in thread
From: Ulrich Müller @ 2023-09-27  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f08efcb0f808ef53d05cb2b47d170349deda104d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 07:07:32 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 07:11:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08efcb0

dev-java/openjfx: drop 11.0.9_p0, 11.0.11_p1

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 dev-java/openjfx/openjfx-11.0.11_p1.ebuild | 226 -----------------------------
 dev-java/openjfx/openjfx-11.0.9_p0.ebuild  | 226 -----------------------------
 2 files changed, 452 deletions(-)

diff --git a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1.ebuild
deleted file mode 100644
index 7d61ff67f2c2..000000000000
--- a/dev-java/openjfx/openjfx-11.0.11_p1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.10.3"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64 ~ppc64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	doc? ( dev-java/openjdk:${SLOT}[doc] )
-	!doc? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags-11.0.11.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error-11.0.11.patch
-	"${FILESDIR}"/11/don-t-force-msse-11.0.11.patch
-	"${FILESDIR}"/11/disable-architecture-verification.patch
-	"${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root 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})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=true
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}

diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
deleted file mode 100644
index 489a905614c1..000000000000
--- a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.10.3"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="-* ~amd64 ~ppc64"
-
-IUSE="cpu_flags_x86_sse2 debug doc source +media"
-
-RDEPEND="
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-video/ffmpeg:0=
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/jpeg
-	virtual/opengl
-	doc? ( dev-java/openjdk:${SLOT}[doc] )
-	!doc? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-	"${FILESDIR}"/11/don-t-force-msse.patch
-	"${FILESDIR}"/11/disable-architecture-verification.patch
-	"${FILESDIR}/11/${PV}-version.patch"
-)
-
-S="${WORKDIR}/rt-${MY_PV}"
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root 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})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=true
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# 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
-			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
-		fi
-		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2023-09-27 10:10 Ulrich Müller
  0 siblings, 0 replies; 28+ messages in thread
From: Ulrich Müller @ 2023-09-27 10:10 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2023-10-01 14:57 Ulrich Müller
  0 siblings, 0 replies; 28+ messages in thread
From: Ulrich Müller @ 2023-10-01 14:57 UTC (permalink / raw
  To: gentoo-commits

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"


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2024-02-08  9:23 Miroslav Šulc
  0 siblings, 0 replies; 28+ messages in thread
From: Miroslav Šulc @ 2024-02-08  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     3b9c68573d71795ba9aab412802bc6cf3da58259
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Feb  7 08:26:57 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 09:19:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c6857

dev-java/openjfx: rbump to 8.1000-r2 for >=dev-java/ant-1.10.14

Closes: https://bugs.gentoo.org/923972
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35213
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../openjfx/{openjfx-8.1000-r1.ebuild => openjfx-8.1000-r2.ebuild}  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/openjfx/openjfx-8.1000-r1.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild
similarity index 96%
rename from dev-java/openjfx/openjfx-8.1000-r1.ebuild
rename to dev-java/openjfx/openjfx-8.1000-r2.ebuild
index 65f972f14ebe..ef27aefdb985 100644
--- a/dev-java/openjfx/openjfx-8.1000-r1.ebuild
+++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild
@@ -29,7 +29,7 @@ RESTRICT="test" # needs junit version we don't have, fragile
 
 DEPEND="
 	app-arch/unzip
-	>=dev-java/ant-core-1.8.2:0
+	>=dev-java/ant-1.10.14:0
 	>=dev-java/antlr-2.7.7-r7:0
 	dev-java/antlr:3
 	dev-java/openjdk:8
@@ -120,8 +120,8 @@ src_prepare() {
 	done
 
 	local swt_file_name="$(java-pkg_getjars swt-4.10)"
-	java-pkg_jar-from --build-only --into "${d}" ant-core ant.jar ant-1.8.2.jar
-	java-pkg_jar-from --build-only --into "${d}" ant-core ant-launcher.jar ant-launcher-1.8.2.jar
+	java-pkg_jar-from --build-only --into "${d}" ant ant.jar ant-1.8.2.jar
+	java-pkg_jar-from --build-only --into "${d}" ant ant-launcher.jar ant-launcher-1.8.2.jar
 	java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
 	java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2024-03-11 17:00 Sam James
  0 siblings, 0 replies; 28+ messages in thread
From: Sam James @ 2024-03-11 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     8693081515fd2d8e34549b9edad1fcfaa22a27ac
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 11 14:21:57 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 17:00:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86930815

dev-java/openjfx: no longer depend on deprecated ant-core

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35714
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{openjfx-11.0.11_p1-r2.ebuild => openjfx-11.0.11_p1-r3.ebuild}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild
similarity index 99%
rename from dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild
rename to dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild
index 4f4331a06705..55962035a564 100644
--- a/dev-java/openjfx/openjfx-11.0.11_p1-r2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
+	dev-java/ant:0
 	dev-java/antlr:0
 	dev-java/antlr:3.5
 	dev-java/hamcrest-core:0


^ permalink raw reply related	[flat|nested] 28+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/
@ 2024-03-18 11:05 Miroslav Šulc
  0 siblings, 0 replies; 28+ messages in thread
From: Miroslav Šulc @ 2024-03-18 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     411897efd077554a6487764d3eb2a92f7018febd
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 18 07:45:52 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 11:05:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411897ef

dev-java/openjfx: drop 11.0.9_p0-r1, 11.0.11_p1-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35814
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/openjfx/Manifest                     |   1 -
 dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild | 223 --------------------------
 dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild  | 223 --------------------------
 3 files changed, 447 deletions(-)

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 65b4b0f82bef..63028b364713 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -8,6 +8,5 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
 DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f6091bc45de4c471ee9d0bcd45700ab3966a3396781ace2666bf94decd1219a83f01b277116cf23baeb6dd34a1a0f44191 SHA512 a1f94b3166aca50344f8af77ec2a5f52be1b0abc1c65fd3ff97f98017377ab772262502af00ad8cd4a6c44281ea459aff43a9cb7e30a1c35b822da8fb39b94fb
-DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32

diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
deleted file mode 100644
index 34f91df33673..000000000000
--- a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.10.3"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-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
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-libs/libjpeg-turbo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/opengl
-	doc? ( dev-java/openjdk:${SLOT}[doc] )
-	!doc? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags-11.0.11.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error-11.0.11.patch
-	"${FILESDIR}"/11/don-t-force-msse-11.0.11.patch
-	"${FILESDIR}"/11/disable-architecture-verification.patch
-	"${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch
-	"${FILESDIR}"/11/ffmpeg5.patch
-)
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	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 -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*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=true
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# build is very sensetive to doc presense, take extra steps
-	if use doc; then
-		local jdk_doc
-		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"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}

diff --git a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
deleted file mode 100644
index 0f4c3e85b629..000000000000
--- a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV/_p/+}"
-SLOT="${MY_PV%%[.+]*}"
-EGRADLE_VER="4.10.3"
-
-inherit flag-o-matic java-pkg-2 multiprocessing
-
-DESCRIPTION="Java OpenJFX client application platform"
-HOMEPAGE="https://openjfx.io"
-
-SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar
-	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar
-	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
-"
-
-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
-	dev-java/swt:4.10[cairo,opengl]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	media-libs/freetype:2
-	media-libs/fontconfig:1.0
-	media-libs/libjpeg-turbo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/cairo[glib]
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/pango
-	virtual/opengl
-	doc? ( dev-java/openjdk:${SLOT}[doc] )
-	!doc? (
-		|| (
-			dev-java/openjdk-bin:${SLOT}
-			dev-java/openjdk:${SLOT}
-		)
-	)
-"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-java/ant-core-1.10.7-r1:0
-	dev-java/antlr:0
-	dev-java/antlr:3.5
-	dev-java/hamcrest-core:0
-	dev-java/stringtemplate:0
-	virtual/ttf-fonts
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/11/disable-buildSrc-tests.patch
-	"${FILESDIR}"/11/glibc-compatibility.patch
-	"${FILESDIR}"/11/respect-user-cflags.patch
-	"${FILESDIR}"/11/use-system-swt-jar.patch
-	"${FILESDIR}"/11/wno-error.patch
-	"${FILESDIR}"/11/don-t-force-msse.patch
-	"${FILESDIR}"/11/disable-architecture-verification.patch
-	"${FILESDIR}"/11/ffmpeg5.patch
-	"${FILESDIR}/11/${PV}-version.patch"
-)
-
-egradle() {
-	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
-	local gradle="${GRADLE_HOME}/bin/gradle"
-	local gradle_args=(
-		--info
-		--stacktrace
-		--no-build-cache
-		--no-daemon
-		--offline
-		--gradle-user-home "${T}/gradle_user_home"
-		--project-cache-dir "${T}/gradle_project_cache"
-	)
-
-	export GRADLE_HOME
-
-	# FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
-	unset ANT_HOME
-
-	einfo "gradle "${gradle_args[@]}" ${@}"
-	# TERM needed, otherwise gradle may fail on terms it does not know about
-	TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-pkg_setup() {
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	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 -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*}
-			export JDK_HOME
-			export JAVA_HOME="${JDK_HOME}"
-			export ANT_RESPECT_JAVA_HOME=true
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack "${P}.tar.bz2"
-	unpack "gradle-${EGRADLE_VER}-bin.zip"
-
-	mkdir "${T}/jars" || die
-
-	local line jar
-	for line in ${SRC_URI}; do
-		if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
-			jar=$(basename "${BASH_REMATCH[-1]}")
-			cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-
-	local d="${T}/jars"
-
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
-	java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
-
-	sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
-}
-
-src_configure() {
-	append-flags -Wno-error -fcommon
-
-	#FIXME: still calls gcc, pkg-config etc by name without chost prefix
-	#FIXME: should we enable webkit? doubt so
-
-	# build is very sensetive to doc presense, take extra steps
-	if use doc; then
-		local jdk_doc
-		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"
-	fi
-
-	cat <<- _EOF_ > "${S}"/gradle.properties
-		COMPILE_TARGETS = linux
-		COMPILE_WEBKIT = false
-		COMPILE_MEDIA = $(usex media true false)
-		JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
-		JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
-		BUILD_LIBAV_STUBS = false
-		GRADLE_VERSION_CHECK = false
-		LINT = none
-		CONF = $(usex debug DebugNative Release)
-		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
-		COMPANY_NAME = "Gentoo"
-	_EOF_
-}
-
-src_compile() {
-	egradle zips $(usex doc "" "--exclude-task javadoc")
-}
-
-src_install() {
-	if ! use source ; then
-		rm -v build/sdk/lib/src.zip || die
-	fi
-
-	insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
-	doins -r build/sdk/.
-	doins build/javafx-exports.zip
-
-	if use doc; then
-		docinto html
-		dodoc -r build/javadoc/.
-		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
-	fi
-}


^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2024-03-18 11:05 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-27  7:11 [gentoo-commits] repo/gentoo:master commit in: dev-java/openjfx/ Ulrich Müller
  -- strict thread matches above, loose matches on Subject: below --
2024-03-18 11:05 Miroslav Šulc
2024-03-11 17:00 Sam James
2024-02-08  9:23 Miroslav Šulc
2023-10-01 14:57 Ulrich Müller
2023-09-27 10:10 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

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