Version bump.

(Portage version: 2.1.3.19)

5 files changed, 36 insertions, 29 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/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"