Remove unneeded versions.

(Portage version: 2.1.3.9)

11 files changed, 8 insertions, 930 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 14d7ffd366f6..dfa810687adc 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.50 2007/08/17 08:08:33 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.51 2007/09/08 18:42:11 nelchael Exp $
+
+  08 Sep 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.0.23/resin.init, -files/3.0.23/resin-3.0.23-gentoo.patch,
+  -files/3.1.1/resin.conf, -files/3.1.1/resin-3.1.1-gentoo.patch,
+  -files/3.0.23/resin.conf, -files/3.1.1/resin.init,
+  -resin-3.0.23-r1.ebuild, -resin-3.1.1-r1.ebuild:
+  Remove unneeded versions.
 
 *resin-3.1.2 (17 Aug 2007)
 *resin-3.0.24 (17 Aug 2007)
diff --git a/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch b/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
deleted file mode 100644
index e4bd9f532d8e..000000000000
--- a/www-servers/resin/files/3.0.23/resin-3.0.23-gentoo.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -Nru resin-3.0.23.vanilla/Makefile.in resin-3.0.23/Makefile.in
---- resin-3.0.23.vanilla/Makefile.in	2007-05-16 12:41:21.000000000 +0200
-+++ resin-3.0.23/Makefile.in	2007-05-16 12:41:38.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.23.vanilla/bin/wrapper.pl resin-3.0.23/bin/wrapper.pl
---- resin-3.0.23.vanilla/bin/wrapper.pl	2007-05-16 12:41:15.000000000 +0200
-+++ resin-3.0.23/bin/wrapper.pl	2007-05-16 12:41:38.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.23.vanilla/bin/wrapper.pl.in resin-3.0.23/bin/wrapper.pl.in
---- resin-3.0.23.vanilla/bin/wrapper.pl.in	2007-05-16 12:41:15.000000000 +0200
-+++ resin-3.0.23/bin/wrapper.pl.in	2007-05-16 12:41:38.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.23.vanilla/build.xml resin-3.0.23/build.xml
---- resin-3.0.23.vanilla/build.xml	2007-05-16 12:41:21.000000000 +0200
-+++ resin-3.0.23/build.xml	2007-05-16 12:42:18.000000000 +0200
-@@ -7,7 +7,6 @@
- 
-   <property name="modules" location="${basedir}/modules"/>
-   <property name="src" location="${basedir}/src"/>
--  <property name="ext" location="${basedir}/modules/ext"/>
-   <property name="doc" location="${basedir}/doc"/>
- 
-   <property name="build" location="${install}/build"/>
-@@ -17,14 +16,12 @@
- 
- 
-   <property name="javac.verbose" value="off"/>
--  <property name="javac.debug" value="on"/>
-+  <property name="javac.debug" value="off"/>
-   <property name="javac.optimize" value="off"/>
-   <property name="javac.deprecation" value="off"/>
-   <property name="javac.nowarn" value="on"/>
-   <property name="javac.memoryMaximumSize" value="256m"/>
- 
--  <property name="javac.source" value="1.4"/>
--
-   <property name="jar.compress" value="false"/>
-   <property name="jar.index" value="true"/>
-   <property name="jar.update" value="false"/>
-@@ -66,7 +63,7 @@
-   </target>
- 
-   <target name="compile" 
--          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
-+          depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
-   </target>
- 
-   <target name="ejb" depends="init, jta">
-@@ -80,7 +77,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ejb30"/>
-       <param name="module.jar" value="ejb-30.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -98,11 +94,10 @@
-     </antcall>
-   </target>
- 
--  <target name="jaxrpc" depends="init,saaj,jsdk">
-+  <target name="jaxrpc" depends="init,saaj">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jaxrpc"/>
-       <param name="module.jar" value="jaxrpc.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -116,7 +111,6 @@
-   <target name="resin-jdk15" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin-jdk15"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -148,7 +142,7 @@
-     </antcall>
-   </target>
- 
--  <target name="jstl" depends="init, jsdk">
-+  <target name="jstl" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jstl"/>
-       <param name="module.jar" value="jstl-11.jar"/>
-@@ -187,7 +181,7 @@
-     </antcall>
-   </target>
- 
--  <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jsdk, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
-+  <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
- 
-     <!-- filter to insert version -->
- 
-@@ -217,7 +211,6 @@
- 
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
-   
-@@ -242,14 +235,12 @@
-   <target name="webutil" depends="init, resin">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="webutil"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-   <target name="quercus-dev" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="quercus"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -282,16 +273,15 @@
-            verbose="${javac.verbose}" 
-            debug="${javac.debug}" optimize="${javac.optimize}"
-            deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
--           source="${javac.source}"
-            excludes="**/.svn/**"
-            memoryMaximumSize="${javac.memoryMaximumSize}">
-       <classpath>
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-        </dirset>
--        <fileset dir="${ext}">
--          <include name="**/*.jar"/>
--        </fileset>
-+          <fileset dir="lib">
-+            <include name="*.jar" />
-+          </fileset>
-       </classpath>
-     </javac>
- 
-@@ -358,13 +348,6 @@
-     </copy>
-   </target>
- 
--  <target name="ext" depends="init, resin">
--    <copy todir="${install}/lib" preservelastmodified="true">
--      <fileset dir="${ext}">
--      </fileset>
--    </copy>
--  </target>
--
-   <target name="webapps" depends="init, doc, quercus">
-   </target>
- 
-@@ -503,9 +486,6 @@
-         <dirset dir="${modules}">
-           <include name="*/classes"/>
-         </dirset>
--        <fileset dir="${modules}/ext">
--          <include name="**/*.jar"/>
--        </fileset>
-       </classpath>
-     </java>
- 
-@@ -688,7 +668,6 @@
-         <include name="lib/jca-15.jar"/>
-         <include name="lib/jms-11.jar"/>
-         <include name="lib/jmx-12.jar"/>
--        <include name="lib/jsdk-24.jar"/>
-         <include name="lib/jstl-11.jar"/>
-         <include name="lib/jta-101.jar"/>
-         <include name="lib/portlet-10.jar"/>
-diff -Nru resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java
---- resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2007-05-16 12:41:19.000000000 +0200
-+++ resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java	2007-05-16 12:41:38.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.23/resin.conf b/www-servers/resin/files/3.0.23/resin.conf
deleted file mode 100644
index b549b414e5d3..000000000000
--- a/www-servers/resin/files/3.0.23/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 -dp resin)
-
-# START/STOP settings
-RESIN_START="start"
-RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.23/resin.init b/www-servers/resin/files/3.0.23/resin.init
deleted file mode 100644
index 3937c573ace5..000000000000
--- a/www-servers/resin/files/3.0.23/resin.init
+++ /dev/null
@@ -1,27 +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.23/resin.init,v 1.2 2007/05/24 14:18:43 nelchael Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-start()	{
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-	ebegin "Starting Resin"
-	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}"
-	eend $?
-}
-
-stop()	{
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-	ebegin "Stopping Resin"
-	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}"
-	eend $?
-}
diff --git a/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch b/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
deleted file mode 100644
index 921b4cda544a..000000000000
--- a/www-servers/resin/files/3.1.1/resin-3.1.1-gentoo.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-diff -Nru resin-3.1.1.vanilla/Makefile.in resin-3.1.1/Makefile.in
---- resin-3.1.1.vanilla/Makefile.in	2007-05-16 12:48:20.000000000 +0200
-+++ resin-3.1.1/Makefile.in	2007-05-16 12:48:38.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.1.1.vanilla/build.xml resin-3.1.1/build.xml
---- resin-3.1.1.vanilla/build.xml	2007-05-16 12:48:20.000000000 +0200
-+++ resin-3.1.1/build.xml	2007-05-16 12:48:58.000000000 +0200
-@@ -7,7 +7,6 @@
- 
-   <property name="modules" location="${basedir}/modules"/>
-   <property name="src" location="${basedir}/src"/>
--  <property name="ext" location="${basedir}/modules/ext"/>
-   <property name="doc" location="${basedir}/doc"/>
- 
-   <property name="build" location="${install}/build"/>
-@@ -17,14 +16,12 @@
- 
- 
-   <property name="javac.verbose" value="off"/>
--  <property name="javac.debug" value="on"/>
-+  <property name="javac.debug" value="off"/>
-   <property name="javac.optimize" value="off"/>
-   <property name="javac.deprecation" value="off"/>
-   <property name="javac.nowarn" value="on"/>
-   <property name="javac.memoryMaximumSize" value="256m"/>
- 
--  <property name="javac.source" value="1.5"/>
--
-   <property name="jar.compress" value="false"/>
-   <!--
-   <property name="jar.index" value="true"/>
-@@ -66,14 +63,13 @@
-   </target>
- 
-   <target name="compile" 
--          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext">
-+          depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf">
-   </target>
- 
-   <target name="ant" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ant"/>
-       <param name="module.jar" value="resin-ant.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -81,7 +77,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ejb"/>
-       <param name="module.jar" value="ejb-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -89,7 +84,6 @@
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jpa"/>
-       <param name="module.jar" value="jpa-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -107,11 +101,10 @@
-     </antcall>
-   </target>
- 
--  <target name="jaxrpc" depends="init,saaj,jsdk">
-+  <target name="jaxrpc" depends="init,saaj">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jaxrpc"/>
-       <param name="module.jar" value="jaxrpc-15.jar"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -157,7 +150,7 @@
-     </antcall>
-   </target>
- 
--  <target name="jstl" depends="init, jsdk">
-+  <target name="jstl" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="jstl"/>
-       <param name="module.jar" value="jstl-11.jar"/>
-@@ -203,7 +196,7 @@
-     </antcall>
-   </target>
- 
--  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jsdk, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
-+  <target name="resin-dev" depends="init, ejb, jca, jcr, jms, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util">
- 
-     <!-- filter to insert version -->
- 
-@@ -233,7 +226,6 @@
- 
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="resin"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
-   
-@@ -258,14 +250,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>
- 
-@@ -274,7 +264,6 @@
-   <target name="ecmascript" depends="init">
-     <antcall target="module" inheritRefs="true">
-       <param name="module.name" value="ecmascript"/>
--      <param name="javac.source" value="1.5"/>
-     </antcall>
-   </target>
- 
-@@ -306,16 +295,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>
- 
-@@ -385,13 +373,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>
- 
-@@ -527,9 +508,6 @@
-           <dirset dir="${modules}">
-             <include name="*/classes"/>
-           </dirset>
--          <fileset dir="${modules}/ext">
--            <include name="**/*.jar"/>
--          </fileset>
-         </classpath>
-       </java>
- 
-@@ -658,7 +636,6 @@
-         <include name="lib/j2ee-management-10.jar"/>
-         <include name="lib/jca-15.jar"/>
-         <include name="lib/jms-11.jar"/>
--        <include name="lib/jsdk-15.jar"/>
-         <include name="lib/jsf-12.jar"/>
-         <include name="lib/jstl-11.jar"/>
-         <include name="lib/jta-101.jar"/>
diff --git a/www-servers/resin/files/3.1.1/resin.conf b/www-servers/resin/files/3.1.1/resin.conf
deleted file mode 100644
index 0895ad30fbf4..000000000000
--- a/www-servers/resin/files/3.1.1/resin.conf
+++ /dev/null
@@ -1,12 +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
-
-# Verbose starting and stopping? (yes/no, defaults to no)
-#VERBOSE="yes"
diff --git a/www-servers/resin/files/3.1.1/resin.init b/www-servers/resin/files/3.1.1/resin.init
deleted file mode 100644
index 200b4844c13b..000000000000
--- a/www-servers/resin/files/3.1.1/resin.init
+++ /dev/null
@@ -1,43 +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.1.1/resin.init,v 1.3 2007/05/24 14:18:43 nelchael Exp $
-
-depend() {
-	need net
-	use dns logger mysql postgresql
-}
-
-runResin() {
-
-	JAVA_HOME=$(java-config -O)
-	[ -n "${GENTOO_VM}" ] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
-	export JAVA_HOME
-
-	local extraArgs=
-	if [ "${VERBOSE}" = "yes" ]; then
-		extraArgs="-verbose"
-	fi
-
-	local msg="${1}"
-	shift
-
-	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}"
-
-	ebegin "${msg}"
-	su - resin -c "${cmdline}"
-	eend $?
-
-}
-
-start()	{
-
-	runResin "Starting Resin" "start"
-
-}
-
-stop()	{
-
-	runResin "Stopping Resin" "stop"
-
-}
diff --git a/www-servers/resin/files/digest-resin-3.0.23-r1 b/www-servers/resin/files/digest-resin-3.0.23-r1
deleted file mode 100644
index bae42a23b37b..000000000000
--- a/www-servers/resin/files/digest-resin-3.0.23-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f18ed18598f4bfbba18ec5dc9427cb68 resin-3.0.23-src.tar.gz 5470406
-RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef resin-3.0.23-src.tar.gz 5470406
-SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d resin-3.0.23-src.tar.gz 5470406
diff --git a/www-servers/resin/files/digest-resin-3.1.1-r1 b/www-servers/resin/files/digest-resin-3.1.1-r1
deleted file mode 100644
index 1ed7597677ec..000000000000
--- a/www-servers/resin/files/digest-resin-3.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 860fbaf78013c0bc5bde742e45a13e21 resin-3.1.1-src.tar.gz 7351646
-RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce resin-3.1.1-src.tar.gz 7351646
-SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424 resin-3.1.1-src.tar.gz 7351646
diff --git a/www-servers/resin/resin-3.0.23-r1.ebuild b/www-servers/resin/resin-3.0.23-r1.ebuild
deleted file mode 100644
index 983f5bda5681..000000000000
--- a/www-servers/resin/resin-3.0.23-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.23-r1.ebuild,v 1.2 2007/05/26 12:50:41 nelchael Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic
-
-DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine."
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/aopalliance
-	>=dev-java/sun-javamail-1.4
-	>=dev-java/sun-jaf-1.1
-	>=dev-java/iso-relax-20050331"
-
-RDEPEND="=virtual/jdk-1.5*
-	${COMMON_DEP}"
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	dev-libs/openssl
-	${COMMON_DEP}"
-
-RESIN_HOME="/usr/lib/resin"
-
-# Rewrites build.xml in documentation
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
-
-	java-ant_bsfix_one "${S}/build.xml"
-
-}
-
-pkg_setup() {
-
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-
-}
-
-src_compile() {
-
-	append-flags -fPIC -DPIC
-
-	chmod 755 ${S}/configure
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-
-	einfo "Building libraries..."
-	# Broken with -jn where n > 1
-	emake -j1 || die "emake failed"
-
-	mkdir ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from sun-javamail
-	java-pkg_jar-from iso-relax
-	java-pkg_jar-from aopalliance-1
-	java-pkg_jar-from resin-servlet-api-2.4
-	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-
-	if use doc; then
-		einfo "Building docs..."
-		eant doc || die "ant doc failed"
-	fi
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	keepdir /var/log/resin
-	keepdir /var/log/resin
-	keepdir /var/run/resin
-
-	dosym /var/log/resin ${RESIN_HOME}/logs
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	dodoc README
-
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
-
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
-	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-
-	dosym /etc/resin/resin.conf /etc/resin/resin.xml
-
-	use source && {
-		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
-	}
-
-	einfo "Removing unneeded files..."
-	rm -f ${D}/${RESIN_HOME}/bin/*.in
-	rm -f ${D}/etc/resin/*.orig
-
-	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 755 ${D}${RESIN_HOME}/bin/*
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
-
-}
-
-pkg_postinst() {
-
-	elog
-	elog " User and group 'resin' have been added."
-	elog
-	elog " By default, Resin runs on port 8080.  You can change this"
-	elog " value by editing /etc/conf/resin.conf."
-	elog
-	elog " To test Resin while it's running, point your web browser to:"
-	elog " http://localhost:8080/"
-	elog
-	elog " Resin cannot run on port 80 as non-root (as of this time)."
-	elog " The best way to get Resin to respond on port 80 is via port"
-	elog " forwarding -- by installing a firewall on the machine running"
-	elog " Resin or the network gateway.  Simply redirect port 80 to"
-	elog " port 8080."
-	elog
-	elog " webapps directory was moved to /var/lib/resin/webapps "
-	elog
-
-}
diff --git a/www-servers/resin/resin-3.1.1-r1.ebuild b/www-servers/resin/resin-3.1.1-r1.ebuild
deleted file mode 100644
index 5004d5244b9a..000000000000
--- a/www-servers/resin/resin-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.1-r1.ebuild,v 1.2 2007/05/18 13:10:16 nelchael Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic
-
-DESCRIPTION="A fast Servlet 2.5 and JSP 2.0 engine."
-HOMEPAGE="http://www.caucho.com"
-SRC_URI="http://www.caucho.com/download/${P}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	>=dev-java/iso-relax-20050331
-	dev-java/aopalliance
-	>=dev-java/sun-javamail-1.4
-	>=dev-java/sun-jaf-1.1"
-
-RDEPEND="=virtual/jdk-1.5*
-	${COMMON_DEP}"
-DEPEND="${RDEPEND}
-	dev-java/ant-core
-	dev-libs/openssl
-	${COMMON_DEP}"
-
-RESIN_HOME="/usr/lib/resin"
-
-# Rewrites build.xml in documentation
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
-
-	java-ant_bsfix_one "${S}/build.xml"
-
-}
-
-pkg_setup() {
-
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-
-}
-
-src_compile() {
-
-	append-flags -fPIC -DPIC
-
-	chmod 755 ${S}/configure
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-
-	einfo "Building libraries..."
-	# Broken with -jn where n > 1
-	emake -j1 || die "emake failed"
-
-	mkdir ${S}/lib
-	cd ${S}/lib
-	java-pkg_jar-from sun-jaf
-	java-pkg_jar-from sun-javamail
-	java-pkg_jar-from iso-relax
-	java-pkg_jar-from aopalliance-1
-	java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
-	ln -s $(java-config --jdk-home)/lib/tools.jar
-	cd ${S}
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-
-	if use doc; then
-		einfo "Building docs..."
-		eant doc || die "ant doc failed"
-	fi
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	dodir /etc/
-	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	keepdir /var/log/resin
-	keepdir /var/log/resin
-	keepdir /var/run/resin
-
-	dosym /var/log/resin ${RESIN_HOME}/logs
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	dodoc README ${S}/conf/*.conf
-
-	newinitd ${FILESDIR}/${PV}/resin.init resin
-	newconfd ${FILESDIR}/${PV}/resin.conf resin
-
-	rm -f ${S}/lib/tools.jar
-	java-pkg_dojar ${S}/lib/*.jar
-	rm -fr ${D}/${RESIN_HOME}/lib
-	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
-
-	dodir /var/lib/resin/webapps
-	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
-	rm -rf ${D}/${RESIN_HOME}/webapps
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-
-	dosym /etc/resin/resin.conf /etc/resin/resin.xml
-
-	use admin && {
-		cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
-	}
-
-	use source && {
-		einfo "Zipping source..."
-		java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
-	}
-
-	einfo "Removing unneeded files..."
-	rm -fr ${D}/${RESIN_HOME}/bin
-	rm -f ${D}/etc/resin/*.orig
-
-	einfo "Fixing permissions..."
-	chown -R resin:resin ${D}${RESIN_HOME}
-	chown -R resin:resin ${D}/etc/resin
-	chown -R resin:resin ${D}/var/log/resin
-	chown -R resin:resin ${D}/var/lib/resin
-	chown -R resin:resin ${D}/var/run/resin
-
-	chmod 644 ${D}/etc/conf.d/resin
-	chmod 755 ${D}/etc/init.d/resin
-	chmod 750 ${D}/var/lib/resin
-	chmod 750 ${D}/var/run/resin
-	chmod 750 ${D}/etc/resin
-
-}
-
-pkg_postinst() {
-
-	elog
-	elog " User and group 'resin' have been added."
-	elog
-	elog " By default, Resin runs on port 8080.  You can change this"
-	elog " value by editing /etc/conf/resin.conf."
-	elog
-	elog " webapps directory was moved to /var/lib/resin/webapps"
-	elog
-	elog " Most options has been moved from /etc/conf.d/resin to"
-	elog " /etc/resin/resin.conf."
-	elog
-
-}