Use tarball of patches.

Package-Manager: portage-2.1.3.19

8 files changed, 48 insertions, 531 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/Manifest b/www-servers/resin/Manifest
index 097029a48c84..a2dc3a11efb5 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -29,10 +29,6 @@ AUX 3.0.22/resin.init 951 RMD160 16eb9a1ada923df0856d89e9ab590ae251eb1bc8 SHA1 9
 MD5 7c721449f590e21647ce5c7d905a544f files/3.0.22/resin.init 951
 RMD160 16eb9a1ada923df0856d89e9ab590ae251eb1bc8 files/3.0.22/resin.init 951
 SHA256 b19014f8dc8dc09e7e63d83eeb543b4b62330eecc11b8af0a25020a971cf72bd files/3.0.22/resin.init 951
-AUX 3.0.24/resin-3.0.24-gentoo.patch 10121 RMD160 68fb7db03d700953347c066d3e3ed151a8d31e5a SHA1 9a35f1b3c3b2f86cde124b96f2ced75846abf127 SHA256 b8b0948e7df2b6c5504e1f239d5442b9cffbd2370bde30c0b2eabffa12851421
-MD5 b8c9174c437bd05668ad3dc6674b62fc files/3.0.24/resin-3.0.24-gentoo.patch 10121
-RMD160 68fb7db03d700953347c066d3e3ed151a8d31e5a files/3.0.24/resin-3.0.24-gentoo.patch 10121
-SHA256 b8b0948e7df2b6c5504e1f239d5442b9cffbd2370bde30c0b2eabffa12851421 files/3.0.24/resin-3.0.24-gentoo.patch 10121
 AUX 3.0.24/resin.conf 792 RMD160 66a33b95f6fee91644d21acef1f17e50916da938 SHA1 fa7b254ee3ffd9a809700d261af8f9add05eb231 SHA256 155febd4a902711ba84f9178989a8c677f869a862947751d2883325b76e6f9bb
 MD5 88ae64384e65435455a964b2f429cbea files/3.0.24/resin.conf 792
 RMD160 66a33b95f6fee91644d21acef1f17e50916da938 files/3.0.24/resin.conf 792
@@ -41,10 +37,6 @@ AUX 3.0.24/resin.init 951 RMD160 7afa05f0924db80e550e8a36e94b5f51c2499649 SHA1 f
 MD5 e37247b586a6eba0524b2c788328cf70 files/3.0.24/resin.init 951
 RMD160 7afa05f0924db80e550e8a36e94b5f51c2499649 files/3.0.24/resin.init 951
 SHA256 1341f1036e0772dff7aa8a2caf00c6fef4dd6b75e29ace0f15969d7bcfa9c27d files/3.0.24/resin.init 951
-AUX 3.1.3/resin-3.1.3-gentoo.patch 7521 RMD160 c84ed05052c0a4c2910666538e23fe37883ac4ab SHA1 14d57d0a78bc7ed7cc7eef0b0cd5473c23f91130 SHA256 cd850d727f8315a13a300051500267d457de49203a1e6db4ccb69f5a0a58f5b1
-MD5 d899a88038339bd0c3f1eb667fe9014a files/3.1.3/resin-3.1.3-gentoo.patch 7521
-RMD160 c84ed05052c0a4c2910666538e23fe37883ac4ab files/3.1.3/resin-3.1.3-gentoo.patch 7521
-SHA256 cd850d727f8315a13a300051500267d457de49203a1e6db4ccb69f5a0a58f5b1 files/3.1.3/resin-3.1.3-gentoo.patch 7521
 AUX 3.1.3/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
 MD5 4ccfaa3a9f3c4f386c77659a6ef91f71 files/3.1.3/resin.conf 425
 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c files/3.1.3/resin.conf 425
@@ -57,6 +49,8 @@ DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493
+DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 SHA1 386e94852599c24521665bdf8bb6405e1d936ab7 SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0
+DIST resin-gentoo-patches-3.1.3.tar.bz2 3516 RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc SHA1 9cfd0514cb74ef88f659ad69a0337cab8e2a991e SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63
 EBUILD resin-2.1.17.ebuild 2704 RMD160 7b1f3b711c566ef25afd27175087dfa504383b48 SHA1 8d119c890b48634872068c7de52b563bce80c62d SHA256 809961945e47d16a6c3d8c087dbd717a550b253febc7093ff573ccc9e23cc945
 MD5 0dc9d09531e2440e0915c697d24dc058 resin-2.1.17.ebuild 2704
 RMD160 7b1f3b711c566ef25afd27175087dfa504383b48 resin-2.1.17.ebuild 2704
@@ -65,18 +59,18 @@ EBUILD resin-3.0.22.ebuild 3667 RMD160 21cb66b4aec9bd3994f88e766f4313dcab708753
 MD5 650987afe69c1660efb6d2f8146b596a resin-3.0.22.ebuild 3667
 RMD160 21cb66b4aec9bd3994f88e766f4313dcab708753 resin-3.0.22.ebuild 3667
 SHA256 c3e4842b8790fc78c48bb1ef86bd8d4d7b242281d24e032975ea8e51b1a1f1d7 resin-3.0.22.ebuild 3667
-EBUILD resin-3.0.24.ebuild 3850 RMD160 b88dc8ea9cdcf94950f69c66e0f0a19f1c47e76b SHA1 a28d2f02b9332c9dbb5a1e6c591956c12deeede4 SHA256 b7ba3a29ea3eec3eb65cf255fe407a50bf67f4e1f89052178a43bc2e447acd1a
-MD5 7648b446c8f694a02a231bab9cf3d8b8 resin-3.0.24.ebuild 3850
-RMD160 b88dc8ea9cdcf94950f69c66e0f0a19f1c47e76b resin-3.0.24.ebuild 3850
-SHA256 b7ba3a29ea3eec3eb65cf255fe407a50bf67f4e1f89052178a43bc2e447acd1a resin-3.0.24.ebuild 3850
-EBUILD resin-3.1.3.ebuild 3714 RMD160 ef6fc5fe633721029db77e4e3136a5b618f690ea SHA1 32a9d8dbfb79f4468a8abdbe14880ba6e30ff1b2 SHA256 c75ab998ad7b7bfafa0d2da41271dc76e3a2cff7779d848cec5e1d9cad17ef7c
-MD5 252efb56a22f7e8b374ba82d9e51b1aa resin-3.1.3.ebuild 3714
-RMD160 ef6fc5fe633721029db77e4e3136a5b618f690ea resin-3.1.3.ebuild 3714
-SHA256 c75ab998ad7b7bfafa0d2da41271dc76e3a2cff7779d848cec5e1d9cad17ef7c resin-3.1.3.ebuild 3714
-MISC ChangeLog 11994 RMD160 3a746a709bf98ba36643c4b8f8d065371c89f12b SHA1 5de5c508b7309c56ddc37853fa49d2917ed607e7 SHA256 052e8effa9ee10a3428fe4c96facccb8e1003a8353f5bf87738c82d54aca800b
-MD5 c37d2dbabbd12f4dd58d156d6b6d0770 ChangeLog 11994
-RMD160 3a746a709bf98ba36643c4b8f8d065371c89f12b ChangeLog 11994
-SHA256 052e8effa9ee10a3428fe4c96facccb8e1003a8353f5bf87738c82d54aca800b ChangeLog 11994
+EBUILD resin-3.0.24.ebuild 3926 RMD160 7c1dec9cc89b4ad049bae19ce5809fde0d1d9098 SHA1 aaa3c35201646f9adb41d4f77bae22d581c15a15 SHA256 19ebf35e68346d1a29b201b344c5445544b266ddbaf0e854174e9e85e5b852fc
+MD5 175fdf6ba43a4cdc3174d57913916f23 resin-3.0.24.ebuild 3926
+RMD160 7c1dec9cc89b4ad049bae19ce5809fde0d1d9098 resin-3.0.24.ebuild 3926
+SHA256 19ebf35e68346d1a29b201b344c5445544b266ddbaf0e854174e9e85e5b852fc resin-3.0.24.ebuild 3926
+EBUILD resin-3.1.3.ebuild 3790 RMD160 2295f23852489df0529d53f7e6708cafbea1efe3 SHA1 c50ca44e7bff80f1830afbf00111f51463d3f4eb SHA256 7891f35fa0750526d7585f5df57598aca9e94e480a6add4858fde9d64c39c177
+MD5 003589b6ba43b8311b997a47dac07645 resin-3.1.3.ebuild 3790
+RMD160 2295f23852489df0529d53f7e6708cafbea1efe3 resin-3.1.3.ebuild 3790
+SHA256 7891f35fa0750526d7585f5df57598aca9e94e480a6add4858fde9d64c39c177 resin-3.1.3.ebuild 3790
+MISC ChangeLog 12201 RMD160 123200f9b3aeb127f89aea086216f2bcf4c0ead8 SHA1 ef621600c8649d97ae7607c0f392b43a6c4f2f88 SHA256 c14f77663ae03b1d6f42d4f3f5d0a3a9718a92a0c82ebbcd090e64bec9a11738
+MD5 b7e6f402ad094375e76b1501744a1a25 ChangeLog 12201
+RMD160 123200f9b3aeb127f89aea086216f2bcf4c0ead8 ChangeLog 12201
+SHA256 c14f77663ae03b1d6f42d4f3f5d0a3a9718a92a0c82ebbcd090e64bec9a11738 ChangeLog 12201
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -87,16 +81,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 e9267b2668be4aafeb97bbdb3d97930a files/digest-resin-3.0.24 247
-RMD160 27adb862f5bc22f97bffe8099abba0203c28ed3a files/digest-resin-3.0.24 247
-SHA256 3d3943077944fee34766254183d9d3ca344c46606c081648d595799b948661ec files/digest-resin-3.0.24 247
-MD5 a8a78ace89324ba9bda96ccea165115b files/digest-resin-3.1.3 244
-RMD160 ee63e107ad02eb9aa793f6e535b8e501b9c09765 files/digest-resin-3.1.3 244
-SHA256 cd4eaac7ed898104dd107d4ee34e0d265612045dd29201c2dfb981775674ee63 files/digest-resin-3.1.3 244
+MD5 c7c462602ca5c349a59a723fa638c5d4 files/digest-resin-3.0.24 527
+RMD160 c4beef8a6695578fcadd59dd4d6e25ea70ad3855 files/digest-resin-3.0.24 527
+SHA256 a6b9a039e60fc1fed41bd34a877a66d164e3a9cfb7fc0d9aff22a5141bc41c51 files/digest-resin-3.0.24 527
+MD5 3452e171ffd7205098076d1bcf888f8e files/digest-resin-3.1.3 521
+RMD160 0f39c9014e42b6ad80acb510396ee332e044584a files/digest-resin-3.1.3 521
+SHA256 90cf2b90e8bc281d1cb1ee06bdff72ef566f58114144fa9fbb27df9bb16df39f files/digest-resin-3.1.3 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHNGmOgo/w9rxVVVERArXQAJ9M9Dhl7JvGECfHmuuoJCZblScSiwCdHbgo
-O1CBZ22JbKEmHvoCjYng4Ww=
-=APM/
+iD8DBQFHNadMgo/w9rxVVVERAtN1AJ4hMZ4TzxAb14OaHW4sMkVNXMecFQCfTcYt
+s0ddoi8zwiHgC9ZYA9yrpXw=
+=U/hc
 -----END PGP SIGNATURE-----
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"