Fix bug #149447 and bug #149451.

Package-Manager: portage-2.1.2_pre1-r4

5 files changed, 33 insertions, 27 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 62835866dbcf..9dd40352866e 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.18 2006/09/24 19:28:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.19 2006/09/28 22:35:28 nelchael Exp $
+
+  28 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  files/3.0.21/resin.conf, files/3.0.21/resin.init, resin-3.0.21.ebuild:
+  Fix bug #149447 and bug #149451.
 
   24 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.0.21.ebuild:
   Update DEPEND to use new sun-jaf and sun-javamail.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 85e4090d50a7..b1d05cc0784e 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -37,14 +37,14 @@ AUX 3.0.21/resin-3.0.21-gentoo.patch 8968 RMD160 f206fdaac58ca232a93916b51e79364
 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 761 RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 SHA1 ba5ead5fcc379c68dd6183c462e47eefc699ba8e SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5
-MD5 d47030173a0582e27b6f4251c3d3e572 files/3.0.21/resin.conf 761
-RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 files/3.0.21/resin.conf 761
-SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5 files/3.0.21/resin.conf 761
-AUX 3.0.21/resin.init 695 RMD160 fdd999a49a52992b4ffef6785a5d260978436196 SHA1 54ff84d1f690d24f7b18d7112db51c495be0fdab SHA256 aecce5980348de3f3f0a9f61634c402314aeaf9f1b2f4ae7d5d14e8bdfcb4015
-MD5 3bd493fba191db988a27a9c87d84cf86 files/3.0.21/resin.init 695
-RMD160 fdd999a49a52992b4ffef6785a5d260978436196 files/3.0.21/resin.init 695
-SHA256 aecce5980348de3f3f0a9f61634c402314aeaf9f1b2f4ae7d5d14e8bdfcb4015 files/3.0.21/resin.init 695
+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.8/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f SHA1 cc11fbfa74f3008dff06e790bab78284ab52328b SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123
 MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.8/21resin 22
 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f files/3.0.8/21resin 22
@@ -73,18 +73,18 @@ EBUILD resin-2.1.17.ebuild 2986 RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57
 MD5 1aaea3df4d0bd80e1eb408d083863ca3 resin-2.1.17.ebuild 2986
 RMD160 69d17ce0b711bc7a3c8b6de114e21bee081bcd57 resin-2.1.17.ebuild 2986
 SHA256 771fac2bccec6571bf094f6fa6f47ea5948ebd4a1652d719cd67b24758d39811 resin-2.1.17.ebuild 2986
-EBUILD resin-3.0.21.ebuild 3640 RMD160 b97ccf605c4fbfd9eaffc6d6e79b728b048f13fe SHA1 603ddead910026c6e77af77cdc5090a44f164382 SHA256 40ed964fcc84d9c2068b104d319d28132c3bc7abeaf5758e1fd0da71ecf5809b
-MD5 1e391aae93907ed7be994f0f74a5aa0b resin-3.0.21.ebuild 3640
-RMD160 b97ccf605c4fbfd9eaffc6d6e79b728b048f13fe resin-3.0.21.ebuild 3640
-SHA256 40ed964fcc84d9c2068b104d319d28132c3bc7abeaf5758e1fd0da71ecf5809b resin-3.0.21.ebuild 3640
+EBUILD resin-3.0.21.ebuild 3640 RMD160 9716c653ccc1af45fd348b2d1a7ff5e5a2f1a13f SHA1 972e1233a0b03d50e238c6ed6c3dc695c4f039b0 SHA256 f52b580f0e6ef5ffe60bd9dbc7d0feef015c15603f7a52c3cf39da06246e9ef8
+MD5 9a636e7ed32d670392d695f528a0d4bf resin-3.0.21.ebuild 3640
+RMD160 9716c653ccc1af45fd348b2d1a7ff5e5a2f1a13f resin-3.0.21.ebuild 3640
+SHA256 f52b580f0e6ef5ffe60bd9dbc7d0feef015c15603f7a52c3cf39da06246e9ef8 resin-3.0.21.ebuild 3640
 EBUILD resin-3.0.8-r1.ebuild 3421 RMD160 a058566d36d377c03b1c618a443c035226c2231a SHA1 2ce387170258e2026bcddd76c7d05eec6e5b05d4 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de
 MD5 0648422e68fa0423df7cd06655baed13 resin-3.0.8-r1.ebuild 3421
 RMD160 a058566d36d377c03b1c618a443c035226c2231a resin-3.0.8-r1.ebuild 3421
 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de resin-3.0.8-r1.ebuild 3421
-MISC ChangeLog 5498 RMD160 9a277f6640af17548fe14011c7a75b81bdb6f5c2 SHA1 a04f8af353543ba2fa44fb5978b8b1ee3b51f0db SHA256 375ef5ce664eab867db2a60ab920fee54a298eff1d8b7c5121428522e310b6f8
-MD5 4aa14320267ad80236f3c2255bab4fa2 ChangeLog 5498
-RMD160 9a277f6640af17548fe14011c7a75b81bdb6f5c2 ChangeLog 5498
-SHA256 375ef5ce664eab867db2a60ab920fee54a298eff1d8b7c5121428522e310b6f8 ChangeLog 5498
+MISC ChangeLog 5660 RMD160 9569f3141b019f28c80c7f814441de343adf34a3 SHA1 a7036e08f1d4146879447212256466bffb5c6283 SHA256 dfc455c4dc638e0c3063a8d033efd1ccab957445ee4baf4a75d3b6ecc2eba940
+MD5 0965d06a8e33db2caaf77f46228eccd6 ChangeLog 5660
+RMD160 9569f3141b019f28c80c7f814441de343adf34a3 ChangeLog 5660
+SHA256 dfc455c4dc638e0c3063a8d033efd1ccab957445ee4baf4a75d3b6ecc2eba940 ChangeLog 5660
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -104,7 +104,7 @@ SHA256 a5d9f4b822a2524029ae0cf42f3124949513da515f7c8e9281269bfb8a02b3b4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFFtxWgo/w9rxVVVERAn2cAJ4lZiWpAIw9JLepBBt9kdUk2R+cAgCeK6QG
-BEHJZvIEKvCCG2U6l9Kqrs8=
-=PR/Z
+iD8DBQFFHE4+go/w9rxVVVERAiOIAJ0fu695NGLWhCaUkAO0iMefnWFHnACgs7mC
+jNJdImdSkSqcI7/6VYpZJ50=
+=KRtP
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.21/resin.conf b/www-servers/resin/files/3.0.21/resin.conf
index 99210edc27b9..7f01b42fe1a2 100644
--- a/www-servers/resin/files/3.0.21/resin.conf
+++ b/www-servers/resin/files/3.0.21/resin.conf
@@ -2,11 +2,11 @@
 # 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`
+# 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
diff --git a/www-servers/resin/files/3.0.21/resin.init b/www-servers/resin/files/3.0.21/resin.init
index 2d0c5b3aff13..e5900e1409a0 100644
--- a/www-servers/resin/files/3.0.21/resin.init
+++ b/www-servers/resin/files/3.0.21/resin.init
@@ -1,7 +1,7 @@
 #!/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.1 2006/08/14 21:19:05 nelchael Exp $
+# $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
@@ -9,12 +9,14 @@ depend() {
 }
 
 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/resin-3.0.21.ebuild b/www-servers/resin/resin-3.0.21.ebuild
index 16f2725f5a28..eb2bfb8902d6 100644
--- a/www-servers/resin/resin-3.0.21.ebuild
+++ b/www-servers/resin/resin-3.0.21.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2006/09/24 19:28:08 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.21.ebuild,v 1.4 2006/09/28 22:35:28 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2 eutils flag-o-matic
 
@@ -13,7 +13,7 @@ IUSE="doc source"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=virtual/jdk-1.5
+RDEPEND="=virtual/jdk-1.5*
 	>=dev-java/iso-relax-20050331"
 DEPEND="${RDEPEND}
 	dev-java/aopalliance