Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-regexp/
Date: Tue, 18 Jan 2022 09:51:25
Message-Id: 1642499478.ace27ff4b5d966a6843f86da8f26710f1e8bcfcd.fordfrog@gentoo
1 commit: ace27ff4b5d966a6843f86da8f26710f1e8bcfcd
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 09:49:56 2022 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 09:51:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace27ff4
7
8 dev-java/jakarta-regexp: eapi8 + min java 1.8 + https + cleanup
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild | 4 ++--
14 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.3-r6.ebuild} | 18 +++++++++---------
15 dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild | 4 ++--
16 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.4-r3.ebuild} | 17 ++++++++---------
17 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.5-r1.ebuild} | 17 ++++++++---------
18 dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild | 4 ++--
19 6 files changed, 31 insertions(+), 33 deletions(-)
20
21 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
22 index ddfe39278ff9..f5a39f4ca7d2 100644
23 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
24 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
25 @@ -1,4 +1,4 @@
26 -# Copyright 1999-2021 Gentoo Authors
27 +# Copyright 1999-2022 Gentoo Authors
28 # Distributed under the terms of the GNU General Public License v2
29
30 EAPI=5
31 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
32
33 DESCRIPTION="100% Pure Java Regular Expression package"
34 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
35 -HOMEPAGE="http://jakarta.apache.org/"
36 +HOMEPAGE="https://jakarta.apache.org/"
37
38 SLOT="${PV}"
39 IUSE=""
40
41 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
42 similarity index 59%
43 copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
44 copy to dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
45 index ddfe39278ff9..ab1d50e24403 100644
46 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
47 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
48 @@ -1,7 +1,7 @@
49 -# Copyright 1999-2021 Gentoo Authors
50 +# Copyright 1999-2022 Gentoo Authors
51 # Distributed under the terms of the GNU General Public License v2
52
53 -EAPI=5
54 +EAPI=8
55
56 JAVA_PKG_IUSE="doc source"
57
58 @@ -9,25 +9,25 @@ inherit java-pkg-2 java-pkg-simple
59
60 DESCRIPTION="100% Pure Java Regular Expression package"
61 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
62 -HOMEPAGE="http://jakarta.apache.org/"
63 +HOMEPAGE="https://jakarta.apache.org/"
64
65 SLOT="${PV}"
66 IUSE=""
67 LICENSE="Apache-1.1"
68 -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
69 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
70
71 RDEPEND="
72 - >=virtual/jre-1.6"
73 + >=virtual/jre-1.8:*"
74
75 DEPEND="
76 - >=virtual/jdk-1.6
77 - source? ( app-arch/zip )"
78 + >=virtual/jdk-1.8:*"
79
80 S="${WORKDIR}/${P}"
81
82 JAVA_SRC_DIR="src/java"
83
84 -java_prepare() {
85 +src_prepare() {
86 + default
87 +
88 java-pkg_clean
89 - rm build.xml || die
90 }
91
92 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
93 index ddfe39278ff9..f5a39f4ca7d2 100644
94 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
95 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
96 @@ -1,4 +1,4 @@
97 -# Copyright 1999-2021 Gentoo Authors
98 +# Copyright 1999-2022 Gentoo Authors
99 # Distributed under the terms of the GNU General Public License v2
100
101 EAPI=5
102 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
103
104 DESCRIPTION="100% Pure Java Regular Expression package"
105 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
106 -HOMEPAGE="http://jakarta.apache.org/"
107 +HOMEPAGE="https://jakarta.apache.org/"
108
109 SLOT="${PV}"
110 IUSE=""
111
112 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
113 similarity index 59%
114 copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
115 copy to dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
116 index ddfe39278ff9..db72332f033f 100644
117 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
118 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
119 @@ -1,7 +1,7 @@
120 -# Copyright 1999-2021 Gentoo Authors
121 +# Copyright 1999-2022 Gentoo Authors
122 # Distributed under the terms of the GNU General Public License v2
123
124 -EAPI=5
125 +EAPI=8
126
127 JAVA_PKG_IUSE="doc source"
128
129 @@ -9,25 +9,24 @@ inherit java-pkg-2 java-pkg-simple
130
131 DESCRIPTION="100% Pure Java Regular Expression package"
132 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
133 -HOMEPAGE="http://jakarta.apache.org/"
134 +HOMEPAGE="https://jakarta.apache.org/"
135
136 SLOT="${PV}"
137 IUSE=""
138 LICENSE="Apache-1.1"
139 -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
140 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
141
142 RDEPEND="
143 - >=virtual/jre-1.6"
144 + >=virtual/jre-1.8:*"
145
146 DEPEND="
147 - >=virtual/jdk-1.6
148 - source? ( app-arch/zip )"
149 + >=virtual/jdk-1.8:*"
150
151 S="${WORKDIR}/${P}"
152
153 JAVA_SRC_DIR="src/java"
154
155 -java_prepare() {
156 +src_prepare() {
157 + default
158 java-pkg_clean
159 - rm build.xml || die
160 }
161
162 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
163 similarity index 59%
164 copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
165 copy to dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
166 index ddfe39278ff9..db72332f033f 100644
167 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
168 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
169 @@ -1,7 +1,7 @@
170 -# Copyright 1999-2021 Gentoo Authors
171 +# Copyright 1999-2022 Gentoo Authors
172 # Distributed under the terms of the GNU General Public License v2
173
174 -EAPI=5
175 +EAPI=8
176
177 JAVA_PKG_IUSE="doc source"
178
179 @@ -9,25 +9,24 @@ inherit java-pkg-2 java-pkg-simple
180
181 DESCRIPTION="100% Pure Java Regular Expression package"
182 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
183 -HOMEPAGE="http://jakarta.apache.org/"
184 +HOMEPAGE="https://jakarta.apache.org/"
185
186 SLOT="${PV}"
187 IUSE=""
188 LICENSE="Apache-1.1"
189 -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
190 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
191
192 RDEPEND="
193 - >=virtual/jre-1.6"
194 + >=virtual/jre-1.8:*"
195
196 DEPEND="
197 - >=virtual/jdk-1.6
198 - source? ( app-arch/zip )"
199 + >=virtual/jdk-1.8:*"
200
201 S="${WORKDIR}/${P}"
202
203 JAVA_SRC_DIR="src/java"
204
205 -java_prepare() {
206 +src_prepare() {
207 + default
208 java-pkg_clean
209 - rm build.xml || die
210 }
211
212 diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
213 index ddfe39278ff9..f5a39f4ca7d2 100644
214 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
215 +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
216 @@ -1,4 +1,4 @@
217 -# Copyright 1999-2021 Gentoo Authors
218 +# Copyright 1999-2022 Gentoo Authors
219 # Distributed under the terms of the GNU General Public License v2
220
221 EAPI=5
222 @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
223
224 DESCRIPTION="100% Pure Java Regular Expression package"
225 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
226 -HOMEPAGE="http://jakarta.apache.org/"
227 +HOMEPAGE="https://jakarta.apache.org/"
228
229 SLOT="${PV}"
230 IUSE=""