Version bumps.

Package-Manager: portage-2.1.2.7

13 files changed, 537 insertions, 42 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 16012193b840..e7c9a7109262 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,18 @@
 # 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.42 2007/04/29 12:32:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.43 2007/05/15 16:36:50 nelchael Exp $
+
+*resin-3.1.1 (15 May 2007)
+*resin-3.0.23 (15 May 2007)
+
+  15 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.1.0/resin-3.1.0-gentoo.patch, +files/3.0.23/resin.conf,
+  -files/3.1.0/resin.conf, +files/3.0.23/resin-3.0.23-gentoo.patch,
+  +files/3.0.23/resin.init, -files/3.1.0/resin.init,
+  +files/3.1.1/resin.conf, +files/3.1.1/resin-3.1.1-gentoo.patch,
+  +files/3.1.1/resin.init, +resin-3.0.23.ebuild, -resin-3.1.0.ebuild,
+  +resin-3.1.1.ebuild:
+  Version bumps.
 
   29 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> resin-3.1.0.ebuild:
   Fix dependencies and call java-pkg-2_pkg_setup in pkg_setup.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 66af8628d975..ec5bb1333996 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -29,21 +29,34 @@ 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.1.0/resin-3.1.0-gentoo.patch 6340 RMD160 a7945c5edff0c041e3fbcaab0a2125265086a813 SHA1 d7899a942369ffd6ebe29b94e69b8848fa944c46 SHA256 fb7daf247ed4866c5767b8173a26053f24ad69d453b8e4b82a6766b10a6b451f
-MD5 8cb00aa0c25e3db7e92d39afc6f46da5 files/3.1.0/resin-3.1.0-gentoo.patch 6340
-RMD160 a7945c5edff0c041e3fbcaab0a2125265086a813 files/3.1.0/resin-3.1.0-gentoo.patch 6340
-SHA256 fb7daf247ed4866c5767b8173a26053f24ad69d453b8e4b82a6766b10a6b451f files/3.1.0/resin-3.1.0-gentoo.patch 6340
-AUX 3.1.0/resin.conf 448 RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 SHA1 6fb88c341a5271488d2b09aeb27c451619ee0015 SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667
-MD5 3065ffbced3b5961423f78283136730b files/3.1.0/resin.conf 448
-RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 files/3.1.0/resin.conf 448
-SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667 files/3.1.0/resin.conf 448
-AUX 3.1.0/resin.init 760 RMD160 0f214967f9d2ebbce0a1f1328a5651ccbc7a7f4e SHA1 5c5627ee2fb82d7263cc66af44d1b8576b694aa8 SHA256 6ca51847c3b3b5055057f0564a2a56a48e99958d8220f40cb75c4aa87cc815b8
-MD5 a9ea68741e1b44173630ea40ac66af8a files/3.1.0/resin.init 760
-RMD160 0f214967f9d2ebbce0a1f1328a5651ccbc7a7f4e files/3.1.0/resin.init 760
-SHA256 6ca51847c3b3b5055057f0564a2a56a48e99958d8220f40cb75c4aa87cc815b8 files/3.1.0/resin.init 760
+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.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
+SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.23/resin.conf 791
+AUX 3.0.23/resin.init 955 RMD160 863d7a7449fc902494958367f2b0cd65bdd0d9c2 SHA1 6e3e539a11802594e57c6690bc0f37c134849361 SHA256 e25f9684676020458155473180797e1734e39b05f557fd26c166a3662e284138
+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.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
+SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667 files/3.1.1/resin.conf 448
+AUX 3.1.1/resin.init 760 RMD160 53aaec63352f09faa7874d57b010b81b9d204ea2 SHA1 453368c17e80b5eee0eb4ff1f1fdc54e4297cef3 SHA256 c60e75bf62736d89038658ff0d796ee0e043a7919df4685c24078ed672efb798
+MD5 bf013ca53a5d97bda9f88c699b9a4188 files/3.1.1/resin.init 760
+RMD160 53aaec63352f09faa7874d57b010b81b9d204ea2 files/3.1.1/resin.init 760
+SHA256 c60e75bf62736d89038658ff0d796ee0e043a7919df4685c24078ed672efb798 files/3.1.1/resin.init 760
 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.1.0-src.tar.gz 5708227 RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 SHA1 2f3f7c5d6003424f2f1afc27f38f9f36cc312466 SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440
+DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d
+DIST resin-3.1.1-src.tar.gz 7351646 RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce SHA1 0bd1b2fb048867fc2156898c749863ed3302512d SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424
 EBUILD resin-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
@@ -52,14 +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.1.0.ebuild 3414 RMD160 6b035fe45f333ee8575fa1db103d9d0b8d1cd1fc SHA1 1af831d9c9666989984209d56e1f335ed551a25a SHA256 190fa9f8cc11f79ebee51e4ef7e11b259e6580d4a63d4897618c5e5b30b6400a
-MD5 e30fb1782de0b53e35678fe8e0d9e0c6 resin-3.1.0.ebuild 3414
-RMD160 6b035fe45f333ee8575fa1db103d9d0b8d1cd1fc resin-3.1.0.ebuild 3414
-SHA256 190fa9f8cc11f79ebee51e4ef7e11b259e6580d4a63d4897618c5e5b30b6400a resin-3.1.0.ebuild 3414
-MISC ChangeLog 8728 RMD160 e665866bc8aff584c1717c3ee5eceb8b64ace198 SHA1 93b5bda919709bd92369d9603d88fbcb4e958ed4 SHA256 aab3c458b5c072349918d557844ce6a77001d6670270d9dcc6a9803a0fb1ad6a
-MD5 fbf2d8ee8699087acc7808fa1a260b56 ChangeLog 8728
-RMD160 e665866bc8aff584c1717c3ee5eceb8b64ace198 ChangeLog 8728
-SHA256 aab3c458b5c072349918d557844ce6a77001d6670270d9dcc6a9803a0fb1ad6a ChangeLog 8728
+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
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -70,13 +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 486b2f59227ff5e961aee6f6a7482362 files/digest-resin-3.1.0 250
-RMD160 29b90fa098e07020808bc9bb0156c404b6e012b3 files/digest-resin-3.1.0 250
-SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/digest-resin-3.1.0 250
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGNJBhcxLzpIGCsLQRAu0oAJ4uYriSUXQ+ilug2bUjPfOQRjAWfQCfUp2J
-rNELFkYPRNmc0GRza+3mJ8A=
-=Q/T7
+iD8DBQFGSeHxgo/w9rxVVVERAp5bAKCI0ns6iV50r8x3iczFUBHWyi7MiACgh7LQ
+6aBgQB9on+KIyj0lKWIFzDQ=
+=wgQY
 -----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
new file mode 100644
index 000000000000..bd9ad2201a6f
--- /dev/null
+++ b/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
@@ -0,0 +1,252 @@
+diff -Nru resin-3.0.23.vanilla/Makefile.in resin-3.0.23/Makefile.in
+--- resin-3.0.23.vanilla/Makefile.in	2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.23/Makefile.in	2006-11-19 13:00:27.000000000 +0100
+@@ -1,6 +1,6 @@
+ PREFIX=@prefix@
+ 
+-all	: 
++all	:
+ 	(cd modules/c/src; $(MAKE))
+ 
+ clean	:
+@@ -8,20 +8,20 @@
+ 
+ install	:
+ 	(cd modules/c/src; $(MAKE) install)
+-	if test $(PREFIX) != `pwd`; then \
+-	  mkdir -p $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/libexec; \
+-	  cp -r libexec/* $(PREFIX)/libexec; \
+-	  cp lib/*.jar $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/bin; \
+-	  cp bin/* $(PREFIX)/bin; \
+-	  mkdir -p $(PREFIX)/webapps; \
+-	  cp -r webapps/* $(PREFIX)/webapps; \
+-	  mkdir -p $(PREFIX)/conf; \
+-	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
+-	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
+-	  if test ! -r $(PREFIX)/conf/resin.conf; then \
+-	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
+-	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
++	if test $(DESTDIR)$(PREFIX) != `pwd`; then \
++	  mkdir -p $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
++	  cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
++	  cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/bin; \
++	  cp bin/* $(DESTDIR)$(PREFIX)/bin; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
++	  cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/conf; \
++	  cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
++	  cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
++	  if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
++	    cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
++	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
+ 	  fi; \
+ 	fi
+diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl resin-3.0.23/bin/wrapper.pl
+--- resin-3.0.23.vanilla/bin/wrapper.pl	2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.23/bin/wrapper.pl	2006-11-19 13:00:27.000000000 +0100
+@@ -447,9 +447,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	$signal = 15;
+ 	$count = 10;
+ 	while (kill($signal, $pid) && $count-- > 0) {
+@@ -565,8 +562,6 @@
+ 	$SIG{CHLD} = 'IGNORE';
+     }
+ 
+-    print "\n\nResin wrapper.pl closing.\n\n";
+-    
+     close(S);
+     close(C); # closing the accepted socket should start orderly shutdown
+     # unlink needs to happen relatively soon so restart's pid won't
+@@ -743,8 +738,6 @@
+       $date = `date`;
+       chop($date);
+ 
+-      print "Resin $name $cmd at $date\n";
+-
+       # create a keepalive socket
+       # when the wrapper dies, the httpd class will detect that and
+       # close gracefully
+diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl.in resin-3.0.23/bin/wrapper.pl.in
+--- resin-3.0.23.vanilla/bin/wrapper.pl.in	2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.23/bin/wrapper.pl.in	2006-11-19 13:00:27.000000000 +0100
+@@ -447,9 +447,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	$signal = 15;
+ 	$count = 10;
+ 	while (kill($signal, $pid) && $count-- > 0) {
+@@ -565,8 +562,6 @@
+ 	$SIG{CHLD} = 'IGNORE';
+     }
+ 
+-    print "\n\nResin wrapper.pl closing.\n\n";
+-    
+     close(S);
+     close(C); # closing the accepted socket should start orderly shutdown
+     # unlink needs to happen relatively soon so restart's pid won't
+@@ -743,8 +738,6 @@
+       $date = `date`;
+       chop($date);
+ 
+-      print "Resin $name $cmd at $date\n";
+-
+       # create a keepalive socket
+       # when the wrapper dies, the httpd class will detect that and
+       # close gracefully
+diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
+--- resin-3.0.23.vanilla/build.xml	2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.23/build.xml	2006-11-19 13:00:27.000000000 +0100
+@@ -7,7 +7,6 @@
+ 
+   <property name="modules" location="${basedir}/modules"/>
+   <property name="src" location="${basedir}/src"/>
+-  <property name="ext" location="${basedir}/modules/ext"/>
+   <property name="doc" location="${basedir}/doc"/>
+ 
+   <property name="build" location="${install}/build"/>
+@@ -17,14 +16,12 @@
+ 
+ 
+   <property name="javac.verbose" value="off"/>
+-  <property name="javac.debug" value="on"/>
++  <property name="javac.debug" value="off"/>
+   <property name="javac.optimize" value="off"/>
+   <property name="javac.deprecation" value="off"/>
+   <property name="javac.nowarn" value="on"/>
+   <property name="javac.memoryMaximumSize" value="256m"/>
+ 
+-  <property name="javac.source" value="1.4"/>
+-
+   <property name="jar.compress" value="false"/>
+   <property name="jar.index" value="true"/>
+   <property name="jar.update" value="false"/>
+@@ -66,7 +63,7 @@
+   </target>
+ 
+   <target name="compile" 
+-          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
++          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
+   </target>
+ 
+   <target name="ejb" depends="init, jta">
+@@ -80,7 +77,6 @@
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="ejb30"/>
+       <param name="module.jar" value="ejb-30.jar"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+ 
+@@ -102,7 +98,6 @@
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="jaxrpc"/>
+       <param name="module.jar" value="jaxrpc.jar"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+ 
+@@ -116,7 +111,6 @@
+   <target name="resin-jdk15" depends="init">
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="resin-jdk15"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+ 
+@@ -217,7 +211,6 @@
+ 
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="resin"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+   
+@@ -242,14 +235,12 @@
+   <target name="webutil" depends="init, resin">
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="webutil"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+ 
+   <target name="quercus-dev" depends="init">
+     <antcall target="module" inheritRefs="true">
+       <param name="module.name" value="quercus"/>
+-      <param name="javac.source" value="1.5"/>
+     </antcall>
+   </target>
+ 
+@@ -282,16 +273,15 @@
+            verbose="${javac.verbose}" 
+            debug="${javac.debug}" optimize="${javac.optimize}"
+            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
+-           source="${javac.source}"
+            excludes="**/.svn/**"
+            memoryMaximumSize="${javac.memoryMaximumSize}">
+       <classpath>
+         <dirset dir="${modules}">
+           <include name="*/classes"/>
+        </dirset>
+-        <fileset dir="${ext}">
+-          <include name="**/*.jar"/>
+-        </fileset>
++          <fileset dir="lib">
++            <include name="*.jar" />
++          </fileset>
+       </classpath>
+     </javac>
+ 
+@@ -358,13 +348,6 @@
+     </copy>
+   </target>
+ 
+-  <target name="ext" depends="init, resin">
+-    <copy todir="${install}/lib" preservelastmodified="true">
+-      <fileset dir="${ext}">
+-      </fileset>
+-    </copy>
+-  </target>
+-
+   <target name="webapps" depends="init, doc, quercus">
+   </target>
+ 
+@@ -503,9 +486,6 @@
+         <dirset dir="${modules}">
+           <include name="*/classes"/>
+         </dirset>
+-        <fileset dir="${modules}/ext">
+-          <include name="**/*.jar"/>
+-        </fileset>
+       </classpath>
+     </java>
+ 
+diff -Nru resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java
+--- resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-11-19 12:59:48.000000000 +0100
++++ resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java	2006-11-19 13:00:27.000000000 +0100
+@@ -700,10 +700,10 @@
+       throw new ConfigException(L().l("The following system property must be set:\n  -Djava.util.logging.manager=com.caucho.log.LogManagerImpl\nThe JDK 1.4 Logging manager must be set to Resin's log manager."));
+     }
+ 
+-    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.4"});
++    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.5"});
+     validatePackage("javax.servlet.jsp.jstl.core.Config", new String[] {"1.1"});
+     validatePackage("javax.management.MBeanServer", new String[] { "1.2", "1.5" });
+-    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.4"});
++    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.5"});
+   }
+ 
+   /**
diff --git a/www-servers/resin/files/3.0.23/resin.conf b/www-servers/resin/files/3.0.23/resin.conf
new file mode 100644
index 000000000000..7f01b42fe1a2
--- /dev/null
+++ b/www-servers/resin/files/3.0.23/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 -p resin)
+
+# START/STOP settings
+RESIN_START="start"
+RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.23/resin.init b/www-servers/resin/files/3.0.23/resin.init
new file mode 100644
index 000000000000..48ecf089bdc3
--- /dev/null
+++ b/www-servers/resin/files/3.0.23/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.23/resin.init,v 1.1 2007/05/15 16:36:50 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.0/resin-3.1.0-gentoo.patch b/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
index 0f55b63d8a60..02de640e6c19 100644
--- a/www-servers/resin/files/3.1.0/resin-3.1.0-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.0.vanilla/Makefile.in resin-3.1.0/Makefile.in
---- resin-3.1.0.vanilla/Makefile.in	2006-12-26 01:39:34.000000000 +0100
-+++ resin-3.1.0/Makefile.in	2006-12-26 01:40:38.000000000 +0100
+diff -Nru resin-3.1.1.vanilla/Makefile.in resin-3.1.1/Makefile.in
+--- resin-3.1.1.vanilla/Makefile.in	2007-05-15 18:11:40.000000000 +0200
++++ resin-3.1.1/Makefile.in	2007-05-15 18:17:07.000000000 +0200
 @@ -8,20 +8,20 @@
  
  install	:
@@ -37,9 +37,9 @@ diff -Nru resin-3.1.0.vanilla/Makefile.in resin-3.1.0/Makefile.in
 +	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
  	  fi; \
  	fi
-diff -Nru resin-3.1.0.vanilla/build.xml resin-3.1.0/build.xml
---- resin-3.1.0.vanilla/build.xml	2006-12-26 01:39:34.000000000 +0100
-+++ resin-3.1.0/build.xml	2006-12-26 01:53:05.000000000 +0100
+diff -Nru resin-3.1.1.vanilla/build.xml resin-3.1.1/build.xml
+--- resin-3.1.1.vanilla/build.xml	2007-05-15 18:11:40.000000000 +0200
++++ resin-3.1.1/build.xml	2007-05-15 18:18:04.000000000 +0200
 @@ -7,7 +7,6 @@
  
    <property name="modules" location="${basedir}/modules"/>
@@ -68,8 +68,8 @@ diff -Nru resin-3.1.0.vanilla/build.xml resin-3.1.0/build.xml
    </target>
  
    <target name="compile" 
--          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext, jsf">
-+          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, jsf">
+-          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext">
++          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf">
    </target>
  
    <target name="ant" depends="init">
diff --git a/www-servers/resin/files/3.1.0/resin.conf b/www-servers/resin/files/3.1.1/resin.conf
index 5fb064e1ba6c..5fb064e1ba6c 100644
--- a/www-servers/resin/files/3.1.0/resin.conf
+++ b/www-servers/resin/files/3.1.1/resin.conf
diff --git a/www-servers/resin/files/3.1.0/resin.init b/www-servers/resin/files/3.1.1/resin.init
index 5e2eebcf73bd..b8513dbe7e47 100644
--- a/www-servers/resin/files/3.1.0/resin.init
+++ b/www-servers/resin/files/3.1.1/resin.init
@@ -1,7 +1,7 @@
 #!/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.0/resin.init,v 1.2 2007/01/02 22:33:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.1/resin.init,v 1.1 2007/05/15 16:36:50 nelchael Exp $
 
 depend() {
 	need net
diff --git a/www-servers/resin/files/digest-resin-3.0.23 b/www-servers/resin/files/digest-resin-3.0.23
new file mode 100644
index 000000000000..bae42a23b37b
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.0.23
@@ -0,0 +1,3 @@
+MD5 f18ed18598f4bfbba18ec5dc9427cb68 resin-3.0.23-src.tar.gz 5470406
+RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef resin-3.0.23-src.tar.gz 5470406
+SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d resin-3.0.23-src.tar.gz 5470406
diff --git a/www-servers/resin/files/digest-resin-3.1.0 b/www-servers/resin/files/digest-resin-3.1.0
deleted file mode 100644
index 82f68ed4827c..000000000000
--- a/www-servers/resin/files/digest-resin-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bee26233a9bf67935c75fbb8136e9001 resin-3.1.0-src.tar.gz 5708227
-RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 resin-3.1.0-src.tar.gz 5708227
-SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440 resin-3.1.0-src.tar.gz 5708227
diff --git a/www-servers/resin/files/digest-resin-3.1.1 b/www-servers/resin/files/digest-resin-3.1.1
new file mode 100644
index 000000000000..1ed7597677ec
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.1.1
@@ -0,0 +1,3 @@
+MD5 860fbaf78013c0bc5bde742e45a13e21 resin-3.1.1-src.tar.gz 7351646
+RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce resin-3.1.1-src.tar.gz 7351646
+SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424 resin-3.1.1-src.tar.gz 7351646
diff --git a/www-servers/resin/resin-3.0.23.ebuild b/www-servers/resin/resin-3.0.23.ebuild
new file mode 100644
index 000000000000..69799a6a5edd
--- /dev/null
+++ b/www-servers/resin/resin-3.0.23.ebuild
@@ -0,0 +1,154 @@
+# 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 $
+
+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.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc source"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="=virtual/jdk-1.5*
+	>=dev-java/iso-relax-20050331"
+DEPEND="${RDEPEND}
+	dev-java/aopalliance
+	>=dev-java/sun-javamail-1.4
+	>=dev-java/sun-jaf-1.1
+	dev-java/ant-core
+	dev-libs/openssl
+	source? ( app-arch/zip )"
+
+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() {
+
+	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
+	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.0.ebuild b/www-servers/resin/resin-3.1.1.ebuild
index b88734bb21d6..a07802b1ded0 100644
--- a/www-servers/resin/resin-3.1.0.ebuild
+++ b/www-servers/resin/resin-3.1.1.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.0.ebuild,v 1.4 2007/04/29 12:32:28 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.1.ebuild,v 1.1 2007/05/15 16:36:50 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"