diff options
Diffstat (limited to 'www-servers/tomcat/tomcat-7.0.107.ebuild')
-rw-r--r-- | www-servers/tomcat/tomcat-7.0.107.ebuild | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild index acdb9985f254..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" @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="7" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps websockets" RESTRICT="test" # can we run them on a production system? @@ -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 |