Fix installation of resin.xml, drop old versions.

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

10 files changed, 25 insertions, 483 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 0c4e7f7e0847..d390efabfe33 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/resin
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.85 2009/03/07 16:22:58 nelchael Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.86 2009/05/01 22:40:16 nelchael Exp $
+
+*resin-3.2.1-r1 (01 May 2009)
+
+  01 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.0.26/resin.conf, -resin-3.1.6-r2.ebuild,
+  -files/3.0.26/resin.init, -resin-3.2.1.ebuild, -files/3.1.6/resin.conf,
+  +resin-3.2.1-r1.ebuild, -files/3.1.6/resin.init, files/3.2.1/resin.init,
+  -resin-3.0.26.ebuild:
+  Fix installation of resin.xml, drop old versions.
 
   07 Mar 2009; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.2.1.ebuild:
   Rewrite build-common.xml.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index a0dff0fd8933..721ac62d198e 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -3,35 +3,25 @@ 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.0.26/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
-AUX 3.0.26/resin.init 951 RMD160 24577bf523d07741fc8798d96d2920798164d63d SHA1 61221c2721080f54070fd6611a3eb82d799b52c2 SHA256 c3615e7623ca6457572ca21720944aaaf719d0a64adc569f33f10175adcb5b6c
-AUX 3.1.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 3.1.6/resin.init 885 RMD160 f1d4543ffa15db428c0e39cb339b8620ddda65ae SHA1 f3bbde79651d4511628e335fe1ff924a9ecb5c16 SHA256 abdef88060b1b7dd707ca0fac1a48cf57d887df87c44d7045dfeeff5ceac6917
 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.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
-AUX 3.2.1/resin.init 885 RMD160 b24f31eca976d095537fcb1f136ec74410a771ef SHA1 0551704a196b0051631f868d870a0d56e692b83e SHA256 fbfb55a780dd12f93942684387321242d87d2ee7e45d9546465ae2797ba8e368
+AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
-DIST resin-3.0.26-src.zip 10762073 RMD160 767cf59c8f7b33175961b61a2132d7bec980cc75 SHA1 a1dc5607e8b0261feab544859b93f17b8a13fdf7 SHA256 e362b55b4d077a8b4277374edbcf478d34a7c1859d3b03f27f33c3b5479a230e
-DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
 DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc
 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
-DIST resin-gentoo-patches-3.0.26.tar.bz2 4802 RMD160 cd22d92dff92408de2bca180cc1872436a5bcee4 SHA1 9e48254e1bdbf8836f62c46590936cd93dbfec89 SHA256 83f4fe0ff5304bd03cb9e0ccda4d4f5350d5f6235ff0ca0aca19908d964a69da
-DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
 DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6
 DIST resin-gentoo-patches-3.2.1.tar.bz2 3737 RMD160 7c0ebad6f727d2db06f9e494cffbe7abebf7222a SHA1 05f3785568ec4a7d28477ece39de647048921220 SHA256 0145db7190f98f080cfd946804b422bccbfaa64a610faf294f98ddee68dd2f6f
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
-EBUILD resin-3.0.26.ebuild 4019 RMD160 30263145e7783b6cca419fc943549a20fa8e4ebd SHA1 f369d06dd59a0ba26f338c3e14b631bfc3b297a4 SHA256 46cf735b2c1be2649feb0d319432badb56a8dfdc12237c55beb0ebaaf4ce8710
-EBUILD resin-3.1.6-r2.ebuild 4181 RMD160 07cb0b60eeb5bf0db2d16736842d9daeaf3038d4 SHA1 ce37ef6095a9059858b8dba5219e33eb957ebba0 SHA256 f43a7297928664e11ca3a27753350805010aadf43f9d90a719b200a2b544f66e
 EBUILD resin-3.1.8.ebuild 4095 RMD160 da5c86497aeb0a6a2c1536f9e76b14b3c1b24c5b SHA1 21c978377ac7450df9ae582958673b2ccfa0d4e2 SHA256 ba0dd18156f76f9b0d3544ea1e13c28d0d124cd39d33d92a267fab6a20d358f8
-EBUILD resin-3.2.1.ebuild 4125 RMD160 f8c1506210d24fa378622178a5ea17302d603514 SHA1 c44375dd9cc05ebb6d9f4e5a99f3731f839fc89b SHA256 710d91accd76f15dc0565f7274893cc3d016f2469c2fc286f61e7b4fc84ccf56
-MISC ChangeLog 16224 RMD160 ddd1ac45150f3828c64c91524902f3be84f5961e SHA1 821594615208d0887fb6f89b4a1fdbbb2ce6d750 SHA256 a6fb27bf1fe465d6976b09ac67f754c17914f91668de3fb6df2dd7d18c4106ab
+EBUILD resin-3.2.1-r1.ebuild 4073 RMD160 6a05af03ea4093e21fa90465eb0dc24f35b6eba1 SHA1 14e9a0ee741f27fb591f9ed50241353e463fe22e SHA256 dac225d737f67408cb67e0997f33adc5fb4e1757b73d86f80a695de6d06d6e2c
+MISC ChangeLog 16586 RMD160 dc2bb92b69257919f5bdf6745894fdbc7e1e1dbe SHA1 ed12537f6149f0ccdabb583e52030cf7f75e2e8b SHA256 a88aea59e69d004dd058dc13663ee9201489a749c914c95365809ace81c1a9a1
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmyn2kACgkQgo/w9rxVVVGwaQCfUPy/TuU+HYa1PX+PZsqpZLUk
-imIAn35j3XZHTCDkFXA9XPHoAiaf/7y4
-=6TRX
+iEYEARECAAYFAkn7elYACgkQgo/w9rxVVVGftQCeObvnR+XjJCAppB7/N5Gq6Z6t
+6XAAn1faWnm2w9RJeEbLPZju0IgMDLm+
+=xBZ5
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.26/resin.conf b/www-servers/resin/files/3.0.26/resin.conf
deleted file mode 100644
index eea8ef6cda50..000000000000
--- a/www-servers/resin/files/3.0.26/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.26/resin.init b/www-servers/resin/files/3.0.26/resin.init
deleted file mode 100644
index 176a8d33373f..000000000000
--- a/www-servers/resin/files/3.0.26/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.26/resin.init,v 1.1 2008/06/10 21:02:09 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.6/resin.conf b/www-servers/resin/files/3.1.6/resin.conf
deleted file mode 100644
index b205f671a22d..000000000000
--- a/www-servers/resin/files/3.1.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/3.1.6/resin.init b/www-servers/resin/files/3.1.6/resin.init
deleted file mode 100644
index 3e54973b2835..000000000000
--- a/www-servers/resin/files/3.1.6/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.6/resin.init,v 1.2 2008/06/09 21:49:34 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.2.1/resin.init b/www-servers/resin/files/3.2.1/resin.init
index ad8ef9f74f90..58a6c1c44b4e 100644
--- a/www-servers/resin/files/3.2.1/resin.init
+++ b/www-servers/resin/files/3.2.1/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.2.1/resin.init,v 1.1 2009/02/02 23:31:58 nelchael Exp $
+# $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
@@ -22,7 +22,7 @@ runResin() {
 	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} ${@}"
+	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}"
diff --git a/www-servers/resin/resin-3.0.26.ebuild b/www-servers/resin/resin-3.0.26.ebuild
deleted file mode 100644
index 96fb85f36c09..000000000000
--- a/www-servers/resin/resin-3.0.26.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.26.ebuild,v 1.1 2008/06/10 21:01:58 nelchael 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="~amd64 ~ppc ~ppc64 ~x86"
-
-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.6-r2.ebuild b/www-servers/resin/resin-3.1.6-r2.ebuild
deleted file mode 100644
index 9a69a14c5497..000000000000
--- a/www-servers/resin/resin-3.1.6-r2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.6-r2.ebuild,v 1.1 2008/06/20 23:16:20 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}-1.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}
-	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
-		epatch "${i}"
-	done;
-
-	java-ant_bsfix_one "${S}/build.xml"
-
-	sed -i -e 's/256m/384m/' "${S}/build.xml"
-
-	cd "${S}"
-	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.2.1.ebuild b/www-servers/resin/resin-3.2.1-r1.ebuild
index 92e2159e6869..c55ad13d43a1 100644
--- a/www-servers/resin/resin-3.2.1.ebuild
+++ b/www-servers/resin/resin-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.1.ebuild,v 1.2 2009/03/07 16:22:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.2.1-r1.ebuild,v 1.1 2009/05/01 22:40:16 nelchael Exp $
 
 EAPI="2"
 
@@ -112,7 +112,7 @@ src_install() {
 	dosym /var/log/resin ${RESIN_HOME}/logs
 	dosym /var/log/resin ${RESIN_HOME}/log
 
-	dodoc README "${S}"/conf/*.conf
+	dodoc README "${S}"/conf/*.xml
 
 	newinitd "${FILESDIR}/${PV}/resin.init" resin
 	newconfd "${FILESDIR}/${PV}/resin.conf" resin
@@ -131,8 +131,6 @@ src_install() {
 	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}/doc/admin" "${D}/var/lib/resin/webapps/" || die "cp failed"
 	}
@@ -167,13 +165,13 @@ 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 " 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.conf."
+	elog " /etc/resin/resin.xml."
 	elog
 
 }