From 594cdc4ea544012ef08d1014671873d0127c6440 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Wed, 30 Dec 2020 09:24:19 +0100 Subject: www-servers/tomcat: switched to acct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Miroslav Šulc --- 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(-) (limited to 'www-servers') diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild index a905c145be4a..84121125211a 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 a905c145be4a..84121125211a 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 ae1fd17bba26..3a82c34d5f2c 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 86d3e5d65919..43b89effd490 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 41d3c02f7744..f85b6b5aea23 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 7f7ed06bb02d..94eda2d7236b 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 -- cgit v1.2.3-65-gdbad