Remove old version.

Package-Manager: portage-2.1.2-r5

7 files changed, 20 insertions, 483 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 4a4986ab43f9..cae5127b3134 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.38 2007/02/03 13:17:50 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.39 2007/02/03 13:42:05 nelchael Exp $
+
+  03 Feb 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.0.21/resin.conf, -files/3.0.21/resin-3.0.21-gentoo.patch,
+  -files/3.0.21/resin.init, -resin-3.0.21.ebuild:
+  Remove old version.
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> resin-3.0.22.ebuild:
   amd64 stable, bug 161021
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 6269134bcd1f..24be8cc9d995 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.1.17/21resin 53 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e SHA1 8a6385133272e1491a4440f9ce31bda4dc27039b SHA256 b3635596eee58b6028bf03ddac3413e00eeb441af978325db062f45d6ab9bfb6
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.17/21resin 53
 RMD160 62e4ea99f9df806df34d777d121804f5802ef74e files/2.1.17/21resin 53
@@ -14,18 +17,6 @@ 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.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 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 367ebbd3a8e585a50fa447494a2a7be8683728a3 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2
-MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.21/resin.conf 791
-RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.21/resin.conf 791
-SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.21/resin.conf 791
-AUX 3.0.21/resin.init 817 RMD160 7b622a03ac095e4b623bd5875ad800e923c1cbe0 SHA1 a4c3ce2e9400bda16c2314ac7d2a603e22ca9409 SHA256 58e742d75c3772d9ded2f0e580b2517ac3b4ef237f6ecb2ee151a0ab800d77ef
-MD5 62dcb11fc5581ecf81db03a0575d0032 files/3.0.21/resin.init 817
-RMD160 7b622a03ac095e4b623bd5875ad800e923c1cbe0 files/3.0.21/resin.init 817
-SHA256 58e742d75c3772d9ded2f0e580b2517ac3b4ef237f6ecb2ee151a0ab800d77ef files/3.0.21/resin.init 817
 AUX 3.0.22/resin-3.0.22-gentoo.patch 8968 RMD160 fa80a57b440f7190a7868d80a2d90bae07b33dde SHA1 ce0ac4676f0f25aca71ebc7431d87acf49da65d5 SHA256 d22af4a1dd4c3f334d55c5ec32200a31698286e0046994a3f125eb227e046966
 MD5 2ec1578b643e44da2f7808b85858d438 files/3.0.22/resin-3.0.22-gentoo.patch 8968
 RMD160 fa80a57b440f7190a7868d80a2d90bae07b33dde files/3.0.22/resin-3.0.22-gentoo.patch 8968
@@ -51,17 +42,12 @@ 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
 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
-DIST resin-3.0.21-src.tar.gz 5401440 RMD160 1f4d90a28aa772a4dc14259816325285ffea1957 SHA1 00a928d470f69f39c1fac511356b6d368ade54e5 SHA256 c9de627433fbe3ec940507fd604a4a2409e70a16342994ffab881a51f8db1055
 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
 EBUILD resin-2.1.17.ebuild 2867 RMD160 459bad3fa6bedff7eb849cf3ff681c906d5ead4c SHA1 3062c915248965ce788677ac512dfc1347817392 SHA256 6c362a375f2d0d19599484fe60b27d0342dab815f0789b5d28a4ed816da5b57d
 MD5 2788a0c8d558c548177b9dc3ce2760a7 resin-2.1.17.ebuild 2867
 RMD160 459bad3fa6bedff7eb849cf3ff681c906d5ead4c resin-2.1.17.ebuild 2867
 SHA256 6c362a375f2d0d19599484fe60b27d0342dab815f0789b5d28a4ed816da5b57d resin-2.1.17.ebuild 2867
-EBUILD resin-3.0.21.ebuild 3635 RMD160 1b95cb5f38228eac90efc197f69f011e313e1fae SHA1 d311a6326f699b6f85f7298deca86ac1e44aeaef SHA256 0cca80709f9b3a5792ed65c1ad9a4a7caa590885206ed227d8b5dad95d127df8
-MD5 5911d3fe20aba7d8726fce87032f8e49 resin-3.0.21.ebuild 3635
-RMD160 1b95cb5f38228eac90efc197f69f011e313e1fae resin-3.0.21.ebuild 3635
-SHA256 0cca80709f9b3a5792ed65c1ad9a4a7caa590885206ed227d8b5dad95d127df8 resin-3.0.21.ebuild 3635
 EBUILD resin-3.0.22.ebuild 3618 RMD160 361b784d83255542e6c8d2edf4817608a7a14077 SHA1 7a0d9398d8f616c9eb058c7e27dc2d036255628d SHA256 53589e69a0a46d3dfe4e553e29bc3a30bc32bc75ae6e550625c512a8f46d24e3
 MD5 e887cc20197b3128404ed834f0ebe4dc resin-3.0.22.ebuild 3618
 RMD160 361b784d83255542e6c8d2edf4817608a7a14077 resin-3.0.22.ebuild 3618
@@ -70,10 +56,10 @@ EBUILD resin-3.1.0.ebuild 3373 RMD160 acc5442cc56f9b84344c34028bb549105b1b4793 S
 MD5 a5c9e6a310b67adaffa4a1f3ab749ba4 resin-3.1.0.ebuild 3373
 RMD160 acc5442cc56f9b84344c34028bb549105b1b4793 resin-3.1.0.ebuild 3373
 SHA256 db6255b508ab1874605db8530467094fff54ab8e01a9109168c30b5964574276 resin-3.1.0.ebuild 3373
-MISC ChangeLog 8146 RMD160 0ec46bfa4cd3d4081ada2c55f2367528d94daf44 SHA1 2b6c545d9330ea176aa456f023347d0c34c57b3f SHA256 8480adf8622840e560ee43b6696577f4c22ed1eea6df18cd9263e0972c38adb1
-MD5 557362f659b926739df15481ece89356 ChangeLog 8146
-RMD160 0ec46bfa4cd3d4081ada2c55f2367528d94daf44 ChangeLog 8146
-SHA256 8480adf8622840e560ee43b6696577f4c22ed1eea6df18cd9263e0972c38adb1 ChangeLog 8146
+MISC ChangeLog 8342 RMD160 653f0dc66153a861094c9421595d839862b0da25 SHA1 026163e595a55fdb562882edc28b92b24f60bd3a SHA256 277d14a5da40ecf2fdeebcd5bdb8b87ff83ab238349371f62e228ede3f0b1b45
+MD5 99fa725bff8c8a4bd4fe5ab0e2cf9655 ChangeLog 8342
+RMD160 653f0dc66153a861094c9421595d839862b0da25 ChangeLog 8342
+SHA256 277d14a5da40ecf2fdeebcd5bdb8b87ff83ab238349371f62e228ede3f0b1b45 ChangeLog 8342
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -81,12 +67,16 @@ SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884 metadata
 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 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 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFxJGdgo/w9rxVVVERAqyXAKCRqZxvmqwSOo7uMxGijfa4ODJkCwCgq3v4
+yKLbsoKxz5a66BTP4wt6stE=
+=Q6u+
+-----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.21/resin-3.0.21-gentoo.patch b/www-servers/resin/files/3.0.21/resin-3.0.21-gentoo.patch
deleted file mode 100644
index 80581892ed44..000000000000
--- a/www-servers/resin/files/3.0.21/resin-3.0.21-gentoo.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-diff -Nru resin-3.0.21.vanilla/Makefile.in resin-3.0.21/Makefile.in
---- resin-3.0.21.vanilla/Makefile.in	2006-08-14 22:44:11.000000000 +0200
-+++ resin-3.0.21/Makefile.in	2006-08-14 22:45:48.000000000 +0200
-@@ -1,6 +1,6 @@
- PREFIX=@prefix@
- 
--all	: 
-+all	:
- 	(cd modules/c/src; $(MAKE))
- 
- clean	:
-@@ -8,20 +8,20 @@
- 
- install	:
- 	(cd modules/c/src; $(MAKE) install)
--	if test $(PREFIX) != `pwd`; then \
--	  mkdir -p $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/libexec; \
--	  cp -r libexec/* $(PREFIX)/libexec; \
--	  cp lib/*.jar $(PREFIX)/lib; \
--	  mkdir -p $(PREFIX)/bin; \
--	  cp bin/* $(PREFIX)/bin; \
--	  mkdir -p $(PREFIX)/webapps; \
--	  cp -r webapps/* $(PREFIX)/webapps; \
--	  mkdir -p $(PREFIX)/conf; \
--	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
--	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
--	  if test ! -r $(PREFIX)/conf/resin.conf; then \
--	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
--	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
-+	if test $(DESTDIR)$(PREFIX) != `pwd`; then \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/lib; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
-+	  cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
-+	  cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/bin; \
-+	  cp bin/* $(DESTDIR)$(PREFIX)/bin; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
-+	  cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
-+	  mkdir -p $(DESTDIR)$(PREFIX)/conf; \
-+	  cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
-+	  cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
-+	  if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
-+	    cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
-+	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
- 	  fi; \
- 	fi
-diff -Nru resin-3.0.21.vanilla/bin/wrapper.pl resin-3.0.21/bin/wrapper.pl
---- resin-3.0.21.vanilla/bin/wrapper.pl	2006-08-14 22:44:03.000000000 +0200
-+++ resin-3.0.21/bin/wrapper.pl	2006-08-14 22:46:33.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.21.vanilla/bin/wrapper.pl.in resin-3.0.21/bin/wrapper.pl.in
---- resin-3.0.21.vanilla/bin/wrapper.pl.in	2006-08-14 22:44:03.000000000 +0200
-+++ resin-3.0.21/bin/wrapper.pl.in	2006-08-14 22:46:54.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.21.vanilla/build.xml resin-3.0.21/build.xml
---- resin-3.0.21.vanilla/build.xml	2006-08-14 22:44:11.000000000 +0200
-+++ resin-3.0.21/build.xml	2006-08-14 23:04:43.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.21.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.21/modules/resin/src/com/caucho/server/resin/Resin.java
---- resin-3.0.21.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-08-14 22:44:09.000000000 +0200
-+++ resin-3.0.21/modules/resin/src/com/caucho/server/resin/Resin.java	2006-08-14 22:50:20.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.21/resin.conf b/www-servers/resin/files/3.0.21/resin.conf
deleted file mode 100644
index 7f01b42fe1a2..000000000000
--- a/www-servers/resin/files/3.0.21/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 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.21/resin.init b/www-servers/resin/files/3.0.21/resin.init
deleted file mode 100644
index e5900e1409a0..000000000000
--- a/www-servers/resin/files/3.0.21/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.21/resin.init,v 1.2 2006/09/28 22:35:28 nelchael Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O)
-	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()	{
-	export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O)
-	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.21 b/www-servers/resin/files/digest-resin-3.0.21
deleted file mode 100644
index be883f386363..000000000000
--- a/www-servers/resin/files/digest-resin-3.0.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e7d7f91479e3931f86afea52d32ca1fa resin-3.0.21-src.tar.gz 5401440
-RMD160 1f4d90a28aa772a4dc14259816325285ffea1957 resin-3.0.21-src.tar.gz 5401440
-SHA256 c9de627433fbe3ec940507fd604a4a2409e70a16342994ffab881a51f8db1055 resin-3.0.21-src.tar.gz 5401440
diff --git a/www-servers/resin/resin-3.0.21.ebuild b/www-servers/resin/resin-3.0.21.ebuild
deleted file mode 100644
index 7eef8295e2a8..000000000000
--- a/www-servers/resin/resin-3.0.21.ebuild
+++ /dev/null
@@ -1,153 +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.21.ebuild,v 1.8 2006/11/24 21:23:08 corsair 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"
-
-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() {
-
-	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
-
-}