Added support for two use flags, jikes and doc.

5 files changed, 51 insertions, 12 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index 20272799410c..3d899d3ad043 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.24 2004/02/16 01:04:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.25 2004/02/22 07:27:17 zx Exp $
+
+  24 Feb 2004; Chris Aniszczyk <zx@gentoo.org> tomcat-5.0.18.ebuild,
+  files/5.0.18/jikes.diff, files/5.0.18/tomcat.conf:
+  Added jikes and doc support. Thanks to Luca Santarelli
+  <hrk@users.sourceforge.net> for some patches. Bug #42175
 
 *tomcat-5.0.18 (15 Feb 2004)
 
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index 80fa7390d6eb..f13ef321b3d3 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,6 +1,6 @@
 MD5 3d05d585898c1192816738c1bcc3f290 tomcat-4.1.29.ebuild 4202
-MD5 5f5a1394548e680ffc46bc9ba81458a2 tomcat-5.0.18.ebuild 4198
-MD5 5dcb5ee56ba15fa591fa623f4f7540d6 ChangeLog 5802
+MD5 6077451f44aee64457ab42b0bbb80267 tomcat-5.0.18.ebuild 4374
+MD5 757c5b780d3ae1e0592b40edd0781ed3 ChangeLog 6041
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 aadebd5a246bdfeb6ccf764f4f9b289b files/digest-tomcat-4.1.29 74
 MD5 16a563fee9101781e780f3d7909f999d files/digest-tomcat-5.0.18 75
@@ -13,6 +13,7 @@ MD5 219cd03e7fd965c15b668a1e41a6e867 files/4.1.29/tomcat.conf 2707
 MD5 016de3831f5145860bfebd0ccb1d07d1 files/4.1.29/tomcat.init 810
 MD5 d686b57da55c6d8da476981c6557a3a1 files/4.1.29/21tomcat 152
 MD5 d0b4b02720bc1672f97f846c44be219e files/5.0.18/gentoo.diff 6359
-MD5 5b42384d025df6e79b07653dbf9f39be files/5.0.18/tomcat.conf 2707
+MD5 1b106c8de8b8546675d60600f778fa28 files/5.0.18/tomcat.conf 2645
 MD5 fd3cf4dd6eb926d069ea95289f486e6e files/5.0.18/tomcat.init 810
+MD5 05406ff27a96734864728d6ae8a95482 files/5.0.18/jikes.diff 904
 MD5 d686b57da55c6d8da476981c6557a3a1 files/5.0.18/21tomcat 152
diff --git a/net-www/tomcat/files/5.0.18/jikes.diff b/net-www/tomcat/files/5.0.18/jikes.diff
new file mode 100644
index 000000000000..44973c7d9cbf
--- /dev/null
+++ b/net-www/tomcat/files/5.0.18/jikes.diff
@@ -0,0 +1,24 @@
+--- conf/web.xml	2004-01-15 18:28:52.000000000 +0100
++++ conf/web.xml.jikes	2004-02-09 22:00:33.204381264 +0100
+@@ -184,6 +184,10 @@
+         <servlet-name>jsp</servlet-name>
+         <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+         <init-param>
++            <param-name>compiler</param-name>
++            <param-value>jikes</param-value>
++        </init-param>
++        <init-param>
+             <param-name>fork</param-name>
+             <param-value>false</param-value>
+         </init-param>
+--- tomcat	2004-02-24 08:08:16.965295648 -0500
++++ tomcat.conf.patched	2004-02-24 08:09:00.413690488 -0500
+@@ -50,7 +50,7 @@
+ 
+ # (Optional) Java runtime options used when the "start", "stop", or "run" 
+ # commands are executed.
+-# CATALINA_OPTS=""
++CATALINA_OPTS="-Dbuild.compiler.emacs=true"
+ 
+ # Java Platform Debugger Architecture (JPDA)
+ # http://java.sun.com/products/jpda/
diff --git a/net-www/tomcat/files/5.0.18/tomcat.conf b/net-www/tomcat/files/5.0.18/tomcat.conf
index 68a709c15cc1..031791549f28 100644
--- a/net-www/tomcat/files/5.0.18/tomcat.conf
+++ b/net-www/tomcat/files/5.0.18/tomcat.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.18/tomcat.conf,v 1.1 2004/02/16 01:06:24 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/files/5.0.18/tomcat.conf,v 1.2 2004/02/22 07:27:17 zx Exp $
 
 # JVM Runtime
 # Using the default setting, it will determine your JVM from the system-vm
@@ -8,7 +8,7 @@
 # You can override this value with whatever path you wish.  
 # Example: JAVA_HOME=/opt/sun-jdk-1.4.1.01
 
-JAVA_HOME=`/bin/grep -e "JAVA_HOME" /etc/profile.env | /bin/sed -e "s/^.*'\(.*\)'$/\1/"`
+JAVA_HOME=`java-config -O`
 
 # (Optional) Java runtime options used when the "start", "stop", or "run"
 # commands are executed.
diff --git a/net-www/tomcat/tomcat-5.0.18.ebuild b/net-www/tomcat/tomcat-5.0.18.ebuild
index 2ec39d8fb94b..75721ac4bed8 100644
--- a/net-www/tomcat/tomcat-5.0.18.ebuild
+++ b/net-www/tomcat/tomcat-5.0.18.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.18.ebuild,v 1.2 2004/02/16 01:04:02 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.18.ebuild,v 1.3 2004/02/22 07:27:17 zx Exp $
+
+inherit eutils
 
 DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 SRC_URI="http://apache.mirrors.pair.com/jakarta/tomcat-`echo ${PV} | cut -b 1`/v${PV}/bin/jakarta-${P}.tar.gz"
@@ -10,6 +12,7 @@ LICENSE="Apache-1.1"
 SLOT="0"
 DEPEND="sys-apps/sed"
 RDEPEND=">=virtual/jdk-1.2"
+IUSE="doc jikes"
 
 S=${WORKDIR}/jakarta-${P}
 At="jakarta-tomcat-${PV}.tar.gz"
@@ -18,6 +21,10 @@ src_unpack() {
 	tar xzf ${DISTDIR}/${At} || die
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/gentoo.diff
+
+	if [ ! `use doc` ] ; then
+		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
+	fi
 }
 
 
@@ -36,7 +43,8 @@ pkg_setup() {
 src_install() {
 	TOMCAT_HOME="/opt/tomcat"
 	INSTALLING="yes"
-	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
+	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
+
 
 	# Create directories
 	dodir ${TOMCAT_HOME}
@@ -55,10 +63,11 @@ src_install() {
 
 	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/tomcat
 	insinto /etc/init.d
-	insopts -m0755
+	insopts -m0750
 	doins ${S}/tomcat
 
 	cp -a ${FILESDIR}/${PV}/tomcat.conf ${S}/tomcat
+	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
 	insinto /etc/conf.d
 	insopts -m0644
 	doins ${S}/tomcat
@@ -78,8 +87,8 @@ src_install() {
 
 	dodoc RELEASE-NOTES RUNNING.txt LICENSE
 
-	chown -R tomcat.tomcat ${S}
-	DIROPTIONS="--mode=0755 --owner=tomcat --group=tomcat"
+	chown -R tomcat:tomcat ${S}
+	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
 	dodir ${TOMCAT_HOME}/common
 	dodir ${TOMCAT_HOME}/common/classes
 	dodir ${TOMCAT_HOME}/webapps
@@ -133,7 +142,7 @@ pkg_postinst() {
 	einfo " value by editing /etc/tomcat/server.xml."
 	einfo " "
 	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://${HOSTNAME}:8080/"
+	einfo " http://localhost:8080/"
 	einfo " "
 	einfo " "
 	einfo " BUGS:"