Bumped to latest version, removed previous version.

Package-Manager: portage-2.1.2.7

6 files changed, 51 insertions, 42 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3eda4ecff615..3bfc08e77b89 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.139 2007/05/15 04:50:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.140 2007/05/15 17:04:37 wltjr Exp $
+
+*tomcat-6.0.13 (15 May 2007)
+
+  15 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/6/build-xml.patch, -tomcat-6.0.10-r5.ebuild, +tomcat-6.0.13.ebuild:
+  Bumped to latest version, removed previous version.
 
   15 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   files/5.5/tomcat.init.2, files/6/tomcat.init:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8f83da54c239..233252df3f64 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -42,10 +42,10 @@ AUX 5.5/tomcat_build_xml.patch 13828 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b7
 MD5 47210f9a3e6b7c1809b34cfdab7fdb9b files/5.5/tomcat_build_xml.patch 13828
 RMD160 3add8fb7d26bef7df205d3ec43e1a55cd6b739d4 files/5.5/tomcat_build_xml.patch 13828
 SHA256 9b1b9feb18d6f1dc5c2226c195f88a2f6cb9d68a2144e47e883fb57790c281f9 files/5.5/tomcat_build_xml.patch 13828
-AUX 6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d SHA1 a41e61f07453d14904d1f4b59c71e577840a9b01 SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6
-MD5 8533b95643881c578f24e30098d3d178 files/6/build-xml.patch 2611
-RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d files/6/build-xml.patch 2611
-SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6 files/6/build-xml.patch 2611
+AUX 6/build-xml.patch 2786 RMD160 7d05d8c4ddcadf882f918e54c8c51c9c54782944 SHA1 944111d0faacf74c7daabcd3aa07cd68daf4a317 SHA256 ef0d6b59aa09e44c789157200dc472331d46ca30434dfec020edeabf40ca9f30
+MD5 6199fadbde5c012d0564919f7a14e840 files/6/build-xml.patch 2786
+RMD160 7d05d8c4ddcadf882f918e54c8c51c9c54782944 files/6/build-xml.patch 2786
+SHA256 ef0d6b59aa09e44c789157200dc472331d46ca30434dfec020edeabf40ca9f30 files/6/build-xml.patch 2786
 AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
 MD5 379187530127260974bdf88624d22d2e files/6/catalina.policy 6956
 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 files/6/catalina.policy 6956
@@ -59,7 +59,7 @@ MD5 5ca14d034cc9c2eac4944a247d1958b0 files/6/tomcat.init 3366
 RMD160 d0b9365fd46b165ecd55ebc5518c9b63ca294fd3 files/6/tomcat.init 3366
 SHA256 ed61a204a312b56641e52e9e6c910c6b350e1e40b31b2e197ed300816e7b2738 files/6/tomcat.init 3366
 DIST apache-tomcat-5.5.23-src.tar.gz 4895919 RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 SHA1 59272b5eedde9c32a126679ff9e1d2a5f56265c8 SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd
-DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
+DIST apache-tomcat-6.0.13-src.tar.gz 3454302 RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c SHA1 8a60e80b878609dc207a357fede749c67857dd54 SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff
 EBUILD tomcat-5.5.23-r1.ebuild 10630 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 SHA1 d731665a2123e5d73952c48dce272e94334bbd4e SHA256 97454d3a2e93b87c86d52b29b075842e6e80d77b948e777fac7b9db4d8a7ca2b
 MD5 ddc708762bdbc5648c2bbd2363e8996d tomcat-5.5.23-r1.ebuild 10630
 RMD160 a164f36224fb766d6f10092d84b953dc5930b5a0 tomcat-5.5.23-r1.ebuild 10630
@@ -68,14 +68,14 @@ EBUILD tomcat-5.5.23-r2.ebuild 10900 RMD160 e45b52fd95e15716f9065f96d140fe3ffa34
 MD5 351096c6975a777f81f7d3d8c01c8701 tomcat-5.5.23-r2.ebuild 10900
 RMD160 e45b52fd95e15716f9065f96d140fe3ffa344c2a tomcat-5.5.23-r2.ebuild 10900
 SHA256 02f9e36e0e7da42eefc5f49ac027a994a02b7f6172d16b29d3953661d915711c tomcat-5.5.23-r2.ebuild 10900
-EBUILD tomcat-6.0.10-r5.ebuild 5758 RMD160 65caa9eca6d20edcdd89939a7f677d4d3692e2e3 SHA1 a77d7d5faff456de3e57c2e66fc22f7685bc5e28 SHA256 ca1ba13ec634bb7d80e5bfb8fdbdeb0172b0dc1e7cd72b7c7f2dc69c91d42a5f
-MD5 3c3315218509873a57dfb54ce05b1ca8 tomcat-6.0.10-r5.ebuild 5758
-RMD160 65caa9eca6d20edcdd89939a7f677d4d3692e2e3 tomcat-6.0.10-r5.ebuild 5758
-SHA256 ca1ba13ec634bb7d80e5bfb8fdbdeb0172b0dc1e7cd72b7c7f2dc69c91d42a5f tomcat-6.0.10-r5.ebuild 5758
-MISC ChangeLog 44714 RMD160 920dca908d83c45b812de525f6971f021d2732f5 SHA1 a43cda5ab760d59fbaf85ce553ceb032cdafe10e SHA256 65740a0773d060ea28e15cd42362a2f5e2f8774e4fd1ac1d50fb36c2e9b7b547
-MD5 056840b0955df7f180647a330654ead7 ChangeLog 44714
-RMD160 920dca908d83c45b812de525f6971f021d2732f5 ChangeLog 44714
-SHA256 65740a0773d060ea28e15cd42362a2f5e2f8774e4fd1ac1d50fb36c2e9b7b547 ChangeLog 44714
+EBUILD tomcat-6.0.13.ebuild 5918 RMD160 284791dc8c32b579b5c6e85a16ef0cec602d1ec5 SHA1 619d918681fda29b6f85fcceea56087fb2622304 SHA256 13dc319e556f6713912bf763cc240a0920afe89ae73fadc4083e94faa6f78c6f
+MD5 a7d1f4ee8bbe8ea75a1622857bce0dd6 tomcat-6.0.13.ebuild 5918
+RMD160 284791dc8c32b579b5c6e85a16ef0cec602d1ec5 tomcat-6.0.13.ebuild 5918
+SHA256 13dc319e556f6713912bf763cc240a0920afe89ae73fadc4083e94faa6f78c6f tomcat-6.0.13.ebuild 5918
+MISC ChangeLog 44932 RMD160 4860dad00c02efdedb576b84331f646a84093917 SHA1 3be8346e5dcb79e695c1bb8c3dba117d163e5f9a SHA256 a15fdf2ac8906a49709d0be458a19ab074605b1af83e849704e1102b8aead6eb
+MD5 092fa5efbbdeb5eb395fb4337fdffddb ChangeLog 44932
+RMD160 4860dad00c02efdedb576b84331f646a84093917 ChangeLog 44932
+SHA256 a15fdf2ac8906a49709d0be458a19ab074605b1af83e849704e1102b8aead6eb ChangeLog 44932
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -86,6 +86,6 @@ SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/di
 MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23-r2 277
 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23-r2 277
 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23-r2 277
-MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r5 277
-RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r5 277
-SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r5 277
+MD5 689139367c10950ec819a442eb5dd0c1 files/digest-tomcat-6.0.13 277
+RMD160 ede80f760c03677d75cfabf3c000208361d6c3c0 files/digest-tomcat-6.0.13 277
+SHA256 66e25a7d2aed203cbc675c9e7c247da0627936e4bb7c7f9b992e511110f2993c files/digest-tomcat-6.0.13 277
diff --git a/www-servers/tomcat/files/6/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch
index fce017234234..e3a627469608 100644
--- a/www-servers/tomcat/files/6/build-xml.patch
+++ b/www-servers/tomcat/files/6/build-xml.patch
@@ -1,14 +1,14 @@
---- ../build.xml	2007-01-28 17:08:59.000000000 -0500
-+++ build.xml	2007-01-28 17:15:32.000000000 -0500
-@@ -94,6 +94,7 @@
-            excludes="**/CVS/**,**/.svn/**">
+--- build.xml	2007-05-15 11:29:45.000000000 -0400
++++ portage/www-servers/tomcat-6.0.13/work/apache-tomcat-6.0.13-src/build.xml	2007-05-15 11:41:46.000000000 -0400
+@@ -96,6 +96,7 @@
        <classpath refid="tomcat.classpath" />
        <exclude name="org/apache/tomcat/util/net/puretls/**" />
+       <exclude name="org/apache/naming/factory/webservices/**" />
 +      <exclude name="javax/servlet/**" />
      </javac>
      <tstamp>
        <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
-@@ -133,27 +134,27 @@
+@@ -135,27 +136,27 @@
        </fileset>
      </jar>
  
@@ -24,7 +24,7 @@
          <exclude name="**/LocalStrings_*" />
        </fileset>
      </jar>
-+	-->
++    -->
  
 -    <!-- JSP 2.1 Implementation JAR File -->
 +    <!-- JSP 2.1 Implementation JAR File
@@ -36,11 +36,11 @@
          <exclude name="**/LocalStrings_*" />
        </fileset>
      </jar>
-+	-->
++    -->
  
      <!-- JSP 2.1 EL Implementation JAR File -->
      <jar  jarfile="${el-api.jar}">
-@@ -299,7 +300,7 @@
+@@ -302,7 +303,7 @@
  
    </target>
  
@@ -49,7 +49,7 @@
  
      <copy todir="${tomcat.build}/webapps">
        <fileset dir="webapps">
-@@ -447,11 +448,16 @@
+@@ -453,11 +454,16 @@
  
    <target name="deploy" depends="build-only,build-docs">
  
@@ -66,7 +66,7 @@
  
    	<!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
-@@ -488,12 +494,14 @@
+@@ -494,7 +500,7 @@
               destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
               debug="${compile.debug}" deprecation="${compile.deprecation}"
               optimize="${compile.optimize}"
@@ -74,6 +74,10 @@
 +    	     classpath="${tomcat.classes}:${jsp-api.jar}"
               excludes="**/CVS/**,**/.svn/**">
      </javac>
+   	
+@@ -506,8 +512,10 @@
+              excludes="**/CVS/**,**/.svn/**">
+     </javac>
  
 +<!--
    	<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
@@ -81,4 +85,4 @@
 +-->
  
    </target>
- 
+ 	
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10-r5 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r5
deleted file mode 100644
index 3dd91cc642dc..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.10-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cfbfa1812b6b46e767a4df5411424526 apache-tomcat-6.0.10-src.tar.gz 3221070
-RMD160 64762f16606645c6ef507906f2eb8eeb102173bb apache-tomcat-6.0.10-src.tar.gz 3221070
-SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199 apache-tomcat-6.0.10-src.tar.gz 3221070
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.13 b/www-servers/tomcat/files/digest-tomcat-6.0.13
new file mode 100644
index 000000000000..d9bfd1fdd00f
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.13
@@ -0,0 +1,3 @@
+MD5 50b3744d734eb12b679c25ac34f8a6ab apache-tomcat-6.0.13-src.tar.gz 3454302
+RMD160 2ef73ec380736661969f28c231a4a0c9fbd6d29c apache-tomcat-6.0.13-src.tar.gz 3454302
+SHA256 273c6d56283677c0c7033e6ecce53ba7f1fac6930e20e83acccfe2ac88c6a6ff apache-tomcat-6.0.13-src.tar.gz 3454302
diff --git a/www-servers/tomcat/tomcat-6.0.10-r5.ebuild b/www-servers/tomcat/tomcat-6.0.13.ebuild
index 61251ad93be2..bd4f983416a3 100644
--- a/www-servers/tomcat/tomcat-6.0.10-r5.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.13.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.10-r5.ebuild,v 1.1 2007/05/15 04:37:21 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13.ebuild,v 1.1 2007/05/15 17:04:37 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -50,10 +50,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
 
-	if use examples; then
-		cd webapps/examples/WEB-INF/lib/
-		rm -v *.jar
-	fi
+	cd webapps/examples/WEB-INF/lib/
+	rm -v *.jar
 }
 
 src_compile(){
@@ -104,10 +102,9 @@ src_install() {
 	diropts -m0755
 
 	cd "${S}"
-	# fix context's since upstream is slackin
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/manager.xml
-	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
+	# fix context's so webapps will be deployed
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' ${S}/webapps/host-manager/META-INF/context.xml
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' ${S}/webapps/manager/META-INF/context.xml
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
@@ -156,16 +153,18 @@ src_install() {
 	dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
 
 	# link the manager's context to the right position
-	dosym ${TOMCAT_HOME}/webapps/host-manager/host-manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
-	dosym ${TOMCAT_HOME}/webapps/manager/manager.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
+	dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
+	dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
 
 	dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }
 
 pkg_postinst() {
+	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
 	# temp fix for bug #176097	
 	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
+	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
 
 	elog
 	elog " This ebuild implements a FHS compliant layout for tomcat"