Drop old versions and ppc/ppc64 keywords due to reliance on sun.* classes not available in IBM JDK's.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

12 files changed, 12 insertions, 719 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 4c8053812429..fc5294ad7feb 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.98 2010/08/31 14:40:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.99 2010/10/14 20:44:04 caster Exp $
+
+  14 Oct 2010; Vlastimil Babka <caster@gentoo.org> -files/3.0.25/resin.conf,
+  -resin-3.0.25.ebuild, -files/3.0.25/resin.init, -resin-3.1.8.ebuild,
+  -files/3.1.8/resin.conf, -resin-3.1.9.ebuild, -files/3.1.8/resin.init,
+  resin-3.2.1-r3.ebuild, -files/3.1.9/resin.conf, -files/3.1.9/resin.init:
+  Drop old versions and ppc/ppc64 keywords due to reliance on sun.* classes
+  not available in IBM JDK's.
 
   31 Aug 2010; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.9.ebuild:
   Respect LDFLAGS when linking, see bug #334417.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 36747aee31e1..34368f91bf7c 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,12 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
-AUX 3.0.25/resin.init 951 RMD160 c6bb819c7bd225a4a5fb570782f15d4cba9bce7e SHA1 123e2b64bc29f1ebbb5cdc65ea98be10c09cf9f8 SHA256 86d043936058453da710957d9da81644eb67f8a4e656160d6624eb9cd974db17
-AUX 3.1.8/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 3.1.8/resin.init 885 RMD160 d8f2cae1744cd32b805aa45ca3680a685afa2d96 SHA1 47930eed1019c58877a588b56efd0d86c70e0a3f SHA256 6f8a84d8716c989fe319a23e8e99e819aaf7abc8d79acad2f67748d15340309a
-AUX 3.1.9/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 3.1.9/resin.init 885 RMD160 12576668fc5e41b6a635c9bf50a6791c43a5b93b SHA1 88981660e5f34f51c2bd6d777d721fccd8df8ead SHA256 d061817a68b51c5d51ef95c069ee94c9d8a50739cee97cf90abf15964df3e566
 AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5
 AUX 4.0.5/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
@@ -15,37 +6,17 @@ AUX 4.0.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db
 AUX 4.0.6/resin.init 882 RMD160 60fdac73535024f7397ab605298a18f5a1ae3914 SHA1 3ca5037c03e4b60f0ee1049ced6308b5ac8d805f SHA256 802be0c092908386c3f9af2568a4d0765a319ab10ff63a70190bcb3530a79adc
 AUX 4.0.9/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 4.0.9/resin.init 882 RMD160 5e6d2accb8ae6a6066bf3d6ed383121ccb45eee1 SHA1 49304a452daadfb740cbaf82574a30120466e9c1 SHA256 9a51f28c3b69752ea3698f55cae05b92efef409926f95fc4c6c6c43bacfee117
-DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
-DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc
-DIST resin-3.1.9-src.zip 13611096 RMD160 6a4c7eec574eeee73cce38ec17b0d997bada52f1 SHA1 28d91e510e5f9a1e861490dc81b484951ba13370 SHA256 f64825ac061122517cb4fb092122272d8af32ef7d63f7d158ba3a2d56a4a9b08
 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
 DIST resin-4.0.5-src.zip 16494405 RMD160 415116a3820288d5145a07fcd81571c5feb71424 SHA1 fddb58a6e31f413a452eb7d5003ceb2f928e7330 SHA256 e11e6d885e1ceec6eb0c4d524fb9904fbea5a7c894786f2f99a5bdc23e8c9aad
 DIST resin-4.0.6-src.zip 16635845 RMD160 c61c6f13cd48d572abda8fb103c404a4b439dbb8 SHA1 1cbd1fbf2ce5cdee47714f2d57c2e4831feee2d0 SHA256 3b653383c8417496e4ae22b9bda9e521842a2115d51a3743e9608d65402b2a91
 DIST resin-4.0.9-src.zip 16980516 RMD160 2fb2367585907ed0a3abefa790b1735418790c39 SHA1 50dc6919b0ff114e07eef68a3f2f90a8889f8fe1 SHA256 ff825948e07306a1f92ceec6a40f5eedb19a5c05142e35fed66992f5f47e0cb7
-DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
-DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6
-DIST resin-gentoo-patches-3.1.9.tar.bz2 3872 RMD160 0fea48e0b94c19e6dc6946f0d85be7808f7b4f3d SHA1 f828d981380430dedf6617c07d2d09ba583dc4c9 SHA256 c22dd2a7933385b76f239a89dff4eddd2895bc503b8821c5474a3b3a56260506
 DIST resin-gentoo-patches-3.2.1-r1.tar.bz2 4202 RMD160 012888c1b89943a78919cdbe046480c99eac3315 SHA1 a467cb8db54a1660ad0deedfed12d4786809b2ed SHA256 18c145d94d2f9a56ac582e6401639588d5597bcde0b69c5702ccf86ec154126a
 DIST resin-gentoo-patches-4.0.5.tar.bz2 2772 RMD160 0b8a9a39eacc35054e1ed0dc64194aeb92858205 SHA1 7b348cf2840b592909f0902711ddebe93ebd743d SHA256 308c6fb071346ed3d25e73d2a1b396733f65142bcdea1c431930dba4ffd5a990
 DIST resin-gentoo-patches-4.0.6.tar.bz2 2804 RMD160 5163ba0b608b99ab3bed8e3616e3c7b71f7a9f58 SHA1 42d145947b504a3d1c56e2c0e32d5cde264fd766 SHA256 3be0748f1aad2793cec4f7e5f5cebb5883f5ebcafc6aa3fb43369d12ef613523
 DIST resin-gentoo-patches-4.0.9.tar.bz2 2820 RMD160 2f115b563683db34a2aafb2c5e62980b0660022e SHA1 34e8c5837c910209af6ff564e9a938ff62fa0bf2 SHA256 606a3489d2eba330fec96df8c953623ee0ce3c03fbee0f52192a553cdc614af0
-EBUILD resin-3.0.25.ebuild 4003 RMD160 550504a07af28bce7c88033932936c01b7626441 SHA1 74a10f3ef41a7f27578fccdf4e27c1b11f1ca354 SHA256 da26baafc3edfd8d997ffc2376882d2e42b45f15a1d7537114b5cf0f3b01312e
-EBUILD resin-3.1.8.ebuild 4095 RMD160 da5c86497aeb0a6a2c1536f9e76b14b3c1b24c5b SHA1 21c978377ac7450df9ae582958673b2ccfa0d4e2 SHA256 ba0dd18156f76f9b0d3544ea1e13c28d0d124cd39d33d92a267fab6a20d358f8
-EBUILD resin-3.1.9.ebuild 4173 RMD160 a1b6da82a540405d6621a737fe52c8ab00ff4d88 SHA1 ca79557ad73a014966a8919426b73e45992072ec SHA256 ac073bbee06a975b181c1ca8440b63cf11af068a82bfbba11f20a245ea91a608
-EBUILD resin-3.2.1-r3.ebuild 4129 RMD160 cc6582992f132c2bd61166bfb121246939b82af5 SHA1 10e1208aa292b107a5fda862e038516d80a3c513 SHA256 fed376025500713d9f3c71cbfcf06d47bac881bc61e810087577314ee944207e
+EBUILD resin-3.2.1-r3.ebuild 4122 RMD160 22649cee4681b83514118bd19e4a9e4be1905e4d SHA1 0abfffa06198148d3517bd9208d7819b2c2706ab SHA256 a42d7cd807efdc79f36e71d6052d2f1f72d42bd046ebde5edfa3d5fcd5696aca
 EBUILD resin-4.0.5.ebuild 4164 RMD160 97bda6a104c780f4f692a969a52af3e054515ff0 SHA1 d8067c23549d6bb5166948fb45319410633d79a5 SHA256 6c2e9b8a738a7639a896d89d9a1c5b4f77e60ab568222ad0624d21ed1c083897
 EBUILD resin-4.0.6.ebuild 4819 RMD160 ba575be76825f7c35eb94e57c824a99a453db8d1 SHA1 eb030fc07ce8d93b0367e8efddbfda5526d89b7f SHA256 3b9d3fe101c66ec96accb9a92f3fc32ca01f6888780ee303594e65fe7b9c0e0a
 EBUILD resin-4.0.9.ebuild 4975 RMD160 8cb37adc8f083a094b68a81e8ab08d5e61e147b7 SHA1 4900e120ff8720f15ca4499b8726a5ff6f25ce23 SHA256 db01f1fe09cdae4c23fc7a01d0c0bc08c0288dfd1f446c7d86df23d63fa93513
-MISC ChangeLog 18402 RMD160 edefc982f7a297c9da4077ba481e3cad41a5a316 SHA1 d0cf1a796e0f645f1ac33a207eb2468dede821e7 SHA256 dbdab46898f3ee04477624d0a0f81b5dbfdebffe85f8c5be02df30462092d590
+MISC ChangeLog 18803 RMD160 41416e1d12d636dc259d26f479b38a36863faf91 SHA1 fa345d92b3aaa8f0ba58d77d1c7f7637c1d745ef SHA256 e2b191d8ce671e25aeca49b3b8434e6e6ac9ef18eccf7f35982e4565c2e33351
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMfRR9AAoJEBZyv1r2qA5GsucIAIpoBC6jVnzS/6oSwwnw5Quh
-l2Cvwe6rJGVt37bT0V8KXho3YsF80oyq9PqzcSMs7eWMsX8JCrFFrjEa31dqyBY1
-vWQQXyv1ZloextJY5lrq/q73H4UOoBR2coE6ijYgC/23Z7eg6XnbWjjbPNaDKRLC
-mR7JuagKv+/OQ2erMRNaIHSSJUaIbdckN3/3Fxs77o59KMN6VBgbRSmYed7skmaW
-jNVSxH/4XF85J55hf6cqgtz0Eq/fMF80UeHYU1xCGBuLajb2Mdzvgf6wClquBJrx
-prrm0GZS0Chg5QP8Nh52y0WTj84vy6ZRbTmxJhFf1PWD6tRjSXRg4CD1lBtjhEQ=
-=FoGg
------END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.25/resin.conf b/www-servers/resin/files/3.0.25/resin.conf
deleted file mode 100644
index eea8ef6cda50..000000000000
--- a/www-servers/resin/files/3.0.25/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=__RESIN_HOME__
-
-# 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.25/resin.init b/www-servers/resin/files/3.0.25/resin.init
deleted file mode 100644
index a3519b7648db..000000000000
--- a/www-servers/resin/files/3.0.25/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.25/resin.init,v 1.1 2007/12/14 09:51:51 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.8/resin.conf b/www-servers/resin/files/3.1.8/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/3.1.8/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 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.8/resin.init b/www-servers/resin/files/3.1.8/resin.init
deleted file mode 100644
index d03e2ebf7d48..000000000000
--- a/www-servers/resin/files/3.1.8/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.8/resin.init,v 1.1 2009/01/10 15:12:33 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 -conf /etc/resin/resin.conf -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" "stop"
-
-}
diff --git a/www-servers/resin/files/3.1.9/resin.conf b/www-servers/resin/files/3.1.9/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/3.1.9/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 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.9/resin.init b/www-servers/resin/files/3.1.9/resin.init
deleted file mode 100644
index 66b4faff802c..000000000000
--- a/www-servers/resin/files/3.1.9/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.9/resin.init,v 1.1 2009/12/12 13:16:58 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 -conf /etc/resin/resin.conf -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" "stop"
-
-}
diff --git a/www-servers/resin/resin-3.0.25.ebuild b/www-servers/resin/resin-3.0.25.ebuild
deleted file mode 100644
index 82b153bfdc18..000000000000
--- a/www-servers/resin/resin-3.0.25.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.25.ebuild,v 1.6 2010/06/30 20:55:42 caster Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib
-
-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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="ppc ppc64"
-
-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}
-	app-arch/unzip
-	dev-java/ant-core
-	dev-libs/openssl
-	${COMMON_DEP}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-# Rewrites build.xml in documentation
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-
-	unpack ${A}
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	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
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME}," "${D}/etc/conf.d/resin"
-
-	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/resin/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.8.ebuild b/www-servers/resin/resin-3.1.8.ebuild
deleted file mode 100644
index 2ae8a6ac4338..000000000000
--- a/www-servers/resin/resin-3.1.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.8.ebuild,v 1.2 2009/01/13 21:12:03 nelchael Exp $
-
-EAPI="1"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
-
-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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/iso-relax
-	dev-java/aopalliance
-	=dev-java/sun-j2ee-deployment-bin-1.1*
-	dev-java/jax-ws-api:2
-	dev-java/jaxb:2
-	java-virtuals/javamail
-	java-virtuals/jaf"
-
-RDEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	dev-java/ant-core
-	dev-libs/openssl
-	${COMMON_DEP}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-# Rewrites build.xml in documentation
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	eautoreconf
-
-}
-
-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 --virtual jaf
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from iso-relax
-	java-pkg_jar-from aopalliance-1
-	java-pkg_jar-from sun-j2ee-deployment-bin-1.1
-	java-pkg_jar-from jax-ws-api-2
-	java-pkg_jar-from jaxb-2
-	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" || die "mv of conf failed"
-	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
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/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
-	dosym /var/log/resin /usr/share/resin/log
-
-	dodir /var/lib/resin/webapps
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
-		die "mv of webapps failed"
-	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/resin/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
-
-}
diff --git a/www-servers/resin/resin-3.1.9.ebuild b/www-servers/resin/resin-3.1.9.ebuild
deleted file mode 100644
index 12f41619bd83..000000000000
--- a/www-servers/resin/resin-3.1.9.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.9.ebuild,v 1.2 2010/04/06 20:11:29 nelchael Exp $
-
-EAPI="1"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
-
-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.zip
-	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/iso-relax
-	dev-java/aopalliance
-	=dev-java/sun-j2ee-deployment-bin-1.1*
-	dev-java/jax-ws-api:2
-	dev-java/jaxb:2
-	java-virtuals/javamail
-	java-virtuals/jaf"
-
-RDEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	dev-java/ant-core
-	dev-libs/openssl
-	${COMMON_DEP}"
-
-RESIN_HOME="/usr/$(get_libdir)/resin"
-
-# Rewrites build.xml in documentation
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	eautoreconf
-
-}
-
-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 --virtual jaf
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from iso-relax
-	java-pkg_jar-from aopalliance-1
-	java-pkg_jar-from sun-j2ee-deployment-bin-1.1
-	java-pkg_jar-from jax-ws-api-2
-	java-pkg_jar-from jaxb-2
-	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" || die "mv of conf failed"
-	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
-
-	sed -i -e "s,__RESIN_HOME__,${RESIN_HOME},g" "${D}/etc/init.d/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
-	dosym /var/log/resin /usr/share/resin/log
-
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	mv "${D}"/${RESIN_HOME}/webapps/* "${D}/var/lib/resin/webapps" || \
-		die "mv of webapps failed"
-	rm -rf "${D}/${RESIN_HOME}/webapps"
-	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
-	dosym /var/lib/resin/hosts ${RESIN_HOME}/hosts
-
-	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/resin/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
-
-}
diff --git a/www-servers/resin/resin-3.2.1-r3.ebuild b/www-servers/resin/resin-3.2.1-r3.ebuild
index 3a4d11e3ac33..bc92450fa4fd 100644
--- a/www-servers/resin/resin-3.2.1-r3.ebuild
+++ b/www-servers/resin/resin-3.2.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.2.1-r3.ebuild,v 1.4 2010/04/06 20:11:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.2.1-r3.ebuild,v 1.5 2010/10/14 20:44:04 caster Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin"
 
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 x86"
 
 	## java-virtuals/jaf"
 COMMON_DEP="~dev-java/resin-servlet-api-${PV}