Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/
Date: Fri, 11 Jan 2019 21:34:36
Message-Id: 1547242454.610a8f49ea590ba36546388e455e5a3e59593fe3.gyakovlev@gentoo
1 commit: 610a8f49ea590ba36546388e455e5a3e59593fe3
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 11 21:28:11 2019 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 11 21:34:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610a8f49
7
8 dev-java/openjdk: fix automagic dep on systemtap
9
10 Bug: https://bugs.gentoo.org/675174
11 Package-Manager: Portage-2.3.54, Repoman-2.3.12
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 dev-java/openjdk/metadata.xml | 1 +
15 dev-java/openjdk/openjdk-11.0.1_p13.ebuild | 6 ++++--
16 2 files changed, 5 insertions(+), 2 deletions(-)
17
18 diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
19 index c76b9ca5d45..efa076c6f48 100644
20 --- a/dev-java/openjdk/metadata.xml
21 +++ b/dev-java/openjdk/metadata.xml
22 @@ -11,6 +11,7 @@
23 <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
24 <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
25 <flag name="source">Install JVM sources</flag>
26 + <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
27 <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
28 </use>
29 </pkgmetadata>
30
31 diff --git a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
32 index 5b9ce2a9bd0..d606429ebcf 100644
33 --- a/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
34 +++ b/dev-java/openjdk/openjdk-11.0.1_p13.ebuild
35 @@ -1,4 +1,4 @@
36 -# Copyright 1999-2018 Gentoo Authors
37 +# Copyright 1999-2019 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=6
41 @@ -33,12 +33,13 @@ REQUIRED_USE="
42 jvm_variant_zero? ( !jvm_variant_server !jvm_variant_client !jvm_variant_minimal )
43 "
44
45 -IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
46 +IUSE="+${IUSE} alsa debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
47
48 CDEPEND="
49 media-libs/freetype:2=
50 net-print/cups
51 sys-libs/zlib
52 + systemtap? ( dev-util/systemtap )
53 !headless-awt? (
54 x11-libs/libX11
55 x11-libs/libXext
56 @@ -170,6 +171,7 @@ src_configure() {
57 --with-version-pre=gentoo \
58 --with-version-string=${MY_PV%+*} \
59 --with-version-build=${MY_PV#*+} \
60 + --enable-dtrace=$(usex systemtap yes no) \
61 --enable-headless-only=$(usex headless-awt yes no) \
62 --enable-full-docs=no \
63 --disable-ccache \