mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-02 11:38:07 -07:00
dev-java/openjdk: drop javafx USE flag
The dependency doesn't exist for these slots, preventing to create stabilization bugs by using 'pkgdev bugs -s'. The USE flag should probably be re-added once the openjfx part is re-written according to https://bugs.gentoo.org/853697#c9. Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Part-of: https://codeberg.org/gentoo/gentoo/pulls/966 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
committed by
Miroslav Šulc
parent
96c3693982
commit
3e88e04cef
@@ -55,10 +55,9 @@ LICENSE="GPL-2-with-classpath-exception"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs system-bootstrap systemtap"
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
javafx? ( alsa !headless-awt )
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
"
|
||||
|
||||
@@ -105,7 +104,6 @@ DEPEND="
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
javafx? ( dev-java/openjfx:${SLOT}= )
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
@@ -239,15 +237,6 @@ src_configure() {
|
||||
$(tc-is-clang && echo "--with-toolchain-type=clang")
|
||||
)
|
||||
|
||||
if use javafx; then
|
||||
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
|
||||
if [[ -r ${zip} ]]; then
|
||||
myconf+=( --with-import-modules="${zip}" )
|
||||
else
|
||||
die "${zip} not found or not readable"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
|
||||
|
||||
@@ -51,10 +51,9 @@ LICENSE="GPL-2-with-classpath-exception"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
javafx? ( alsa !headless-awt )
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
!system-bootstrap? ( || ( ppc64 x86 ) )
|
||||
"
|
||||
@@ -102,7 +101,6 @@ DEPEND="
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
javafx? ( dev-java/openjfx:${SLOT}= )
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
@@ -238,15 +236,6 @@ src_configure() {
|
||||
|
||||
use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
|
||||
|
||||
if use javafx; then
|
||||
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
|
||||
if [[ -r ${zip} ]]; then
|
||||
myconf+=( --with-import-modules="${zip}" )
|
||||
else
|
||||
die "${zip} not found or not readable"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
|
||||
|
||||
@@ -73,10 +73,9 @@ LICENSE="GPL-2-with-classpath-exception"
|
||||
SLOT="$(ver_cut 1)"
|
||||
KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
javafx? ( alsa !headless-awt )
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
!system-bootstrap? ( ppc64 )
|
||||
"
|
||||
@@ -124,7 +123,6 @@ DEPEND="
|
||||
x11-libs/libXrender
|
||||
x11-libs/libXt
|
||||
x11-libs/libXtst
|
||||
javafx? ( dev-java/openjfx:${SLOT}= )
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk-bin:${SLOT}
|
||||
@@ -257,15 +255,6 @@ src_configure() {
|
||||
|
||||
use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
|
||||
|
||||
if use javafx; then
|
||||
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
|
||||
if [[ -r ${zip} ]]; then
|
||||
myconf+=( --with-import-modules="${zip}" )
|
||||
else
|
||||
die "${zip} not found or not readable"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
|
||||
|
||||
@@ -73,10 +73,9 @@ LICENSE="GPL-2-with-classpath-exception"
|
||||
SLOT="$(ver_cut 1)"
|
||||
# KEYWORDS="" # Not an LTS candidate
|
||||
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs +system-bootstrap systemtap"
|
||||
|
||||
REQUIRED_USE="
|
||||
javafx? ( alsa !headless-awt )
|
||||
!system-bootstrap? ( jbootstrap )
|
||||
!system-bootstrap? ( ppc64 )
|
||||
"
|
||||
@@ -117,7 +116,6 @@ DEPEND="
|
||||
media-libs/alsa-lib
|
||||
net-print/cups
|
||||
!headless-awt? ( x11-base/xorg-proto )
|
||||
javafx? ( dev-java/openjfx:${SLOT}= )
|
||||
system-bootstrap? (
|
||||
|| (
|
||||
dev-java/openjdk:26
|
||||
@@ -253,15 +251,6 @@ src_configure() {
|
||||
|
||||
use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" )
|
||||
|
||||
if use javafx; then
|
||||
local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
|
||||
if [[ -r ${zip} ]]; then
|
||||
myconf+=( --with-import-modules="${zip}" )
|
||||
else
|
||||
die "${zip} not found or not readable"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Workaround for bug #938302
|
||||
if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then
|
||||
myconf+=( DTRACE="${BROOT}"/usr/bin/stap-dtrace )
|
||||
|
||||
Reference in New Issue
Block a user