Version bump, cleaned up old versions.

(Portage version: 2.1.1_pre5)
 (Signed Manifest commit)

18 files changed, 27 insertions, 1064 deletions

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 914db3603e24..fc27051b9b35 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -33,50 +33,18 @@ AUX 2.1.17/resin.init 753 RMD160 12345a4c50f0d609f9f02b6d145a1762e51ed9f5 SHA1 e
 MD5 7e1a3288eba4385e435c4a2564f86303 files/2.1.17/resin.init 753
 RMD160 12345a4c50f0d609f9f02b6d145a1762e51ed9f5 files/2.1.17/resin.init 753
 SHA256 45e83ce58b3a3a48620ad30b31555d0640339d9fd35724bf675611933bbe2271 files/2.1.17/resin.init 753
-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.20/resin-3.0.20-gentoo.patch 8877 RMD160 c3137d58920362ce0db8ce1ecc3df5cc5918f312 SHA1 8337829cea359d02b5b47687cfd81a29b1b81d65 SHA256 8f79f96e18b4a80c2b72b5074622c5a505187d7a3379e60a2c1e8cdeb82f79ee
-MD5 f2551e208e8687ec383e4446bf681769 files/3.0.20/resin-3.0.20-gentoo.patch 8877
-RMD160 c3137d58920362ce0db8ce1ecc3df5cc5918f312 files/3.0.20/resin-3.0.20-gentoo.patch 8877
-SHA256 8f79f96e18b4a80c2b72b5074622c5a505187d7a3379e60a2c1e8cdeb82f79ee files/3.0.20/resin-3.0.20-gentoo.patch 8877
-AUX 3.0.20/resin.conf 761 RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 SHA1 ba5ead5fcc379c68dd6183c462e47eefc699ba8e SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5
-MD5 d47030173a0582e27b6f4251c3d3e572 files/3.0.20/resin.conf 761
-RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 files/3.0.20/resin.conf 761
-SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5 files/3.0.20/resin.conf 761
-AUX 3.0.20/resin.init 695 RMD160 1707b093528c08410ff731dc3d512b7eaad79e8c SHA1 104dde03ada6b7b9401666fe3d5bdfc57c640f08 SHA256 0ab7d87b3dfdd73d92a8eb69ad4666d6b4c26b16343b5ca762606cc4a25eaeae
-MD5 c92cf53fb4d08788f25e93954c7dd254 files/3.0.20/resin.init 695
-RMD160 1707b093528c08410ff731dc3d512b7eaad79e8c files/3.0.20/resin.init 695
-SHA256 0ab7d87b3dfdd73d92a8eb69ad4666d6b4c26b16343b5ca762606cc4a25eaeae files/3.0.20/resin.init 695
+AUX 3.0.21/resin-3.0.21-gentoo.patch 8968 RMD160 f206fdaac58ca232a93916b51e793642fa86c9c4 SHA1 6d1ca27ff2810ead7fca84fd5b15604137231727 SHA256 796e9fc923312c12f6de4eb055d4f607d21e9bb82f02cce8e6d596a277870e9e
+MD5 9eb1106e834c468bb9a52c67902c7afb files/3.0.21/resin-3.0.21-gentoo.patch 8968
+RMD160 f206fdaac58ca232a93916b51e793642fa86c9c4 files/3.0.21/resin-3.0.21-gentoo.patch 8968
+SHA256 796e9fc923312c12f6de4eb055d4f607d21e9bb82f02cce8e6d596a277870e9e files/3.0.21/resin-3.0.21-gentoo.patch 8968
+AUX 3.0.21/resin.conf 761 RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 SHA1 ba5ead5fcc379c68dd6183c462e47eefc699ba8e SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5
+MD5 d47030173a0582e27b6f4251c3d3e572 files/3.0.21/resin.conf 761
+RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 files/3.0.21/resin.conf 761
+SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5 files/3.0.21/resin.conf 761
+AUX 3.0.21/resin.init 695 RMD160 fdd999a49a52992b4ffef6785a5d260978436196 SHA1 54ff84d1f690d24f7b18d7112db51c495be0fdab SHA256 aecce5980348de3f3f0a9f61634c402314aeaf9f1b2f4ae7d5d14e8bdfcb4015
+MD5 3bd493fba191db988a27a9c87d84cf86 files/3.0.21/resin.init 695
+RMD160 fdd999a49a52992b4ffef6785a5d260978436196 files/3.0.21/resin.init 695
+SHA256 aecce5980348de3f3f0a9f61634c402314aeaf9f1b2f4ae7d5d14e8bdfcb4015 files/3.0.21/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
@@ -95,9 +63,7 @@ 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-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
-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.20-src.tar.gz 5396774 RMD160 0e82848e3e88048db10019563d0c731e71b52b66 SHA1 b262642aedc1d131b39d6405412a894f7b968a35 SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e
+DIST resin-3.0.21-src.tar.gz 5401440 RMD160 1f4d90a28aa772a4dc14259816325285ffea1957 SHA1 00a928d470f69f39c1fac511356b6d368ade54e5 SHA256 c9de627433fbe3ec940507fd604a4a2409e70a16342994ffab881a51f8db1055
 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
@@ -107,26 +73,18 @@ EBUILD resin-2.1.17.ebuild 2986 RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57
 MD5 1aaea3df4d0bd80e1eb408d083863ca3 resin-2.1.17.ebuild 2986
 RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57 resin-2.1.17.ebuild 2986
 SHA256 771fac2bccec6571bf094f6fa6f47ea5948ebd4a1652d719cd67b24758d39811 resin-2.1.17.ebuild 2986
-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 3365 RMD160 5c783fc4ac60d2d8427f0b5ec5c765ff7d356e5f SHA1 578257a43a940636f8678d5dbb54297df872f5ff SHA256 ec9ec7da82b7466e495b5b863f17dcaf5cda4857c67b987c95132d9b88ec023d
-MD5 f8f44a42fdf3caadd07a3be0fe072f96 resin-3.0.19.ebuild 3365
-RMD160 5c783fc4ac60d2d8427f0b5ec5c765ff7d356e5f resin-3.0.19.ebuild 3365
-SHA256 ec9ec7da82b7466e495b5b863f17dcaf5cda4857c67b987c95132d9b88ec023d resin-3.0.19.ebuild 3365
-EBUILD resin-3.0.20.ebuild 3451 RMD160 289ee573526acef2605ab8cdcdd8b07cb41fd81e SHA1 022cc43e7d91ca5f49a1af0ccc96d250c8c48d2f SHA256 a1080f74466a0f186475f3fad0d3819fc6b8a0581f5a8202a8a680bbe4c9550e
-MD5 2879ca8c3b9c71b24d887b9adead9038 resin-3.0.20.ebuild 3451
-RMD160 289ee573526acef2605ab8cdcdd8b07cb41fd81e resin-3.0.20.ebuild 3451
-SHA256 a1080f74466a0f186475f3fad0d3819fc6b8a0581f5a8202a8a680bbe4c9550e resin-3.0.20.ebuild 3451
+EBUILD resin-3.0.21.ebuild 3549 RMD160 469312b47b54cb9ce7c47c3d2156c4f0a0320e42 SHA1 05ed9f480715a5073393c25aebb76de4c22e35df SHA256 d8d9d78b248f7600ade820d8b8900ddc24e90845a8bf72b12f43f539936b6bc9
+MD5 0a115af0faf96fc105a842a19f50c822 resin-3.0.21.ebuild 3549
+RMD160 469312b47b54cb9ce7c47c3d2156c4f0a0320e42 resin-3.0.21.ebuild 3549
+SHA256 d8d9d78b248f7600ade820d8b8900ddc24e90845a8bf72b12f43f539936b6bc9 resin-3.0.21.ebuild 3549
 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 4505 RMD160 2ee00084d3ebcc6eedea14054685e5721e71413e SHA1 e13407877e88142cd499566f085f7cb025d324e6 SHA256 c018ec93a92202895050570687bc6dececcc979097958f1e82e3ae00350c1a47
-MD5 e5319b6f661f8aff970c0dade6409c9e ChangeLog 4505
-RMD160 2ee00084d3ebcc6eedea14054685e5721e71413e ChangeLog 4505
-SHA256 c018ec93a92202895050570687bc6dececcc979097958f1e82e3ae00350c1a47 ChangeLog 4505
+MISC ChangeLog 5145 RMD160 f8e879695db33c26a86ede85c51d6cc3cb235e71 SHA1 f057f32fb776b400ed3042b32a72faf35ef88a4d SHA256 3f3cd5d140a6b43ad82882940022d82548eef5fadd1f2912e62ed0993d995f6d
+MD5 0757688a6426704a387da272e60395b1 ChangeLog 5145
+RMD160 f8e879695db33c26a86ede85c51d6cc3cb235e71 ChangeLog 5145
+SHA256 3f3cd5d140a6b43ad82882940022d82548eef5fadd1f2912e62ed0993d995f6d ChangeLog 5145
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -137,22 +95,16 @@ SHA256 634f44dc2b824fa8b5d1d516e83506db922a4ae7fd6eeff888c5f029a6186a03 files/di
 MD5 07e6b1635b6db18f68bd40814c347673 files/digest-resin-2.1.17 241
 RMD160 4139a546bdfad3a5c0a0bbf3330583eeb38756ac files/digest-resin-2.1.17 241
 SHA256 bc4da846dca614d5ad2d9ddd735df2109aabd6bfc9a7d4c6f550198a5ecd9440 files/digest-resin-2.1.17 241
-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 6296765725f98c29390e1f34c15d69d7 files/digest-resin-3.0.20 253
-RMD160 01a32245b86cd2aeb34982ae43eb29d5d1668431 files/digest-resin-3.0.20 253
-SHA256 2b0b455e54b71e73ea2ff94fe33d9fae7288707dbaac66829c388d322d87e4b7 files/digest-resin-3.0.20 253
+MD5 5e94a4e010b7907c1f3f12e58cedf48b files/digest-resin-3.0.21 253
+RMD160 e8190934daf9ec6c037ea5b58b9f84e30aaac20d files/digest-resin-3.0.21 253
+SHA256 a41462d28571aee053b0bb80907636bc065420f0422b8c3e6661ac5986f2f39d files/digest-resin-3.0.21 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.5 (GNU/Linux)
 
-iD8DBQFE0S1Ugo/w9rxVVVERAh2rAJsFxXdlB5jqmCKyUEmWrNFBumGkQQCglXWu
-bRxQq8kEvnmbExPB80WaPTo=
-=znqU
+iD8DBQFE4Ojtgo/w9rxVVVERAnzLAJ92nEIWe0ph3vw2F4E2tBtvktg1SgCfUgAe
+NCr/BTiR3SBdkZ25rfD+vo8=
+=9JqO
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.12/21resin b/www-servers/resin/files/3.0.12/21resin
deleted file mode 100644
index 8ebed2d0a4f8..000000000000
--- a/www-servers/resin/files/3.0.12/21resin
+++ /dev/null
@@ -1 +0,0 @@
-RESIN_HOME=/opt/resin
diff --git a/www-servers/resin/files/3.0.12/gentoo.diff b/www-servers/resin/files/3.0.12/gentoo.diff
deleted file mode 100644
index 1e258a2b0524..000000000000
--- a/www-servers/resin/files/3.0.12/gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../resin-3.0.12/configure	2005-01-12 00:00:26.000000000 +0100
-+++ configure	2005-04-29 16:18:15.000000000 +0200
-@@ -8261,6 +8261,10 @@
-  apache_exe="${apache_bin}/httpd"
- elif test -x "${apache_bin}/httpd2"; then
-  apache_exe="${apache_bin}/httpd2"
-+elif test -x "${apache_bin}/apache"; then
-+ apache_exe="${apache_bin}/apache"
-+elif test -x "${apache_bin}/apache2"; then
-+ apache_exe="${apache_bin}/apache2"
- else
-   { { echo "$as_me:$LINENO: error: Can't find Apache binary in directory ${apache_bin}" >&5
- echo "$as_me: error: Can't find Apache binary in directory ${apache_bin}" >&2;}
-diff -uprN ../resin-3.0.12/src/c/resin_os/Makefile.in src/c/resin_os/Makefile.in
---- ../resin-3.0.12/src/c/resin_os/Makefile.in	2004-12-01 00:22:38.000000000 +0100
-+++ src/c/resin_os/Makefile.in	2005-04-29 16:24:36.000000000 +0200
-@@ -13,7 +13,7 @@ resin_libexec=@apache_libexec@
- resin_home=@resin_home@
- JNI_INCLUDE=@JNI_INCLUDE@
- INCLUDES = @INCLUDES@ $(JNI_INCLUDE) -I../common
--CFLAGS = @CFLAGS@ -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS)
-+CFLAGS = @CFLAGS@ -fPIC -DRESIN_HOME=\"$(resin_home)\" $(INCLUDES) -DCPU=\"$(CPU)\" -DOS=$(OS)
- OBJ= jni_os.o
- 
- all	: libresin_os.$(SO)
diff --git a/www-servers/resin/files/3.0.12/resin.conf b/www-servers/resin/files/3.0.12/resin.conf
deleted file mode 100644
index 9dfcf0269d58..000000000000
--- a/www-servers/resin/files/3.0.12/resin.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.0.12/resin.conf,v 1.1 2005/04/19 14:03:56 luckyduck Exp $
-
-# 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 used when the "start", "stop", or "run"
-# commands are executed.
-# JAVA_OPTS=""
-
-# Where your Resin is installed
-RESIN_HOME=/opt/resin
-SERVER_ROOT=${RESIN_HOME}
-
-# Resin's User
-RESIN_USER=resin
-
-# Resin Log Locations
-RESIN_OUT=/var/log/resin/resin_out.log
-RESIN_ERR=/var/log/resin/resin_err.log
-
-# Location of the Resin JARs and classes
-RESIN_LIBDIR=/usr/share/resin/lib
-
-# The CLASSPATH for Resin to use, plus any others you need.
-CLASSPATH=$(java-config -p resin 2>/dev/null):${RESIN_LIBDIR}/lib
-
-# START/STOP settings
-RESIN_START="-java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} start"
-RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.12/resin.init b/www-servers/resin/files/3.0.12/resin.init
deleted file mode 100644
index 7c73128a5857..000000000000
--- a/www-servers/resin/files/3.0.12/resin.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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.12/resin.init,v 1.1 2005/04/19 14:03:56 luckyduck Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	ebegin "Starting Resin"
-	cd ${RESIN_HOME}
-	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_START}" 
-	eend $?
-}
-
-stop()	{
-	ebegin "Stopping Resin"
-	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_STOP}"
-	sleep 2
-	eend $?
-}
diff --git a/www-servers/resin/files/3.0.12/wrapper.pl.diff b/www-servers/resin/files/3.0.12/wrapper.pl.diff
deleted file mode 100644
index 0bd8702e6a0f..000000000000
--- a/www-servers/resin/files/3.0.12/wrapper.pl.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- bin/wrapper.pl.in	2004-07-30 01:59:20.680348752 +0200
-+++ bin/wrapper.pl.in	2004-07-30 02:04:38.745995424 +0200
-@@ -418,9 +418,6 @@
- 	$pid=`cat $pid_file`;
- 	chop($pid);
- 
--	if ($cmd eq "stop") {
--	    print("Stopping ${name}\n");
--	}
- 	kill(15, $pid);
- 	unlink($pid_file);
-     }
-@@ -679,8 +676,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 --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
deleted file mode 100644
index 6a69d8c54739..000000000000
--- a/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-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
deleted file mode 100644
index bd0a89cd3ecf..000000000000
--- a/www-servers/resin/files/3.0.19/resin.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
deleted file mode 100644
index a7ed58f2d29b..000000000000
--- a/www-servers/resin/files/3.0.19/resin.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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/3.0.20/resin-3.0.20-gentoo.patch b/www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch
deleted file mode 100644
index e9418588a74c..000000000000
--- a/www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -Nru resin-3.0.20.vanilla/Makefile.in resin-3.0.20/Makefile.in
---- resin-3.0.20.vanilla/Makefile.in	2006-08-02 23:15:09.000000000 +0200
-+++ resin-3.0.20/Makefile.in	2006-08-02 23:16:48.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.20.vanilla/bin/wrapper.pl resin-3.0.20/bin/wrapper.pl
---- resin-3.0.20.vanilla/bin/wrapper.pl	2006-08-02 23:15:02.000000000 +0200
-+++ resin-3.0.20/bin/wrapper.pl	2006-08-02 23:18:03.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.20.vanilla/bin/wrapper.pl.in resin-3.0.20/bin/wrapper.pl.in
---- resin-3.0.20.vanilla/bin/wrapper.pl.in	2006-08-02 23:15:02.000000000 +0200
-+++ resin-3.0.20/bin/wrapper.pl.in	2006-08-02 23:18: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.20.vanilla/build.xml resin-3.0.20/build.xml
---- resin-3.0.20.vanilla/build.xml	2006-08-02 23:15:09.000000000 +0200
-+++ resin-3.0.20/build.xml	2006-08-03 00:00:17.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, 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>
- 
-@@ -355,13 +345,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>
- 
-@@ -500,9 +483,6 @@
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-         </dirset>
--        <fileset dir="${modules}/ext">
--          <include name="**/*.jar"/>
--        </fileset>
-       </classpath>
-     </java>
- 
-diff -Nru resin-3.0.20.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.20/modules/resin/src/com/caucho/server/resin/Resin.java
---- resin-3.0.20.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-08-02 23:15:08.000000000 +0200
-+++ resin-3.0.20/modules/resin/src/com/caucho/server/resin/Resin.java	2006-08-02 23:20:19.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.20/resin.conf b/www-servers/resin/files/3.0.20/resin.conf
deleted file mode 100644
index 99210edc27b9..000000000000
--- a/www-servers/resin/files/3.0.20/resin.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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)
-
-# START/STOP settings
-RESIN_START="start"
-RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.20/resin.init b/www-servers/resin/files/3.0.20/resin.init
deleted file mode 100644
index 9a439e667d0f..000000000000
--- a/www-servers/resin/files/3.0.20/resin.init
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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.20/resin.init,v 1.1 2006/08/02 22:39:38 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.12 b/www-servers/resin/files/digest-resin-3.0.12
deleted file mode 100644
index f30e72a442a2..000000000000
--- a/www-servers/resin/files/digest-resin-3.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90a302b5e76bcb29457d3f68529e6587 resin-3.0.12.tar.gz 6965320
diff --git a/www-servers/resin/files/digest-resin-3.0.19 b/www-servers/resin/files/digest-resin-3.0.19
deleted file mode 100644
index 26edb4c85522..000000000000
--- a/www-servers/resin/files/digest-resin-3.0.19
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-resin-3.0.20 b/www-servers/resin/files/digest-resin-3.0.20
deleted file mode 100644
index 6ba5b302e614..000000000000
--- a/www-servers/resin/files/digest-resin-3.0.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ae9651a4a8a928b696352288636e5f7 resin-3.0.20-src.tar.gz 5396774
-RMD160 0e82848e3e88048db10019563d0c731e71b52b66 resin-3.0.20-src.tar.gz 5396774
-SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e resin-3.0.20-src.tar.gz 5396774
diff --git a/www-servers/resin/resin-3.0.12.ebuild b/www-servers/resin/resin-3.0.12.ebuild
deleted file mode 100644
index 508d34db5871..000000000000
--- a/www-servers/resin/resin-3.0.12.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.12.ebuild,v 1.6 2005/07/19 00:03:55 axxo Exp $
-
-inherit java-pkg eutils
-
-DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine with EJB and distributed session load balancing."
-SRC_URI="http://www.caucho.com/download/${P}.tar.gz"
-HOMEPAGE="http://www.caucho.com"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.3
-		!www-servers/resin-ee"
-RDEPEND=">=virtual/jdk-1.3
-		dev-lang/perl"
-IUSE=""
-
-RESIN_HOME="/opt/resin"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/wrapper.pl.diff
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-}
-
-pkg_preinst() {
-	enewgroup resin
-	enewuser resin -1 /bin/bash /opt/resin resin
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/var/log/${PN}
-	chown -R resin:resin ${D}/etc/resin
-	# when updating from resin 2, move things to there new location
-	if [ ! -L ${RESIN_HOME}/conf ]; then
-		if [ ! -d /etc/resin ]; then
-			mkdir /etc/resin
-			chown resin:resin /etc/resin
-		fi
-		mv ${RESIN_HOME}/conf/ /etc/resin/conf.old
-	fi
-}
-
-src_compile() {
-	./configure --prefix=${D}${RESIN_HOME} || die "configure failed"
-	make || die "make failed"
-}
-
-src_install() {
-	dodir ${RESIN_HOME} /etc/resin
-	cp -r lib bin webapps ${D}${RESIN_HOME}
-
-	dodir /etc/resin
-	cp -r conf/* ${D}/etc/resin/
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	dodir /var/log/${PN}
-	dosym /var/log/${PN} ${RESIN_HOME}/logs
-	keepdir /var/log/${PN}/
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d ; insopts -m0750 ; newins ${FILESDIR}/${PV}/resin.init resin
-	insinto /etc/conf.d ; insopts -m0755 ; newins ${FILESDIR}/${PV}/resin.conf resin
-	insinto /etc/env.d  ; insopts -m0755 ; doins ${FILESDIR}/${PV}/21resin
-
-	dodoc README
-	java-pkg_dojar ${S}/lib/*.jar
-
-	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
-}
-
-pkg_postinst() {
-	einfo
-	einfo " NOTICE!"
-	einfo " User and group 'resin' have been added."
-	einfo
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Resin home directory: ${RESIN_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/resin"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Logs:  /var/log/resin/"
-	einfo " 4.  Executables, libraries:  /usr/share/resin/"
-	einfo
-	einfo "If you are updating from resin-2* your old configuration files"
-	einfo "have been moved to /etc/resin/conf.old"
-	einfo
-	einfo " STARTING AND STOPPING RESIN:"
-	einfo "   /etc/init.d/resin start"
-	einfo "   /etc/init.d/resin stop"
-	einfo "   /etc/init.d/resin restart"
-	einfo
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Resin runs on port 8080.  You can change this"
-	einfo " value by editing ${RESIN_HOME}/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 " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-}
-
-pkg_postrm() {
-	einfo "You may want to remove the resin user and group"
-}
-
diff --git a/www-servers/resin/resin-3.0.19.ebuild b/www-servers/resin/resin-3.0.19.ebuild
deleted file mode 100644
index 989eb28de0af..000000000000
--- a/www-servers/resin/resin-3.0.19.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.3 2006/07/23 13:51:05 dertobi123 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 ~ppc ~ppc64 ~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
-
-}
diff --git a/www-servers/resin/resin-3.0.20.ebuild b/www-servers/resin/resin-3.0.20.ebuild
deleted file mode 100644
index d2432e99133a..000000000000
--- a/www-servers/resin/resin-3.0.20.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.20.ebuild,v 1.2 2006/08/02 22:54:38 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"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/iso-relax-20050331"
-DEPEND="${RDEPEND}
-	dev-java/aopalliance
-	>=dev-java/sun-javamail-bin-1.4
-	>=dev-java/sun-jaf-bin-1.1
-	dev-java/ant-core
-	dev-libs/openssl"
-
-RESIN_HOME="/usr/lib/resin"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
-
-}
-
-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-bin
-	java-pkg_jar-from sun-javamail-bin
-	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
-
-	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
-
-}