Version bump.

(Portage version: 2.1.4_rc10)

5 files changed, 352 insertions, 1 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 480c36aa9a69..77c4edba9a79 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.60 2007/11/10 20:52:05 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.61 2007/12/14 09:42:51 nelchael Exp $
+
+*resin-3.1.4 (14 Dec 2007)
+*resin-3.0.25 (14 Dec 2007)
+
+  14 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org> +resin-3.0.25.ebuild,
+  +resin-3.1.4.ebuild:
+  Version bump.
 
   10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/3.0.22/resin.conf, -files/3.0.22/resin-3.0.22-gentoo.patch,
diff --git a/www-servers/resin/files/digest-resin-3.0.25 b/www-servers/resin/files/digest-resin-3.0.25
new file mode 100644
index 000000000000..4bc6edf952e8
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.0.25
@@ -0,0 +1,6 @@
+MD5 7dd070b3730620104a67b7fbc26e1328 resin-3.0.25-src.zip 10690692
+RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca resin-3.0.25-src.zip 10690692
+SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc resin-3.0.25-src.zip 10690692
+MD5 784d2ea6c8918a5f1fa5511b74f3d350 resin-gentoo-patches-3.0.25.tar.bz2 4781
+RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 resin-gentoo-patches-3.0.25.tar.bz2 4781
+SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd resin-gentoo-patches-3.0.25.tar.bz2 4781
diff --git a/www-servers/resin/files/digest-resin-3.1.4 b/www-servers/resin/files/digest-resin-3.1.4
new file mode 100644
index 000000000000..1df51cd35684
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.1.4
@@ -0,0 +1,6 @@
+MD5 cac3643498b9650b1876b3e7fd443cf9 resin-3.1.4-src.zip 12667690
+RMD160 205b26d1aa853af5d83c110d751633ea51369bc8 resin-3.1.4-src.zip 12667690
+SHA256 c8fab8d798e234a8ad6167eff9f35d7a07ce79a14b7759d6b616df086477ca99 resin-3.1.4-src.zip 12667690
+MD5 4eee6d1e5515afb86aec7e88404dbea6 resin-gentoo-patches-3.1.4.tar.bz2 3551
+RMD160 9c431b18d76683b9cbc4a6f4e3231421db865b70 resin-gentoo-patches-3.1.4.tar.bz2 3551
+SHA256 54f5d009b79f7b60296044f29daa514d0eccdf6405f1083340b7c1717ed344f8 resin-gentoo-patches-3.1.4.tar.bz2 3551
diff --git a/www-servers/resin/resin-3.0.25.ebuild b/www-servers/resin/resin-3.0.25.ebuild
new file mode 100644
index 000000000000..2a811fb3e19c
--- /dev/null
+++ b/www-servers/resin/resin-3.0.25.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2007 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.1 2007/12/14 09:42:51 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/conf/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.4.ebuild b/www-servers/resin/resin-3.1.4.ebuild
new file mode 100644
index 000000000000..72699ace95ac
--- /dev/null
+++ b/www-servers/resin/resin-3.1.4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.4.ebuild,v 1.1 2007/12/14 09:42:51 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib
+
+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 ~ppc64 ~x86"
+
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}
+	>=dev-java/iso-relax-20050331
+	dev-java/aopalliance
+	>=dev-java/sun-javamail-1.4
+	>=dev-java/sun-jaf-1.1"
+
+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"
+
+	sed -i -e 's/256m/384m/' "${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.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"
+	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
+
+	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
+	keepdir /usr/share/resin/log
+
+	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 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/conf/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
+
+}