| 1 |
commit: 98f175b3b200f8b7fa5db00c19ffd8288cfba2e5 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 09:52:24 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 09:56:23 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98f175b3 |
| 7 |
|
| 8 |
dev-java/openjdk: fix overwritten required use |
| 9 |
|
| 10 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-java/openjdk/openjdk-11.0.14_p9.ebuild | 7 ++++--- |
| 13 |
dev-java/openjdk/openjdk-17.0.2_p8.ebuild | 8 +++++--- |
| 14 |
2 files changed, 9 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 17 |
index 4e6f5d74d0bb..2ec008bab592 100644 |
| 18 |
--- a/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 19 |
+++ b/dev-java/openjdk/openjdk-11.0.14_p9.ebuild |
| 20 |
@@ -44,7 +44,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 21 |
|
| 22 |
IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" |
| 23 |
|
| 24 |
-REQUIRED_USE="!system-bootstrap? ( jbootstrap )" |
| 25 |
+REQUIRED_USE=" |
| 26 |
+ javafx? ( alsa !headless-awt ) |
| 27 |
+ !system-bootstrap? ( jbootstrap ) |
| 28 |
+" |
| 29 |
|
| 30 |
COMMON_DEPEND=" |
| 31 |
media-libs/freetype:2= |
| 32 |
@@ -98,8 +101,6 @@ DEPEND=" |
| 33 |
) |
| 34 |
" |
| 35 |
|
| 36 |
-REQUIRED_USE="javafx? ( alsa !headless-awt )" |
| 37 |
- |
| 38 |
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" |
| 39 |
|
| 40 |
# The space required to build varies wildly depending on USE flags, |
| 41 |
|
| 42 |
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 43 |
index b1f71eb6dafc..ca2e6c7e58a3 100644 |
| 44 |
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 45 |
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild |
| 46 |
@@ -42,7 +42,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
| 47 |
|
| 48 |
IUSE="alsa big-endian cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" |
| 49 |
|
| 50 |
-REQUIRED_USE="!system-bootstrap? ( jbootstrap )" |
| 51 |
+REQUIRED_USE=" |
| 52 |
+ javafx? ( alsa !headless-awt ) |
| 53 |
+ !system-bootstrap? ( jbootstrap ) |
| 54 |
+" |
| 55 |
+ |
| 56 |
|
| 57 |
COMMON_DEPEND=" |
| 58 |
media-libs/freetype:2= |
| 59 |
@@ -96,8 +100,6 @@ DEPEND=" |
| 60 |
) |
| 61 |
" |
| 62 |
|
| 63 |
-REQUIRED_USE="javafx? ( alsa !headless-awt )" |
| 64 |
- |
| 65 |
S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" |
| 66 |
|
| 67 |
# The space required to build varies wildly depending on USE flags, |
Archives