introduced support for the examples useflag, also modified the init script to fix #86905

Package-Manager: portage-2.0.51.19

4 files changed, 21 insertions, 15 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6c6178cabbf2..65f7e24838cd 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.23 2005/03/27 17:23:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.24 2005/03/28 03:14:47 luckyduck Exp $
+
+  28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> files/5.0.28/tomcat.init,
+  tomcat-5.0.28-r2.ebuild:
+  introduced support for the examples useflag, also modified the init script to
+  fix #86905
 
   27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r2.ebuild:
   moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 46e5d39d81ae..85138fbe9827 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,8 +2,8 @@
 Hash: SHA1
 
 MD5 0111243c02d84f0284685e7647620eb8 tomcat-5.0.27-r4.ebuild 3776
-MD5 7b8b78d293cbecf0cb661181b82beaa2 tomcat-5.0.28-r2.ebuild 9842
-MD5 81bd17c403dd6656898c99b4fc824f9a ChangeLog 15005
+MD5 fcfd460f4eaae2d73e350a7e56ca6eef tomcat-5.0.28-r2.ebuild 9876
+MD5 5094a0fa1d78b54eea41f9b838eb20fb ChangeLog 15204
 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r2 78
@@ -17,13 +17,13 @@ MD5 987ddee3c5a93ccaa4311c85f5dfceb3 files/5.0.28/gentoo.diff 541
 MD5 286d3dcf80a376b72913412cec25e496 files/5.0.28/tomcat.env 34
 MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
 MD5 d538c7caef4b5cecd6cc95ee1988bace files/5.0.28/tomcat.conf 2652
-MD5 498695600231d4d791e4e78c1997e4b6 files/5.0.28/tomcat.init 672
+MD5 c0d89ffb4276e8a6d0cf08fcad6517f9 files/5.0.28/tomcat.init 701
 MD5 744a9ce174144fc5689c1fabee527e55 files/5.0.28/build.xml-02.patch 3177
 MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCRuwW06ebR+OMO78RAiygAJwLO0ijsuv7d9uAIcdFMm/gUraqfgCeOTy4
-mL7UI1flxVWeD40d0sFsgCY=
-=IfM6
+iD8DBQFCR3a306ebR+OMO78RAnRxAJ45Hm8VU+ipIBdoojsoAG+tP1Mk/QCfepNJ
+BY5GMRFjHoPHuEeBzie0CqY=
+=xJHx
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.init b/www-servers/tomcat/files/5.0.28/tomcat.init
index 729884331be0..1de1cc199e2d 100644
--- a/www-servers/tomcat/files/5.0.28/tomcat.init
+++ b/www-servers/tomcat/files/5.0.28/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.0.28/tomcat.init,v 1.2 2005/02/13 19:52:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/5.0.28/tomcat.init,v 1.3 2005/03/28 03:14:47 luckyduck Exp $
 
 depend() {
 	use dns logger mysql postgresql net
@@ -9,6 +9,7 @@ depend() {
 
 start()	{
 	ebegin "Starting Tomcat"
+	cd ${CATALINA_BASE}/webapps
 	start-stop-daemon --start --quiet --chuid tomcat:tomcat \
 			  --exec ${CATALINA_HOME}/bin/catalina.sh \
 			  -- ${TOMCAT_START}
diff --git a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
index 5d2c8c67231b..02b5d94a0297 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r2.ebuild,v 1.3 2005/03/27 17:23:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r2.ebuild,v 1.4 2005/03/28 03:14:47 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -38,7 +38,7 @@ RDEPEND=">=virtual/jdk-1.4
 	   dev-java/sun-jaf-bin
 	   >=dev-java/xerces-2.6.2-r1
 		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
+IUSE="doc examples jikes"
 
 S=${WORKDIR}/jakarta-${P}-src
 
@@ -186,8 +186,8 @@ src_install() {
 	cp -ra bin common server shared ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
 	# if the useflag is set, copy over the examples
-	if use doc; then
-		dodir /var/lib/${TOMCAT_NAME}/default/webapps
+	dodir /var/lib/${TOMCAT_NAME}/default/webapps
+	if use examples; then
 		cp ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
 		cp -r webapps/{tomcat-docs,jsp-examples,servlets-examples,ROOT,webdav} \
 			${D}/var/lib/${TOMCAT_NAME}/default/webapps
@@ -199,7 +199,7 @@ src_install() {
 	dosym /var/tmp/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/temp
 	dosym /var/run/${TOMCAT_NAME}/default /var/lib/${TOMCAT_NAME}/default/work
 
-	dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt}
+	use doc && dodoc ${S}/jakarta-tomcat-5/{LICENSE,RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/default/tomcat-users.xml
 }
 
@@ -265,9 +265,9 @@ pkg_postinst() {
 	einfo " "
 	einfo " To test Tomcat while it's running, point your web browser to:"
 	einfo " http://localhost:8080/"
-	if ! use doc; then
+	if ! use examples; then
 		ewarn ""
-		ewarn "You do not have the doc USE flag set, examples have NOT been installed."
+		ewarn "You do not have the examples USE flag set, examples have NOT been installed."
 		ewarn " "
 	fi
 	einfo " "