Fixed init script to respect per bug # 148331. Removed older ebuild

5 files changed, 36 insertions, 29 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 9f93f1ccec9b..c9c694cf2190 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.60 2006/09/10 23:28:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.61 2006/09/20 14:34:06 wltjr Exp $
+
+*tomcat-5.5.17-r5 (20 Sep 2006)
+
+  20 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/5.5.17/tomcat.init, -tomcat-5.5.17-r3.ebuild,
+  +tomcat-5.5.17-r5.ebuild:
+  Fixed init script to respect  per bug # 148331. Removed older ebuild
 
 *tomcat-5.5.17-r4 (09 Sep 2006)
 *tomcat-5.0.28-r13 (09 Sep 2006)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7e1e7313ad74..e13eb9a15f21 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -90,10 +90,10 @@ AUX 5.5.17/tomcat.env 36 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 SHA1 1c
 MD5 f41b77c0652379c5cfbe0f04bf99b4c2 files/5.5.17/tomcat.env 36
 RMD160 2d6488d26696ec0624b7774d3a31cb02afeaeea0 files/5.5.17/tomcat.env 36
 SHA256 c2aa217a92fb637fb81a77c98cd769932923bbe65e72c25295993f7cf4982fef files/5.5.17/tomcat.env 36
-AUX 5.5.17/tomcat.init 3030 RMD160 b129c0e1787bd430eb0e1f81f95dc17180de8f34 SHA1 e24c0e457139d308df7c01c2e31a6716aab87cbc SHA256 9c37df228776f4eb956169aaaededef286a9c765533a94599b66cd27d8af2051
-MD5 21ad5253db7a693b52ab702642ed1859 files/5.5.17/tomcat.init 3030
-RMD160 b129c0e1787bd430eb0e1f81f95dc17180de8f34 files/5.5.17/tomcat.init 3030
-SHA256 9c37df228776f4eb956169aaaededef286a9c765533a94599b66cd27d8af2051 files/5.5.17/tomcat.init 3030
+AUX 5.5.17/tomcat.init 3042 RMD160 77188431937c2d2d96cd38d459e572b0ad63f058 SHA1 43a62bfdd5214367125f2c71a0fa47c160ffb22e SHA256 bbed3d360595e204412d053314ada38502157b491025aef172a5b96f3afed487
+MD5 c4b888d49301372ec936bc82e00ca2af files/5.5.17/tomcat.init 3042
+RMD160 77188431937c2d2d96cd38d459e572b0ad63f058 files/5.5.17/tomcat.init 3042
+SHA256 bbed3d360595e204412d053314ada38502157b491025aef172a5b96f3afed487 files/5.5.17/tomcat.init 3042
 AUX 5.5.17/tomcatbuild-xml-docs.patch 4745 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 SHA1 7c2d036d8931409dab360ed83346a6fc69203cf4 SHA256 ac0248500302ff5bac595296e30008dccc5e901c13a998aff859a36c6c8945ff
 MD5 ca2c6c89f893448ccaeebff6255b285f files/5.5.17/tomcatbuild-xml-docs.patch 4745
 RMD160 ad084d8290dd628a4b1e1a13bfdc3dca7446fa04 files/5.5.17/tomcatbuild-xml-docs.patch 4745
@@ -121,18 +121,18 @@ EBUILD tomcat-5.0.28-r13.ebuild 9390 RMD160 edc2241e882d1b2e3b297927765c5358fd8f
 MD5 1533455980569c6999d5b9fe276d913f tomcat-5.0.28-r13.ebuild 9390
 RMD160 edc2241e882d1b2e3b297927765c5358fd8fce32 tomcat-5.0.28-r13.ebuild 9390
 SHA256 4a6b027e912c7ff680421cedf22b2dbc009f2639d076c5a1b3d3ad7e625ee502 tomcat-5.0.28-r13.ebuild 9390
-EBUILD tomcat-5.5.17-r3.ebuild 10053 RMD160 58a43bdfd1c1ca129c64963b34faa70122c0971c SHA1 d42e8f7e5c1b29d760b93fecdf9b7c83f68c3dfd SHA256 e6959fb8c5bd09675ae04111a2f1c6f009037744bf50d8190e5897688407c729
-MD5 b05aa6889edc42a90e7254af4c8666fa tomcat-5.5.17-r3.ebuild 10053
-RMD160 58a43bdfd1c1ca129c64963b34faa70122c0971c tomcat-5.5.17-r3.ebuild 10053
-SHA256 e6959fb8c5bd09675ae04111a2f1c6f009037744bf50d8190e5897688407c729 tomcat-5.5.17-r3.ebuild 10053
 EBUILD tomcat-5.5.17-r4.ebuild 10024 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 SHA1 c337e729d3362c15d0cdd0f12edf658196894547 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa
 MD5 4f894fdb598e788028129044b66e5a0d tomcat-5.5.17-r4.ebuild 10024
 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 tomcat-5.5.17-r4.ebuild 10024
 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa tomcat-5.5.17-r4.ebuild 10024
-MISC ChangeLog 22400 RMD160 66f88c71c4bbdc2e50b838ae49a733bbcf2b78bc SHA1 e48c3de8525cfa8ab7a72d540907b7a71ee330cd SHA256 8b03ed621a2dd72ca1e3b846c39ca68d158171fb69edd62c613da1062e66c2c3
-MD5 af9f840d3cd06888f29fe2822f273a41 ChangeLog 22400
-RMD160 66f88c71c4bbdc2e50b838ae49a733bbcf2b78bc ChangeLog 22400
-SHA256 8b03ed621a2dd72ca1e3b846c39ca68d158171fb69edd62c613da1062e66c2c3 ChangeLog 22400
+EBUILD tomcat-5.5.17-r5.ebuild 10024 RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 SHA1 c337e729d3362c15d0cdd0f12edf658196894547 SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa
+MD5 4f894fdb598e788028129044b66e5a0d tomcat-5.5.17-r5.ebuild 10024
+RMD160 f7290ad1c512f21ba1bf2438976460164dcb7823 tomcat-5.5.17-r5.ebuild 10024
+SHA256 97dbe290a8f8449d069cc9a1c861ce12cf3962e20589c2477edfa9567cf95eaa tomcat-5.5.17-r5.ebuild 10024
+MISC ChangeLog 22644 RMD160 13395006e2a0f99fa6783480e337dfbfbb21d7cf SHA1 c64185a99a9e30f75ecc327f56fd6c4a4d08c5b5 SHA256 7e1c44715b989424513b56ed7cb75a138f2263afc5841871a53b0a698208757d
+MD5 836c6f0677108a1cc430cee9c12209bc ChangeLog 22644
+RMD160 13395006e2a0f99fa6783480e337dfbfbb21d7cf ChangeLog 22644
+SHA256 7e1c44715b989424513b56ed7cb75a138f2263afc5841871a53b0a698208757d ChangeLog 22644
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -146,9 +146,9 @@ SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/di
 MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r13 280
 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r13 280
 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r13 280
-MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r3 277
-RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r3 277
-SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r3 277
 MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r4 277
 RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r4 277
 SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r4 277
+MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r5 277
+RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r5 277
+SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r5 277
diff --git a/www-servers/tomcat/files/5.5.17/tomcat.init b/www-servers/tomcat/files/5.5.17/tomcat.init
index 94ef2deaf31e..25eff8342203 100755
--- a/www-servers/tomcat/files/5.5.17/tomcat.init
+++ b/www-servers/tomcat/files/5.5.17/tomcat.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.17/tomcat.init,v 1.3 2006/09/04 01:18:50 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.5.17/tomcat.init,v 1.4 2006/09/20 14:34:07 wltjr Exp $
 
 init_env_vars() {
 	# Set some sane defaults
@@ -12,11 +12,11 @@ init_env_vars() {
 	# Activate Logging
 	if [[ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]]; then
 		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-								-Djava.util.logging.config.file=/etc/tomcat-5.5/logging.properties"
+			-Djava.util.logging.config.file=${CATALINA_BASE}/logging.properties"
 	fi
 
 	# Populate the classpath
-	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:$JAVA_HOME/lib/tools.jar"
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/server/lib:${JAVA_HOME}/lib/tools.jar"
 	if [[ -n "${JSSE_HOME}" ]]; then
 		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
 	fi
@@ -50,21 +50,21 @@ start()	{
 	init_env_vars
 	# Figure out what arguments to pass start-helper based on TOMCAT_START
 	if [[ "${TOMCAT_START}" == "debug" ]] ; then
-		start-helper $JAVA_HOME/bin/jdb \
+		start-helper ${JAVA_HOME}/bin/jdb \
 			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
 	elif [[ "${TOMCAT_START}" == "debug -security" ]] ; then
-		start-helper $JAVA_HOME/bin/jdb \
+		start-helper ${JAVA_HOME}/bin/jdb \
 			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
 			-Djava.security.manager \
-			-Djava.security.policy=/etc/tomcat-5.5/catalina.policy
+			-Djava.security.policy=${CATALINA_BASE}/catalina.policy
 	elif [[ "${TOMCAT_START}" == "jpda start" ]] ; then
-		start-helper $JAVA_HOME/bin/java ${JPDA_OPTS}
+		start-helper ${JAVA_HOME}/bin/java ${JPDA_OPTS}
 	elif [[ "${TOMCAT_START}" == "start" ]] ; then
-		start-helper $JAVA_HOME/bin/java
+		start-helper ${JAVA_HOME}/bin/java
 	elif [[ "${TOMCAT_START}" == "start -security" ]] ; then
-		start-helper $JAVA_HOME/bin/java \
+		start-helper ${JAVA_HOME}/bin/java \
 			-Djava.security.manager \
-			-Djava.security.policy=/etc/tomcat-5.5/catalina.policy
+			-Djava.security.policy=${CATALINA_BASE}/catalina.policy
 	else
 		eerror "Invalid TOMCAT_START variable value, or one is not set"
 		eerror "Please see /etc/conf.d/tomcat-5.5 for more information"
@@ -78,6 +78,6 @@ stop()	{
 	init_env_vars
 	start-stop-daemon --stop --quiet \
 	       	--make-pidfile --pidfile /var/run/tomcat.pid \
-			--exec $JAVA_HOME/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop
+			--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_ARGS} stop
 	eend $?
 }
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r3 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r5
index 51d603367aa1..51d603367aa1 100644
--- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r3
+++ b/www-servers/tomcat/files/digest-tomcat-5.5.17-r5
diff --git a/www-servers/tomcat/tomcat-5.5.17-r3.ebuild b/www-servers/tomcat/tomcat-5.5.17-r5.ebuild
index f432e354ca45..60b166cdd7c3 100644
--- a/www-servers/tomcat/tomcat-5.5.17-r3.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.17-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r3.ebuild,v 1.2 2006/09/09 14:33:24 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r5.ebuild,v 1.1 2006/09/20 14:34:07 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -159,7 +159,7 @@ src_compile(){
 		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
 	fi
 
-	eant ${antflags} || die "compile failed"
+	eant ${antflags}
 
 }