Use dev-java/resin-servlet-api.

Package-Manager: portage-2.1.2.7

8 files changed, 139 insertions, 57 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index e7c9a7109262..6dcafe0a2da1 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,15 @@
 # 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.43 2007/05/15 16:36:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.44 2007/05/16 10:52:02 nelchael Exp $
+
+*resin-3.1.1-r1 (16 May 2007)
+*resin-3.0.23-r1 (16 May 2007)
+
+  16 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/3.0.23/resin-3.0.23-gentoo.patch,
+  files/3.1.1/resin-3.1.1-gentoo.patch, -resin-3.0.23.ebuild,
+  +resin-3.0.23-r1.ebuild, -resin-3.1.1.ebuild, +resin-3.1.1-r1.ebuild:
+  Use dev-java/resin-servlet-api.
 
 *resin-3.1.1 (15 May 2007)
 *resin-3.0.23 (15 May 2007)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index ec5bb1333996..5b08391ec71d 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -29,10 +29,10 @@ AUX 3.0.22/resin.init 955 RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 SHA1 6
 MD5 9f676cf44140395b22cdd5b04ec0aef9 files/3.0.22/resin.init 955
 RMD160 c144337f0247d6d9385c24bab60ddc66cf56c101 files/3.0.22/resin.init 955
 SHA256 2dfc51c94319d4cccd5ac5086ea3761a4d68a1e2585492790919cd0138fb4175 files/3.0.22/resin.init 955
-AUX 3.0.23/resin-3.0.23-gentoo.patch 8968 RMD160 3a898ab94fb1482438e39688baedbcb38051f4d9 SHA1 d660c3569726d0991fc87360415519cf0a93663f SHA256 c6d4b82a215a69bbf03d37bcf5c99b6fd4d3dda9653d0268e8c4f01c013c265b
-MD5 b2f2a10e1873d655b48a72162366c8cf files/3.0.23/resin-3.0.23-gentoo.patch 8968
-RMD160 3a898ab94fb1482438e39688baedbcb38051f4d9 files/3.0.23/resin-3.0.23-gentoo.patch 8968
-SHA256 c6d4b82a215a69bbf03d37bcf5c99b6fd4d3dda9653d0268e8c4f01c013c265b files/3.0.23/resin-3.0.23-gentoo.patch 8968
+AUX 3.0.23/resin-3.0.23-gentoo.patch 10121 RMD160 2fec131a2e68c8a3191f62a28435c58c6eabacb5 SHA1 13bbfa02868fbf6c53c111f69c20b930f35afe14 SHA256 402aaa73057f59ef7b4c171eb12471c761b500b392748409504b038d82f7f79a
+MD5 eb0955c1afae395b12dc78928f4df6e7 files/3.0.23/resin-3.0.23-gentoo.patch 10121
+RMD160 2fec131a2e68c8a3191f62a28435c58c6eabacb5 files/3.0.23/resin-3.0.23-gentoo.patch 10121
+SHA256 402aaa73057f59ef7b4c171eb12471c761b500b392748409504b038d82f7f79a files/3.0.23/resin-3.0.23-gentoo.patch 10121
 AUX 3.0.23/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 367ebbd3a8e585a50fa447494a2a7be8683728a3 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2
 MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.23/resin.conf 791
 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.23/resin.conf 791
@@ -41,10 +41,10 @@ AUX 3.0.23/resin.init 955 RMD160 863d7a7449fc902494958367f2b0cd65bdd0d9c2 SHA1 6
 MD5 cffb8354a138bd1a43fcb70cc8fc91b7 files/3.0.23/resin.init 955
 RMD160 863d7a7449fc902494958367f2b0cd65bdd0d9c2 files/3.0.23/resin.init 955
 SHA256 e25f9684676020458155473180797e1734e39b05f557fd26c166a3662e284138 files/3.0.23/resin.init 955
-AUX 3.1.1/resin-3.1.1-gentoo.patch 6340 RMD160 392edeed6675189d144d255af45105be62ba36c6 SHA1 86f68831c94b427d58f4ee18ae8baef0c83df2cc SHA256 810006604014be01d59250d0f29268b1db5a0bac170a7b70450b3288ed038917
-MD5 0dfa7829bdf77706615fdc0d237148a0 files/3.1.1/resin-3.1.1-gentoo.patch 6340
-RMD160 392edeed6675189d144d255af45105be62ba36c6 files/3.1.1/resin-3.1.1-gentoo.patch 6340
-SHA256 810006604014be01d59250d0f29268b1db5a0bac170a7b70450b3288ed038917 files/3.1.1/resin-3.1.1-gentoo.patch 6340
+AUX 3.1.1/resin-3.1.1-gentoo.patch 7476 RMD160 9f03bcd1fcacc301b7cbe74f4948d300d358a3ed SHA1 f541869159b5483d0e570929f2957c1343830638 SHA256 c03d506f97cfc301dc134c350ccfb44ec8d168dd51eb9ca724717c366f5c42ce
+MD5 55a57949a29acb38a65f7fb2f5254ee0 files/3.1.1/resin-3.1.1-gentoo.patch 7476
+RMD160 9f03bcd1fcacc301b7cbe74f4948d300d358a3ed files/3.1.1/resin-3.1.1-gentoo.patch 7476
+SHA256 c03d506f97cfc301dc134c350ccfb44ec8d168dd51eb9ca724717c366f5c42ce files/3.1.1/resin-3.1.1-gentoo.patch 7476
 AUX 3.1.1/resin.conf 448 RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 SHA1 6fb88c341a5271488d2b09aeb27c451619ee0015 SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667
 MD5 3065ffbced3b5961423f78283136730b files/3.1.1/resin.conf 448
 RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 files/3.1.1/resin.conf 448
@@ -65,18 +65,18 @@ EBUILD resin-3.0.22.ebuild 3645 RMD160 5b754dc37188011708113dcc6f26a37c150fef7d
 MD5 229d25c69e2af561515be0b5eb329df9 resin-3.0.22.ebuild 3645
 RMD160 5b754dc37188011708113dcc6f26a37c150fef7d resin-3.0.22.ebuild 3645
 SHA256 34584df51d13e007baa792aefa1836a3c50149949d4ee536093a2918d2dcfe19 resin-3.0.22.ebuild 3645
-EBUILD resin-3.0.23.ebuild 3649 RMD160 613d98ec4b1a8d3e6483be4081e000ec5c61e6df SHA1 a2581f4d921dcaaad7e9982af9346afa869bdb22 SHA256 9869202a14768bff876fa37e4e7043b2174c457386cca5c3381ee5a85c0943e0
-MD5 f0214bfd0b2fb4543dcb225d686bdae5 resin-3.0.23.ebuild 3649
-RMD160 613d98ec4b1a8d3e6483be4081e000ec5c61e6df resin-3.0.23.ebuild 3649
-SHA256 9869202a14768bff876fa37e4e7043b2174c457386cca5c3381ee5a85c0943e0 resin-3.0.23.ebuild 3649
-EBUILD resin-3.1.1.ebuild 3412 RMD160 422a7c5a93de56507e410eab23d3daf9b8a54b0a SHA1 001f35f3501741d8a4f1072d426c3a332d2d1177 SHA256 97a48b94bd2e1326f5cab6fa0885bbb5d36f4f9bc0adae2bbc5d892c37aadd7b
-MD5 371716c79d9365a01a621ca1db9e00d8 resin-3.1.1.ebuild 3412
-RMD160 422a7c5a93de56507e410eab23d3daf9b8a54b0a resin-3.1.1.ebuild 3412
-SHA256 97a48b94bd2e1326f5cab6fa0885bbb5d36f4f9bc0adae2bbc5d892c37aadd7b resin-3.1.1.ebuild 3412
-MISC ChangeLog 9200 RMD160 c0da6fcfaa0b2ac1bece1c364b69114ae016a04d SHA1 c9f353089b356e80fd201304d5c8d0468271ef4d SHA256 6e61bb740f36f066693a49f9100029065f66c77de6dc361c2e3f8fb48bd5889e
-MD5 2871058ba0e9548f03b61fb1214b2d08 ChangeLog 9200
-RMD160 c0da6fcfaa0b2ac1bece1c364b69114ae016a04d ChangeLog 9200
-SHA256 6e61bb740f36f066693a49f9100029065f66c77de6dc361c2e3f8fb48bd5889e ChangeLog 9200
+EBUILD resin-3.0.23-r1.ebuild 3763 RMD160 cd71832aee0fa747a55de4e7974fbd651e3c74c4 SHA1 860c4757b0033f3c7f7ec84d32f8a9be98d21f43 SHA256 43b6f55c0c01134bc290858c8c4cd316a053d00d31197932c2963906804e239f
+MD5 f3f955fa7e618fb85cca7153eb2fb111 resin-3.0.23-r1.ebuild 3763
+RMD160 cd71832aee0fa747a55de4e7974fbd651e3c74c4 resin-3.0.23-r1.ebuild 3763
+SHA256 43b6f55c0c01134bc290858c8c4cd316a053d00d31197932c2963906804e239f resin-3.0.23-r1.ebuild 3763
+EBUILD resin-3.1.1-r1.ebuild 3534 RMD160 b41ea2fed9fa15d5d709610bf6778961c5094343 SHA1 8771b2b870083715e55f718bf952703ae57381f0 SHA256 489e2aea038341821b97bff433b4d45d45a352bb7c2f937a4396eb6e4277375c
+MD5 3d4c9b04fa5835fe9e5fbfdc65e6499c resin-3.1.1-r1.ebuild 3534
+RMD160 b41ea2fed9fa15d5d709610bf6778961c5094343 resin-3.1.1-r1.ebuild 3534
+SHA256 489e2aea038341821b97bff433b4d45d45a352bb7c2f937a4396eb6e4277375c resin-3.1.1-r1.ebuild 3534
+MISC ChangeLog 9526 RMD160 289fe8eda34f5fe3f44b8a8966f461f0e8c1ef5f SHA1 2cbc8651d1469254ade08e1e094e574b0799e5b2 SHA256 29af6f11fc1450783b52154b90da5f5c24442d22fc856f567026c1d00f359815
+MD5 f54446dfff06fcf3744301cff85faa2f ChangeLog 9526
+RMD160 289fe8eda34f5fe3f44b8a8966f461f0e8c1ef5f ChangeLog 9526
+SHA256 29af6f11fc1450783b52154b90da5f5c24442d22fc856f567026c1d00f359815 ChangeLog 9526
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -87,16 +87,16 @@ SHA256 bc4da846dca614d5ad2d9ddd735df2109aabd6bfc9a7d4c6f550198a5ecd9440 files/di
 MD5 1df6f758925c19f33df250705d01755e files/digest-resin-3.0.22 253
 RMD160 bd3fd0cce1c7cccefb0440cd6520d7d58f3625eb files/digest-resin-3.0.22 253
 SHA256 22df3f8469cc556d0c7f3e0238eb0a7bfc0ebf2f64fdf30fee739e286e1505cb files/digest-resin-3.0.22 253
-MD5 a4e0893dd1c60cd73ce6f28a4ccc8ae6 files/digest-resin-3.0.23 253
-RMD160 43ab80dd8eff83f564cb02b725ab6c287f7edb60 files/digest-resin-3.0.23 253
-SHA256 325bcbc92c222e3a387af37a3313ebcd4be2d8fba1f97b936e487580741db7b3 files/digest-resin-3.0.23 253
-MD5 7c0a009cc263c0f8e753ffebd4d4dd90 files/digest-resin-3.1.1 250
-RMD160 343df1f7d1981283f5e2f3b0564949bc5ab9d505 files/digest-resin-3.1.1 250
-SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/digest-resin-3.1.1 250
+MD5 a4e0893dd1c60cd73ce6f28a4ccc8ae6 files/digest-resin-3.0.23-r1 253
+RMD160 43ab80dd8eff83f564cb02b725ab6c287f7edb60 files/digest-resin-3.0.23-r1 253
+SHA256 325bcbc92c222e3a387af37a3313ebcd4be2d8fba1f97b936e487580741db7b3 files/digest-resin-3.0.23-r1 253
+MD5 7c0a009cc263c0f8e753ffebd4d4dd90 files/digest-resin-3.1.1-r1 250
+RMD160 343df1f7d1981283f5e2f3b0564949bc5ab9d505 files/digest-resin-3.1.1-r1 250
+SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/digest-resin-3.1.1-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSeHxgo/w9rxVVVERAp5bAKCI0ns6iV50r8x3iczFUBHWyi7MiACgh7LQ
-6aBgQB9on+KIyj0lKWIFzDQ=
-=wgQY
+iD8DBQFGSuKigo/w9rxVVVERAtGMAKCWvAbOWCy+glTw33IpMxW5TbJf6wCfTfV0
+C2oAmQE430R2V2vn8F6gQ6s=
+=4vJY
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch b/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
index bd9ad2201a6f..e4bd9f532d8e 100644
--- a/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
+++ b/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
@@ -1,6 +1,6 @@
 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
+--- resin-3.0.23.vanilla/Makefile.in	2007-05-16 12:41:21.000000000 +0200
++++ resin-3.0.23/Makefile.in	2007-05-16 12:41:38.000000000 +0200
 @@ -1,6 +1,6 @@
  PREFIX=@prefix@
  
@@ -46,8 +46,8 @@ diff -Nru resin-3.0.23.vanilla/Makefile.in resin-3.0.23/Makefile.in
  	  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
+--- resin-3.0.23.vanilla/bin/wrapper.pl	2007-05-16 12:41:15.000000000 +0200
++++ resin-3.0.23/bin/wrapper.pl	2007-05-16 12:41:38.000000000 +0200
 @@ -447,9 +447,6 @@
  	$pid=`cat $pid_file`;
  	chop($pid);
@@ -77,8 +77,8 @@ diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl resin-3.0.23/bin/wrapper.pl
        # 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
+--- resin-3.0.23.vanilla/bin/wrapper.pl.in	2007-05-16 12:41:15.000000000 +0200
++++ resin-3.0.23/bin/wrapper.pl.in	2007-05-16 12:41:38.000000000 +0200
 @@ -447,9 +447,6 @@
  	$pid=`cat $pid_file`;
  	chop($pid);
@@ -108,8 +108,8 @@ diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl.in resin-3.0.23/bin/wrapper.pl.in
        # 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
+--- resin-3.0.23.vanilla/build.xml	2007-05-16 12:41:21.000000000 +0200
++++ resin-3.0.23/build.xml	2007-05-16 12:42:18.000000000 +0200
 @@ -7,7 +7,6 @@
  
    <property name="modules" location="${basedir}/modules"/>
@@ -139,7 +139,7 @@ diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
  
    <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">
++          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">
@@ -151,7 +151,12 @@ diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
      </antcall>
    </target>
  
-@@ -102,7 +98,6 @@
+@@ -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"/>
@@ -167,6 +172,24 @@ diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
      </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">
@@ -234,9 +257,17 @@ diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
        </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.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
+--- resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2007-05-16 12:41:19.000000000 +0200
++++ resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java	2007-05-16 12:41:38.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."));
      }
diff --git a/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch b/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
index 02de640e6c19..921b4cda544a 100644
--- a/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
+++ b/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
@@ -1,6 +1,6 @@
 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
+--- resin-3.1.1.vanilla/Makefile.in	2007-05-16 12:48:20.000000000 +0200
++++ resin-3.1.1/Makefile.in	2007-05-16 12:48:38.000000000 +0200
 @@ -8,20 +8,20 @@
  
  install	:
@@ -38,8 +38,8 @@ diff -Nru resin-3.1.1.vanilla/Makefile.in resin-3.1.1/Makefile.in
  	  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
+--- resin-3.1.1.vanilla/build.xml	2007-05-16 12:48:20.000000000 +0200
++++ resin-3.1.1/build.xml	2007-05-16 12:48:58.000000000 +0200
 @@ -7,7 +7,6 @@
  
    <property name="modules" location="${basedir}/modules"/>
@@ -69,7 +69,7 @@ diff -Nru resin-3.1.1.vanilla/build.xml resin-3.1.1/build.xml
  
    <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">
++          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">
@@ -96,7 +96,12 @@ diff -Nru resin-3.1.1.vanilla/build.xml resin-3.1.1/build.xml
      </antcall>
    </target>
  
-@@ -111,7 +105,6 @@
+@@ -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"/>
@@ -104,6 +109,24 @@ diff -Nru resin-3.1.1.vanilla/build.xml resin-3.1.1/build.xml
      </antcall>
    </target>
  
+@@ -157,7 +150,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"/>
+@@ -203,7 +196,7 @@
+     </antcall>
+   </target>
+ 
+-  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jsdk, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
++  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
+ 
+     <!-- filter to insert version -->
+ 
 @@ -233,7 +226,6 @@
  
      <antcall target="module" inheritRefs="true">
@@ -179,3 +202,11 @@ diff -Nru resin-3.1.1.vanilla/build.xml resin-3.1.1/build.xml
          </classpath>
        </java>
  
+@@ -658,7 +636,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.23 b/www-servers/resin/files/digest-resin-3.0.23-r1
index bae42a23b37b..bae42a23b37b 100644
--- a/www-servers/resin/files/digest-resin-3.0.23
+++ b/www-servers/resin/files/digest-resin-3.0.23-r1
diff --git a/www-servers/resin/files/digest-resin-3.1.1 b/www-servers/resin/files/digest-resin-3.1.1-r1
index 1ed7597677ec..1ed7597677ec 100644
--- a/www-servers/resin/files/digest-resin-3.1.1
+++ b/www-servers/resin/files/digest-resin-3.1.1-r1
diff --git a/www-servers/resin/resin-3.0.23.ebuild b/www-servers/resin/resin-3.0.23-r1.ebuild
index 69799a6a5edd..880c45bf6b6e 100644
--- a/www-servers/resin/resin-3.0.23.ebuild
+++ b/www-servers/resin/resin-3.0.23-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.23.ebuild,v 1.1 2007/05/15 16:36:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.23-r1.ebuild,v 1.1 2007/05/16 10:52:02 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2 eutils flag-o-matic
 
@@ -9,19 +11,22 @@ HOMEPAGE="http://www.caucho.com"
 SRC_URI="http://www.caucho.com/download/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc source"
+IUSE=""
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="=virtual/jdk-1.5*
-	>=dev-java/iso-relax-20050331"
-DEPEND="${RDEPEND}
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}
 	dev-java/aopalliance
 	>=dev-java/sun-javamail-1.4
 	>=dev-java/sun-jaf-1.1
+	>=dev-java/iso-relax-20050331"
+
+RDEPEND="=virtual/jdk-1.5*
+	${COMMON_DEP}"
+DEPEND="${RDEPEND}
 	dev-java/ant-core
 	dev-libs/openssl
-	source? ( app-arch/zip )"
+	${COMMON_DEP}"
 
 RESIN_HOME="/usr/lib/resin"
 
@@ -61,6 +66,7 @@ src_compile() {
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
+	java-pkg_jar-from resin-servlet-api-2.4
 	ln -s $(java-config --jdk-home)/lib/tools.jar
 	cd ${S}
 
diff --git a/www-servers/resin/resin-3.1.1.ebuild b/www-servers/resin/resin-3.1.1-r1.ebuild
index a07802b1ded0..2dfc372bb89d 100644
--- a/www-servers/resin/resin-3.1.1.ebuild
+++ b/www-servers/resin/resin-3.1.1-r1.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.1.ebuild,v 1.1 2007/05/15 16:36:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.1-r1.ebuild,v 1.1 2007/05/16 10:52:02 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -15,14 +15,18 @@ IUSE="admin"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND="=virtual/jdk-1.5*
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}
 	>=dev-java/iso-relax-20050331
 	dev-java/aopalliance
 	>=dev-java/sun-javamail-1.4
 	>=dev-java/sun-jaf-1.1"
+
+RDEPEND="=virtual/jdk-1.5*
+	${COMMON_DEP}"
 DEPEND="${RDEPEND}
 	dev-java/ant-core
-	dev-libs/openssl"
+	dev-libs/openssl
+	${COMMON_DEP}"
 
 RESIN_HOME="/usr/lib/resin"
 
@@ -63,6 +67,7 @@ src_compile() {
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
+	java-pkg_jar-from resin-servlet-api-2.5
 	ln -s $(java-config --jdk-home)/lib/tools.jar
 	cd ${S}