Version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 197 insertions, 3 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index c30e5ffb5cbb..7ab89b10a493 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.65 2007/12/14 16:10:37 nelchael Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.66 2008/02/27 22:06:36 nelchael Exp $
+
+*resin-3.1.5 (27 Feb 2008)
+
+  27 Feb 2008; Krzysiek Pawlik <nelchael@gentoo.org> +resin-3.1.5.ebuild:
+  Version bump.
 
   14 Dec 2007; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.1.4.ebuild:
   Use correct patches for 3.1.4.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 2c6f73f182a3..7fcdeb83ec47 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 AUX 3.0.25/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 53668e6b6760c628eb1876d8428dfefb5740a21c SHA256 f079ad48fd8bc43cbb06db2fcf86a2806f815cd425182fc0eaf6bccdae2eb526
@@ -10,13 +13,23 @@ DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493
 DIST resin-3.1.4-src.zip 12667690 RMD160 205b26d1aa853af5d83c110d751633ea51369bc8 SHA1 98710e42363a2dc98545d374a36ff5205d01d083 SHA256 c8fab8d798e234a8ad6167eff9f35d7a07ce79a14b7759d6b616df086477ca99
+DIST resin-3.1.5-src.zip 13386594 RMD160 6999c8d783fef67a8f659ce58c88569cdf084ec9 SHA1 09308ae749d531c2ba57374c7a489db33ea4a724 SHA256 717ed02899c7aa05a48ce1cbb38e826646153463a68f626350f628c4b5ba9351
 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.3.tar.bz2 3516 RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc SHA1 9cfd0514cb74ef88f659ad69a0337cab8e2a991e SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63
 DIST resin-gentoo-patches-3.1.4-r2.tar.bz2 3560 RMD160 4049201161d5414d3db886310184a4b977653d38 SHA1 04dab3d984b3c742525d17a01900820d6cdfc182 SHA256 53340a55609f9ef5e3d1ed7010ad6ef04f11122f673f9c90936a2fe5c0039d28
+DIST resin-gentoo-patches-3.1.5.tar.bz2 3808 RMD160 55edbd158c662014e8140dcc04e3ee4a271ce5df SHA1 5e246c9347380413e707faf89483d58fc0afe78d SHA256 b08df65309d175e2573002ae2df0b687b212a4997b0fe7253842820f7bfa67f1
 EBUILD resin-3.0.24.ebuild 4014 RMD160 fb70875eb73141ae69661ad84e25c7d641871858 SHA1 35247f240dd19e0bf1365296eb75477796306b00 SHA256 38a9b241b0e40595b41925c12c58a06de56ab9db2f17888b6c19bdc759353bb6
 EBUILD resin-3.0.25.ebuild 4018 RMD160 eae80492fe12c0cbe1117c881bec5dd7bed862d0 SHA1 eb2a3e5f4b689d7d67f7405c058b33d286d01815 SHA256 e123d8dfd6df79c2b8975fb5a645d6b806d473d8fc0543f5e28848aaeaae13e4
 EBUILD resin-3.1.3.ebuild 3809 RMD160 545c42423b07b2fc9b696beaf0e63183fa3209be SHA1 1ba9a915f63b8687f390564517bef14591bc431a SHA256 e97bc400c748db6ef54ccdeb5105829eea3a03a2a3e5b066e3ec28bb73a8f62d
 EBUILD resin-3.1.4.ebuild 3812 RMD160 dfd3633958e6df72b66254fb9c00ac8bf78d56be SHA1 30adc9564118bf79d4307608a8f524091a02f25d SHA256 2346c66b40e4a1f1cef4f002a66c20ee444db67f2e32dd8ff75839bdbdd69530
-MISC ChangeLog 13278 RMD160 444dc88cf5804630c0f42d2ce4b6552ca54782bc SHA1 60b868fa3e5c50114e679d304c721e909441f22c SHA256 d6f6461bcf67732f2231cdd9411e15c69d61eebd6efd892cb5b08e8ded90856b
+EBUILD resin-3.1.5.ebuild 4027 RMD160 529153e8cde9d123e5af0d6dfff5d68c2c671aa1 SHA1 dd90adb031a9cec101288ed025f7a2eb6db65b00 SHA256 5c6cdc11a5f562364f215377637449817ba25b0c578addaf7cd50ef6b022079d
+MISC ChangeLog 13397 RMD160 d1b31609faa280fd07561bb2a0757f05c3508de9 SHA1 858b3a884bf8f3af8f53a9523bfd5ea1bc4c9668 SHA256 70604c4eb5085250afa4912cea961b61a336d236a2fe2683abf90d63c163b36e
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxd7ygo/w9rxVVVERAkoEAJ9MFr7Y+y6a5ldGu2mZ2a63LknJTQCgmCDN
+rZWfmRSrLo5DPpZfJFAIrDI=
+=R6Mi
+-----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-3.1.5.ebuild b/www-servers/resin/resin-3.1.5.ebuild
new file mode 100644
index 000000000000..5a5410330391
--- /dev/null
+++ b/www-servers/resin/resin-3.1.5.ebuild
@@ -0,0 +1,176 @@
+# 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.5.ebuild,v 1.1 2008/02/27 22:06:36 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 ~x86"
+
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}
+	>=dev-java/iso-relax-20050331
+	dev-java/aopalliance
+	=dev-java/sun-j2ee-deployment-bin-1.1*
+	dev-java/jax-ws-api:2
+	dev-java/jaxb:2
+	>=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"
+
+	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 sun-jaf
+	java-pkg_jar-from sun-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"
+	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
+
+}