Remove old version.

Package-Manager: portage-2.1.5_rc10

5 files changed, 16 insertions, 228 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 7cae20e91dcb..ee074606a820 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.74 2008/05/12 08:41:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.75 2008/05/12 08:54:43 nelchael Exp $
+
+  12 May 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/3.0.24/resin.conf, -files/3.0.24/resin.init, -resin-3.0.24.ebuild:
+  Remove old version.
 
   12 May 2008; Markus Rothe <corsair@gentoo.org> resin-3.0.25.ebuild:
   Stable on ppc64; bug #221263
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 04d1daa1a157..04c75b8362f7 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,17 +1,22 @@
-AUX 3.0.24/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
-AUX 3.0.24/resin.init 951 RMD160 7afa05f0924db80e550e8a36e94b5f51c2499649 SHA1 f92ef3ce279ab7c7d97aecd5b37609636beaecdd SHA256 1341f1036e0772dff7aa8a2caf00c6fef4dd6b75e29ace0f15969d7bcfa9c27d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
 AUX 3.0.25/resin.init 951 RMD160 c6bb819c7bd225a4a5fb570782f15d4cba9bce7e SHA1 123e2b64bc29f1ebbb5cdc65ea98be10c09cf9f8 SHA256 86d043936058453da710957d9da81644eb67f8a4e656160d6624eb9cd974db17
 AUX 3.1.6/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
 AUX 3.1.6/resin.init 854 RMD160 e20186fbd0f49212b22fa59d1c5dbc2dd4b803db SHA1 9e3dde87f4b19776d175b4e17afa8b7a29826259 SHA256 b000efd3457e8ea4e9705fc6fcf1b405c3176376a19d13e576f86453acede1d5
-DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
-DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 SHA1 386e94852599c24521665bdf8bb6405e1d936ab7 SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
-EBUILD resin-3.0.24.ebuild 4015 RMD160 206d28aab8d7c51035220cc2a9b3109a70a3dcc0 SHA1 3055ab100f5b8f272dc8192b1c0ad2188cb307d1 SHA256 0bd2601f382ab488fa7e184c6e59312c0037437c9150c67995f52594480898aa
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
 EBUILD resin-3.1.6.ebuild 4104 RMD160 008565be6ac8319bf5318a1f65c2ef6e6b8c2122 SHA1 8b6e2eef7259d65f7dc162c6d3dbd1cb4a6b266c SHA256 e4c4160c1f7406835148f1d78ce1db6560702bf15ca7ec266bd4331022fb0027
-MISC ChangeLog 14647 RMD160 fae43e4c7b6d392f1dc2503f8f893ee21f15df1a SHA1 53e0bad2fddb2a3c05c162c430bf8da2d81769f5 SHA256 4be9f8198bdbad30b049f9df4af98a36708254352a10e6fb21f8fe79113041db
+MISC ChangeLog 14800 RMD160 4a60ee0771e320174172d6f52363e519358a17d8 SHA1 f508378f2fc6ff3f32f77dba146556215a007898 SHA256 833f6c03e68a0b37c505b9b91a4df1efde20405d09dd937dcb61fb05dc15cc63
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgoBdgACgkQgo/w9rxVVVHipQCfXV+yqKRZV8oKTNM/UpFej8Zt
+66wAn2XoA/s9+SAXmHIf4tvzvWj/wFKt
+=qe6C
+-----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.24/resin.conf b/www-servers/resin/files/3.0.24/resin.conf
deleted file mode 100644
index eea8ef6cda50..000000000000
--- a/www-servers/resin/files/3.0.24/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.24/resin.init b/www-servers/resin/files/3.0.24/resin.init
deleted file mode 100644
index 31d9664df428..000000000000
--- a/www-servers/resin/files/3.0.24/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.24/resin.init,v 1.1 2007/08/17 08:08:34 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/resin-3.0.24.ebuild b/www-servers/resin/resin-3.0.24.ebuild
deleted file mode 100644
index 791250c19d3e..000000000000
--- a/www-servers/resin/resin-3.0.24.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.24.ebuild,v 1.9 2008/05/11 14:44:15 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
-
-}