From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1360442-garchives=archives.gentoo.org@lists.gentoo.org> 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 05E0B158087 for <garchives@archives.gentoo.org>; Sat, 22 Jan 2022 21:18:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA2752BC008; Sat, 22 Jan 2022 21:18:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 42B122BC008 for <gentoo-commits@lists.gentoo.org>; Sat, 22 Jan 2022 21:18:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0B977343175 for <gentoo-commits@lists.gentoo.org>; Sat, 22 Jan 2022 21:18:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44076D0 for <gentoo-commits@lists.gentoo.org>; Sat, 22 Jan 2022 21:18:01 +0000 (UTC) From: "Georgy Yakovlev" <gyakovlev@gentoo.org> 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" <gyakovlev@gentoo.org> Message-ID: <1642886275.d1ff6d69a33d8c12ce9edaece3be362e983fa66d.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild X-VCS-Directories: dev-java/openjdk-bin/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: d1ff6d69a33d8c12ce9edaece3be362e983fa66d X-VCS-Branch: master Date: Sat, 22 Jan 2022 21:18:01 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 03b6f8a3-8b06-4ab7-b7bb-383d814cabf7 X-Archives-Hash: b62bc6bb9ae142e412e61838e6cfcdc6 commit: d1ff6d69a33d8c12ce9edaece3be362e983fa66d Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sat Jan 22 21:17:11 2022 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sat Jan 22 21:17:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ff6d69 dev-java/openjdk-bin: fix installation directory Bug: https://bugs.gentoo.org/831780 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> ...penjdk-bin-11.0.14_p9.ebuild => openjdk-bin-11.0.14_p9-r1.ebuild} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild similarity index 97% rename from dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild rename to dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild index 019ca529d3b6..8a314444f21d 100644 --- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9.ebuild +++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild @@ -71,7 +71,7 @@ src_unpack() { } src_install() { - local dest="/opt/${PN}-${SLOT}" + local dest="/opt/${P}" local ddest="${ED}/${dest#/}" # on macOS if they would exist they would be called .dylib, but most @@ -107,6 +107,9 @@ src_install() { dodir "${dest}" cp -pPR * "${ddest}" || die + # provide stable symlink + dosym "${P}" "/opt/${PN}-${SLOT}" + java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh java-vm_set-pax-markings "${ddest}" java-vm_revdep-mask