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

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/
Date: Wed, 30 Dec 2020 08:24:33
Message-Id: 1609316659.594cdc4ea544012ef08d1014671873d0127c6440.fordfrog@gentoo
1 commit: 594cdc4ea544012ef08d1014671873d0127c6440
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 30 08:24:19 2020 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 30 08:24:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594cdc4e
7
8 www-servers/tomcat: switched to acct
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 www-servers/tomcat/tomcat-7.0.106.ebuild | 10 +++-------
14 www-servers/tomcat/tomcat-7.0.107.ebuild | 10 +++-------
15 www-servers/tomcat/tomcat-8.5.60.ebuild | 10 +++-------
16 www-servers/tomcat/tomcat-8.5.61.ebuild | 10 +++-------
17 www-servers/tomcat/tomcat-9.0.40.ebuild | 10 +++-------
18 www-servers/tomcat/tomcat-9.0.41.ebuild | 10 +++-------
19 6 files changed, 18 insertions(+), 42 deletions(-)
20
21 diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild
22 index a905c145be4..84121125211 100644
23 --- a/www-servers/tomcat/tomcat-7.0.106.ebuild
24 +++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
25 @@ -5,7 +5,7 @@ EAPI=7
26
27 JAVA_PKG_IUSE="doc source test"
28
29 -inherit eutils java-pkg-2 java-ant-2 prefix user
30 +inherit eutils java-pkg-2 java-ant-2 prefix
31
32 MY_P="apache-${P}-src"
33
34 @@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
35 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
36 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
37 RDEPEND="${COMMON_DEP}
38 + acct-group/tomcat
39 + acct-user/tomcat
40 virtual/jre"
41 DEPEND="${COMMON_DEP}
42 virtual/jdk:1.8
43 @@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
44
45 S=${WORKDIR}/${MY_P}
46
47 -pkg_setup() {
48 - java-pkg-2_pkg_setup
49 - enewgroup tomcat 265
50 - enewuser tomcat 265 -1 /dev/null tomcat
51 -}
52 -
53 src_prepare() {
54 default
55
56
57 diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild
58 index a905c145be4..84121125211 100644
59 --- a/www-servers/tomcat/tomcat-7.0.107.ebuild
60 +++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
61 @@ -5,7 +5,7 @@ EAPI=7
62
63 JAVA_PKG_IUSE="doc source test"
64
65 -inherit eutils java-pkg-2 java-ant-2 prefix user
66 +inherit eutils java-pkg-2 java-ant-2 prefix
67
68 MY_P="apache-${P}-src"
69
70 @@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
71 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
72 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
73 RDEPEND="${COMMON_DEP}
74 + acct-group/tomcat
75 + acct-user/tomcat
76 virtual/jre"
77 DEPEND="${COMMON_DEP}
78 virtual/jdk:1.8
79 @@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
80
81 S=${WORKDIR}/${MY_P}
82
83 -pkg_setup() {
84 - java-pkg-2_pkg_setup
85 - enewgroup tomcat 265
86 - enewuser tomcat 265 -1 /dev/null tomcat
87 -}
88 -
89 src_prepare() {
90 default
91
92
93 diff --git a/www-servers/tomcat/tomcat-8.5.60.ebuild b/www-servers/tomcat/tomcat-8.5.60.ebuild
94 index ae1fd17bba2..3a82c34d5f2 100644
95 --- a/www-servers/tomcat/tomcat-8.5.60.ebuild
96 +++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
97 @@ -5,7 +5,7 @@ EAPI=7
98
99 JAVA_PKG_IUSE="doc source test"
100
101 -inherit eutils java-pkg-2 java-ant-2 prefix user
102 +inherit eutils java-pkg-2 java-ant-2 prefix
103
104 MY_P="apache-${P}-src"
105
106 @@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
107 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
108 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
109 RDEPEND="${COMMON_DEP}
110 + acct-group/tomcat
111 + acct-user/tomcat
112 virtual/jre"
113 DEPEND="${COMMON_DEP}
114 app-admin/pwgen
115 @@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
116
117 S=${WORKDIR}/${MY_P}
118
119 -pkg_setup() {
120 - java-pkg-2_pkg_setup
121 - enewgroup tomcat 265
122 - enewuser tomcat 265 -1 /dev/null tomcat
123 -}
124 -
125 src_prepare() {
126 default
127
128
129 diff --git a/www-servers/tomcat/tomcat-8.5.61.ebuild b/www-servers/tomcat/tomcat-8.5.61.ebuild
130 index 86d3e5d6591..43b89effd49 100644
131 --- a/www-servers/tomcat/tomcat-8.5.61.ebuild
132 +++ b/www-servers/tomcat/tomcat-8.5.61.ebuild
133 @@ -5,7 +5,7 @@ EAPI=7
134
135 JAVA_PKG_IUSE="doc source test"
136
137 -inherit eutils java-pkg-2 java-ant-2 prefix user
138 +inherit eutils java-pkg-2 java-ant-2 prefix
139
140 MY_P="apache-${P}-src"
141
142 @@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
143 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
144 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
145 RDEPEND="${COMMON_DEP}
146 + acct-group/tomcat
147 + acct-user/tomcat
148 virtual/jre"
149 DEPEND="${COMMON_DEP}
150 app-admin/pwgen
151 @@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
152
153 S=${WORKDIR}/${MY_P}
154
155 -pkg_setup() {
156 - java-pkg-2_pkg_setup
157 - enewgroup tomcat 265
158 - enewuser tomcat 265 -1 /dev/null tomcat
159 -}
160 -
161 src_prepare() {
162 default
163
164
165 diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
166 index 41d3c02f774..f85b6b5aea2 100644
167 --- a/www-servers/tomcat/tomcat-9.0.40.ebuild
168 +++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
169 @@ -5,7 +5,7 @@ EAPI=7
170
171 JAVA_PKG_IUSE="doc source test"
172
173 -inherit eutils java-pkg-2 java-ant-2 prefix user
174 +inherit eutils java-pkg-2 java-ant-2 prefix
175
176 MY_P="apache-${PN}-${PV}-src"
177
178 @@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
179 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
180 dev-java/wsdl4j:0"
181 RDEPEND="${COMMON_DEP}
182 + acct-group/tomcat
183 + acct-user/tomcat
184 virtual/jre"
185 DEPEND="${COMMON_DEP}
186 app-admin/pwgen
187 @@ -65,12 +67,6 @@ src_unpack() {
188 ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
189 }
190
191 -pkg_setup() {
192 - java-pkg-2_pkg_setup
193 - enewgroup tomcat 265
194 - enewuser tomcat 265 -1 /dev/null tomcat
195 -}
196 -
197 src_prepare() {
198 default
199
200
201 diff --git a/www-servers/tomcat/tomcat-9.0.41.ebuild b/www-servers/tomcat/tomcat-9.0.41.ebuild
202 index 7f7ed06bb02..94eda2d7236 100644
203 --- a/www-servers/tomcat/tomcat-9.0.41.ebuild
204 +++ b/www-servers/tomcat/tomcat-9.0.41.ebuild
205 @@ -5,7 +5,7 @@ EAPI=7
206
207 JAVA_PKG_IUSE="doc source test"
208
209 -inherit eutils java-pkg-2 java-ant-2 prefix user
210 +inherit eutils java-pkg-2 java-ant-2 prefix
211
212 MY_P="apache-${PN}-${PV}-src"
213
214 @@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
215 ~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
216 dev-java/wsdl4j:0"
217 RDEPEND="${COMMON_DEP}
218 + acct-group/tomcat
219 + acct-user/tomcat
220 virtual/jre"
221 DEPEND="${COMMON_DEP}
222 app-admin/pwgen
223 @@ -65,12 +67,6 @@ src_unpack() {
224 ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
225 }
226
227 -pkg_setup() {
228 - java-pkg-2_pkg_setup
229 - enewgroup tomcat 265
230 - enewuser tomcat 265 -1 /dev/null tomcat
231 -}
232 -
233 src_prepare() {
234 default
Report Message
Find on MARC Find on Google Groups