Version bump.

Package-Manager: portage-2.1.3.6

12 files changed, 989 insertions, 9 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 9e1379df5eee..14d7ffd366f6 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,16 @@
 # 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.49 2007/06/17 20:40:18 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.50 2007/08/17 08:08:33 nelchael Exp $
+
+*resin-3.1.2 (17 Aug 2007)
+*resin-3.0.24 (17 Aug 2007)
+
+  17 Aug 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/3.0.24/resin.init, +files/3.0.24/resin-3.0.24-gentoo.patch,
+  +files/3.1.2/resin.conf, +files/3.1.2/resin-3.1.2-gentoo.patch,
+  +files/3.0.24/resin.conf, +files/3.1.2/resin.init, +resin-3.0.24.ebuild,
+  +resin-3.1.2.ebuild:
+  Version bump.
 
   17 Jun 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   files/3.0.22/resin.conf, files/3.0.23/resin.conf:
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 814594289af8..b16d15b17198 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -41,6 +41,18 @@ AUX 3.0.23/resin.init 951 RMD160 5770a06dac99475a94943f125f3b236e33372a06 SHA1 b
 MD5 c528c07cd8359907e8ddbe4f3f7d8a82 files/3.0.23/resin.init 951
 RMD160 5770a06dac99475a94943f125f3b236e33372a06 files/3.0.23/resin.init 951
 SHA256 70de55e5930032759fa7d1fdb5addce8dc71281143154e8922c1b7e8d00fb604 files/3.0.23/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
+SHA256 155febd4a902711ba84f9178989a8c677f869a862947751d2883325b76e6f9bb files/3.0.24/resin.conf 792
+AUX 3.0.24/resin.init 951 RMD160 7afa05f0924db80e550e8a36e94b5f51c2499649 SHA1 f92ef3ce279ab7c7d97aecd5b37609636beaecdd SHA256 1341f1036e0772dff7aa8a2caf00c6fef4dd6b75e29ace0f15969d7bcfa9c27d
+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.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
@@ -53,10 +65,24 @@ AUX 3.1.1/resin.init 826 RMD160 2021befc854746c4a31cfa8cc3a80108b3e8aaad SHA1 75
 MD5 c0a55d189f02d4454edbcc5938d25590 files/3.1.1/resin.init 826
 RMD160 2021befc854746c4a31cfa8cc3a80108b3e8aaad files/3.1.1/resin.init 826
 SHA256 85bbc3b77ad9887fbac98f90cf7c1fca3eb14fb4744a5c4277830df2a88faf3d files/3.1.1/resin.init 826
+AUX 3.1.2/resin-3.1.2-gentoo.patch 7454 RMD160 ad32057c690ee1a74cac73b68c067b1108693aa7 SHA1 dba2b67fa712cbbb87fa2987910147be8590aaf9 SHA256 860c423dc7e010852c7f37e4f3764332e71d2c9226d45edd7460e0b57d8510f1
+MD5 4ce90eb1449e1667ac3b01dbb61ba55d files/3.1.2/resin-3.1.2-gentoo.patch 7454
+RMD160 ad32057c690ee1a74cac73b68c067b1108693aa7 files/3.1.2/resin-3.1.2-gentoo.patch 7454
+SHA256 860c423dc7e010852c7f37e4f3764332e71d2c9226d45edd7460e0b57d8510f1 files/3.1.2/resin-3.1.2-gentoo.patch 7454
+AUX 3.1.2/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
+MD5 4ccfaa3a9f3c4f386c77659a6ef91f71 files/3.1.2/resin.conf 425
+RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c files/3.1.2/resin.conf 425
+SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c files/3.1.2/resin.conf 425
+AUX 3.1.2/resin.init 826 RMD160 fb4abd01377293c73bcce149ad0be2dff54b806a SHA1 9b1172ced52d9029959898a855bc980f71bedc56 SHA256 2e422791add7739e235cf6d8124b887994d7571d1c788f4e994cee5ed11adbba
+MD5 a50249fd4f36661c9169eefe0cce8f65 files/3.1.2/resin.init 826
+RMD160 fb4abd01377293c73bcce149ad0be2dff54b806a files/3.1.2/resin.init 826
+SHA256 2e422791add7739e235cf6d8124b887994d7571d1c788f4e994cee5ed11adbba files/3.1.2/resin.init 826
 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d
+DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.1.1-src.tar.gz 7351646 RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce SHA1 0bd1b2fb048867fc2156898c749863ed3302512d SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424
+DIST resin-3.1.2-src.zip 13317024 RMD160 33989f69c6d757fe5cf4ea50077f503fc68e98d1 SHA1 643fb194f6762b273131ea63a0e66ab9ca283bb0 SHA256 3e56d9437091597b7d0bf6523254b753733533dbfbb4160af21b1cadf793d081
 EBUILD resin-2.1.17.ebuild 2692 RMD160 0232cdd890d7a737c054adaa3e75f5495010c10a SHA1 f7cac0fe9e64b79adba3570fee3af8e1ad2abbdb SHA256 d24ddd63f3a728cf8b03af0745eb0580e5baf5e9b9d4ada6646a5f173c6fcf1e
 MD5 bf58f83bd839b688857fd2bd18009a6f resin-2.1.17.ebuild 2692
 RMD160 0232cdd890d7a737c054adaa3e75f5495010c10a resin-2.1.17.ebuild 2692
@@ -69,14 +95,22 @@ EBUILD resin-3.0.23-r1.ebuild 3785 RMD160 69f357cd17518439e6b5f122bd384d1a685419
 MD5 65f9ec7ba599bb2a96356152d038ce3b resin-3.0.23-r1.ebuild 3785
 RMD160 69f357cd17518439e6b5f122bd384d1a685419ce resin-3.0.23-r1.ebuild 3785
 SHA256 479c0e10f9b35020fb0e13031008cb12944c48db1291918a6aa5077ea5475bcb resin-3.0.23-r1.ebuild 3785
+EBUILD resin-3.0.24.ebuild 3779 RMD160 4ce2b02d5699e380f13530eb3f5ce81a05eb6cfb SHA1 d70f3538576be734bb1708c4f44d87ce17ec1f02 SHA256 c58b6c2302b31b91b6a0e93523916646d147ba1f040a589fea2605bfa447da3a
+MD5 32907008782d57e77419f4c0a9917d88 resin-3.0.24.ebuild 3779
+RMD160 4ce2b02d5699e380f13530eb3f5ce81a05eb6cfb resin-3.0.24.ebuild 3779
+SHA256 c58b6c2302b31b91b6a0e93523916646d147ba1f040a589fea2605bfa447da3a resin-3.0.24.ebuild 3779
 EBUILD resin-3.1.1-r1.ebuild 3568 RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fcf SHA1 e60e5d81f029e7c71e66e755329a63b4d6927442 SHA256 017d161cf41a741e2823fc99cac2f8649b8a5d59bd6fcdf6fadaff31d7d0ce52
 MD5 972cfa2bdf9f5c1c9d812ad99aa3de4d resin-3.1.1-r1.ebuild 3568
 RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fcf resin-3.1.1-r1.ebuild 3568
 SHA256 017d161cf41a741e2823fc99cac2f8649b8a5d59bd6fcdf6fadaff31d7d0ce52 resin-3.1.1-r1.ebuild 3568
-MISC ChangeLog 10284 RMD160 6f283e4a30dfd313e0242fb1beb2a8632c16cfd9 SHA1 e0d8852aa1d5ea807dc6d735b2af57d9be772ff3 SHA256 2d21673e039d16bd006c32b2e66d79371bab008535c10d55109078c1c44fa1ba
-MD5 5f0db6605ad3eb4faba9e938302ea1c8 ChangeLog 10284
-RMD160 6f283e4a30dfd313e0242fb1beb2a8632c16cfd9 ChangeLog 10284
-SHA256 2d21673e039d16bd006c32b2e66d79371bab008535c10d55109078c1c44fa1ba ChangeLog 10284
+EBUILD resin-3.1.2.ebuild 3592 RMD160 837e95395610a78c246b254ee81707783337934c SHA1 021a5613c1375a121739324e8e25027401f5af51 SHA256 b98a38718b4f86c565ba3718f6a012fa82dd31f0c1139472d43a2d983459c255
+MD5 48002aec83730202163f9e7c074d738a resin-3.1.2.ebuild 3592
+RMD160 837e95395610a78c246b254ee81707783337934c resin-3.1.2.ebuild 3592
+SHA256 b98a38718b4f86c565ba3718f6a012fa82dd31f0c1139472d43a2d983459c255 resin-3.1.2.ebuild 3592
+MISC ChangeLog 10643 RMD160 d8f44dc62d4eb0adbc339f1c91bd4eb791ba6c42 SHA1 a3b3bad178be5b2cdeb66ec075a451827f529a62 SHA256 39159f640b4e9d533d5dde35e646dbcb56bf1a8f680ac69f18337c9bdaffca30
+MD5 c4045973506a9aa9451a4324e60d94a0 ChangeLog 10643
+RMD160 d8f44dc62d4eb0adbc339f1c91bd4eb791ba6c42 ChangeLog 10643
+SHA256 39159f640b4e9d533d5dde35e646dbcb56bf1a8f680ac69f18337c9bdaffca30 ChangeLog 10643
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -90,13 +124,19 @@ SHA256 22df3f8469cc556d0c7f3e0238eb0a7bfc0ebf2f64fdf30fee739e286e1505cb files/di
 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 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 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
+MD5 815a5df25d9ceb4f43bfb0918e594cda files/digest-resin-3.1.2 244
+RMD160 cc4962a3a5191878bbb8a988626737ad938908f1 files/digest-resin-3.1.2 244
+SHA256 fa0fd17591fb94b90a16268874a84d0dcc6ad57ecd417a804207c1b9f23b0f4f files/digest-resin-3.1.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGdZxggo/w9rxVVVERAtyWAJ4njWwrxZjmkV0pC2pH4pRBecxUvgCgwZcF
-RayjlG682639Llq6wzaxKf8=
-=5T/Z
+iD8DBQFGxVbNgo/w9rxVVVERAhVoAKCbWXJpMSGE3rXEMlN7orPHeaFH3ACeNXl+
+WVwx44zGlCHXJ0mwaGzYxCY=
+=RoHb
 -----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
new file mode 100644
index 000000000000..6b54c07b4218
--- /dev/null
+++ b/www-servers/resin/files/3.0.24/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/www-servers/resin/files/3.0.24/resin.conf b/www-servers/resin/files/3.0.24/resin.conf
new file mode 100644
index 000000000000..b549b414e5d3
--- /dev/null
+++ b/www-servers/resin/files/3.0.24/resin.conf
@@ -0,0 +1,27 @@
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+
+# You can override this value with whatever JDK 1.5 you want.
+# For a list of valid values for GENTOO_VM see output of
+#   java-config -L
+#GENTOO_VM=sun-jdk-1.5
+
+# (Optional) Java runtime options.
+# WARNING! Prepend each option with -J, so -Xmx512m should be -J-Xmx512m
+# JAVA_OPTS=""
+
+# Where your Resin is installed
+RESIN_HOME=/usr/lib/resin
+
+# Resin Log Locations
+RESIN_OUT=/var/log/resin/resin_out.log
+RESIN_ERR=/var/log/resin/resin_err.log
+
+# The CLASSPATH for Resin to use, plus any others you need.
+CLASSPATH=$(java-config -dp resin)
+
+# START/STOP settings
+RESIN_START="start"
+RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.24/resin.init b/www-servers/resin/files/3.0.24/resin.init
new file mode 100644
index 000000000000..31d9664df428
--- /dev/null
+++ b/www-servers/resin/files/3.0.24/resin.init
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.24/resin.init,v 1.1 2007/08/17 08:08:34 nelchael Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	JAVA_HOME=$(java-config -O)
+	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
+	export JAVA_HOME
+	ebegin "Starting Resin"
+	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}"
+	eend $?
+}
+
+stop()	{
+	JAVA_HOME=$(java-config -O)
+	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
+	export JAVA_HOME
+	ebegin "Stopping Resin"
+	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}"
+	eend $?
+}
diff --git a/www-servers/resin/files/3.1.2/resin-3.1.2-gentoo.patch b/www-servers/resin/files/3.1.2/resin-3.1.2-gentoo.patch
new file mode 100644
index 000000000000..42033d136c3f
--- /dev/null
+++ b/www-servers/resin/files/3.1.2/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/www-servers/resin/files/3.1.2/resin.conf b/www-servers/resin/files/3.1.2/resin.conf
new file mode 100644
index 000000000000..0895ad30fbf4
--- /dev/null
+++ b/www-servers/resin/files/3.1.2/resin.conf
@@ -0,0 +1,12 @@
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+
+# You can override this value with whatever JDK 1.5 you want.
+# For a list of valid values for GENTOO_VM see output of
+#   java-config -L
+#GENTOO_VM=sun-jdk-1.5
+
+# Verbose starting and stopping? (yes/no, defaults to no)
+#VERBOSE="yes"
diff --git a/www-servers/resin/files/3.1.2/resin.init b/www-servers/resin/files/3.1.2/resin.init
new file mode 100644
index 000000000000..58e20216d950
--- /dev/null
+++ b/www-servers/resin/files/3.1.2/resin.init
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.2/resin.init,v 1.1 2007/08/17 08:08:33 nelchael Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+runResin() {
+
+	JAVA_HOME=$(java-config -O)
+	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
+	export JAVA_HOME
+
+	local extraArgs=
+	if [ "${VERBOSE}" = "yes" ]; then
+		extraArgs="-verbose"
+	fi
+
+	local msg="${1}"
+	shift
+
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}"
+
+	ebegin "${msg}"
+	su - resin -c "${cmdline}"
+	eend $?
+
+}
+
+start()	{
+
+	runResin "Starting Resin" "start"
+
+}
+
+stop()	{
+
+	runResin "Stopping Resin" "stop"
+
+}
diff --git a/www-servers/resin/files/digest-resin-3.0.24 b/www-servers/resin/files/digest-resin-3.0.24
new file mode 100644
index 000000000000..42192b685b09
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-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/www-servers/resin/files/digest-resin-3.1.2 b/www-servers/resin/files/digest-resin-3.1.2
new file mode 100644
index 000000000000..7df0a0078aca
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-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/www-servers/resin/resin-3.0.24.ebuild b/www-servers/resin/resin-3.0.24.ebuild
new file mode 100644
index 000000000000..ca50afbed2bd
--- /dev/null
+++ b/www-servers/resin/resin-3.0.24.ebuild
@@ -0,0 +1,161 @@
+# 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.1 2007/08/17 08:08:33 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+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
+	${COMMON_DEP}"
+
+RESIN_HOME="/usr/lib/resin"
+
+# Rewrites build.xml in documentation
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+
+	java-ant_bsfix_one "${S}/build.xml"
+
+}
+
+pkg_setup() {
+
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+
+}
+
+src_compile() {
+
+	append-flags -fPIC -DPIC
+
+	chmod 755 ${S}/configure
+	econf --prefix=${RESIN_HOME} || die "econf failed"
+
+	einfo "Building libraries..."
+	# Broken with -jn where n > 1
+	emake -j1 || die "emake failed"
+
+	mkdir ${S}/lib
+	cd ${S}/lib
+	java-pkg_jar-from sun-jaf
+	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}
+
+	einfo "Building jars..."
+	eant || die "ant failed"
+
+	if use doc; then
+		einfo "Building docs..."
+		eant doc || die "ant doc failed"
+	fi
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodir /etc/
+	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	keepdir /var/log/resin
+	keepdir /var/log/resin
+	keepdir /var/run/resin
+
+	dosym /var/log/resin ${RESIN_HOME}/logs
+	dosym /var/log/resin ${RESIN_HOME}/log
+
+	dodoc README
+
+	newinitd ${FILESDIR}/${PV}/resin.init resin
+	newconfd ${FILESDIR}/${PV}/resin.conf resin
+
+	rm -f ${S}/lib/tools.jar
+	java-pkg_dojar ${S}/lib/*.jar
+	rm -fr ${D}/${RESIN_HOME}/lib
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+	dodir /var/lib/resin/webapps
+	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
+	rm -rf ${D}/${RESIN_HOME}/webapps
+	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+
+	dosym /etc/resin/resin.conf /etc/resin/resin.xml
+
+	use source && {
+		einfo "Zipping source..."
+		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+	}
+
+	einfo "Removing unneeded files..."
+	rm -f ${D}/${RESIN_HOME}/bin/*.in
+	rm -f ${D}/etc/resin/*.orig
+
+	einfo "Fixing permissions..."
+	chown -R resin:resin ${D}${RESIN_HOME}
+	chown -R resin:resin ${D}/etc/resin
+	chown -R resin:resin ${D}/var/log/resin
+	chown -R resin:resin ${D}/var/lib/resin
+	chown -R resin:resin ${D}/var/run/resin
+
+	chmod 755 ${D}${RESIN_HOME}/bin/*
+	chmod 644 ${D}/etc/conf.d/resin
+	chmod 755 ${D}/etc/init.d/resin
+	chmod 750 ${D}/var/lib/resin
+	chmod 750 ${D}/var/run/resin
+	chmod 750 ${D}/etc/resin
+
+}
+
+pkg_postinst() {
+
+	elog
+	elog " User and group 'resin' have been added."
+	elog
+	elog " By default, Resin runs on port 8080.  You can change this"
+	elog " value by editing /etc/conf/resin.conf."
+	elog
+	elog " To test Resin while it's running, point your web browser to:"
+	elog " http://localhost:8080/"
+	elog
+	elog " Resin cannot run on port 80 as non-root (as of this time)."
+	elog " The best way to get Resin to respond on port 80 is via port"
+	elog " forwarding -- by installing a firewall on the machine running"
+	elog " Resin or the network gateway.  Simply redirect port 80 to"
+	elog " port 8080."
+	elog
+	elog " webapps directory was moved to /var/lib/resin/webapps "
+	elog
+
+}
diff --git a/www-servers/resin/resin-3.1.2.ebuild b/www-servers/resin/resin-3.1.2.ebuild
new file mode 100644
index 000000000000..58b938aab849
--- /dev/null
+++ b/www-servers/resin/resin-3.1.2.ebuild
@@ -0,0 +1,159 @@
+# 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.2.ebuild,v 1.1 2007/08/17 08:08:33 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+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
+	${COMMON_DEP}"
+
+RESIN_HOME="/usr/lib/resin"
+
+# Rewrites build.xml in documentation
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+
+	java-ant_bsfix_one "${S}/build.xml"
+
+}
+
+pkg_setup() {
+
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+
+}
+
+src_compile() {
+
+	append-flags -fPIC -DPIC
+
+	chmod 755 ${S}/configure
+	econf --prefix=${RESIN_HOME} || die "econf failed"
+
+	einfo "Building libraries..."
+	# Broken with -jn where n > 1
+	emake -j1 || die "emake failed"
+
+	mkdir ${S}/lib
+	cd ${S}/lib
+	java-pkg_jar-from sun-jaf
+	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 resin-servlet-api.jar jsdk-15.jar
+	ln -s $(java-config --jdk-home)/lib/tools.jar
+	cd ${S}
+
+	einfo "Building jars..."
+	eant || die "ant failed"
+
+	if use doc; then
+		einfo "Building docs..."
+		eant doc || die "ant doc failed"
+	fi
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodir /etc/
+	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	keepdir /var/log/resin
+	keepdir /var/log/resin
+	keepdir /var/run/resin
+
+	dosym /var/log/resin ${RESIN_HOME}/logs
+	dosym /var/log/resin ${RESIN_HOME}/log
+
+	dodoc README ${S}/conf/*.conf
+
+	newinitd ${FILESDIR}/${PV}/resin.init resin
+	newconfd ${FILESDIR}/${PV}/resin.conf resin
+
+	rm -f ${S}/lib/tools.jar
+	java-pkg_dojar ${S}/lib/*.jar
+	rm -fr ${D}/${RESIN_HOME}/lib
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+	keepdir /usr/share/resin/log
+
+	dodir /var/lib/resin/webapps
+	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
+	rm -rf ${D}/${RESIN_HOME}/webapps
+	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+
+	dosym /etc/resin/resin.conf /etc/resin/resin.xml
+
+	use admin && {
+		cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
+	}
+
+	use source && {
+		einfo "Zipping source..."
+		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+	}
+
+	einfo "Removing unneeded files..."
+	rm -fr ${D}/${RESIN_HOME}/bin
+	rm -f ${D}/etc/resin/*.orig
+
+	einfo "Fixing permissions..."
+	chown -R resin:resin ${D}${RESIN_HOME}
+	chown -R resin:resin ${D}/etc/resin
+	chown -R resin:resin ${D}/var/log/resin
+	chown -R resin:resin ${D}/var/lib/resin
+	chown -R resin:resin ${D}/var/run/resin
+
+	chmod 644 ${D}/etc/conf.d/resin
+	chmod 755 ${D}/etc/init.d/resin
+	chmod 750 ${D}/var/lib/resin
+	chmod 750 ${D}/var/run/resin
+	chmod 750 ${D}/etc/resin
+
+}
+
+pkg_postinst() {
+
+	elog
+	elog " User and group 'resin' have been added."
+	elog
+	elog " By default, Resin runs on port 8080.  You can change this"
+	elog " value by editing /etc/conf/resin.conf."
+	elog
+	elog " webapps directory was moved to /var/lib/resin/webapps"
+	elog
+	elog " Most options has been moved from /etc/conf.d/resin to"
+	elog " /etc/resin/resin.conf."
+	elog
+
+}