Version bump.

(Portage version: 2.1.3.6)

7 files changed, 606 insertions, 1 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index 6fbb1847aa51..bd53b38dca6b 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2007/05/24 13:21:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.3 2007/08/17 08:02:03 nelchael Exp $
+
+*resin-servlet-api-3.1.2 (17 Aug 2007)
+*resin-servlet-api-3.0.24 (17 Aug 2007)
+
+  17 Aug 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/resin-3.0.24-gentoo.patch, +files/resin-3.1.2-gentoo.patch,
+  +resin-servlet-api-3.0.24.ebuild, +resin-servlet-api-3.1.2.ebuild:
+  Version bump.
 
   24 May 2007; Diego Pettenò <flameeyes@gentoo.org>
   resin-servlet-api-3.1.1.ebuild:
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.24 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.24
new file mode 100644
index 000000000000..42192b685b09
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.24
@@ -0,0 +1,3 @@
+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
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
new file mode 100644
index 000000000000..7df0a0078aca
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.2
@@ -0,0 +1,3 @@
+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/resin-3.0.24-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.0.24-gentoo.patch
new file mode 100644
index 000000000000..6b54c07b4218
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/resin-3.0.24-gentoo.patch
@@ -0,0 +1,283 @@
+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/dev-java/resin-servlet-api/files/resin-3.1.2-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.1.2-gentoo.patch
new file mode 100644
index 000000000000..42033d136c3f
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/resin-3.1.2-gentoo.patch
@@ -0,0 +1,212 @@
+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
+@@ -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.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
+@@ -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.5"/>
+-
+   <property name="jar.compress" value="false"/>
+   <!--
+   <property name="jar.index" value="true"/>
+@@ -66,14 +63,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>
+ 
+@@ -81,7 +77,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>
+ 
+@@ -89,7 +84,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>
+ 
+@@ -107,11 +101,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>
+ 
+@@ -150,7 +143,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"/>
+@@ -196,7 +189,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 -->
+ 
+@@ -226,7 +219,6 @@
+ 
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="resin"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+   
+@@ -251,14 +243,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>
+ 
+@@ -267,7 +257,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>
+ 
+@@ -299,16 +288,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>
+ 
+@@ -378,13 +366,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>
+ 
+@@ -520,9 +501,6 @@
+           <dirset dir="${modules}">
+             <include name="*/classes"/>
+           </dirset>
+-          <fileset dir="${modules}/ext">
+-            <include name="**/*.jar"/>
+-          </fileset>
+         </classpath>
+       </java>
+ 
+@@ -651,7 +629,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"/>
+         -->
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.24.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.24.ebuild
new file mode 100644
index 000000000000..12f3ea0f3bd4
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.24.ebuild
@@ -0,0 +1,48 @@
+# 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.0.24.ebuild,v 1.1 2007/08/17 08:02:03 nelchael Exp $
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	mkdir "${S}/lib"
+
+	cd "${S}"
+	epatch "${FILESDIR}/resin-${PV}-gentoo.patch"
+
+}
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+src_install() {
+
+	java-pkg_newjar "lib/jsdk-24.jar"
+	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
+
+}
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.2.ebuild
new file mode 100644
index 000000000000..fa61ae705ce5
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.2.ebuild
@@ -0,0 +1,48 @@
+# 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 $
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+
+	unpack ${A}
+
+	mkdir "${S}/lib"
+
+	cd "${S}"
+	epatch "${FILESDIR}/resin-${PV}-gentoo.patch"
+
+}
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+src_install() {
+
+	java-pkg_newjar "lib/jsdk-15.jar"
+	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
+
+}