summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-04-29 13:06:31 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-04-29 13:06:31 +0000
commita3c8078b6179688adad98a69deb455e73c420d7e (patch)
tree5c8a1ceef6a0a54521e2ec2a2e2f5f6e0d1536df /www-servers
parentHandle the case in elisp-site-regen that there are no site-init files. (diff)
downloadgentoo-2-a3c8078b6179688adad98a69deb455e73c420d7e.tar.gz
gentoo-2-a3c8078b6179688adad98a69deb455e73c420d7e.tar.bz2
gentoo-2-a3c8078b6179688adad98a69deb455e73c420d7e.zip
RDEPEND on dev-java/ant-core and call java-pkg-2_pkg_setup in pkg_setup.
(Portage version: 2.1.2.5)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/tomcat-5.5.23-r1.ebuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index aec3098fcda8..f9bb2b376178 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.136 2007/04/23 20:40:14 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.137 2007/04/29 13:06:31 betelgeuse Exp $
+
+ 29 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+ tomcat-5.5.23-r1.ebuild:
+ RDEPEND on dev-java/ant-core and call java-pkg-2_pkg_setup in pkg_setup.
*tomcat-6.0.10-r4 (23 Apr 2007)
diff --git a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
index 8fd4ea72d066..150570b880de 100644
--- a/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.23-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.3 2007/04/07 00:35:32 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.23-r1.ebuild,v 1.4 2007/04/29 13:06:31 betelgeuse Exp $
#WANT_ANT_TASKS="ant-trax"
@@ -35,6 +35,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.2*
>=dev-java/log4j-1.2.9
>=dev-java/saxpath-1.0
~dev-java/tomcat-servlet-api-${PV}
+ dev-java/ant-core
admin? ( =dev-java/struts-1.2* )
dev-java/sun-javamail
java5? ( >=virtual/jre-1.5 )
@@ -56,6 +57,7 @@ TOMCAT_NAME="${PN}-${SLOT}"
WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
pkg_setup() {
+ java-pkg-2_pkg_setup
# new user for tomcat
enewgroup tomcat
enewuser tomcat -1 -1 /dev/null tomcat