Version bump.

Package-Manager: portage-2.1.3.19

6 files changed, 62 insertions, 45 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index 69e0c3dbf9d7..a4c154e552af 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/resin-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.7 2007/10/20 09:03:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.8 2007/11/09 14:04:47 nelchael Exp $
+
+*resin-servlet-api-3.1.3 (09 Nov 2007)
+
+  09 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/resin-3.1.2-gentoo.patch, +files/resin-3.1.3-gentoo.patch,
+  -resin-servlet-api-3.1.2.ebuild, +resin-servlet-api-3.1.3.ebuild:
+  Version bump.
 
   20 Oct 2007; Markus Rothe <corsair@gentoo.org>
   resin-servlet-api-3.0.24.ebuild:
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index bb53d15e9a9d..b9a3c55353c4 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,25 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX resin-3.0.24-gentoo.patch 10121 RMD160 68fb7db03d700953347c066d3e3ed151a8d31e5a SHA1 9a35f1b3c3b2f86cde124b96f2ced75846abf127 SHA256 b8b0948e7df2b6c5504e1f239d5442b9cffbd2370bde30c0b2eabffa12851421
 MD5 b8c9174c437bd05668ad3dc6674b62fc files/resin-3.0.24-gentoo.patch 10121
 RMD160 68fb7db03d700953347c066d3e3ed151a8d31e5a files/resin-3.0.24-gentoo.patch 10121
 SHA256 b8b0948e7df2b6c5504e1f239d5442b9cffbd2370bde30c0b2eabffa12851421 files/resin-3.0.24-gentoo.patch 10121
-AUX resin-3.1.2-gentoo.patch 7454 RMD160 ad32057c690ee1a74cac73b68c067b1108693aa7 SHA1 dba2b67fa712cbbb87fa2987910147be8590aaf9 SHA256 860c423dc7e010852c7f37e4f3764332e71d2c9226d45edd7460e0b57d8510f1
-MD5 4ce90eb1449e1667ac3b01dbb61ba55d files/resin-3.1.2-gentoo.patch 7454
-RMD160 ad32057c690ee1a74cac73b68c067b1108693aa7 files/resin-3.1.2-gentoo.patch 7454
-SHA256 860c423dc7e010852c7f37e4f3764332e71d2c9226d45edd7460e0b57d8510f1 files/resin-3.1.2-gentoo.patch 7454
+AUX resin-3.1.3-gentoo.patch 7521 RMD160 c84ed05052c0a4c2910666538e23fe37883ac4ab SHA1 14d57d0a78bc7ed7cc7eef0b0cd5473c23f91130 SHA256 cd850d727f8315a13a300051500267d457de49203a1e6db4ccb69f5a0a58f5b1
+MD5 d899a88038339bd0c3f1eb667fe9014a files/resin-3.1.3-gentoo.patch 7521
+RMD160 c84ed05052c0a4c2910666538e23fe37883ac4ab files/resin-3.1.3-gentoo.patch 7521
+SHA256 cd850d727f8315a13a300051500267d457de49203a1e6db4ccb69f5a0a58f5b1 files/resin-3.1.3-gentoo.patch 7521
 DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
-DIST resin-3.1.2-src.zip 13317024 RMD160 33989f69c6d757fe5cf4ea50077f503fc68e98d1 SHA1 643fb194f6762b273131ea63a0e66ab9ca283bb0 SHA256 3e56d9437091597b7d0bf6523254b753733533dbfbb4160af21b1cadf793d081
+DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493
 EBUILD resin-servlet-api-3.0.24.ebuild 944 RMD160 7dd6c3e232eb6e00baa7daaf7d2e4c6eef2ee6dc SHA1 ab07b5a3d9c775e9eedc0f72adcfd75f67611a23 SHA256 62c0ee74f50edc975dd75cf3e9a18faa91a9708f955b61de9d028e1cd2bcee0c
 MD5 3ffd52ccb2e3221cde32ad318a229295 resin-servlet-api-3.0.24.ebuild 944
 RMD160 7dd6c3e232eb6e00baa7daaf7d2e4c6eef2ee6dc resin-servlet-api-3.0.24.ebuild 944
 SHA256 62c0ee74f50edc975dd75cf3e9a18faa91a9708f955b61de9d028e1cd2bcee0c resin-servlet-api-3.0.24.ebuild 944
-EBUILD resin-servlet-api-3.1.2.ebuild 957 RMD160 d5e1c7b046d81244d7c9ad58b345fc208e8098c3 SHA1 54a407a0485e1d26cf87814abe27d1d285bad901 SHA256 e876181ec6899b80eb588dee69d10512a074dedcfb2c57c7724b27991cad9166
-MD5 5b37e4ce7f19df51fd3d626e188b824a resin-servlet-api-3.1.2.ebuild 957
-RMD160 d5e1c7b046d81244d7c9ad58b345fc208e8098c3 resin-servlet-api-3.1.2.ebuild 957
-SHA256 e876181ec6899b80eb588dee69d10512a074dedcfb2c57c7724b27991cad9166 resin-servlet-api-3.1.2.ebuild 957
-MISC ChangeLog 1507 RMD160 d80fecc3c51cb4d4ad8bdb49517426ee3b1d7505 SHA1 0927d75d49eb965f71e8fcf3f0bbd7c9fa08559c SHA256 8040c8743fbe15a623865465cf760a09d2d986127c7ff58f724991e36fa788e1
-MD5 a92865b7da201e0843d30915fcc4a358 ChangeLog 1507
-RMD160 d80fecc3c51cb4d4ad8bdb49517426ee3b1d7505 ChangeLog 1507
-SHA256 8040c8743fbe15a623865465cf760a09d2d986127c7ff58f724991e36fa788e1 ChangeLog 1507
+EBUILD resin-servlet-api-3.1.3.ebuild 957 RMD160 9c24c0ffa04b0bf5d51a11b585bdbd692bc39eb7 SHA1 f1a2492fd5f3ef772feee843898b8a1202621a0d SHA256 da5b099c66c6a055756768a690ba6b0a7200babad157b002ac7bd272b677f3b9
+MD5 2c77ca0142af20aaae7587a55013383a resin-servlet-api-3.1.3.ebuild 957
+RMD160 9c24c0ffa04b0bf5d51a11b585bdbd692bc39eb7 resin-servlet-api-3.1.3.ebuild 957
+SHA256 da5b099c66c6a055756768a690ba6b0a7200babad157b002ac7bd272b677f3b9 resin-servlet-api-3.1.3.ebuild 957
+MISC ChangeLog 1754 RMD160 245b6a970756109b5c1e1a336634f97eb1ba4562 SHA1 1f3ce71c7aa5f9df44eac350911b3813af19b6e5 SHA256 f828cbfccf44b3ee464c8914fd205e8231bbd605241a122b16d11831a9b434bc
+MD5 db1cc9cd6ad5e0110d8c7b577c572ec8 ChangeLog 1754
+RMD160 245b6a970756109b5c1e1a336634f97eb1ba4562 ChangeLog 1754
+SHA256 f828cbfccf44b3ee464c8914fd205e8231bbd605241a122b16d11831a9b434bc ChangeLog 1754
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -27,6 +30,13 @@ SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata
 MD5 e9267b2668be4aafeb97bbdb3d97930a files/digest-resin-servlet-api-3.0.24 247
 RMD160 27adb862f5bc22f97bffe8099abba0203c28ed3a files/digest-resin-servlet-api-3.0.24 247
 SHA256 3d3943077944fee34766254183d9d3ca344c46606c081648d595799b948661ec files/digest-resin-servlet-api-3.0.24 247
-MD5 815a5df25d9ceb4f43bfb0918e594cda files/digest-resin-servlet-api-3.1.2 244
-RMD160 cc4962a3a5191878bbb8a988626737ad938908f1 files/digest-resin-servlet-api-3.1.2 244
-SHA256 fa0fd17591fb94b90a16268874a84d0dcc6ad57ecd417a804207c1b9f23b0f4f files/digest-resin-servlet-api-3.1.2 244
+MD5 a8a78ace89324ba9bda96ccea165115b files/digest-resin-servlet-api-3.1.3 244
+RMD160 ee63e107ad02eb9aa793f6e535b8e501b9c09765 files/digest-resin-servlet-api-3.1.3 244
+SHA256 cd4eaac7ed898104dd107d4ee34e0d265612045dd29201c2dfb981775674ee63 files/digest-resin-servlet-api-3.1.3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHNGkMgo/w9rxVVVERAmvDAKCpawAl9TPl+vXiJVx9rjZt+MLQLwCggPoP
+N4ShyCpMRrZ8+dKuUar0Lx8=
+=d/7h
+-----END PGP SIGNATURE-----
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.2 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.2
deleted file mode 100644
index 7df0a0078aca..000000000000
--- a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f9cd79d9f5b12bf163ef632da8c9e4e3 resin-3.1.2-src.zip 13317024
-RMD160 33989f69c6d757fe5cf4ea50077f503fc68e98d1 resin-3.1.2-src.zip 13317024
-SHA256 3e56d9437091597b7d0bf6523254b753733533dbfbb4160af21b1cadf793d081 resin-3.1.2-src.zip 13317024
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.3 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.3
new file mode 100644
index 000000000000..7fba46d3cf54
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.3
@@ -0,0 +1,3 @@
+MD5 9b786d3fc037f43f9c11b48d486a0893 resin-3.1.3-src.zip 12366224
+RMD160 573db137aca6da906f519333b27e67611d2b8a7a resin-3.1.3-src.zip 12366224
+SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493 resin-3.1.3-src.zip 12366224
diff --git a/dev-java/resin-servlet-api/files/resin-3.1.2-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.1.3-gentoo.patch
index 42033d136c3f..7179ff56b415 100644
--- a/dev-java/resin-servlet-api/files/resin-3.1.2-gentoo.patch
+++ b/dev-java/resin-servlet-api/files/resin-3.1.3-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru resin-3.1.2.vanilla/Makefile.in resin-3.1.2/Makefile.in
---- resin-3.1.2.vanilla/Makefile.in	2007-08-17 09:44:18.000000000 +0200
-+++ resin-3.1.2/Makefile.in	2007-08-17 09:45:48.000000000 +0200
+diff -Nru resin-3.1.3.vanilla/Makefile.in resin-3.1.3/Makefile.in
+--- resin-3.1.3.vanilla/Makefile.in	2007-11-09 14:59:07.000000000 +0100
++++ resin-3.1.3/Makefile.in	2007-11-09 15:00:28.000000000 +0100
 @@ -9,20 +9,20 @@
  
  install	:
@@ -8,7 +8,7 @@ diff -Nru resin-3.1.2.vanilla/Makefile.in resin-3.1.2/Makefile.in
 -	if test $(PREFIX) != `pwd`; then \
 -	  mkdir -p $(PREFIX)/lib; \
 -	  mkdir -p $(PREFIX)/$(LIBEXEC); \
--	  cp -r libexec/* $(PREFIX)/$(LIBEXEC); \
+-	  cp -r $(LIBEXEC)/* $(PREFIX)/$(LIBEXEC); \
 -	  cp lib/*.jar $(PREFIX)/lib; \
 -	  mkdir -p $(PREFIX)/bin; \
 -	  cp bin/* $(PREFIX)/bin; \
@@ -23,7 +23,7 @@ diff -Nru resin-3.1.2.vanilla/Makefile.in resin-3.1.2/Makefile.in
 +	if test $(DESTDIR)/$(PREFIX) != `pwd`; then \
 +	  mkdir -p $(DESTDIR)/$(PREFIX)/lib; \
 +	  mkdir -p $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
-+	  cp -r libexec/* $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
++	  cp -r $(LIBEXEC)/* $(DESTDIR)/$(PREFIX)/$(LIBEXEC); \
 +	  cp lib/*.jar $(DESTDIR)/$(PREFIX)/lib; \
 +	  mkdir -p $(DESTDIR)/$(PREFIX)/bin; \
 +	  cp bin/* $(DESTDIR)/$(PREFIX)/bin; \
@@ -37,9 +37,9 @@ diff -Nru resin-3.1.2.vanilla/Makefile.in resin-3.1.2/Makefile.in
 +	    cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml; \
  	  fi; \
  	fi
-diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
---- resin-3.1.2.vanilla/build.xml	2007-08-17 09:44:18.000000000 +0200
-+++ resin-3.1.2/build.xml	2007-08-17 09:47:12.000000000 +0200
+diff -Nru resin-3.1.3.vanilla/build.xml resin-3.1.3/build.xml
+--- resin-3.1.3.vanilla/build.xml	2007-11-09 14:59:07.000000000 +0100
++++ resin-3.1.3/build.xml	2007-11-09 15:01:17.000000000 +0100
 @@ -7,7 +7,6 @@
  
    <property name="modules" location="${basedir}/modules"/>
@@ -57,14 +57,14 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
    <property name="javac.optimize" value="off"/>
    <property name="javac.deprecation" value="off"/>
    <property name="javac.nowarn" value="on"/>
-   <property name="javac.memoryMaximumSize" value="256m"/>
+   <property name="javac.memoryMaximumSize" value="512m"/>
  
 -  <property name="javac.source" value="1.5"/>
 -
    <property name="jar.compress" value="false"/>
    <!--
    <property name="jar.index" value="true"/>
-@@ -66,14 +63,13 @@
+@@ -83,14 +80,13 @@
    </target>
  
    <target name="compile" 
@@ -80,7 +80,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -81,7 +77,6 @@
+@@ -98,7 +94,6 @@
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="ejb"/>
        <param name="module.jar" value="ejb-15.jar"/>
@@ -88,7 +88,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -89,7 +84,6 @@
+@@ -106,7 +101,6 @@
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="jpa"/>
        <param name="module.jar" value="jpa-15.jar"/>
@@ -96,7 +96,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -107,11 +101,10 @@
+@@ -124,11 +118,10 @@
      </antcall>
    </target>
  
@@ -109,7 +109,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -150,7 +143,7 @@
+@@ -167,7 +160,7 @@
      </antcall>
    </target>
  
@@ -118,7 +118,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="jstl"/>
        <param name="module.jar" value="jstl-11.jar"/>
-@@ -196,7 +189,7 @@
+@@ -221,7 +214,7 @@
      </antcall>
    </target>
  
@@ -127,7 +127,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
  
      <!-- filter to insert version -->
  
-@@ -226,7 +219,6 @@
+@@ -251,7 +244,6 @@
  
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="resin"/>
@@ -135,7 +135,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
    
-@@ -251,14 +243,12 @@
+@@ -276,14 +268,12 @@
    <target name="webutil" depends="init, resin">
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="webutil"/>
@@ -150,7 +150,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -267,7 +257,6 @@
+@@ -292,7 +282,6 @@
    <target name="ecmascript" depends="init">
      <antcall target="module" inheritRefs="true">
        <param name="module.name" value="ecmascript"/>
@@ -158,7 +158,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
      </antcall>
    </target>
  
-@@ -299,16 +288,15 @@
+@@ -325,16 +314,15 @@
             verbose="${javac.verbose}" 
             debug="${javac.debug}" optimize="${javac.optimize}"
             deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
@@ -178,7 +178,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
        </classpath>
      </javac>
  
-@@ -378,13 +366,6 @@
+@@ -428,13 +416,6 @@
      </copy>
    </target>
  
@@ -192,7 +192,7 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
    <target name="webapps" depends="init, doc, quercus">
    </target>
  
-@@ -520,9 +501,6 @@
+@@ -536,9 +517,6 @@
            <dirset dir="${modules}">
              <include name="*/classes"/>
            </dirset>
@@ -202,11 +202,11 @@ diff -Nru resin-3.1.2.vanilla/build.xml resin-3.1.2/build.xml
          </classpath>
        </java>
  
-@@ -651,7 +629,6 @@
+@@ -667,7 +645,6 @@
          <include name="lib/j2ee-management-10.jar"/>
          <include name="lib/jca-15.jar"/>
          <include name="lib/jms-11.jar"/>
 -        <include name="lib/jsdk-15.jar"/>
-         <!--
          <include name="lib/jsf-12.jar"/>
-         -->
+         <include name="lib/jstl-11.jar"/>
+         <include name="lib/jta-101.jar"/>
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.2.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild
index fa61ae705ce5..fadb014035eb 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.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/dev-java/resin-servlet-api/resin-servlet-api-3.1.2.ebuild,v 1.1 2007/08/17 08:02:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.3.ebuild,v 1.1 2007/11/09 14:04:47 nelchael Exp $
 
 JAVA_PKG_IUSE="source"