summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2007-09-08 18:45:05 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2007-09-08 18:45:05 +0000
commitec0051e956c73aafd9cbc8d9337bb6c140a753ca (patch)
treed5126e5096d7a4a6436f72af5ffc6836864dc390 /dev-java
parentStable on amd64 wrt bug #191615 (diff)
downloadgentoo-2-ec0051e956c73aafd9cbc8d9337bb6c140a753ca.tar.gz
gentoo-2-ec0051e956c73aafd9cbc8d9337bb6c140a753ca.tar.bz2
gentoo-2-ec0051e956c73aafd9cbc8d9337bb6c140a753ca.zip
Remove unneeded versions.
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/resin-servlet-api/ChangeLog7
-rw-r--r--dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.233
-rw-r--r--dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.13
-rw-r--r--dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch252
-rw-r--r--dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch181
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild48
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild48
7 files changed, 6 insertions, 536 deletions
diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index bd53b38dca6b..8905f9f7ed16 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/resin-servlet-api
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.3 2007/08/17 08:02:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.4 2007/09/08 18:45:05 nelchael Exp $
+
+ 08 Sep 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+ -files/resin-3.0.23-gentoo.patch, -files/resin-3.1.1-gentoo.patch,
+ -resin-servlet-api-3.0.23.ebuild, -resin-servlet-api-3.1.1.ebuild:
+ Remove unneeded versions.
*resin-servlet-api-3.1.2 (17 Aug 2007)
*resin-servlet-api-3.0.24 (17 Aug 2007)
diff --git a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23
deleted file mode 100644
index bae42a23b37b..000000000000
--- a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.0.23
+++ /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/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1 b/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1
deleted file mode 100644
index 1ed7597677ec..000000000000
--- a/dev-java/resin-servlet-api/files/digest-resin-servlet-api-3.1.1
+++ /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/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch
deleted file mode 100644
index bd9ad2201a6f..000000000000
--- a/dev-java/resin-servlet-api/files/resin-3.0.23-gentoo.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-diff -Nru resin-3.0.23.vanilla/Makefile.in resin-3.0.23/Makefile.in
---- resin-3.0.23.vanilla/Makefile.in 2006-11-19 12:59:49.000000000 +0100
-+++ resin-3.0.23/Makefile.in 2006-11-19 13:00:27.000000000 +0100
-@@ -1,6 +1,6 @@
- PREFIX=@prefix@
-
--all :
-+all :
- (cd modules/c/src; $(MAKE))
-
- clean :
-@@ -8,20 +8,20 @@
-
- install :
- (cd modules/c/src; $(MAKE) install)
-- if test $(PREFIX) != `pwd`; then \
-- mkdir -p $(PREFIX)/lib; \
-- mkdir -p $(PREFIX)/libexec; \
-- cp -r libexec/* $(PREFIX)/libexec; \
-- cp lib/*.jar $(PREFIX)/lib; \
-- mkdir -p $(PREFIX)/bin; \
-- cp bin/* $(PREFIX)/bin; \
-- mkdir -p $(PREFIX)/webapps; \
-- cp -r webapps/* $(PREFIX)/webapps; \
-- mkdir -p $(PREFIX)/conf; \
-- cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
-- cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
-- if test ! -r $(PREFIX)/conf/resin.conf; then \
-- cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
-- cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
-+ if test $(DESTDIR)$(PREFIX) != `pwd`; then \
-+ mkdir -p $(DESTDIR)$(PREFIX)/lib; \
-+ mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
-+ cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
-+ cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
-+ mkdir -p $(DESTDIR)$(PREFIX)/bin; \
-+ cp bin/* $(DESTDIR)$(PREFIX)/bin; \
-+ mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
-+ cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
-+ mkdir -p $(DESTDIR)$(PREFIX)/conf; \
-+ cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
-+ cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
-+ if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
-+ cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
-+ cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
- fi; \
- fi
-diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl resin-3.0.23/bin/wrapper.pl
---- resin-3.0.23.vanilla/bin/wrapper.pl 2006-11-19 12:59:41.000000000 +0100
-+++ resin-3.0.23/bin/wrapper.pl 2006-11-19 13:00:27.000000000 +0100
-@@ -447,9 +447,6 @@
- $pid=`cat $pid_file`;
- chop($pid);
-
-- if ($cmd eq "stop") {
-- print("Stopping ${name}\n");
-- }
- $signal = 15;
- $count = 10;
- while (kill($signal, $pid) && $count-- > 0) {
-@@ -565,8 +562,6 @@
- $SIG{CHLD} = 'IGNORE';
- }
-
-- print "\n\nResin wrapper.pl closing.\n\n";
--
- close(S);
- close(C); # closing the accepted socket should start orderly shutdown
- # unlink needs to happen relatively soon so restart's pid won't
-@@ -743,8 +738,6 @@
- $date = `date`;
- chop($date);
-
-- print "Resin $name $cmd at $date\n";
--
- # create a keepalive socket
- # when the wrapper dies, the httpd class will detect that and
- # close gracefully
-diff -Nru resin-3.0.23.vanilla/bin/wrapper.pl.in resin-3.0.23/bin/wrapper.pl.in
---- resin-3.0.23.vanilla/bin/wrapper.pl.in 2006-11-19 12:59:41.000000000 +0100
-+++ resin-3.0.23/bin/wrapper.pl.in 2006-11-19 13:00:27.000000000 +0100
-@@ -447,9 +447,6 @@
- $pid=`cat $pid_file`;
- chop($pid);
-
-- if ($cmd eq "stop") {
-- print("Stopping ${name}\n");
-- }
- $signal = 15;
- $count = 10;
- while (kill($signal, $pid) && $count-- > 0) {
-@@ -565,8 +562,6 @@
- $SIG{CHLD} = 'IGNORE';
- }
-
-- print "\n\nResin wrapper.pl closing.\n\n";
--
- close(S);
- close(C); # closing the accepted socket should start orderly shutdown
- # unlink needs to happen relatively soon so restart's pid won't
-@@ -743,8 +738,6 @@
- $date = `date`;
- chop($date);
-
-- print "Resin $name $cmd at $date\n";
--
- # create a keepalive socket
- # when the wrapper dies, the httpd class will detect that and
- # close gracefully
-diff -Nru resin-3.0.23.vanilla/build.xml resin-3.0.23/build.xml
---- resin-3.0.23.vanilla/build.xml 2006-11-19 12:59:49.000000000 +0100
-+++ resin-3.0.23/build.xml 2006-11-19 13:00:27.000000000 +0100
-@@ -7,7 +7,6 @@
-
- <property name="modules" location="${basedir}/modules"/>
- <property name="src" location="${basedir}/src"/>
-- <property name="ext" location="${basedir}/modules/ext"/>
- <property name="doc" location="${basedir}/doc"/>
-
- <property name="build" location="${install}/build"/>
-@@ -17,14 +16,12 @@
-
-
- <property name="javac.verbose" value="off"/>
-- <property name="javac.debug" value="on"/>
-+ <property name="javac.debug" value="off"/>
- <property name="javac.optimize" value="off"/>
- <property name="javac.deprecation" value="off"/>
- <property name="javac.nowarn" value="on"/>
- <property name="javac.memoryMaximumSize" value="256m"/>
-
-- <property name="javac.source" value="1.4"/>
--
- <property name="jar.compress" value="false"/>
- <property name="jar.index" value="true"/>
- <property name="jar.update" value="false"/>
-@@ -66,7 +63,7 @@
- </target>
-
- <target name="compile"
-- depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
-+ depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
- </target>
-
- <target name="ejb" depends="init, jta">
-@@ -80,7 +77,6 @@
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="ejb30"/>
- <param name="module.jar" value="ejb-30.jar"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
-@@ -102,7 +98,6 @@
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="jaxrpc"/>
- <param name="module.jar" value="jaxrpc.jar"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
-@@ -116,7 +111,6 @@
- <target name="resin-jdk15" depends="init">
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="resin-jdk15"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
-@@ -217,7 +211,6 @@
-
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="resin"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
-@@ -242,14 +235,12 @@
- <target name="webutil" depends="init, resin">
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="webutil"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
- <target name="quercus-dev" depends="init">
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="quercus"/>
-- <param name="javac.source" value="1.5"/>
- </antcall>
- </target>
-
-@@ -282,16 +273,15 @@
- verbose="${javac.verbose}"
- debug="${javac.debug}" optimize="${javac.optimize}"
- deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
-- source="${javac.source}"
- excludes="**/.svn/**"
- memoryMaximumSize="${javac.memoryMaximumSize}">
- <classpath>
- <dirset dir="${modules}">
- <include name="*/classes"/>
- </dirset>
-- <fileset dir="${ext}">
-- <include name="**/*.jar"/>
-- </fileset>
-+ <fileset dir="lib">
-+ <include name="*.jar" />
-+ </fileset>
- </classpath>
- </javac>
-
-@@ -358,13 +348,6 @@
- </copy>
- </target>
-
-- <target name="ext" depends="init, resin">
-- <copy todir="${install}/lib" preservelastmodified="true">
-- <fileset dir="${ext}">
-- </fileset>
-- </copy>
-- </target>
--
- <target name="webapps" depends="init, doc, quercus">
- </target>
-
-@@ -503,9 +486,6 @@
- <dirset dir="${modules}">
- <include name="*/classes"/>
- </dirset>
-- <fileset dir="${modules}/ext">
-- <include name="**/*.jar"/>
-- </fileset>
- </classpath>
- </java>
-
-diff -Nru resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java
---- resin-3.0.23.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java 2006-11-19 12:59:48.000000000 +0100
-+++ resin-3.0.23/modules/resin/src/com/caucho/server/resin/Resin.java 2006-11-19 13:00:27.000000000 +0100
-@@ -700,10 +700,10 @@
- throw new ConfigException(L().l("The following system property must be set:\n -Djava.util.logging.manager=com.caucho.log.LogManagerImpl\nThe JDK 1.4 Logging manager must be set to Resin's log manager."));
- }
-
-- validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.4"});
-+ validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.5"});
- validatePackage("javax.servlet.jsp.jstl.core.Config", new String[] {"1.1"});
- validatePackage("javax.management.MBeanServer", new String[] { "1.2", "1.5" });
-- validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.4"});
-+ validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.5"});
- }
-
- /**
diff --git a/dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch b/dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch
deleted file mode 100644
index 02de640e6c19..000000000000
--- a/dev-java/resin-servlet-api/files/resin-3.1.1-gentoo.patch
+++ /dev/null
@@ -1,181 +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-15 18:11:40.000000000 +0200
-+++ resin-3.1.1/Makefile.in 2007-05-15 18:17:07.000000000 +0200
-@@ -8,20 +8,20 @@
-
- install :
- (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-15 18:11:40.000000000 +0200
-+++ resin-3.1.1/build.xml 2007-05-15 18:18:04.000000000 +0200
-@@ -7,7 +7,6 @@
-
- <property name="modules" location="${basedir}/modules"/>
- <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, jsdk, 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>
-
-@@ -111,7 +105,6 @@
- <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>
-
-@@ -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>
-
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild
deleted file mode 100644
index a8ab0a14b9a9..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.0.23.ebuild,v 1.1 2007/05/16 10:29:07 nelchael Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-
- unpack ${A}
-
- mkdir "${S}/lib"
-
- cd "${S}"
- epatch "${FILESDIR}/resin-${PV}-gentoo.patch"
-
-}
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_install() {
-
- java-pkg_newjar "lib/jsdk-24.jar"
- use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
-}
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild
deleted file mode 100644
index 5365d3ee055b..000000000000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-3.1.1.ebuild,v 1.2 2007/05/24 13:21:36 flameeyes Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-
- unpack ${A}
-
- mkdir "${S}/lib"
-
- cd "${S}"
- epatch "${FILESDIR}/resin-${PV}-gentoo.patch"
-
-}
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_install() {
-
- java-pkg_newjar "lib/jsdk-15.jar"
- use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
-}