added missing patchset, fixes #89602. also corrected license for resin > 3.0, fixes #89595

(Portage version: 2.0.51.19)

8 files changed, 95 insertions, 18 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index a15468f79ec4..dfd75ae22650 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.6 2005/04/18 17:23:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.7 2005/04/19 14:03:56 luckyduck Exp $
+
+  19 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/3.0.12/21resin,
+  +files/3.0.12/resin.conf, +files/3.0.12/resin.init,
+  +files/3.0.12/wrapper.pl.diff, resin-3.0.12.ebuild, resin-3.0.8-r1.ebuild:
+  added missing patchset, fixes #89602. also corrected license for resin > 3.0,
+  fixes #89595
 
 *resin-3.0.12 (18 Apr 2005)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index ef2ff302dc37..c2da2ef3e295 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 622b40a2e8d1b9564b19b5103921f6ba resin-3.0.12.ebuild 3352
-MD5 f5c0130fefd389d46d5d003a923622ec resin-3.0.8-r1.ebuild 3371
-MD5 f6a4d871ac3510c3db60f18fd89fbe38 ChangeLog 2978
+MD5 b50f1d6115b880ae51b2967bb91e2e83 resin-3.0.12.ebuild 3351
+MD5 5b193c6e0690769a1e3066a0947cd162 resin-3.0.8-r1.ebuild 3370
+MD5 42a7dc0436a7717788c5992ab5fe5d78 ChangeLog 3280
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 1774ee83435bc1d54cb0905b01dbba12 resin-2.1.14.ebuild 3035
 MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
@@ -21,10 +18,3 @@ MD5 033efd80975c8c86d388f3389eb352c8 files/3.0.12/resin.conf 1126
 MD5 4aee09a4e9a32217579c5cf7e73f2c71 files/3.0.12/resin.init 545
 MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.12/21resin 22
 MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.12/wrapper.pl.diff 526
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCY+0806ebR+OMO78RAnz8AKCYgKOekNKVPMY3O+PBcNKFmNevlACdGvbp
-GZcJB4XoBdjlV/bS4TUP4Xs=
-=PbxB
------END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.12/21resin b/www-servers/resin/files/3.0.12/21resin
new file mode 100644
index 000000000000..8ebed2d0a4f8
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/21resin
@@ -0,0 +1 @@
+RESIN_HOME=/opt/resin
diff --git a/www-servers/resin/files/3.0.12/resin.conf b/www-servers/resin/files/3.0.12/resin.conf
new file mode 100644
index 000000000000..9dfcf0269d58
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/resin.conf
@@ -0,0 +1,36 @@
+# $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
new file mode 100644
index 000000000000..7c73128a5857
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/resin.init
@@ -0,0 +1,23 @@
+#!/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
new file mode 100644
index 000000000000..0bd8702e6a0f
--- /dev/null
+++ b/www-servers/resin/files/3.0.12/wrapper.pl.diff
@@ -0,0 +1,21 @@
+--- 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/resin-3.0.12.ebuild b/www-servers/resin/resin-3.0.12.ebuild
index bd3508cb73a0..525cbecf3b6b 100644
--- a/www-servers/resin/resin-3.0.12.ebuild
+++ b/www-servers/resin/resin-3.0.12.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/04/18 17:23:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.12.ebuild,v 1.2 2005/04/19 14:03:56 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine with EJB and distributed sess
 SRC_URI="http://www.caucho.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.caucho.com"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
-LICENSE="CAUCHO"
+LICENSE="GPL-2"
 SLOT="0"
 DEPEND="!net-www/resin-ee"
 RDEPEND=">=virtual/jdk-1.3
diff --git a/www-servers/resin/resin-3.0.8-r1.ebuild b/www-servers/resin/resin-3.0.8-r1.ebuild
index 00faa29a2b27..baa9447c227b 100644
--- a/www-servers/resin/resin-3.0.8-r1.ebuild
+++ b/www-servers/resin/resin-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8-r1.ebuild,v 1.4 2005/04/18 17:23:52 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.8-r1.ebuild,v 1.5 2005/04/19 14:03:56 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine with EJB and distributed sess
 SRC_URI="http://www.caucho.com/download/${P}.tar.gz"
 HOMEPAGE="http://www.caucho.com"
 KEYWORDS="x86 ~ppc ~sparc amd64 ppc64"
-LICENSE="CAUCHO"
+LICENSE="GPL-2"
 SLOT="0"
 DEPEND="!net-www/resin-ee"
 RDEPEND=">=virtual/jdk-1.3