Remove old versions.

(Portage version: 2.1.9.43/cvs/Linux x86_64)

13 files changed, 8 insertions, 916 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/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
-}