www-servers/resin: drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7902

6 files changed, 3 insertions, 114 deletions

diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/4.0.46/resin.init
deleted file mode 100644
index 2ce1af068f93..000000000000
--- a/www-servers/resin/files/4.0.46/resin.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 -conf /etc/resin/resin.xml -server \"${SERVER_ID}\" -resin-home __RESIN_HOME__ -root-directory __RESIN_HOME__ ${extraArgs} ${@}"
-
-	ebegin "${msg}"
-	su - resin -c "${cmdline}"
-	eend $?
-}
-
-start()	{
-	runResin "Starting Resin" "start"
-}
-
-stop()	{
-	runResin "Stopping Resin" "shutdown"
-}
diff --git a/www-servers/resin/files/4.0.48/build.xml.patch b/www-servers/resin/files/4.0.48/build.xml.patch
deleted file mode 100644
index dc3a413fc0bf..000000000000
--- a/www-servers/resin/files/4.0.48/build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
-+++ build.xml	2015-08-12 23:14:47.909000000 +0000
-@@ -12,7 +12,7 @@
-   <property name="eclipse.home" value="${user.home}/eclipse"/>
- 
-   <target name="compile"
--          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
-+          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
-   </target>
- 
-   <!--
-@@ -27,10 +27,6 @@
-     </antcall>
-   </target>
-   -->
--  <target name="resin-eclipselink" depends="eclipselink">
--    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
--          todir="${resin.lib}"/>
--  </target>
- 
-   <target name="richfaces" depends="init">
-     <antcall target="artifact" inheritRefs="true">
-@@ -92,13 +88,6 @@
-     </antcall>
-   </target>
- 
--  <target name="eclipselink" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="eclipselink"/>
--      <param name="module.jar" value="resin-eclipselink.jar"/>
--    </antcall>
--  </target>
--
-   <!-- gae APIs for quercus testing -->
-   <target name="gae" depends="init">
-     <antcall target="module" inheritRefs="true">
-@@ -437,13 +426,6 @@
-     </antcall>
-   </target>
- 
--  <target name="jasper" depends="init">
--    <antcall target="module" inheritRefs="true">
--      <param name="module.name" value="jasper"/>
--      <param name="module.jar" value="resin-jasper.jar"/>
--    </antcall>
--  </target>
--
-   <target name="version">
-     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
-           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
-@@ -903,7 +885,7 @@
-     <delete dir="${dist}/${dist.name}"/>
-   </target>
- 
--  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
-+  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
- 
-   <target name="configure" depends="init">
-      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/4.0.48/resin.conf b/www-servers/resin/files/4.0.48/resin.conf
deleted file mode 100644
index a48840b5e9f2..000000000000
--- a/www-servers/resin/files/4.0.48/resin.conf
+++ /dev/null
@@ -1,16 +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 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"
-
-# Select which server will be started, this is an advanced feature, please refer
-# to Resin documentation.
-SERVER_ID=""
diff --git a/www-servers/resin/files/4.0.46/build.xml.patch b/www-servers/resin/files/resin-4.0.48-build.xml.patch
index dc3a413fc0bf..5ef1abc63c56 100644
--- a/www-servers/resin/files/4.0.46/build.xml.patch
+++ b/www-servers/resin/files/resin-4.0.48-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
-+++ build.xml	2015-08-12 23:14:47.909000000 +0000
+--- a/build.xml
++++ b/build.xml
 @@ -12,7 +12,7 @@
    <property name="eclipse.home" value="${user.home}/eclipse"/>
  
diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/resin-4.0.48.conf
index a48840b5e9f2..a48840b5e9f2 100644
--- a/www-servers/resin/files/4.0.46/resin.conf
+++ b/www-servers/resin/files/resin-4.0.48.conf
diff --git a/www-servers/resin/files/4.0.48/resin.init b/www-servers/resin/files/resin-4.0.48.init
index 2ce1af068f93..a0e5cfb49b67 100644
--- a/www-servers/resin/files/4.0.48/resin.init
+++ b/www-servers/resin/files/resin-4.0.48.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {