gentoo resync : 25.08.2020

4 files changed, 250 insertions, 2 deletions

diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 9c7bda6bae97..3dd98b603f18 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -1,3 +1,4 @@
+AUX 11/11.0.9_p0-version.patch 691 BLAKE2B 33cfcd3c615e9dec14e2df985b48dc85b895d12ff127ffc3df08b670ad1bcc3790efec63c68b639288c44f7cf5da8dcb2de72195df24c049692df109b20e42ac SHA512 472bb5debb929d4191b2dc2bd0b2e2370f3c93671e581fe42616e4ed6fc3e4a34638a90f04ed756acb5e10d404694267cd861ecf698c7c926cd4c6fe6d6fe8ba
 AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede
 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981
 AUX 11/respect-user-cflags.patch 8609 BLAKE2B 865e8c2b10cc24c7ce45a4d6b039a1e852902f702fee06102273565f22ed870391f5f072c59db51fa48077516a8072b41252fdce961cde20581d8f520eb67afe SHA512 ab77752add6fe7b708d7e7eb94cad722b6016d50bc3ba40505107db0e70e642dfd7d48550cba344ee2e88bf2ea7f55d58140f5eeb7b025c112b87be0ce71e74c
@@ -12,6 +13,8 @@ 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
-EBUILD openjfx-11.0.7_p1.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b
+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
+EBUILD openjfx-11.0.8_p2.ebuild 6464 BLAKE2B a9f744e7110f9ba603be95bece2ed38c7ade228aebf0ce08717e53c05fd416ac565b35b3186fadc7e953b6d354c41e4cf039784c0937c4946aa60d8e51a5ee4e SHA512 896d9ce23679f4649bdec58e40682393e508bdafb265728cb318d52443351342dc0be79a8c20d5164d40032c80b4ee2779b2def73be2a22f097e77bae4c3506b
+EBUILD openjfx-11.0.9_p0.ebuild 6502 BLAKE2B b64405041784dc2a1eaeca4ff789259378bd11428182aaa719d1def547194445b1c2e22efa20ba63546df7730b677319bd63e344a803e37c0cf7a22953682934 SHA512 b6b0f5a5b2829bd061f2f127be0489ced00fe0caf5e6ef40a7110ef3e1d2394e5ffcff95d6851ce84188375c5d152e327d40159e0c54670fbb7b8ab9eb59b852
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/files/11/11.0.9_p0-version.patch b/dev-java/openjfx/files/11/11.0.9_p0-version.patch
new file mode 100644
index 000000000000..fbcbb3890499
--- /dev/null
+++ b/dev-java/openjfx/files/11/11.0.9_p0-version.patch
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User jvos
+# Date 1597927682 -7200
+# Node ID c0fe72db97a8924c906e4237881aa3c1d5669d19
+# Parent  38425dc30b9a25d52fbb0548ea1b0d098888aaed
+8252067: Change JavaFX release version in 11-dev to 11.0.9
+Reviewed-by: kcr
+
+diff -r 38425dc30b9a -r c0fe72db97a8 build.properties
+--- a/build.properties	Thu Aug 20 10:24:03 2020 +0200
++++ b/build.properties	Thu Aug 20 14:48:02 2020 +0200
+@@ -41,7 +41,7 @@
+ # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
+ jfx.release.major.version=11
+ jfx.release.minor.version=0
+-jfx.release.security.version=8
++jfx.release.security.version=9
+ jfx.release.patch.version=0
+ 
+ # Note: The release version is now calculated in build.gradle as the
+
diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
index 5f211eba215c..5f211eba215c 100644
--- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.8_p2.ebuild
diff --git a/dev-java/openjfx/openjfx-11.0.9_p0.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
new file mode 100644
index 000000000000..be554f4fb9cf
--- /dev/null
+++ b/dev-java/openjfx/openjfx-11.0.9_p0.ebuild
@@ -0,0 +1,223 @@
+# 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
+	"${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=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
+}