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

(Portage version: 2.2_rc91/cvs/Linux x86_64)

11 files changed, 10 insertions, 688 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/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}