From: Petteri Räty <betelgeuse@gentoo.org>
Date: Sun, 29 Apr 2007 13:06:31 +0000 (+0000)
Subject: RDEPEND on dev-java/ant-core and call java-pkg-2_pkg_setup in pkg_setup.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b584b3d3c6ea385c9034ec24fab4573c4427c39;p=gentoo.git

RDEPEND on dev-java/ant-core and call java-pkg-2_pkg_setup in pkg_setup.
Package-Manager: portage-2.1.2.5
---

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/Manifest b/www-servers/tomcat/Manifest
index b9251634fd07..0b85347fc3d7 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.5/catalina_build_xml.patch 1149 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 SHA1 8eda11132851da5773ceb33f90515f0c8ffabdb6 SHA256 dc2d7255dd990359f765f329a04825aca18888e505b4024bb64e0dc6e348498e
 MD5 4b2dbaa2a74776229f4fffa1274d0a13 files/5.5/catalina_build_xml.patch 1149
 RMD160 9622ca4f688e2c57e4bc34f08ceebb651f75deb1 files/5.5/catalina_build_xml.patch 1149
@@ -44,18 +47,18 @@ RMD160 1fb76aaed26e38112f504bff67c004626af13d36 files/6/tomcat.init 3350
 SHA256 a401131da25f7855c6123143bf0e17e3b8df138b0e5fdfdf2dc32e79f51f57b8 files/6/tomcat.init 3350
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
-EBUILD tomcat-5.5.23-r1.ebuild 10584 RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd SHA1 58efb4c5d483e3a4bc8cb47ccbaf81607ba9e29d SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c
-MD5 367fce83dfc2e05c71de752be7dfd1e4 tomcat-5.5.23-r1.ebuild 10584
-RMD160 c42b0b5268b7cc6e4047fbf8da52b0be12a783dd tomcat-5.5.23-r1.ebuild 10584
-SHA256 744de62a876d0b2567d80aa9c1252f37c8c4ad6d0f74920693692b0ddf59000c tomcat-5.5.23-r1.ebuild 10584
+EBUILD tomcat-5.5.23-r1.ebuild 10630 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 SHA1 d731665a2123e5d73952c48dce272e94334bbd4e SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b
+MD5 ddc708762bdbc5648c2bbd2363e8996d tomcat-5.5.23-r1.ebuild 10630
+RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 tomcat-5.5.23-r1.ebuild 10630
+SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b tomcat-5.5.23-r1.ebuild 10630
 EBUILD tomcat-6.0.10-r4.ebuild 5510 RMD160 0cb80c1315fe43650232e3166265026f481d5f9a SHA1 b1147f67215491bfdaf3657c1dc2261796eea759 SHA256 8d66e39ff8096386a8847caf1e789586d3bceba183e90683b86afa8194e09a55
 MD5 d787c758a58cda5825213c76ad0748d4 tomcat-6.0.10-r4.ebuild 5510
 RMD160 0cb80c1315fe43650232e3166265026f481d5f9a tomcat-6.0.10-r4.ebuild 5510
 SHA256 8d66e39ff8096386a8847caf1e789586d3bceba183e90683b86afa8194e09a55 tomcat-6.0.10-r4.ebuild 5510
-MISC ChangeLog 44056 RMD160 ff0dba5306827777076bd234f0cb99658d44846f SHA1 093fb87c1974abba2d59b0d57b59ef62db8f7be0 SHA256 11a5bd3e6c20e75f4ef6acf07d372b59f85cd7c142e2bb3d7fe2aedd04e1608e
-MD5 71894f922f6e70ef3cd24a17c80616ee ChangeLog 44056
-RMD160 ff0dba5306827777076bd234f0cb99658d44846f ChangeLog 44056
-SHA256 11a5bd3e6c20e75f4ef6acf07d372b59f85cd7c142e2bb3d7fe2aedd04e1608e ChangeLog 44056
+MISC ChangeLog 44217 RMD160 7547a8c125ad4b7436f19c6ca3647ab79a62e40c SHA1 e4cb9d42b86db269dccc6612f49d819c36b710ba SHA256 143892d2021fb83000b9b486261269a4d88b20718ee1988cf1faecd0fe19fdac
+MD5 13ef18c3bc65e6ea8a273796256360d0 ChangeLog 44217
+RMD160 7547a8c125ad4b7436f19c6ca3647ab79a62e40c ChangeLog 44217
+SHA256 143892d2021fb83000b9b486261269a4d88b20718ee1988cf1faecd0fe19fdac ChangeLog 44217
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -66,3 +69,10 @@ SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/di
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r4 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r4 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r4 277
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGNJhccxLzpIGCsLQRAo+RAJ0RvYc7q6HGUUD+u4fyvawLj9MpPgCfSmDn
+fYijM0SC/UmRBbnJN0rljzk=
+=NR5g
+-----END PGP SIGNATURE-----
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