From 98f175b3b200f8b7fa5db00c19ffd8288cfba2e5 Mon Sep 17 00:00:00 2001 From: Georgy Yakovlev Date: Thu, 20 Jan 2022 01:52:24 -0800 Subject: [PATCH] dev-java/openjdk: fix overwritten required use Signed-off-by: Georgy Yakovlev --- dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 7 ++++--- dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild index 4e6f5d74d0bbc..2ec008bab5923 100644 --- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild +++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild @@ -44,7 +44,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" -REQUIRED_USE="!system-bootstrap? ( jbootstrap )" +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" COMMON_DEPEND=" media-libs/freetype:2= @@ -98,8 +101,6 @@ DEPEND=" ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" # The space required to build varies wildly depending on USE flags, diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild index b1f71eb6dafc9..ca2e6c7e58a3c 100644 --- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild @@ -42,7 +42,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" -REQUIRED_USE="!system-bootstrap? ( jbootstrap )" +REQUIRED_USE=" + javafx? ( alsa !headless-awt ) + !system-bootstrap? ( jbootstrap ) +" + COMMON_DEPEND=" media-libs/freetype:2= @@ -96,8 +100,6 @@ DEPEND=" ) " -REQUIRED_USE="javafx? ( alsa !headless-awt )" - S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" # The space required to build varies wildly depending on USE flags,