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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 699D3158093 for ; Mon, 4 Jul 2022 10:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBB4EE08F3; Mon, 4 Jul 2022 10:44:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B5ACE08F3 for ; Mon, 4 Jul 2022 10:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9DCD23419A3 for ; Mon, 4 Jul 2022 10:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09E7D526 for ; Mon, 4 Jul 2022 10:44:56 +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: <1656931472.47a6b18cec31fafb037c2aa6189cc1c026055e42.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/files/, dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/files/openjdk-11.env.sh dev-java/openjdk/files/openjdk-17.env.sh dev-java/openjdk/files/openjdk-8.env.sh dev-java/openjdk/files/openjdk.env.sh dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild X-VCS-Directories: dev-java/openjdk/files/ dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 47a6b18cec31fafb037c2aa6189cc1c026055e42 X-VCS-Branch: master Date: Mon, 4 Jul 2022 10:44:56 +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: ded64a86-957a-423e-a43f-e9a53bd557e7 X-Archives-Hash: acb6470caa13e7eb2be59477f17a7590 commit: 47a6b18cec31fafb037c2aa6189cc1c026055e42 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 28 18:28:56 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Jul 4 10:44:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a6b18c dev-java/openjdk: consolidate env files Also drop the pointless copyright notice. Signed-off-by: Mike Gilbert gentoo.org> Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/files/openjdk-17.env.sh | 16 ---------------- dev-java/openjdk/files/openjdk-8.env.sh | 3 --- .../openjdk/files/{openjdk-11.env.sh => openjdk.env.sh} | 3 --- dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 2 +- dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 2 +- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dev-java/openjdk/files/openjdk-17.env.sh b/dev-java/openjdk/files/openjdk-17.env.sh deleted file mode 100644 index 7db6461bf48f..000000000000 --- a/dev-java/openjdk/files/openjdk-17.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="OpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk/files/openjdk-8.env.sh b/dev-java/openjdk/files/openjdk-8.env.sh index 8f863e4c869a..cc0bc80b474b 100644 --- a/dev-java/openjdk/files/openjdk-8.env.sh +++ b/dev-java/openjdk/files/openjdk-8.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/files/openjdk-11.env.sh b/dev-java/openjdk/files/openjdk.env.sh similarity index 80% rename from dev-java/openjdk/files/openjdk-11.env.sh rename to dev-java/openjdk/files/openjdk.env.sh index 96c4be79c33f..287c0578b7c2 100644 --- a/dev-java/openjdk/files/openjdk-11.env.sh +++ b/dev-java/openjdk/files/openjdk.env.sh @@ -1,6 +1,3 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - VERSION="OpenJDK ${PV}" JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild index 8431ae423614..4b7612e1259b 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild @@ -278,7 +278,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild index 18915c340d94..226b675fbd2f 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild @@ -291,7 +291,7 @@ src_install() { einfo "Creating the Class Data Sharing archives and disabling usage tracking" "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh + use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh java-vm_revdep-mask java-vm_sandbox-predict /dev/random /proc/self/coredump_filter