Use tarball of patches.

(Portage version: 2.1.3.19)

7 files changed, 25 insertions, 502 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 17c30eb63055..e37408b790b7 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.58 2007/11/09 14:07:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.59 2007/11/10 12:42:43 nelchael Exp $
+
+  10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.0.24/resin-3.0.24-gentoo.patch,
+  -files/3.1.3/resin-3.1.3-gentoo.patch, resin-3.0.24.ebuild,
+  resin-3.1.3.ebuild:
+  Use tarball of patches.
 
 *resin-3.1.3 (09 Nov 2007)
 
diff --git a/www-servers/resin/files/3.0.24/resin-3.0.24-gentoo.patch b/www-servers/resin/files/3.0.24/resin-3.0.24-gentoo.patch
deleted file mode 100644
index 6b54c07b4218..000000000000
--- a/www-servers/resin/files/3.0.24/resin-3.0.24-gentoo.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -Nru resin-3.0.24.vanilla/Makefile.in resin-3.0.24/Makefile.in
---- resin-3.0.24.vanilla/Makefile.in	2006-08-01 12:48:26.000000000 +0200
-+++ resin-3.0.24/Makefile.in	2007-08-17 09:12:32.000000000 +0200
-@@ -1,6 +1,6 @@
- PREFIX=@prefix@
- 
--all	: 
-+all	:
- 	(cd modules/c/src; $(MAKE))
- 
- clean	:
-@@ -8,20 +8,20 @@
- 
- install	:
- 	(cd modules/c/src; $(MAKE) install)
--	if test $(PREFIX) != `pwd`; then \
--	  mkdir -p $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/libexec; \
--	  cp -r libexec/* $(PREFIX)/libexec; \
--	  cp lib/*.jar $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/bin; \
--	  cp bin/* $(PREFIX)/bin; \
--	  mkdir -p $(PREFIX)/webapps; \
--	  cp -r webapps/* $(PREFIX)/webapps; \
--	  mkdir -p $(PREFIX)/conf; \
--	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
--	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
--	  if test ! -r $(PREFIX)/conf/resin.conf; then \
--	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
--	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
-+	if test $(DESTDIR)$(PREFIX) != `pwd`; then \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/lib; \
-+	  mkdir -p $(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; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
-+	  cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/conf; \
-+	  cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
-+	  cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
-+	  if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
-+	    cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
-+	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
- 	  fi; \
- 	fi
-diff -Nru resin-3.0.24.vanilla/bin/wrapper.pl resin-3.0.24/bin/wrapper.pl
---- resin-3.0.24.vanilla/bin/wrapper.pl	2007-08-14 08:56:36.000000000 +0200
-+++ resin-3.0.24/bin/wrapper.pl	2007-08-17 09:12:32.000000000 +0200
-@@ -447,9 +447,6 @@
- 	$pid=`cat $pid_file`;
- 	chop($pid);
- 
--	if ($cmd eq "stop") {
--	    print("Stopping ${name}\n");
--	}
- 	$signal = 15;
- 	$count = 10;
- 	while (kill($signal, $pid) && $count-- > 0) {
-@@ -565,8 +562,6 @@
- 	$SIG{CHLD} = 'IGNORE';
-     }
- 
--    print "\n\nResin wrapper.pl closing.\n\n";
--    
-     close(S);
-     close(C); # closing the accepted socket should start orderly shutdown
-     # unlink needs to happen relatively soon so restart's pid won't
-@@ -743,8 +738,6 @@
-       $date = `date`;
-       chop($date);
- 
--      print "Resin $name $cmd at $date\n";
--
-       # create a keepalive socket
-       # when the wrapper dies, the httpd class will detect that and
-       # close gracefully
-diff -Nru resin-3.0.24.vanilla/bin/wrapper.pl.in resin-3.0.24/bin/wrapper.pl.in
---- resin-3.0.24.vanilla/bin/wrapper.pl.in	2007-01-01 11:02:08.000000000 +0100
-+++ resin-3.0.24/bin/wrapper.pl.in	2007-08-17 09:12:32.000000000 +0200
-@@ -447,9 +447,6 @@
- 	$pid=`cat $pid_file`;
- 	chop($pid);
- 
--	if ($cmd eq "stop") {
--	    print("Stopping ${name}\n");
--	}
- 	$signal = 15;
- 	$count = 10;
- 	while (kill($signal, $pid) && $count-- > 0) {
-@@ -565,8 +562,6 @@
- 	$SIG{CHLD} = 'IGNORE';
-     }
- 
--    print "\n\nResin wrapper.pl closing.\n\n";
--    
-     close(S);
-     close(C); # closing the accepted socket should start orderly shutdown
-     # unlink needs to happen relatively soon so restart's pid won't
-@@ -743,8 +738,6 @@
-       $date = `date`;
-       chop($date);
- 
--      print "Resin $name $cmd at $date\n";
--
-       # create a keepalive socket
-       # when the wrapper dies, the httpd class will detect that and
-       # close gracefully
-diff -Nru resin-3.0.24.vanilla/build.xml resin-3.0.24/build.xml
---- resin-3.0.24.vanilla/build.xml	2006-11-01 09:59:02.000000000 +0100
-+++ resin-3.0.24/build.xml	2007-08-17 09:12:32.000000000 +0200
-@@ -7,7 +7,6 @@
- 
-   <property name="modules" location="${basedir}/modules"/>
-   <property name="src" location="${basedir}/src"/>
--  <property name="ext" location="${basedir}/modules/ext"/>
-   <property name="doc" location="${basedir}/doc"/>
- 
-   <property name="build" location="${install}/build"/>
-@@ -17,14 +16,12 @@
- 
- 
-   <property name="javac.verbose" value="off"/>
--  <property name="javac.debug" value="on"/>
-+  <property name="javac.debug" value="off"/>
-   <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.source" value="1.4"/>
--
-   <property name="jar.compress" value="false"/>
-   <property name="jar.index" value="true"/>
-   <property name="jar.update" value="false"/>
-@@ -66,7 +63,7 @@
-   </target>
- 
-   <target name="compile" 
--          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
-+          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
-   </target>
- 
-   <target name="ejb" depends="init, jta">
-@@ -80,7 +77,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ejb30"/>
-       <param name="module.jar" value="ejb-30.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -98,11 +94,10 @@
-     </antcall>
-   </target>
- 
--  <target name="jaxrpc" depends="init,saaj,jsdk">
-+  <target name="jaxrpc" depends="init,saaj">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jaxrpc"/>
-       <param name="module.jar" value="jaxrpc.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -116,7 +111,6 @@
-   <target name="resin-jdk15" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin-jdk15"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -148,7 +142,7 @@
-     </antcall>
-   </target>
- 
--  <target name="jstl" depends="init, jsdk">
-+  <target name="jstl" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jstl"/>
-       <param name="module.jar" value="jstl-11.jar"/>
-@@ -187,7 +181,7 @@
-     </antcall>
-   </target>
- 
--  <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jsdk, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
-+  <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
- 
-     <!-- filter to insert version -->
- 
-@@ -217,7 +211,6 @@
- 
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
-   
-@@ -242,14 +235,12 @@
-   <target name="webutil" depends="init, resin">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="webutil"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-   <target name="quercus-dev" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="quercus"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -282,16 +273,15 @@
-            verbose="${javac.verbose}" 
-            debug="${javac.debug}" optimize="${javac.optimize}"
-            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
--           source="${javac.source}"
-            excludes="**/.svn/**"
-            memoryMaximumSize="${javac.memoryMaximumSize}">
-       <classpath>
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-        </dirset>
--        <fileset dir="${ext}">
--          <include name="**/*.jar"/>
--        </fileset>
-+          <fileset dir="lib">
-+            <include name="*.jar" />
-+          </fileset>
-       </classpath>
-     </javac>
- 
-@@ -358,13 +348,6 @@
-     </copy>
-   </target>
- 
--  <target name="ext" depends="init, resin">
--    <copy todir="${install}/lib" preservelastmodified="true">
--      <fileset dir="${ext}">
--      </fileset>
--    </copy>
--  </target>
--
-   <target name="webapps" depends="init, doc, quercus">
-   </target>
- 
-@@ -503,9 +486,6 @@
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-         </dirset>
--        <fileset dir="${modules}/ext">
--          <include name="**/*.jar"/>
--        </fileset>
-       </classpath>
-     </java>
- 
-@@ -688,7 +668,6 @@
-         <include name="lib/jca-15.jar"/>
-         <include name="lib/jms-11.jar"/>
-         <include name="lib/jmx-12.jar"/>
--        <include name="lib/jsdk-24.jar"/>
-         <include name="lib/jstl-11.jar"/>
-         <include name="lib/jta-101.jar"/>
-         <include name="lib/portlet-10.jar"/>
-diff -Nru resin-3.0.24.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.24/modules/resin/src/com/caucho/server/resin/Resin.java
---- resin-3.0.24.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-08-01 12:43:54.000000000 +0200
-+++ resin-3.0.24/modules/resin/src/com/caucho/server/resin/Resin.java	2007-08-17 09:12:32.000000000 +0200
-@@ -700,10 +700,10 @@
-       throw new ConfigException(L().l("The following system property must be set:\n  -Djava.util.logging.manager=com.caucho.log.LogManagerImpl\nThe JDK 1.4 Logging manager must be set to Resin's log manager."));
-     }
- 
--    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.4"});
-+    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.5"});
-     validatePackage("javax.servlet.jsp.jstl.core.Config", new String[] {"1.1"});
-     validatePackage("javax.management.MBeanServer", new String[] { "1.2", "1.5" });
--    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.4"});
-+    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.5"});
-   }
- 
-   /**
diff --git a/www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch b/www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch
deleted file mode 100644
index 7179ff56b415..000000000000
--- a/www-servers/resin/files/3.1.3/resin-3.1.3-gentoo.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-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	:
- 	(cd modules/c/src; $(MAKE) install)
--	if test $(PREFIX) != `pwd`; then \
--	  mkdir -p $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/$(LIBEXEC); \
--	  cp -r $(LIBEXEC)/* $(PREFIX)/$(LIBEXEC); \
--	  cp lib/*.jar $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/bin; \
--	  cp bin/* $(PREFIX)/bin; \
--	  mkdir -p $(PREFIX)/webapps; \
--	  cp -r webapps/* $(PREFIX)/webapps; \
--	  mkdir -p $(PREFIX)/conf; \
--	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
--	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
--	  if test ! -r $(PREFIX)/conf/resin.conf; then \
--	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
--	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
-+	if test $(DESTDIR)/$(PREFIX) != `pwd`; then \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/lib; \
-+	  mkdir -p $(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; \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/webapps; \
-+	  cp -r webapps/* $(DESTDIR)/$(PREFIX)/webapps; \
-+	  mkdir -p $(DESTDIR)/$(PREFIX)/conf; \
-+	  cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf.orig; \
-+	  cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml.orig; \
-+	  if test ! -r $(DESTDIR)/$(PREFIX)/conf/resin.conf; then \
-+	    cp conf/resin.conf $(DESTDIR)/$(PREFIX)/conf/resin.conf; \
-+	    cp conf/app-default.xml $(DESTDIR)/$(PREFIX)/conf/app-default.xml; \
- 	  fi; \
- 	fi
-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"/>
-   <property name="src" location="${basedir}/src"/>
--  <property name="ext" location="${basedir}/modules/ext"/>
-   <property name="doc" location="${basedir}/doc"/>
- 
-   <property name="build" location="${install}/build"/>
-@@ -17,14 +16,12 @@
- 
- 
-   <property name="javac.verbose" value="off"/>
--  <property name="javac.debug" value="on"/>
-+  <property name="javac.debug" value="off"/>
-   <property name="javac.optimize" value="off"/>
-   <property name="javac.deprecation" value="off"/>
-   <property name="javac.nowarn" value="on"/>
-   <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"/>
-@@ -83,14 +80,13 @@
-   </target>
- 
-   <target name="compile" 
--          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext">
-+          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf">
-   </target>
- 
-   <target name="ant" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ant"/>
-       <param name="module.jar" value="resin-ant.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -98,7 +94,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ejb"/>
-       <param name="module.jar" value="ejb-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -106,7 +101,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jpa"/>
-       <param name="module.jar" value="jpa-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -124,11 +118,10 @@
-     </antcall>
-   </target>
- 
--  <target name="jaxrpc" depends="init,saaj,jsdk">
-+  <target name="jaxrpc" depends="init,saaj">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jaxrpc"/>
-       <param name="module.jar" value="jaxrpc-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -167,7 +160,7 @@
-     </antcall>
-   </target>
- 
--  <target name="jstl" depends="init, jsdk">
-+  <target name="jstl" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jstl"/>
-       <param name="module.jar" value="jstl-11.jar"/>
-@@ -221,7 +214,7 @@
-     </antcall>
-   </target>
- 
--  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jsdk, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
-+  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
- 
-     <!-- filter to insert version -->
- 
-@@ -251,7 +244,6 @@
- 
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
-   
-@@ -276,14 +268,12 @@
-   <target name="webutil" depends="init, resin">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="webutil"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-   <target name="quercus-dev" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="quercus"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -292,7 +282,6 @@
-   <target name="ecmascript" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ecmascript"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -325,16 +314,15 @@
-            verbose="${javac.verbose}" 
-            debug="${javac.debug}" optimize="${javac.optimize}"
-            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
--           source="${javac.source}"
-            excludes="**/.svn/**"
-            memoryMaximumSize="${javac.memoryMaximumSize}">
-       <classpath>
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-        </dirset>
--        <fileset dir="${ext}">
--          <include name="**/*.jar"/>
--        </fileset>
-+       <fileset dir="lib/">
-+           <include name="*.jar"/>
-+       </fileset>
-       </classpath>
-     </javac>
- 
-@@ -428,13 +416,6 @@
-     </copy>
-   </target>
- 
--  <target name="ext" depends="init, resin">
--    <copy todir="${install}/lib" preservelastmodified="true">
--      <fileset dir="${ext}">
--      </fileset>
--    </copy>
--  </target>
--
-   <target name="webapps" depends="init, doc, quercus">
-   </target>
- 
-@@ -536,9 +517,6 @@
-           <dirset dir="${modules}">
-             <include name="*/classes"/>
-           </dirset>
--          <fileset dir="${modules}/ext">
--            <include name="**/*.jar"/>
--          </fileset>
-         </classpath>
-       </java>
- 
-@@ -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/www-servers/resin/files/digest-resin-3.0.24 b/www-servers/resin/files/digest-resin-3.0.24
index 42192b685b09..0b7053910d75 100644
--- a/www-servers/resin/files/digest-resin-3.0.24
+++ b/www-servers/resin/files/digest-resin-3.0.24
@@ -1,3 +1,6 @@
 MD5 9310288218c7cb4c97f68a966600fede resin-3.0.24-src.zip 10688883
 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 resin-3.0.24-src.zip 10688883
 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c resin-3.0.24-src.zip 10688883
+MD5 aa067e589a4fefbd8db05f20a81e5e98 resin-gentoo-patches-3.0.24.tar.bz2 4788
+RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 resin-gentoo-patches-3.0.24.tar.bz2 4788
+SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0 resin-gentoo-patches-3.0.24.tar.bz2 4788
diff --git a/www-servers/resin/files/digest-resin-3.1.3 b/www-servers/resin/files/digest-resin-3.1.3
index 7fba46d3cf54..f034967b0e7e 100644
--- a/www-servers/resin/files/digest-resin-3.1.3
+++ b/www-servers/resin/files/digest-resin-3.1.3
@@ -1,3 +1,6 @@
 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
+MD5 a16352098c112615d1465055bf38b94d resin-gentoo-patches-3.1.3.tar.bz2 3516
+RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc resin-gentoo-patches-3.1.3.tar.bz2 3516
+SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63 resin-gentoo-patches-3.1.3.tar.bz2 3516
diff --git a/www-servers/resin/resin-3.0.24.ebuild b/www-servers/resin/resin-3.0.24.ebuild
index f01538524487..0ba1c9afa145 100644
--- a/www-servers/resin/resin-3.0.24.ebuild
+++ b/www-servers/resin/resin-3.0.24.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/resin/resin-3.0.24.ebuild,v 1.6 2007/11/06 14:41:45 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.24.ebuild,v 1.7 2007/11/10 12:42:43 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -8,7 +8,8 @@ inherit java-pkg-2 java-ant-2 eutils flag-o-matic
 
 DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine."
 HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
+SRC_URI="http://www.caucho.com/download/${P}-src.zip
+	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -37,7 +38,9 @@ JAVA_PKG_BSFIX="off"
 src_unpack() {
 
 	unpack ${A}
-	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
+		epatch "${i}"
+	done;
 
 	java-ant_bsfix_one "${S}/build.xml"
 
diff --git a/www-servers/resin/resin-3.1.3.ebuild b/www-servers/resin/resin-3.1.3.ebuild
index 0d5780668043..dfe2ccef7324 100644
--- a/www-servers/resin/resin-3.1.3.ebuild
+++ b/www-servers/resin/resin-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/www-servers/resin/resin-3.1.3.ebuild,v 1.1 2007/11/09 14:07:01 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.3.ebuild,v 1.2 2007/11/10 12:42:43 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -8,7 +8,8 @@ inherit java-pkg-2 java-ant-2 eutils flag-o-matic
 
 DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine."
 HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.zip"
+SRC_URI="http://www.caucho.com/download/${P}-src.zip
+	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin"
@@ -37,7 +38,9 @@ JAVA_PKG_BSFIX="off"
 src_unpack() {
 
 	unpack ${A}
-	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
+		epatch "${i}"
+	done;
 
 	java-ant_bsfix_one "${S}/build.xml"