dev-java/openj9-openjdk: update to 0.30.0

4 files changed, 8 insertions, 37 deletions

diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest
index bfa52d1..59b817d 100644
--- a/dev-java/openj9-openjdk/Manifest
+++ b/dev-java/openj9-openjdk/Manifest
@@ -1,6 +1,4 @@
-DIST openj9-0.29.0.tar.gz 16776743 BLAKE2B 524fc53506be1521c07ce6a65ec17419e7d228baa7543342b4011a223c6f2d1e50d80e2d4eee51cc8cfe89bf387ae17a9eb7d28ce61a5d8ff8bc790307061882 SHA512 accfb336b52c94f6988ef47c79c8be3fe841e37611596e61edaad57c801856c53ea248daab41f05a5487873d002f75b3a684588cb81b0fb0270f2638d6d06ed7
-DIST openj9-0.29.1.tar.gz 16789002 BLAKE2B 8cb49c7ebf89e50c6f7802912d3666d0be3a5614558daa17b90dcdc73b5b11e82265445df6064f4c03db220473320b1a164c4f3274a0316644d2c63d5b1aa71e SHA512 e61aaba78e836f209d35f0aaa344f727e0a9c77ec8efee68fa3a9d73dba44040bba12953ed2dff3475b3dfa94f9f4db6d7978a1b5dd05ae5a6db9eaa60fa83fa
-DIST openj9-omr-0.29.0.tar.gz 7852434 BLAKE2B 6f77abbf2597ee4f71aec7eb44e5a9f54c76fde7e3d432415d34c94c84dc00d49c3cd716c6cda4e0fea807b8ba87345b2c94a0014019154a0c60dde4a00db7b1 SHA512 de58cc6b3c2f3d657b8f588151b96acfffc63af274ef6d9c06e5e832c45c246476475c2d40b657c852d2d6f1915ea52095dae89defdaa644cd14f35500e0939f
-DIST openj9-omr-0.29.1.tar.gz 7852824 BLAKE2B 947e0ec74dcc327b646af7274f0a270a1f4b90f542b8a275e8bb839f8937191d171259da9727cd76bca9b1a83bf20713c538bcc6344d35949e617c293bb63e3d SHA512 8374fc5295cc082496d8e12e00450f57c08bbe4f320bd18a3dd4e5b190091022250b2077867abd81aa2da1bcacd04741d4b07d7e08275237c6997c446bcbead2
-DIST openj9-openjdk-jdk11-openj9-0.29.0.tar.gz 108964710 BLAKE2B 40526d85b988cbcd04ea254c120fd6cffecd2a1d3ce16e8dde54a3bffad81aea9d78b56804671a79684dfb327f6a8176d15b08e06f1e0b9f64f360c113a2b1b2 SHA512 a033b50bbe49c80c97ecf5f49757913815fcb15c1b8b6574f4039899b254febcbc8deaa49b2e5fd255d5dbcb9fccef9d7778971efa41ea3b0a09a40a0b65c87e
-DIST openj9-openjdk-jdk17-openj9-0.29.1.tar.gz 93765672 BLAKE2B b1825236b7a7e6ee70beefde588cde79d35b03f29b7f7ca83b3db178c9d0df318bd07dac81a09266466d094a567990448cad6746953643f7bf51870dc90cf169 SHA512 1fba0cce3840a70b7e43022991034dedc073f1989937fe9cbee1a2260fda71adf729e2bb67ef25e6300f830b69089edb792b35784c09e59e9fc996c38797dec6
+DIST openj9-0.30.0.tar.gz 16883499 BLAKE2B d6e518224aca5402a74fce20b457c71833f4c19f9c043607234b610bb544859ad0584a0bfb629976a35f22f8298d25c7799484ac75c35a0c94bb18ac144c10fe SHA512 9f4ea84f7d8e338e77e30e37d6d0ad952096a736d47d87f8893dda04735cd0e5e1fbd9e3901f46736645d39f7fadb374cda881df54e6f39f0bf27c4f564d43f9
+DIST openj9-omr-0.30.0.tar.gz 7857347 BLAKE2B 68e954a5f9360e18fd96d61d50fff46b0f7a53da4418e5e3f51e72da43536ff51b3b91fd3f76cc04922e5588c2b2b7802e0414d1a7858a1dd71dfe5bc77f7bc7 SHA512 c4778056c5edf1e40379ab1a16fd4ecf11789f5195ed4cd1860bcce7e52f9e158fb3d1c7bf83bc177a1ca7c140a31627d1414850c65e0459a935c405cc41095d
+DIST openj9-openjdk-jdk11-openj9-0.30.0.tar.gz 109017065 BLAKE2B 223a5345ce26f2d02ada3af91ba3f84834010563bf533cc990e19f89fe6f9cc5068d464792c81a1cc029dd555ecec771500f322ce884b933a8a37f3d376703f1 SHA512 fca7fa504c3cec243074972e36a90facc051f1e2a70a690670e2cd328547a1b18d8a01db9dc174ca8c2cbb7382f1d3ed0d56c5c7fd82c99d121037b507c451f1
+DIST openj9-openjdk-jdk17-openj9-0.30.0.tar.gz 93841453 BLAKE2B 48fa76809a7ebee24c6c5d1b411a58220c17c4c8eda09bffadec1ee8dd0c3d1c13e8f883b0ea7a91524fe179b3cbe15c57adb9838b12b7bae66fcaec1d4a408c SHA512 2e97beaee98f1b6f46fe7575a71d9a779008ce03cc5a79b5bf2b2ad4ed1e4130ef08d246ecaf3f0d2b2ae4f26fbf614ebcde9f38f06e688c083477065aa76d2c
diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml
index 1616443..5847839 100644
--- a/dev-java/openj9-openjdk/metadata.xml
+++ b/dev-java/openj9-openjdk/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="ddr">Enable Direct Dump Reader</flag>
-		<flag name="custom-optimization">Override OpenJDK and OpenJ9 per-module optimization flags</flag>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 		<flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag>
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.30.0.ebuild
index 07ab41d..18a4b68 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.30.0.ebuild
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap"
+IUSE="alsa cups custom-optimization ddr debug doc gentoo-vm headless-awt javafx +jbootstrap selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -85,8 +85,6 @@ DEPEND="
 	)
 "
 
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
 S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
 
 # The space required to build varies wildly depending on USE flags,
@@ -205,6 +203,7 @@ src_configure() {
 
 	local myconf=(
 		--disable-ccache
+		--disable-precompiled-headers
 		--disable-warnings-as-errors{,-omr,-openj9}
 		--enable-full-docs=no
 		--with-boot-jdk="${JDK_HOME}"
@@ -225,7 +224,6 @@ src_configure() {
 		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
-		--with-version-opt=""
 		--with-zlib=system
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
@@ -244,13 +242,6 @@ src_configure() {
 		fi
 	fi
 
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
 	(
 		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
@@ -296,10 +287,6 @@ src_install() {
 		rm -v lib/libjsound.* || die
 	fi
 
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
 	if ! use source ; then
 		rm -v lib/src.zip || die
 	fi
diff --git a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.30.0.ebuild
index 93bdcf3..2c42e9a 100644
--- a/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.1.ebuild
+++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.30.0.ebuild
@@ -27,7 +27,7 @@ fi
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap numa +pch selinux source systemtap"
+IUSE="alsa cups ddr debug doc gentoo-vm headless-awt javafx +jbootstrap numa selinux source systemtap"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -86,8 +86,6 @@ DEPEND="
 	)
 "
 
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
 S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release"
 
 # The space required to build varies wildly depending on USE flags,
@@ -205,6 +203,7 @@ src_configure() {
 
 	local myconf=(
 		--disable-ccache
+		--disable-precompiled-headers
 		--disable-warnings-as-errors{,-omr,-openj9}
 		--enable-full-docs=no
 		--with-boot-jdk="${JDK_HOME}"
@@ -225,7 +224,6 @@ src_configure() {
 		--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
 		--with-vendor-version-string="${PVR}"
 		--with-version-pre=""
-		--with-version-opt=""
 		--with-zlib=system
 		--enable-dtrace=$(usex systemtap yes no)
 		--enable-headless-only=$(usex headless-awt yes no)
@@ -244,13 +242,6 @@ src_configure() {
 		fi
 	fi
 
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
 	(
 		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
 		CFLAGS= CXXFLAGS= LDFLAGS= \
@@ -297,10 +288,6 @@ src_install() {
 		rm -v lib/libjsound.* || die
 	fi
 
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
 	if ! use source ; then
 		rm -v lib/src.zip || die
 	fi