Version bump, uses new Java build system. Closes bug #63246.

Package-Manager: portage-2.1.1_pre2-r4

7 files changed, 440 insertions, 21 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 52b2f913400b..6b918a4d5868 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.8 2005/04/29 14:31:00 luckyduck Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.9 2006/07/06 11:25:04 nelchael Exp $
+
+*resin-3.0.19 (01 Jul 2006)
+
+  01 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/3.0.19/resin.conf, +files/3.0.19/resin-3.0.19-gentoo.patch,
+  +files/3.0.19/resin.init, +resin-3.0.19.ebuild:
+  Version bump, uses new Java build system. Closes bug #63246.
 
   29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/3.0.12/gentoo.diff,
   resin-3.0.12.ebuild:
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 359a8b99c2f8..9927f99f13d1 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,31 +1,114 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1bfc6d50e2f52dbcbade3df91569998f resin-3.0.12.ebuild 3440
-MD5 0648422e68fa0423df7cd06655baed13 resin-3.0.8-r1.ebuild 3421
-MD5 3638217ea99b079b7849e1be156329d7 ChangeLog 3464
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 493369717a39d721e008936cfe2e34ac resin-2.1.14.ebuild 2980
-MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
-MD5 c4456fac82339e40800999da730ef2e2 files/digest-resin-3.0.12 65
-MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8-r1 64
-MD5 033efd80975c8c86d388f3389eb352c8 files/3.0.8/resin.conf 1126
-MD5 4aee09a4e9a32217579c5cf7e73f2c71 files/3.0.8/resin.init 545
-MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.8/21resin 22
-MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.8/wrapper.pl.diff 526
+AUX 2.1.14/21resin 53 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e SHA1 8a6385133272e1491a4440f9ce31bda4dc27039b SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6
+MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
+RMD160 62e4ea99f9df806df34d777d121804f5802ef74e files/2.1.14/21resin 53
+SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6 files/2.1.14/21resin 53
+AUX 2.1.14/resin.conf 1178 RMD160 3d5189f01b0523e03f0248d1f88c480d34e679b3 SHA1 a955aec266c49c922a890ca2e9c7a13592e878b1 SHA256 1414bd9aa421ce7df568f967b9e0afa9d05808ff167ae77d0172ca2de651ae06
 MD5 94a0740742735629f269e776256d09bf files/2.1.14/resin.conf 1178
+RMD160 3d5189f01b0523e03f0248d1f88c480d34e679b3 files/2.1.14/resin.conf 1178
+SHA256 1414bd9aa421ce7df568f967b9e0afa9d05808ff167ae77d0172ca2de651ae06 files/2.1.14/resin.conf 1178
+AUX 2.1.14/resin.diff 504 RMD160 5c68c5509f03da3ff9e52ccba075f27f406bf9ab SHA1 5ea54c4249df4ade67e5eb130c78b29c42fba397 SHA256 ea304110358cb34b70cf295a53c9a33c797e8f465ccdb987f1d67dc32dac7362
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.14/resin.diff 504
+RMD160 5c68c5509f03da3ff9e52ccba075f27f406bf9ab files/2.1.14/resin.diff 504
+SHA256 ea304110358cb34b70cf295a53c9a33c797e8f465ccdb987f1d67dc32dac7362 files/2.1.14/resin.diff 504
+AUX 2.1.14/resin.init 751 RMD160 2c4cf66790eb2332ac78337478953a199779bb8a SHA1 89606c83834695fd94611e4d622c23d69a11fcee SHA256 9c0a43a3deff11daa8d15da56d82b5fa70b0d3c112526c024c561295148ef1a6
 MD5 fdd22c5f252db48ef11406b278e267be files/2.1.14/resin.init 751
-MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
-MD5 a06fd833b2ca8f78bf18028b530d52b4 files/3.0.12/resin.conf 1130
-MD5 b113cda023ae557981e4b2e36023d401 files/3.0.12/resin.init 549
+RMD160 2c4cf66790eb2332ac78337478953a199779bb8a files/2.1.14/resin.init 751
+SHA256 9c0a43a3deff11daa8d15da56d82b5fa70b0d3c112526c024c561295148ef1a6 files/2.1.14/resin.init 751
+AUX 3.0.12/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f SHA1 cc11fbfa74f3008dff06e790bab78284ab52328b SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123
 MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.12/21resin 22
+RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f files/3.0.12/21resin 22
+SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123 files/3.0.12/21resin 22
+AUX 3.0.12/gentoo.diff 1203 RMD160 545ffc182b477237a2e30c23e726caef40148c8a SHA1 32b4615121d90ce0c2819461baa0bb7727128529 SHA256 190365a4531a03cdc36ea9bb37df07e357089c42ba0708c4edef029ade5e6b55
 MD5 7d6b40e67e41acafd82feb48350882b6 files/3.0.12/gentoo.diff 1203
+RMD160 545ffc182b477237a2e30c23e726caef40148c8a files/3.0.12/gentoo.diff 1203
+SHA256 190365a4531a03cdc36ea9bb37df07e357089c42ba0708c4edef029ade5e6b55 files/3.0.12/gentoo.diff 1203
+AUX 3.0.12/resin.conf 1130 RMD160 5c805bc47740643eb296e9c7f2d75f16e6faa6ce SHA1 678a750b2090520749622c55ba3cafa4f9d1eee4 SHA256 27d3db8495233221d443129db7505980cb5f066c5b28800dc653854ba76bbb24
+MD5 a06fd833b2ca8f78bf18028b530d52b4 files/3.0.12/resin.conf 1130
+RMD160 5c805bc47740643eb296e9c7f2d75f16e6faa6ce files/3.0.12/resin.conf 1130
+SHA256 27d3db8495233221d443129db7505980cb5f066c5b28800dc653854ba76bbb24 files/3.0.12/resin.conf 1130
+AUX 3.0.12/resin.init 549 RMD160 5c7f3710e7aa4b44a933396286ebf8a96e6cf234 SHA1 2fb372cff5e68b0d95cc414894a6f8542a7c9e9a SHA256 674e20c3716dfb8d39655276802c9aa2a1a43b0160db8c2ffb57ad1331272496
+MD5 b113cda023ae557981e4b2e36023d401 files/3.0.12/resin.init 549
+RMD160 5c7f3710e7aa4b44a933396286ebf8a96e6cf234 files/3.0.12/resin.init 549
+SHA256 674e20c3716dfb8d39655276802c9aa2a1a43b0160db8c2ffb57ad1331272496 files/3.0.12/resin.init 549
+AUX 3.0.12/wrapper.pl.diff 526 RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 SHA1 944b36b919a0b102ec1204d32969a36880db59a9 SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125
 MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.12/wrapper.pl.diff 526
+RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 files/3.0.12/wrapper.pl.diff 526
+SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125 files/3.0.12/wrapper.pl.diff 526
+AUX 3.0.19/resin-3.0.19-gentoo.patch 5598 RMD160 f11d4d6f8743e89d1a141a55d6f1f6497a50d79c SHA1 9f1d2e17cf50024f138731cdab44efbaddfd3846 SHA256 eed2631c10967b9f43aca5f0e05c150064cef4d56731e9629523d9cf62e9ab89
+MD5 d8d96c1318d5d6b1f62363bd3ed7af7d files/3.0.19/resin-3.0.19-gentoo.patch 5598
+RMD160 f11d4d6f8743e89d1a141a55d6f1f6497a50d79c files/3.0.19/resin-3.0.19-gentoo.patch 5598
+SHA256 eed2631c10967b9f43aca5f0e05c150064cef4d56731e9629523d9cf62e9ab89 files/3.0.19/resin-3.0.19-gentoo.patch 5598
+AUX 3.0.19/resin.conf 785 RMD160 d94b97c66ddb08b69bf6a8bdc110a81d0a287f8d SHA1 bbd73dd00ef5690b0fb363534e35445c0acdeb1a SHA256 295d2efc576d4bdfdd67933a3c2fda8de27e78aeb095cad2e08ba40e68b7b18a
+MD5 018de1aad2ef1ad4618638dbec825927 files/3.0.19/resin.conf 785
+RMD160 d94b97c66ddb08b69bf6a8bdc110a81d0a287f8d files/3.0.19/resin.conf 785
+SHA256 295d2efc576d4bdfdd67933a3c2fda8de27e78aeb095cad2e08ba40e68b7b18a files/3.0.19/resin.conf 785
+AUX 3.0.19/resin.init 695 RMD160 afc2432fb0f23000f13be60930b3062984e824d2 SHA1 412c918c8bf201b4047a9cef6ca7425f0e17e1a4 SHA256 b9f050a5f378aa51307af97c6e424a3d3930372eb64962ac8b1d01f2102dda85
+MD5 6be83e8d3f0d574593bbfeacfc6ca3ba files/3.0.19/resin.init 695
+RMD160 afc2432fb0f23000f13be60930b3062984e824d2 files/3.0.19/resin.init 695
+SHA256 b9f050a5f378aa51307af97c6e424a3d3930372eb64962ac8b1d01f2102dda85 files/3.0.19/resin.init 695
+AUX 3.0.8/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f SHA1 cc11fbfa74f3008dff06e790bab78284ab52328b SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123
+MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.8/21resin 22
+RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f files/3.0.8/21resin 22
+SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123 files/3.0.8/21resin 22
+AUX 3.0.8/resin.conf 1126 RMD160 25c5d5a22485c50f8f60f8940b73dec4134be060 SHA1 59a8a63c5a642987dea9cbe02fd17e0c4c961827 SHA256 0a5e1c75b8f8a87d400098e67cc137a02d28f5c7a2b691a5bee837e184da7b9d
+MD5 033efd80975c8c86d388f3389eb352c8 files/3.0.8/resin.conf 1126
+RMD160 25c5d5a22485c50f8f60f8940b73dec4134be060 files/3.0.8/resin.conf 1126
+SHA256 0a5e1c75b8f8a87d400098e67cc137a02d28f5c7a2b691a5bee837e184da7b9d files/3.0.8/resin.conf 1126
+AUX 3.0.8/resin.init 545 RMD160 70fa73c92cb5774c74c8eefeb74b2f77c65d5d5e SHA1 3fca3c7339cc7d18dd4368c08550c9fb98d108c5 SHA256 b4f95e84b0b28b6c780447fc6fc6a4ad4107dc8a51b36e84053acd82baa42211
+MD5 4aee09a4e9a32217579c5cf7e73f2c71 files/3.0.8/resin.init 545
+RMD160 70fa73c92cb5774c74c8eefeb74b2f77c65d5d5e files/3.0.8/resin.init 545
+SHA256 b4f95e84b0b28b6c780447fc6fc6a4ad4107dc8a51b36e84053acd82baa42211 files/3.0.8/resin.init 545
+AUX 3.0.8/wrapper.pl.diff 526 RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 SHA1 944b36b919a0b102ec1204d32969a36880db59a9 SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125
+MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.8/wrapper.pl.diff 526
+RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 files/3.0.8/wrapper.pl.diff 526
+SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125 files/3.0.8/wrapper.pl.diff 526
+DIST resin-2.1.14.tar.gz 3305648
+DIST resin-3.0.12.tar.gz 6965320
+DIST resin-3.0.19-src.tar.gz 5031722 RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 SHA1 9de0832abcb3ec18d717702afd8108f61c102aac SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3
+DIST resin-3.0.8.tar.gz 5757738
+EBUILD resin-2.1.14.ebuild 2980 RMD160 e3e8eecab447ef6d0b44af4dae12968c5cd608b6 SHA1 81b0d5a73b1118708f4a37cd75e939267fc1d9fb SHA256 f4657b6982e64a1394a382b3d0a04c8292177b72cd927fffb9b4814d7f16e8b5
+MD5 493369717a39d721e008936cfe2e34ac resin-2.1.14.ebuild 2980
+RMD160 e3e8eecab447ef6d0b44af4dae12968c5cd608b6 resin-2.1.14.ebuild 2980
+SHA256 f4657b6982e64a1394a382b3d0a04c8292177b72cd927fffb9b4814d7f16e8b5 resin-2.1.14.ebuild 2980
+EBUILD resin-3.0.12.ebuild 3440 RMD160 3e29c34b07c232a8175060853e6a0b8b03d115e8 SHA1 6c9bc062106bf7c3c4337741215d6699d7dfea95 SHA256 c6dbd72d90f85a6c3ee3c4d4ce243f9a07f23378d22f88561e4d13426b95a321
+MD5 1bfc6d50e2f52dbcbade3df91569998f resin-3.0.12.ebuild 3440
+RMD160 3e29c34b07c232a8175060853e6a0b8b03d115e8 resin-3.0.12.ebuild 3440
+SHA256 c6dbd72d90f85a6c3ee3c4d4ce243f9a07f23378d22f88561e4d13426b95a321 resin-3.0.12.ebuild 3440
+EBUILD resin-3.0.19.ebuild 3351 RMD160 e8f014a90d15487dd550f1bff5a2e9776041e2cd SHA1 eb09d8f24bf24305acadd0c87980e8c4b271db3e SHA256 02835a0c516f312012a1f99dacfafd6e7c976f6589f71f522dc981f77b0657c7
+MD5 8cef973ed5f0e7f5161fd84c3d8ff0c4 resin-3.0.19.ebuild 3351
+RMD160 e8f014a90d15487dd550f1bff5a2e9776041e2cd resin-3.0.19.ebuild 3351
+SHA256 02835a0c516f312012a1f99dacfafd6e7c976f6589f71f522dc981f77b0657c7 resin-3.0.19.ebuild 3351
+EBUILD resin-3.0.8-r1.ebuild 3421 RMD160 a058566d36d377c03b1c618a443c035226c2231a SHA1 2ce387170258e2026bcddd76c7d05eec6e5b05d4 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de
+MD5 0648422e68fa0423df7cd06655baed13 resin-3.0.8-r1.ebuild 3421
+RMD160 a058566d36d377c03b1c618a443c035226c2231a resin-3.0.8-r1.ebuild 3421
+SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de resin-3.0.8-r1.ebuild 3421
+MISC ChangeLog 3728 RMD160 317f0e1bc4e8c94c96c0dc3a87672ccbcb37eae0 SHA1 7d2d11fa347a43ebf536b4f611b2f823299f0685 SHA256 248f9fc295ef4207a2ea34657b78f700395210dbb6f1e2a868ce47f042b1f63e
+MD5 f194fa53ee717a685d5c9b2ebc22a6c1 ChangeLog 3728
+RMD160 317f0e1bc4e8c94c96c0dc3a87672ccbcb37eae0 ChangeLog 3728
+SHA256 248f9fc295ef4207a2ea34657b78f700395210dbb6f1e2a868ce47f042b1f63e ChangeLog 3728
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
+RMD160 a6cdb924c8a569a3b4fe291bc26036aa93fb2b19 files/digest-resin-2.1.14 65
+SHA256 634f44dc2b824fa8b5d1d516e83506db922a4ae7fd6eeff888c5f029a6186a03 files/digest-resin-2.1.14 65
+MD5 c4456fac82339e40800999da730ef2e2 files/digest-resin-3.0.12 65
+RMD160 bf2a1bd23b3e722408449bed71b05acb1c072c92 files/digest-resin-3.0.12 65
+SHA256 3e02fb910717eb0d1ff43aee169f1a6ed64861aeab6dabd755e4f10823ce26a1 files/digest-resin-3.0.12 65
+MD5 0c5de37c2495a8cd57a0ccafa02eca53 files/digest-resin-3.0.19 253
+RMD160 72e08fd9c7fb5e14df3f4579ea3a8c442b83aea4 files/digest-resin-3.0.19 253
+SHA256 092bf61d5004c321668d0e000c821dd9a7f2a8fce1acaaa42059f37f7dcd6fe4 files/digest-resin-3.0.19 253
+MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8-r1 64
+RMD160 1ed3e5fee0a5bfc62d0e47c1b5cdbc25799070e6 files/digest-resin-3.0.8-r1 64
+SHA256 a5d9f4b822a2524029ae0cf42f3124949513da515f7c8e9281269bfb8a02b3b4 files/digest-resin-3.0.8-r1 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFC3EN5/rLF9B432nYRAk7SAKCJQc7LAYQa6p4uvJN72surJhSqRQCfS73h
-SunIovLQS8fpCEegCH3bXZ4=
-=a90A
+iD8DBQFErPMggo/w9rxVVVERAmm0AJ9YtHMmUwDED9AHBup538GwbbovqgCgqXo5
+HTYB/CRMXwEbLoEsIVn1eFc=
+=npjA
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch b/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch
new file mode 100644
index 000000000000..6a69d8c54739
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch
@@ -0,0 +1,143 @@
+diff -Nru resin-3.0.19.vanilla/Makefile.in resin-3.0.19/Makefile.in
+--- resin-3.0.19.vanilla/Makefile.in	2006-05-27 17:02:08.000000000 +0200
++++ resin-3.0.19/Makefile.in	2006-05-27 17:03:04.000000000 +0200
+@@ -8,20 +8,20 @@
+ 
+ install	:
+ 	(cd modules/c/src; $(MAKE) install)
+-	if test $(PREFIX) != `pwd`; then \
+-	  mkdir -p $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/libexec; \
+-	  cp -r libexec/* $(PREFIX)/libexec; \
+-	  cp lib/*.jar $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/bin; \
+-	  cp bin/* $(PREFIX)/bin; \
+-	  mkdir -p $(PREFIX)/webapps; \
+-	  cp -r webapps/* $(PREFIX)/webapps; \
+-	  mkdir -p $(PREFIX)/conf; \
+-	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
+-	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
+-	  if test ! -r $(PREFIX)/conf/resin.conf; then \
+-	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
+-	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
++	if test $(DESTDIR)$(PREFIX) != `pwd`; then \
++	  mkdir -p $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
++	  cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
++	  cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/bin; \
++	  cp bin/* $(DESTDIR)$(PREFIX)/bin; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
++	  cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/conf; \
++	  cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
++	  cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
++	  if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
++	    cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
++	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
+ 	  fi; \
+ 	fi
+diff -Nru resin-3.0.19.vanilla/bin/wrapper.pl resin-3.0.19/bin/wrapper.pl
+--- resin-3.0.19.vanilla/bin/wrapper.pl	2006-05-27 17:01:59.000000000 +0200
++++ resin-3.0.19/bin/wrapper.pl	2006-05-27 17:03:34.000000000 +0200
+@@ -441,9 +441,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -729,8 +726,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.19.vanilla/bin/wrapper.pl.in resin-3.0.19/bin/wrapper.pl.in
+--- resin-3.0.19.vanilla/bin/wrapper.pl.in	2006-05-27 17:01:59.000000000 +0200
++++ resin-3.0.19/bin/wrapper.pl.in	2006-05-27 17:03:52.000000000 +0200
+@@ -441,9 +441,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -729,8 +726,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.19.vanilla/build.xml resin-3.0.19/build.xml
+--- resin-3.0.19.vanilla/build.xml	2006-05-27 17:02:08.000000000 +0200
++++ resin-3.0.19/build.xml	2006-05-27 17:04:57.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"/>
+@@ -66,7 +65,7 @@
+   </target>
+ 
+   <target name="compile" 
+-          depends="init, ejb, ejb30, j2eedeploy, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, mail, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
++          depends="init, ejb, ejb30, j2eedeploy, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, mail, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
+   </target>
+ 
+   <target name="ejb" depends="init, jta">
+@@ -266,9 +265,6 @@
+         <dirset dir="${modules}">
+           <include name="*/classes"/>
+        </dirset>
+-        <fileset dir="${ext}">
+-          <include name="**/*.jar"/>
+-        </fileset>
+       </classpath>
+     </javac>
+ 
+@@ -331,13 +327,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>
+ 
+diff -Nru resin-3.0.19.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.19/modules/resin/src/com/caucho/server/resin/Resin.java
+--- resin-3.0.19.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-05-27 17:02:07.000000000 +0200
++++ resin-3.0.19/modules/resin/src/com/caucho/server/resin/Resin.java	2006-05-27 17:05:48.000000000 +0200
+@@ -699,10 +699,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.19/resin.conf b/www-servers/resin/files/3.0.19/resin.conf
new file mode 100644
index 000000000000..bd0a89cd3ecf
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/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 path you wish.
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.1.01
+
+JAVA_HOME=`java-config -O`
+
+# (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,iso-relax,aopalliance-1)
+
+# START/STOP settings
+RESIN_START="start"
+RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.19/resin.init b/www-servers/resin/files/3.0.19/resin.init
new file mode 100644
index 000000000000..a7ed58f2d29b
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/resin.init
@@ -0,0 +1,21 @@
+#!/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.19/resin.init,v 1.1 2006/07/06 11:25:04 nelchael Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	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()	{
+	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/digest-resin-3.0.19 b/www-servers/resin/files/digest-resin-3.0.19
new file mode 100644
index 000000000000..26edb4c85522
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.0.19
@@ -0,0 +1,3 @@
+MD5 7e50a5393752e9002d456758a228b45c resin-3.0.19-src.tar.gz 5031722
+RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 resin-3.0.19-src.tar.gz 5031722
+SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3 resin-3.0.19-src.tar.gz 5031722
diff --git a/www-servers/resin/resin-3.0.19.ebuild b/www-servers/resin/resin-3.0.19.ebuild
new file mode 100644
index 000000000000..7c5833ff2831
--- /dev/null
+++ b/www-servers/resin/resin-3.0.19.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.19.ebuild,v 1.1 2006/07/06 11:25:04 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"
+
+# 2006/01/21: keywords (ppc, ppc64, sparc) dropped due to deps:
+#  - aopalliance has (amd64, x86)
+#  - iso-relax has (amd64, ppc, x86)
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/iso-relax-20050331"
+DEPEND="${RDEPEND}
+	dev-java/aopalliance
+	dev-java/ant-core
+	dev-libs/openssl"
+
+RESIN_HOME="/usr/lib/resin"
+
+src_unpack() {
+
+	unpack "${A}"
+	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+
+}
+
+pkg_setup() {
+
+	einfo "Adding resin:resin"
+	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"
+
+	einfo "Building jars..."
+	eant -lib $(java-pkg_getjars iso-relax aopalliance-1) || 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
+
+	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
+
+	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() {
+
+	einfo
+	einfo " User and group 'resin' have been added."
+	einfo
+	einfo " By default, Resin runs on port 8080.  You can change this"
+	einfo " value by editing /etc/conf/resin.conf."
+	einfo
+	einfo " To test Resin while it's running, point your web browser to:"
+	einfo " http://localhost:8080/"
+	einfo
+	einfo " Resin cannot run on port 80 as non-root (as of this time)."
+	einfo " The best way to get Resin to respond on port 80 is via port"
+	einfo " forwarding -- by installing a firewall on the machine running"
+	einfo " Resin or the network gateway.  Simply redirect port 80 to"
+	einfo " port 8080."
+	einfo
+	einfo " webapps directory was moved to /var/lib/resin/webapps "
+	einfo
+
+}