Updating 6.0.x to dep on tomcat-servlet-api. Modified patch to no longer build or install servletapi from tomcat package. Dropped force of ecj compiler for now, added commented out code to deal with oom/heap issues if they pop up again. Synced ebuilds and backported ~ppc keyword.

(Portage version: 2.1.2-r1)

6 files changed, 84 insertions, 14 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index bbcc621e26b0..4f8e5150cc20 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.107 2007/01/26 16:22:02 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.108 2007/01/26 21:07:52 wltjr Exp $
+
+*tomcat-6.0.8_alpha-r1 (26 Jan 2007)
+*tomcat-6.0.7_beta-r4 (26 Jan 2007)
+
+  26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/6/build-xml.patch, -tomcat-6.0.7_beta-r3.ebuild,
+  +tomcat-6.0.7_beta-r4.ebuild, -tomcat-6.0.8_alpha.ebuild,
+  +tomcat-6.0.8_alpha-r1.ebuild:
+  Updating 6.0.x to dep on tomcat-servlet-api. Modified patch to no longer
+  build or install servletapi from tomcat package. Dropped force of ecj
+  compiler for now, added commented out code to deal with oom/heap issues if
+  they pop up again. Synced ebuilds and backported ~ppc keyword.
 
   26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-6.0.8_alpha.ebuild:
diff --git a/www-servers/tomcat/files/6/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch
index a89196ea4c40..59d811a4279c 100644
--- a/www-servers/tomcat/files/6/build-xml.patch
+++ b/www-servers/tomcat/files/6/build-xml.patch
@@ -1,6 +1,46 @@
---- build.xml	2006-11-15 18:33:20.000000000 -0500
-+++ ../build.xml	2006-11-19 16:47:58.000000000 -0500
-@@ -446,11 +446,16 @@
+--- ../build.xml	2007-01-26 14:42:58.000000000 -0500
++++ build.xml	2007-01-26 14:58:59.000000000 -0500
+@@ -94,6 +94,7 @@
+            excludes="**/CVS/**,**/.svn/**">
+       <classpath refid="tomcat.classpath" />
+       <exclude name="org/apache/tomcat/util/net/puretls/**" />
++      <exclude name="javax/servlet/**" />
+     </javac>
+     <tstamp>
+       <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+@@ -133,27 +134,27 @@
+       </fileset>
+     </jar>
+ 
+-    <!-- Servlet 2.5 Implementation JAR File -->
++    <!-- Servlet 2.5 Implementation JAR File
+     <jar  jarfile="${servlet-api.jar}">
+       <fileset dir="${tomcat.classes}">
+         <include name="javax/servlet/*" />
+         <include name="javax/servlet/http/*" />
+         <include name="javax/servlet/resources/*" />
+-        <!-- Javadoc and i18n exclusions -->
+         <exclude name="**/package.html" />
+         <exclude name="**/LocalStrings_*" />
+       </fileset>
+     </jar>
++	-->
+ 
+-    <!-- JSP 2.1 Implementation JAR File -->
++    <!-- JSP 2.1 Implementation JAR File
+     <jar  jarfile="${jsp-api.jar}">
+       <fileset dir="${tomcat.classes}">
+         <include name="javax/servlet/jsp/**" />
+-        <!-- Javadoc and i18n exclusions -->
+         <exclude name="**/package.html" />
+         <exclude name="**/LocalStrings_*" />
+       </fileset>
+     </jar>
++	-->
+ 
+     <!-- JSP 2.1 EL Implementation JAR File -->
+     <jar  jarfile="${el-api.jar}">
+@@ -447,11 +448,16 @@
  
    <target name="deploy" depends="build-only,build-docs">
  
@@ -17,7 +57,7 @@
  
    	<!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
-@@ -489,8 +494,10 @@
+@@ -492,8 +498,10 @@
               excludes="**/CVS/**,**/.svn/**">
      </javac>
  
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4
index 1309a094c51c..1309a094c51c 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r3
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r4
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1
index d9ae7e3b1bba..d9ae7e3b1bba 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r1
diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r3.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r4.ebuild
index 48e8923bea94..8e41eb27ac27 100644
--- a/www-servers/tomcat/tomcat-6.0.7_beta-r3.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.7_beta-r4.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-6.0.7_beta-r3.ebuild,v 1.1 2007/01/20 16:54:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r4.ebuild,v 1.1 2007/01/26 21:07:52 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -10,7 +10,7 @@ MY_P="apache-${P/_beta/}-src"
 SLOT="6"
 SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
 IUSE="doc examples source test"
@@ -20,7 +20,8 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
 	>=dev-java/commons-daemon-1.0.1
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2"
+	>=dev-java/commons-pool-1.2
+	=dev-java/tomcat-servlet-api-${PV}"
 
 DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	${RDEPEND}
@@ -31,7 +32,6 @@ DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	!test? ( dev-java/ant-core )"
 
 S=${WORKDIR}/${MY_P}
-NS=${WORKDIR}/tomcat-native-${TC_NV}-src
 
 TOMCAT_NAME="${PN}-${SLOT}"
 TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
@@ -57,7 +57,13 @@ src_unpack() {
 
 src_compile(){
 	# Prevent out of memory/heap space errors
-	java-pkg_force-compiler ecj-3.2
+	# Not sure if this is happening for others
+
+	# Old way
+#	java-pkg_force-compiler ecj-3.2
+
+	# New way if others get out of heap space
+#	ANT_OPTS=-XX:MaxPermSize=128m
 
 	local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
 	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
@@ -115,6 +121,9 @@ src_install() {
 	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
 	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
 
+	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
+	java-pkg_jar-from tomcat-servlet-api-2.5
+
 	cd ${S}
 
 	# Copy over webapps, some controlled by use flags
diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r1.ebuild
index d41ba9f87692..e43d6dec272e 100644
--- a/www-servers/tomcat/tomcat-6.0.8_alpha.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.8_alpha-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-6.0.8_alpha.ebuild,v 1.2 2007/01/26 16:22:02 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r1.ebuild,v 1.1 2007/01/26 21:07:52 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -20,7 +20,8 @@ RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
 	>=dev-java/commons-daemon-1.0.1
 	>=dev-java/commons-dbcp-1.2.1
 	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.2"
+	>=dev-java/commons-pool-1.2
+	=dev-java/tomcat-servlet-api-${PV}"
 
 DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	${RDEPEND}
@@ -31,7 +32,6 @@ DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	!test? ( dev-java/ant-core )"
 
 S=${WORKDIR}/${MY_P}
-NS=${WORKDIR}/tomcat-native-${TC_NV}-src
 
 TOMCAT_NAME="${PN}-${SLOT}"
 TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
@@ -57,7 +57,13 @@ src_unpack() {
 
 src_compile(){
 	# Prevent out of memory/heap space errors
-	java-pkg_force-compiler ecj-3.2
+	# Not sure if this is happening for others
+
+	# Old way
+#	java-pkg_force-compiler ecj-3.2
+
+	# New way if others get out of heap space
+#	ANT_OPTS=-XX:MaxPermSize=128m
 
 	local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
 	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
@@ -115,6 +121,9 @@ src_install() {
 	chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
 	chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
 
+	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
+	java-pkg_jar-from tomcat-servlet-api-2.5
+
 	cd ${S}
 
 	# Copy over webapps, some controlled by use flags