Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Tue, 13 Sep 2022 23:17:50
Message-Id: 1663111054.cc0613141e60d62b391df254f81286e2123c8c1f.gyakovlev@gentoo
1 commit: cc0613141e60d62b391df254f81286e2123c8c1f
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 13 23:13:08 2022 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 13 23:17:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc061314
7
8 dev-java/openjdk: add -ga tag explanation inline
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild | 6 ++++++
13 dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild | 6 ++++++
14 dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild | 6 ++++++
15 dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild | 6 ++++++
16 dev-java/openjdk/openjdk-17.0.5_p5.ebuild | 6 ++++++
17 dev-java/openjdk/openjdk-8.332_p09.ebuild | 11 ++++++++---
18 dev-java/openjdk/openjdk-8.345_p01.ebuild | 11 ++++++++---
19 7 files changed, 46 insertions(+), 6 deletions(-)
20
21 diff --git a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
22 index ef15a142fec5..feaa4c78cbc9 100644
23 --- a/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
24 +++ b/dev-java/openjdk/openjdk-11.0.15_p10-r1.ebuild
25 @@ -5,6 +5,12 @@ EAPI=7
26
27 inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
28
29 +# don't change versioning scheme
30 +# to find correct _p number, look at
31 +# https://github.com/openjdk/jdk${SLOT}u/tags
32 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
33 +# to exact same commit sha. we should always use the full version.
34 +# -ga tag is just for humans to easily identify General Availability release tag.
35 # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
36 # set build version properly
37 MY_PV="${PV%_p*}-ga"
38
39 diff --git a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
40 index 4952d502f500..055cb96bc4a9 100644
41 --- a/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
42 +++ b/dev-java/openjdk/openjdk-11.0.16.1_p1.ebuild
43 @@ -5,6 +5,12 @@ EAPI=7
44
45 inherit eapi8-dosym check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
46
47 +# don't change versioning scheme
48 +# to find correct _p number, look at
49 +# https://github.com/openjdk/jdk${SLOT}u/tags
50 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
51 +# to exact same commit sha. we should always use the full version.
52 +# -ga tag is just for humans to easily identify General Availability release tag.
53 # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
54 # set build version properly
55 MY_PV="${PV%_p*}-ga"
56
57 diff --git a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
58 index c79922b35711..9f355b7b9030 100644
59 --- a/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
60 +++ b/dev-java/openjdk/openjdk-17.0.3_p7-r1.ebuild
61 @@ -26,6 +26,12 @@ bootstrap_uri() {
62 echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
63 }
64
65 +# don't change versioning scheme
66 +# to find correct _p number, look at
67 +# https://github.com/openjdk/jdk${SLOT}u/tags
68 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
69 +# to exact same commit sha. we should always use the full version.
70 +# -ga tag is just for humans to easily identify General Availability release tag.
71 MY_PV="${PV//_p/+}"
72 SLOT="$(ver_cut 1)"
73
74
75 diff --git a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
76 index 36683911df51..2ed126279a79 100644
77 --- a/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
78 +++ b/dev-java/openjdk/openjdk-17.0.4.1_p1.ebuild
79 @@ -26,6 +26,12 @@ bootstrap_uri() {
80 echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
81 }
82
83 +# don't change versioning scheme
84 +# to find correct _p number, look at
85 +# https://github.com/openjdk/jdk${SLOT}u/tags
86 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
87 +# to exact same commit sha. we should always use the full version.
88 +# -ga tag is just for humans to easily identify General Availability release tag.
89 MY_PV="${PV//_p/+}"
90
91 SLOT="$(ver_cut 1)"
92
93 diff --git a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
94 index ce1e101e1c8d..191467d5a34c 100644
95 --- a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
96 +++ b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild
97 @@ -26,6 +26,12 @@ bootstrap_uri() {
98 echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })"
99 }
100
101 +# don't change versioning scheme
102 +# to find correct _p number, look at
103 +# https://github.com/openjdk/jdk${SLOT}u/tags
104 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
105 +# to exact same commit sha. we should always use the full version.
106 +# -ga tag is just for humans to easily identify General Availability release tag.
107 MY_PV="${PV//_p/+}"
108 SLOT="$(ver_cut 1)"
109
110
111 diff --git a/dev-java/openjdk/openjdk-8.332_p09.ebuild b/dev-java/openjdk/openjdk-8.332_p09.ebuild
112 index 2ddd4bb724fa..e2f8f421b145 100644
113 --- a/dev-java/openjdk/openjdk-8.332_p09.ebuild
114 +++ b/dev-java/openjdk/openjdk-8.332_p09.ebuild
115 @@ -5,9 +5,14 @@ EAPI=7
116
117 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
118
119 -# we need latest -ga tag from git, but want to keep build number as well
120 -# as _p component of the gentoo version string.
121 -
122 +# don't change versioning scheme
123 +# to find correct _p number, look at
124 +# https://github.com/openjdk/jdk${SLOT}u/tags
125 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
126 +# to exact same commit sha. we should always use the full version.
127 +# -ga tag is just for humans to easily identify General Availability release tag.
128 +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
129 +# set build version properly
130 MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
131 SLOT="${PV%%[.+]*}"
132
133
134 diff --git a/dev-java/openjdk/openjdk-8.345_p01.ebuild b/dev-java/openjdk/openjdk-8.345_p01.ebuild
135 index b46632bbb4bb..0981ff23ed4e 100644
136 --- a/dev-java/openjdk/openjdk-8.345_p01.ebuild
137 +++ b/dev-java/openjdk/openjdk-8.345_p01.ebuild
138 @@ -5,9 +5,14 @@ EAPI=7
139
140 inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
141
142 -# we need latest -ga tag from git, but want to keep build number as well
143 -# as _p component of the gentoo version string.
144 -
145 +# don't change versioning scheme
146 +# to find correct _p number, look at
147 +# https://github.com/openjdk/jdk${SLOT}u/tags
148 +# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
149 +# to exact same commit sha. we should always use the full version.
150 +# -ga tag is just for humans to easily identify General Availability release tag.
151 +# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
152 +# set build version properly
153 MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
154 SLOT="${PV%%[.+]*}"
Report Message
Find on MARC Find on Google Groups