commit: 594cdc4ea544012ef08d1014671873d0127c6440
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 08:24:19 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 08:24:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594cdc4e
www-servers/tomcat: switched to acct
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
www-servers/tomcat/tomcat-7.0.106.ebuild | 10 +++-------
www-servers/tomcat/tomcat-7.0.107.ebuild | 10 +++-------
www-servers/tomcat/tomcat-8.5.60.ebuild | 10 +++-------
www-servers/tomcat/tomcat-8.5.61.ebuild | 10 +++-------
www-servers/tomcat/tomcat-9.0.40.ebuild | 10 +++-------
www-servers/tomcat/tomcat-9.0.41.ebuild | 10 +++-------
6 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild
b/www-servers/tomcat/tomcat-7.0.106.ebuild
index a905c145be4..84121125211 100644
--- a/www-servers/tomcat/tomcat-7.0.106.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild
b/www-servers/tomcat/tomcat-7.0.107.ebuild
index a905c145be4..84121125211 100644
--- a/www-servers/tomcat/tomcat-7.0.107.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.60.ebuild
b/www-servers/tomcat/tomcat-8.5.60.ebuild
index ae1fd17bba2..3a82c34d5f2 100644
--- a/www-servers/tomcat/tomcat-8.5.60.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.61.ebuild
b/www-servers/tomcat/tomcat-8.5.61.ebuild
index 86d3e5d6591..43b89effd49 100644
--- a/www-servers/tomcat/tomcat-8.5.61.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.61.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild
b/www-servers/tomcat/tomcat-9.0.40.ebuild
index 41d3c02f774..f85b6b5aea2 100644
--- a/www-servers/tomcat/tomcat-9.0.40.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink
bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.41.ebuild
b/www-servers/tomcat/tomcat-9.0.41.ebuild
index 7f7ed06bb02..94eda2d7236 100644
--- a/www-servers/tomcat/tomcat-9.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.41.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink
bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
