From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2BFD138359 for ; Sat, 5 Sep 2020 06:32:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E61A7E081E; Sat, 5 Sep 2020 06:32:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDD21E081E for ; Sat, 5 Sep 2020 06:32:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 707A8340CB6 for ; Sat, 5 Sep 2020 06:32:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD926342 for ; Sat, 5 Sep 2020 06:32:31 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1599287476.078b41597702e6ed5ca5a5605380bab675b1b701.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/metadata.xml dev-java/openjdk/openjdk-11.0.8_p10.ebuild dev-java/openjdk/openjdk-8.265_p01.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 078b41597702e6ed5ca5a5605380bab675b1b701 X-VCS-Branch: master Date: Sat, 5 Sep 2020 06:32:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 48c8fa0b-0cd0-4d27-930b-46b366580398 X-Archives-Hash: 57dee77d443fa46669341123f3e1ba18 commit: 078b41597702e6ed5ca5a5605380bab675b1b701 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Sep 5 06:19:26 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Sep 5 06:31:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078b4159 dev-java/openjdk: drop nsplugin, webstart flags. simply install icedtea-web instead Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/metadata.xml | 1 - dev-java/openjdk/openjdk-11.0.8_p10.ebuild | 7 +------ dev-java/openjdk/openjdk-8.265_p01.ebuild | 8 ++------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index c9555ad9e77..ebcb18f5897 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -24,6 +24,5 @@ Build OpenJDK twice, the second time using the result of the first Install JVM sources Enable SystemTAP/DTrace tracing - Provide javaws command through symlink to icedtea-web diff --git a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild index 35a2c27c3f8..403654841b0 100644 --- a/dev-java/openjdk/openjdk-11.0.8_p10.ebuild +++ b/dev-java/openjdk/openjdk-11.0.8_p10.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}. LICENSE="GPL-2" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart" +IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -68,11 +68,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - REQUIRED_USE="javafx? ( alsa !headless-awt )" S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild index d88de6a02a7..df934d0962a 100644 --- a/dev-java/openjdk/openjdk-8.265_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild @@ -28,7 +28,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="$(ver_cut 1)" KEYWORDS="amd64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart" +IUSE="alsa debug cups doc examples headless-awt +jbootstrap +pch selinux source" COMMON_DEPEND=" media-libs/freetype:2= @@ -73,11 +73,6 @@ DEPEND=" ) " -PDEPEND=" - webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) -" - S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}" # The space required to build varies wildly depending on USE flags, @@ -223,4 +218,5 @@ src_install() { pkg_postinst() { java-vm-2_pkg_postinst + einfo "JavaWebStart functionality provided by icedtea-web package" }