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 5D405158012 for ; Tue, 13 Sep 2022 23:17:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 754A3E0894; Tue, 13 Sep 2022 23:17:49 +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 555ACE0894 for ; Tue, 13 Sep 2022 23:17:49 +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 4653F340BBD for ; Tue, 13 Sep 2022 23:17:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B72156A for ; Tue, 13 Sep 2022 23:17:46 +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: <1663111054.cc0613141e60d62b391df254f81286e2123c8c1f.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/openjdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild dev-java/openjdk/openjdk-17.0.5_p5.ebuild dev-java/openjdk/openjdk-8.332_p09.ebuild dev-java/openjdk/openjdk-8.345_p01.ebuild X-VCS-Directories: dev-java/openjdk/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: cc0613141e60d62b391df254f81286e2123c8c1f X-VCS-Branch: master Date: Tue, 13 Sep 2022 23:17:46 +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: b80b09b6-25b1-4de8-a2e8-533f8cf11a2d X-Archives-Hash: 4b59cfe849e621fb2a50c7c53acd22a8 commit: cc0613141e60d62b391df254f81286e2123c8c1f Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Sep 13 23:13:08 2022 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Sep 13 23:17:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc061314 dev-java/openjdk: add -ga tag explanation inline Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 6 ++++++ dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild | 6 ++++++ dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 6 ++++++ dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild | 6 ++++++ dev-java/openjdk/openjdk-17.0.5_p5.ebuild | 6 ++++++ dev-java/openjdk/openjdk-8.332_p09.ebuild | 11 ++++++++--- dev-java/openjdk/openjdk-8.345_p01.ebuild | 11 ++++++++--- 7 files changed, 46 insertions(+), 6 deletions(-) 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 ef15a142fec5..feaa4c78cbc9 100644 --- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild @@ -5,6 +5,12 @@ EAPI=7 inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to # set build version properly MY_PV="${PV%_p*}-ga" diff --git a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild index 4952d502f500..055cb96bc4a9 100644 --- a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild @@ -5,6 +5,12 @@ EAPI=7 inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to # set build version properly MY_PV="${PV%_p*}-ga" 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 c79922b35711..9f355b7b9030 100644 --- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild @@ -26,6 +26,12 @@ bootstrap_uri() { echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" } +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. MY_PV="${PV//_p/+}" SLOT="$(ver_cut 1)" diff --git a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild index 36683911df51..2ed126279a79 100644 --- a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild +++ b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild @@ -26,6 +26,12 @@ bootstrap_uri() { echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" } +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. MY_PV="${PV//_p/+}" SLOT="$(ver_cut 1)" diff --git a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild index ce1e101e1c8d..191467d5a34c 100644 --- a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild +++ b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild @@ -26,6 +26,12 @@ bootstrap_uri() { echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" } +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. MY_PV="${PV//_p/+}" SLOT="$(ver_cut 1)" diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild index 2ddd4bb724fa..e2f8f421b145 100644 --- a/dev-java/openjdk/openjdk-8.332_p09.ebuild +++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild @@ -5,9 +5,14 @@ EAPI=7 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs -# we need latest -ga tag from git, but want to keep build number as well -# as _p component of the gentoo version string. - +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" SLOT="${PV%%[.+]*}" diff --git a/dev-java/openjdk/openjdk-8.345_p01.ebuild b/dev-java/openjdk/openjdk-8.345_p01.ebuild index b46632bbb4bb..0981ff23ed4e 100644 --- a/dev-java/openjdk/openjdk-8.345_p01.ebuild +++ b/dev-java/openjdk/openjdk-8.345_p01.ebuild @@ -5,9 +5,14 @@ EAPI=7 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs -# we need latest -ga tag from git, but want to keep build number as well -# as _p component of the gentoo version string. - +# don't change versioning scheme +# to find correct _p number, look at +# https://github.com/openjdk/jdk${SLOT}u/tags +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point +# to exact same commit sha. we should always use the full version. +# -ga tag is just for humans to easily identify General Availability release tag. +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to +# set build version properly MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" SLOT="${PV%%[.+]*}"