Remove old versions.

Package-Manager: portage-2.1.9.43/cvs/Linux x86_64

14 files changed, 17 insertions, 951 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 5a68ed2be38b..ddde91d28613 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.105 2011/03/07 09:31:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.106 2011/03/15 19:37:20 nelchael Exp $
+
+  15 Mar 2011; Krzysztof Pawlik <nelchael@gentoo.org> -files/3.2.1/resin.conf,
+  -files/3.2.1/resin.init, -files/4.0.5/resin.conf, -files/4.0.5/resin.init,
+  -files/4.0.6/resin.conf, -files/4.0.6/resin.init, -files/4.0.9/resin.conf,
+  -resin-3.2.1-r3.ebuild, -resin-4.0.5.ebuild, -resin-4.0.6.ebuild,
+  -resin-4.0.9.ebuild, -files/4.0.9/resin.init:
+  Remove old versions.
 
   07 Mar 2011; Markos Chandras <hwoarang@gentoo.org> resin-4.0.13-r1.ebuild:
   Stable on amd64 wrt bug #353881
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index fa0e87e9088e..7fff44001fbc 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,52 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-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.13/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
 AUX 4.0.13/resin.init 908 RMD160 1eaf21ce2f732030d99a80540517c33cd25328b1 SHA1 37fdacdfb502f38eabce074d5b2438ced65dceeb SHA256 c0f70f050e8fc700913ba4073072a9f3910a7f8dcb8ebde8f7484a1f8e3cb9e1
 AUX 4.0.14/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
 AUX 4.0.14/resin.init 908 RMD160 ca04eda90a854e8d778a994741fd5bba24abd0dc SHA1 10678cd1bcb379949496d80eb3be875c3664092b SHA256 218bc0e124ce053cf2bc8c117aab72bd7e190ccd645bb4d9ed135579ad7f6b74
-AUX 4.0.5/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 4.0.5/resin.init 884 RMD160 060b7bd06e16a5d6f36909dd24e09fced55c2bc0 SHA1 fc7ed3336edeb17fcd35a7781e0127687df16217 SHA256 9c274a3a23d5ebc09056977a5776b29acc77e1a9822e7bb09f6ac51eba887c3a
-AUX 4.0.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-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.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
 DIST resin-4.0.13-src.zip 17439983 RMD160 943355c103cde76fa24dbeee7e05d194aceed44a SHA1 11a48ed5e36554de16585a1b74147710e189e64b SHA256 2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e
 DIST resin-4.0.14-src.zip 17542066 RMD160 78e08e690c14b6a492732d0268022e2baa7d0c2e SHA1 14a2408c16bac2a076bbfbea789e5254f75faf32 SHA256 6a0b1bed5240609672041529a1b6b926f45356f47114ce4db0df1262a0b98fa5
-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.2.1-r1.tar.bz2 4202 RMD160 012888c1b89943a78919cdbe046480c99eac3315 SHA1 a467cb8db54a1660ad0deedfed12d4786809b2ed SHA256 18c145d94d2f9a56ac582e6401639588d5597bcde0b69c5702ccf86ec154126a
 DIST resin-gentoo-patches-4.0.13.tar.bz2 2487 RMD160 f6615dda025bb8a0ac322d5194fe9b76844a7ff6 SHA1 1e69e6c80641904ba42f08c1110dec4fb2eb2ce6 SHA256 56bc88cb760d683f893b68f9421465c2205681de5d3ad7a5f58888d6d0e5a6e4
 DIST resin-gentoo-patches-4.0.14.tar.bz2 2486 RMD160 dfdfa5f327374122088e4a81d29f1fd9842cddb6 SHA1 d14360ef94bbb296c46977cab8d6f541c02727ed SHA256 716f23fa775a8a6460e8ebdf2873932433f18fbe1f05ef868c4769ab4db5c30e
-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.2.1-r3.ebuild 4122 RMD160 22649cee4681b83514118bd19e4a9e4be1905e4d SHA1 0abfffa06198148d3517bd9208d7819b2c2706ab SHA256 a42d7cd807efdc79f36e71d6052d2f1f72d42bd046ebde5edfa3d5fcd5696aca
 EBUILD resin-4.0.13-r1.ebuild 4977 RMD160 590d16626e5bdcb29dcf29d143c0acfe16b97f11 SHA1 7b65d4ba5264379067038529170b7398417200fc SHA256 29254bd9ea5fcb5028fa99a8ee2b1b06fc238a15603a885ed27528b8a3fc5b03
 EBUILD resin-4.0.14.ebuild 4976 RMD160 1aecf62dbb6f9d7c247ab32707b9d734c101e971 SHA1 0f9c882c4ffc6d00de6403dcf8d01f8d37ba2e58 SHA256 a9c4b2c10bf5b7b60b04e25ff7035366278d335adcde39dbedd01401d810b51d
-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 19750 RMD160 f883e62f385d3cdfec27ebfa4463ae7bf96ac069 SHA1 186cbf0291f52edf3508698f8a87f31240beffe3 SHA256 a40b77608e84ed77375646a3737675e206028b911a9f9993a4b6d5a51ed8f713
+MISC ChangeLog 20123 RMD160 ddfa18b9a3acac77ecd53b4dc59e4a9c72f6646c SHA1 784da5d1cf6e5eaef2d4acfa9c87c9d68fab85f9 SHA256 0c51e269848f7a2b0df08d167e2f77ff190577087fb6aac1d24bbb8a6cd1e842
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNdKXpAAoJEPqDWhW0r/LCwKgQAIC6QiBmVeSEjkcZkD9yApex
-79+m65wdcfttElDqCUokykdVe3QUkhxOuLJtc5sp3f2SE4OOvFyRIW7auJlXhe4E
-a0LWFxZtcfVhl5DrxE+eT+EGqAwtVhbrZGaLhupikwKaUvH9GL/E+kyYEAKqpQ52
-HnH94yhq3T84uG7KiGXYVlQGf87FsxAzzBEfFW8Gh8B2xvO60w6bOKb1Zezr6oBW
-UfNzXb9C3OCzz6QJ7H2akUAQR5r1kXdR5JezBMTa3UaMjhG45nPu7BKNTS6AmGFC
-/le2D49r1p3Oj/8d+VxAe8J465ijAIQ74EtSp7YdTD5c2YjbD3x7kLvPO0fwkR/2
-XD+sSrYh9QPnMm0FFOab/jFuzP3D3O0rBnxfmJfKUWirYSmjc7oaDXu6U39eHPS+
-ldoz7Un81BkqT+vkYX22XwhvnormnPRQwjRC63fdCIwzLKyw0dNu9CPbA+II0qlt
-tgYBIBWrgumSfZ+cDGv4i/tVfXuNIVWyc4TQ5sEK4VE9yiFemlopo9iiX2F8HmQm
-0s2NBfRtnxr35/2D4SVhVxZBAW24uTiFGsQLrF/FUdLU1xGnHysnjCFsVgB4Sy2I
-6+sGFPaipFGE7Aslq53QxgLchKSiMhweEJtpVxz2zNjlm/L021o1IC4GUnJCJE4g
-+wx1DCtPF9YsBDsLCsCc
-=EBAN
+iQEcBAEBAgAGBQJNf7/2AAoJEBZyv1r2qA5GCDsH/iZVyDgqLj9Z7bTtcRpIJxwY
+vhd3CELkzkHlAo5Unw6LiyJyxaRJ5chq/gURzx+jf6RAbP5pEFu+u0hn1Qbk3io2
+NZSKS6bS5zMyQMEIaXVOPia04LKU2ZAbhtay98jxlAXbJOc7IQ2Llwkiy9RDFSIg
+orfJ++WxzTPW65DLFcKmFl2hbnXEEARTSn5WthO2bSe3xJnfn1RFaZE/qRjbyXiQ
+iwHw7m0iWjgaq8EQLMAPAXe+l+3t8A1HI7/fD9Tz5l4/RNPPUGS8FqJQSI3S/Dyq
+kKqMoqcIBRch8UFwC16HFEnHyLb7FiXdDp1U6yAQ9gkAIBaeFfNtlvS2zZQWx6w=
+=E725
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.2.1/resin.conf b/www-servers/resin/files/3.2.1/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/3.2.1/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.2.1/resin.init b/www-servers/resin/files/3.2.1/resin.init
deleted file mode 100644
index 58a6c1c44b4e..000000000000
--- a/www-servers/resin/files/3.2.1/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.2.1/resin.init,v 1.2 2009/05/01 22:40:16 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.xml -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/4.0.5/resin.conf b/www-servers/resin/files/4.0.5/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/4.0.5/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/4.0.5/resin.init b/www-servers/resin/files/4.0.5/resin.init
deleted file mode 100644
index 3cc0be3df323..000000000000
--- a/www-servers/resin/files/4.0.5/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/4.0.5/resin.init,v 1.1 2010/04/02 15:41:27 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.xml -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/4.0.6/resin.conf b/www-servers/resin/files/4.0.6/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/4.0.6/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/4.0.6/resin.init b/www-servers/resin/files/4.0.6/resin.init
deleted file mode 100644
index ee39862047d9..000000000000
--- a/www-servers/resin/files/4.0.6/resin.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.6/resin.init,v 1.1 2010/04/19 23:02:47 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.xml -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.9/resin.conf b/www-servers/resin/files/4.0.9/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/4.0.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/4.0.9/resin.init b/www-servers/resin/files/4.0.9/resin.init
deleted file mode 100644
index e6ec67cf3708..000000000000
--- a/www-servers/resin/files/4.0.9/resin.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.9/resin.init,v 1.1 2010/08/19 19:31:25 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.xml -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/resin-3.2.1-r3.ebuild b/www-servers/resin/resin-3.2.1-r3.ebuild
deleted file mode 100644
index bc92450fa4fd..000000000000
--- a/www-servers/resin/resin-3.2.1-r3.ebuild
+++ /dev/null
@@ -1,177 +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.2.1-r3.ebuild,v 1.5 2010/10/14 20:44:04 caster Exp $
-
-EAPI="2"
-
-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}-r1.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="admin"
-
-KEYWORDS="amd64 x86"
-
-	## java-virtuals/jaf"
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/glassfish-deployment-api:1.2
-	java-virtuals/javamail"
-
-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"
-
-pkg_setup() {
-
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-
-}
-
-src_prepare() {
-
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	sed -i -e 's/256m/384m/' "${S}/build.xml"
-
-	eautoreconf
-
-}
-
-src_configure() {
-
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure"
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-
-}
-
-src_compile() {
-
-	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 glassfish-deployment-api-1.2
-	java-pkg_jar-from resin-servlet-api-2.5
-	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/*.xml
-
-	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
-
-	use admin && {
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || 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 -fr "${D}/${RESIN_HOME}/doc"
-	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.xml."
-	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.xml."
-	elog
-
-}
diff --git a/www-servers/resin/resin-4.0.5.ebuild b/www-servers/resin/resin-4.0.5.ebuild
deleted file mode 100644
index 6c965e3082cf..000000000000
--- a/www-servers/resin/resin-4.0.5.ebuild
+++ /dev/null
@@ -1,165 +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-4.0.5.ebuild,v 1.2 2010/04/02 15:46:21 nelchael Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
-
-DESCRIPTION="A fast Servlet and JSP 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 ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}.3.0
-	dev-java/glassfish-deployment-api:1.2
-	java-virtuals/javamail
-	dev-java/jsr101
-	dev-java/mojarra:1.2"
-
-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"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	# No bundled JARs!
-	rm -f "${S}/modules/ext/"*.jar
-	rm -rf "${S}/project-jars"
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	mkdir -p "${S}/m4"
-	eautoreconf
-
-	# Symlink our libraries:
-	mkdir -p "${S}/gentoo-deps"
-	cd "${S}/gentoo-deps/"
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from glassfish-deployment-api-1.2
-	java-pkg_jar-from resin-servlet-api-3.0
-	java-pkg_jar-from mojarra-1.2
-	java-pkg_jar-from jsr101
-	ln -s $(java-config --jdk-home)/lib/tools.jar
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure"
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake || die "make failed"
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	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/*.xml
-
-	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
-
-	dodir /usr/lib/resin/project-jars
-	cp -a "${S}"/project-jars/*.jar "${D}/usr/lib/resin/project-jars"
-
-	use admin && {
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || 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 -fr "${D}/${RESIN_HOME}/doc"
-	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.xml."
-	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.xml."
-	elog
-}
diff --git a/www-servers/resin/resin-4.0.6.ebuild b/www-servers/resin/resin-4.0.6.ebuild
deleted file mode 100644
index d109bc4a009a..000000000000
--- a/www-servers/resin/resin-4.0.6.ebuild
+++ /dev/null
@@ -1,180 +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-4.0.6.ebuild,v 1.1 2010/04/19 23:02:48 nelchael Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
-
-DESCRIPTION="A fast Servlet and JSP 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 doc"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/glassfish-deployment-api:1.2
-	java-virtuals/javamail
-	dev-java/jsr101
-	dev-java/mojarra:1.2"
-
-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"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	# No bundled JARs!
-	rm -f "${S}/modules/ext/"*.jar
-	rm -rf "${S}/project-jars"
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	mkdir -p "${S}/m4"
-	eautoreconf
-
-	# Symlink our libraries:
-	mkdir -p "${S}/gentoo-deps"
-	cd "${S}/gentoo-deps/"
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from glassfish-deployment-api-1.2
-	java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar
-	java-pkg_jar-from mojarra-1.2
-	java-pkg_jar-from jsr101
-	ln -s $(java-config --jdk-home)/lib/tools.jar
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure"
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake || die "make failed"
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	einfo "Moving configuration to /etc ..."
-	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	einfo "Rewriting resin.xml ..."
-	sed -i \
-		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-		-e 's,${resin.root}/doc/admin,webapps/admin,' \
-		"${D}/etc/resin/resin.xml"
-
-	einfo "Fixing log directory ..."
-	rm -rf "${D}/${RESIN_HOME}/log"
-	keepdir /var/log/resin
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	einfo "Installing basic documentation ..."
-	dodoc README "${S}"/conf/*.xml
-
-	einfo "Installing init.d script ..."
-	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"
-
-	einfo "Fixing location of jars ..."
-	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
-
-	einfo "Symlinking directories from /var/lib/resin ..."
-	rm -rf "${D}/${RESIN_HOME}/resin-data"
-	rm -rf "${D}/${RESIN_HOME}/watchdog-data"
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	keepdir /var/lib/resin/resin-data
-	keepdir /var/lib/resin/watchdog-data
-	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 /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
-	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
-	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die
-
-	use admin && {
-		einfo "Installing administration app ..."
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
-	}
-	use doc && {
-		einfo "Installing documentation app ..."
-		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
-	}
-
-	use source && {
-		einfo "Installing sources ..."
-		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
-	}
-
-	einfo "Removing stale directories ..."
-	rm -fr "${D}/${RESIN_HOME}/bin"
-	rm -fr "${D}/${RESIN_HOME}/doc"
-	rm -fr "${D}/${RESIN_HOME}/keys"
-	rm -fr "${D}/${RESIN_HOME}/licenses"
-	rm -fr "${D}/etc/resin/"*.orig
-
-	einfo "Fixing ownerships and permissions ..."
-	chown -R 0:root "${D}/"
-	chown -R resin:resin "${D}/etc/resin"
-	chown -R resin:resin "${D}/var/lib/resin"
-	chown -R resin:resin "${D}/var/log/resin"
-
-	chmod 644 "${D}/etc/conf.d/resin"
-	chmod 755 "${D}/etc/init.d/resin"
-	chmod 750 "${D}/var/lib/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.xml."
-	elog
-}
diff --git a/www-servers/resin/resin-4.0.9.ebuild b/www-servers/resin/resin-4.0.9.ebuild
deleted file mode 100644
index 035f720f3439..000000000000
--- a/www-servers/resin/resin-4.0.9.ebuild
+++ /dev/null
@@ -1,185 +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-4.0.9.ebuild,v 1.2 2010/08/31 14:40:55 nelchael Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
-
-DESCRIPTION="A fast Servlet and JSP 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 doc"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="~dev-java/resin-servlet-api-${PV}
-	dev-java/glassfish-deployment-api:1.2
-	java-virtuals/javamail
-	dev-java/jsr101
-	dev-java/mojarra:1.2
-	dev-java/validation-api:1.0"
-
-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"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup resin
-	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
-}
-
-src_prepare() {
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	# Respect LDFLAGS:
-	sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in
-
-	# No bundled JARs!
-	rm -f "${S}/modules/ext/"*.jar
-	rm -rf "${S}/project-jars"
-
-	java-ant_bsfix_one "${S}/build.xml"
-	java-ant_bsfix_one "${S}/build-common.xml"
-
-	mkdir -p "${S}/m4"
-	eautoreconf
-
-	# Symlink our libraries:
-	mkdir -p "${S}/gentoo-deps"
-	cd "${S}/gentoo-deps/"
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from glassfish-deployment-api-1.2
-	java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar
-	java-pkg_jar-from mojarra-1.2
-	java-pkg_jar-from jsr101
-	java-pkg_jar-from validation-api-1.0
-	ln -s $(java-config --jdk-home)/lib/tools.jar
-}
-
-src_configure() {
-	append-flags -fPIC -DPIC
-
-	chmod 755 "${S}/configure"
-	econf --prefix=${RESIN_HOME} || die "econf failed"
-}
-
-src_compile() {
-	einfo "Building libraries..."
-	emake || die "make failed"
-
-	einfo "Building jars..."
-	eant || die "ant failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	einfo "Moving configuration to /etc ..."
-	dodir /etc/
-	mv "${D}/${RESIN_HOME}/conf" "${D}/etc/resin" || die "mv of conf failed"
-	dosym /etc/resin ${RESIN_HOME}/conf
-
-	einfo "Rewriting resin.xml ..."
-	sed -i \
-		-e 's,${resin.root}/doc/resin-doc,webapps/resin-doc,' \
-		-e 's,${resin.root}/doc/admin,webapps/admin,' \
-		"${D}/etc/resin/resin.xml"
-
-	einfo "Fixing log directory ..."
-	rm -rf "${D}/${RESIN_HOME}/log"
-	keepdir /var/log/resin
-	dosym /var/log/resin ${RESIN_HOME}/log
-
-	einfo "Installing basic documentation ..."
-	dodoc README "${S}"/conf/*.xml
-
-	einfo "Installing init.d script ..."
-	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"
-
-	einfo "Fixing location of jars ..."
-	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
-
-	einfo "Symlinking directories from /var/lib/resin ..."
-	rm -rf "${D}/${RESIN_HOME}/resin-data"
-	rm -rf "${D}/${RESIN_HOME}/watchdog-data"
-	dodir /var/lib/resin/webapps
-	keepdir /var/lib/resin/hosts
-	keepdir /var/lib/resin/resin-data
-	keepdir /var/lib/resin/watchdog-data
-	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 /var/lib/resin/resin-data ${RESIN_HOME}/resin-data
-	dosym /var/lib/resin/watchdog-data ${RESIN_HOME}/watchdog-data
-
-	dosym \
-		"$(java-pkg_getjar resin-servlet-api-3.0 resin-servlet-api.jar)" \
-		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die
-
-	use admin && {
-		einfo "Installing administration app ..."
-		cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || die
-	}
-	use doc && {
-		einfo "Installing documentation app ..."
-		cp -a "${S}/doc/resin-doc" "${D}/var/lib/resin/webapps/" || die
-	}
-
-	use source && {
-		einfo "Installing sources ..."
-		java-pkg_dosrc "${S}"/modules/*/src/* > /dev/null
-	}
-
-	einfo "Removing stale directories ..."
-	rm -fr "${D}/${RESIN_HOME}/bin"
-	rm -fr "${D}/${RESIN_HOME}/doc"
-	rm -fr "${D}/${RESIN_HOME}/keys"
-	rm -fr "${D}/${RESIN_HOME}/licenses"
-	rm -fr "${D}/etc/resin/"*.orig
-
-	einfo "Fixing ownerships and permissions ..."
-	chown -R 0:root "${D}/"
-	chown -R resin:resin "${D}/etc/resin"
-	chown -R resin:resin "${D}/var/lib/resin"
-	chown -R resin:resin "${D}/var/log/resin"
-
-	chmod 644 "${D}/etc/conf.d/resin"
-	chmod 755 "${D}/etc/init.d/resin"
-	chmod 750 "${D}/var/lib/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.xml."
-	elog
-}