Added resin-servlet-api.

(Portage version: 2.1.2.7)

9 files changed, 588 insertions, 0 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
new file mode 100644
index 000000000000..cfe67b5c1fcf
--- /dev/null
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -0,0 +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.1 2007/05/16 10:29:07 nelchael Exp $
+
+*resin-servlet-api-3.1.1 (16 May 2007)
+*resin-servlet-api-3.0.23 (16 May 2007)
+
+  16 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/resin-3.0.23-gentoo.patch, +files/resin-3.1.1-gentoo.patch,
+  +metadata.xml, +resin-servlet-api-3.0.23.ebuild,
+  +resin-servlet-api-3.1.1.ebuild:
+  Added resin-servlet-api.
+
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
new file mode 100644
index 000000000000..cf0815142fa0
--- /dev/null
+++ b/dev-java/resin-servlet-api/Manifest
@@ -0,0 +1,32 @@
+AUX resin-3.0.23-gentoo.patch 8968 RMD160 3a898ab94fb1482438e39688baedbcb38051f4d9 SHA1 d660c3569726d0991fc87360415519cf0a93663f SHA256 c6d4b82a215a69bbf03d37bcf5c99b6fd4d3dda9653d0268e8c4f01c013c265b
+MD5 b2f2a10e1873d655b48a72162366c8cf files/resin-3.0.23-gentoo.patch 8968
+RMD160 3a898ab94fb1482438e39688baedbcb38051f4d9 files/resin-3.0.23-gentoo.patch 8968
+SHA256 c6d4b82a215a69bbf03d37bcf5c99b6fd4d3dda9653d0268e8c4f01c013c265b files/resin-3.0.23-gentoo.patch 8968
+AUX resin-3.1.1-gentoo.patch 6340 RMD160 392edeed6675189d144d255af45105be62ba36c6 SHA1 86f68831c94b427d58f4ee18ae8baef0c83df2cc SHA256 810006604014be01d59250d0f29268b1db5a0bac170a7b70450b3288ed038917
+MD5 0dfa7829bdf77706615fdc0d237148a0 files/resin-3.1.1-gentoo.patch 6340
+RMD160 392edeed6675189d144d255af45105be62ba36c6 files/resin-3.1.1-gentoo.patch 6340
+SHA256 810006604014be01d59250d0f29268b1db5a0bac170a7b70450b3288ed038917 files/resin-3.1.1-gentoo.patch 6340
+DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d
+DIST resin-3.1.1-src.tar.gz 7351646 RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce SHA1 0bd1b2fb048867fc2156898c749863ed3302512d SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424
+EBUILD resin-servlet-api-3.0.23.ebuild 829 RMD160 e52f8435f9f7ae15a785d534741f3cfe1d975c29 SHA1 f36ed8fe4424f6adb4bff022bdc3d27029806be2 SHA256 e9f4d9300e772a37ee33985188eb653a70926573b02ae50b6646247b0fc4580d
+MD5 a6ac6e2158c75fc4fdae0e40780be7c4 resin-servlet-api-3.0.23.ebuild 829
+RMD160 e52f8435f9f7ae15a785d534741f3cfe1d975c29 resin-servlet-api-3.0.23.ebuild 829
+SHA256 e9f4d9300e772a37ee33985188eb653a70926573b02ae50b6646247b0fc4580d resin-servlet-api-3.0.23.ebuild 829
+EBUILD resin-servlet-api-3.1.1.ebuild 829 RMD160 0a9f9ee0fa753f401ebb147356c78f31daa4361a SHA1 20d2790c02deb16da49396883677bc376016e65a SHA256 06206ab01e43038f707628e4db9e055aac98d5f9e947e2eddc519ae73df0fed2
+MD5 c6fe4152e8967ec4a1c32ca38d69c657 resin-servlet-api-3.1.1.ebuild 829
+RMD160 0a9f9ee0fa753f401ebb147356c78f31daa4361a resin-servlet-api-3.1.1.ebuild 829
+SHA256 06206ab01e43038f707628e4db9e055aac98d5f9e947e2eddc519ae73df0fed2 resin-servlet-api-3.1.1.ebuild 829
+MISC ChangeLog 443 RMD160 0ecc339d6d022bca0bc15a7636bb0037d25c838f SHA1 51e5e57669e26230409772e8286672a5cd3e3dac SHA256 2571823644f430312a69b9db80d0f2b17c6ff18c43f1faed10ce0825fdfddd08
+MD5 8fdb9026974c09064435d927db34ae69 ChangeLog 443
+RMD160 0ecc339d6d022bca0bc15a7636bb0037d25c838f ChangeLog 443
+SHA256 2571823644f430312a69b9db80d0f2b17c6ff18c43f1faed10ce0825fdfddd08 ChangeLog 443
+MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
+MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
+RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
+SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata.xml 229
+MD5 a4e0893dd1c60cd73ce6f28a4ccc8ae6 files/digest-resin-servlet-api-3.0.23 253
+RMD160 43ab80dd8eff83f564cb02b725ab6c287f7edb60 files/digest-resin-servlet-api-3.0.23 253
+SHA256 325bcbc92c222e3a387af37a3313ebcd4be2d8fba1f97b936e487580741db7b3 files/digest-resin-servlet-api-3.0.23 253
+MD5 7c0a009cc263c0f8e753ffebd4d4dd90 files/digest-resin-servlet-api-3.1.1 250
+RMD160 343df1f7d1981283f5e2f3b0564949bc5ab9d505 files/digest-resin-servlet-api-3.1.1 250
+SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/digest-resin-servlet-api-3.1.1 250
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23
new file mode 100644
index 000000000000..bae42a23b37b
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23
@@ -0,0 +1,3 @@
+MD5 f18ed18598f4bfbba18ec5dc9427cb68 resin-3.0.23-src.tar.gz 5470406
+RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef resin-3.0.23-src.tar.gz 5470406
+SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d resin-3.0.23-src.tar.gz 5470406
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1
new file mode 100644
index 000000000000..1ed7597677ec
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1
@@ -0,0 +1,3 @@
+MD5 860fbaf78013c0bc5bde742e45a13e21 resin-3.1.1-src.tar.gz 7351646
+RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce resin-3.1.1-src.tar.gz 7351646
+SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424 resin-3.1.1-src.tar.gz 7351646
diff --git a/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch
new file mode 100644
index 000000000000..bd9ad2201a6f
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch
@@ -0,0 +1,252 @@
+diff -Nru resin-3.0.23.vanilla/Makefile.in resin-3.0.23/Makefile.in
+--- resin-3.0.23.vanilla/Makefile.in	2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.23/Makefile.in	2006-11-19 13:00:27.000000000 +0100
+@@ -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.23.vanilla/bin/wrapper.pl resin-3.0.23/bin/wrapper.pl
+--- resin-3.0.23.vanilla/bin/wrapper.pl	2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.23/bin/wrapper.pl	2006-11-19 13:00:27.000000000 +0100
+@@ -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.23.vanilla/bin/wrapper.pl.in resin-3.0.23/bin/wrapper.pl.in
+--- resin-3.0.23.vanilla/bin/wrapper.pl.in	2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.23/bin/wrapper.pl.in	2006-11-19 13:00:27.000000000 +0100
+@@ -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.23.vanilla/build.xml resin-3.0.23/build.xml
+--- resin-3.0.23.vanilla/build.xml	2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.23/build.xml	2006-11-19 13:00:27.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="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, jsdk, 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>
+ 
+@@ -102,7 +98,6 @@
+     <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>
+ 
+@@ -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>
+ 
+diff -Nru resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java
+--- resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-11-19 12:59:48.000000000 +0100
++++ resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java	2006-11-19 13:00:27.000000000 +0100
+@@ -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.1-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch
new file mode 100644
index 000000000000..02de640e6c19
--- /dev/null
+++ b/dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch
@@ -0,0 +1,181 @@
+diff -Nru resin-3.1.1.vanilla/Makefile.in resin-3.1.1/Makefile.in
+--- resin-3.1.1.vanilla/Makefile.in	2007-05-15 18:11:40.000000000 +0200
++++ resin-3.1.1/Makefile.in	2007-05-15 18:17:07.000000000 +0200
+@@ -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.1.1.vanilla/build.xml resin-3.1.1/build.xml
+--- resin-3.1.1.vanilla/build.xml	2007-05-15 18:11:40.000000000 +0200
++++ resin-3.1.1/build.xml	2007-05-15 18:18:04.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, jsdk, 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>
+ 
+@@ -111,7 +105,6 @@
+     <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>
+ 
+@@ -233,7 +226,6 @@
+ 
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="resin"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+   
+@@ -258,14 +250,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>
+ 
+@@ -274,7 +264,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>
+ 
+@@ -306,16 +295,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>
+ 
+@@ -385,13 +373,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>
+ 
+@@ -527,9 +508,6 @@
+           <dirset dir="${modules}">
+             <include name="*/classes"/>
+           </dirset>
+-          <fileset dir="${modules}/ext">
+-            <include name="**/*.jar"/>
+-          </fileset>
+         </classpath>
+       </java>
+ 
diff --git a/dev-java/resin-servlet-api/metadata.xml b/dev-java/resin-servlet-api/metadata.xml
new file mode 100644
index 000000000000..39fffcd80808
--- /dev/null
+++ b/dev-java/resin-servlet-api/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+    <email>nelchael@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild
new file mode 100644
index 000000000000..a8ab0a14b9a9
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.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.23.ebuild,v 1.1 2007/05/16 10:29:07 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.tar.gz"
+
+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.1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild
new file mode 100644
index 000000000000..b658afe0be35
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.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.1.ebuild,v 1.1 2007/05/16 10:29:07 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.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+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/*
+
+}