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.

Package-Manager: portage-2.1.2-r1

7 files changed, 106 insertions, 36 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/Manifest b/www-servers/tomcat/Manifest
index a37807f10032..ff83ab208a4f 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -94,10 +94,10 @@ AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06
 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470
-AUX 6/build-xml.patch 785 RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c SHA1 085f416f6f68931b5c22f69af993188dea425a99 SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c
-MD5 23fa5265de5dc6680c3c9e4c7806d382 files/6/build-xml.patch 785
-RMD160 d5d296009e86e0aec3aaf1ba4d1651dc7358d23c files/6/build-xml.patch 785
-SHA256 51920be0dce79f1ea562ef46120e866ded371049e54f16a8e064e1b68b3d239c files/6/build-xml.patch 785
+AUX 6/build-xml.patch 2123 RMD160 3999e521bdfa34496130aab5269fe8602601013c SHA1 743c8df0e89ebb8c6f50aeb9f175b2e944a42950 SHA256 421d9aa75047f5fa793daecf7f715a729f6e2a67bd22ae31c59a197e585683c6
+MD5 3e8e78fce622eb87b75a2d2cd7a0e688 files/6/build-xml.patch 2123
+RMD160 3999e521bdfa34496130aab5269fe8602601013c files/6/build-xml.patch 2123
+SHA256 421d9aa75047f5fa793daecf7f715a729f6e2a67bd22ae31c59a197e585683c6 files/6/build-xml.patch 2123
 AUX 6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe SHA1 53bf051861b624f619f78d99d8ea634b8e617464 SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb
 MD5 87c3a871a5f81aa03cec06fe5b195bed files/6/tomcat.conf 2669
 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe files/6/tomcat.conf 2669
@@ -127,18 +127,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e
 MD5 8af16e1d4381d7656ed93be48867ad03 tomcat-5.5.20-r8.ebuild 10299
 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa tomcat-5.5.20-r8.ebuild 10299
 SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601 tomcat-5.5.20-r8.ebuild 10299
-EBUILD tomcat-6.0.7_beta-r3.ebuild 4594 RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d SHA1 e143791d36924f90223be83d3b87ccea78be500c SHA256 b27596f4ba9ba08eedc8fbfcb8bfcfe8d77b7c52e51862fe5e59e8289266f09f
-MD5 b0ad9f67abd102331b3d62c29c6b14fc tomcat-6.0.7_beta-r3.ebuild 4594
-RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d tomcat-6.0.7_beta-r3.ebuild 4594
-SHA256 b27596f4ba9ba08eedc8fbfcb8bfcfe8d77b7c52e51862fe5e59e8289266f09f tomcat-6.0.7_beta-r3.ebuild 4594
-EBUILD tomcat-6.0.8_alpha.ebuild 4598 RMD160 9dbe1ca48a9a5b2029bb4348776ae984320238f2 SHA1 edc0bc72619603c33e2ea1fbb0069c51a143df41 SHA256 c503e39583b36e6785aacbca53b7aa59a1cd0d0a9b8ae3e2e2e9abf58e88d3eb
-MD5 5f3bf14ce2236bffefd0928c77f0da70 tomcat-6.0.8_alpha.ebuild 4598
-RMD160 9dbe1ca48a9a5b2029bb4348776ae984320238f2 tomcat-6.0.8_alpha.ebuild 4598
-SHA256 c503e39583b36e6785aacbca53b7aa59a1cd0d0a9b8ae3e2e2e9abf58e88d3eb tomcat-6.0.8_alpha.ebuild 4598
-MISC ChangeLog 34401 RMD160 bffbf3324ae1952811f620eb0ca47fba8e20e4fe SHA1 48d055ff28c1b90604604994e1482fcce4055deb SHA256 0a28714bc26e1c4f061fbcec751d18ae3743004b267e48d371736f78130bf516
-MD5 223d0e33f8a98d111fce4f6dbe72ddf9 ChangeLog 34401
-RMD160 bffbf3324ae1952811f620eb0ca47fba8e20e4fe ChangeLog 34401
-SHA256 0a28714bc26e1c4f061fbcec751d18ae3743004b267e48d371736f78130bf516 ChangeLog 34401
+EBUILD tomcat-6.0.7_beta-r4.ebuild 4810 RMD160 3f86d7cc1c645fc4ed2648fb7ea4466caacdd790 SHA1 7c5cc93de40df8dea21efd1f1e4d22c197d6aa0d SHA256 deb61fe72a327f4438208599814c8c64fcd9efd394f3f08cbdb87d3bdb803c18
+MD5 ceb9db771cc0484f85cc49d6b7e171f9 tomcat-6.0.7_beta-r4.ebuild 4810
+RMD160 3f86d7cc1c645fc4ed2648fb7ea4466caacdd790 tomcat-6.0.7_beta-r4.ebuild 4810
+SHA256 deb61fe72a327f4438208599814c8c64fcd9efd394f3f08cbdb87d3bdb803c18 tomcat-6.0.7_beta-r4.ebuild 4810
+EBUILD tomcat-6.0.8_alpha-r1.ebuild 4812 RMD160 1343157691bb0a5a9f2fbec4f381dc17bcc37160 SHA1 9c830a7709f256624e6389f153228706c2f96cac SHA256 8faac466d80750a5f44e9718c7bd4494b09c429d5ad4d6181f9c3b7e15016193
+MD5 4159afb58fe80a7ff5931f7b47cfd6a1 tomcat-6.0.8_alpha-r1.ebuild 4812
+RMD160 1343157691bb0a5a9f2fbec4f381dc17bcc37160 tomcat-6.0.8_alpha-r1.ebuild 4812
+SHA256 8faac466d80750a5f44e9718c7bd4494b09c429d5ad4d6181f9c3b7e15016193 tomcat-6.0.8_alpha-r1.ebuild 4812
+MISC ChangeLog 34972 RMD160 226e3cba19c16a42b34f01648ebe523a8d4b049f SHA1 fca9916bfebc220314632bd23e046065c61cf1cb SHA256 07d6e7e787d81d569394b2adfa89f06e26f56daf51445aacbee1bcebcb3dcfa2
+MD5 537cf1c114fc0694d0086848b90ef04d ChangeLog 34972
+RMD160 226e3cba19c16a42b34f01648ebe523a8d4b049f ChangeLog 34972
+SHA256 07d6e7e787d81d569394b2adfa89f06e26f56daf51445aacbee1bcebcb3dcfa2 ChangeLog 34972
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -155,9 +155,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r3 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r3 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r3 274
-MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha 274
-RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha 274
-SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha 274
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r4 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r4 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r4 274
+MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r1 274
+RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r1 274
+SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r1 274
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