Version bump.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-tuxonice x86_64

3 files changed, 196 insertions, 6 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index a57325039dfc..a363b3cd5b0f 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # 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.80 2008/08/22 22:37:01 cardoe Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.81 2009/01/10 15:11:35 nelchael Exp $
+
+*resin-3.1.8 (10 Jan 2009)
+
+  10 Jan 2009; <nelchael@gentoo.org> +files/3.1.8/resin.conf,
+  +files/3.1.8/resin.init, +resin-3.1.8.ebuild:
+  Version bump.
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 7bce134bb1b1..62ca6704e006 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -7,21 +7,26 @@ AUX 3.0.26/resin.conf 792 RMD160 91b29442c28c6730b9e80df8cc6a32b429289014 SHA1 5
 AUX 3.0.26/resin.init 951 RMD160 24577bf523d07741fc8798d96d2920798164d63d SHA1 61221c2721080f54070fd6611a3eb82d799b52c2 SHA256 c3615e7623ca6457572ca21720944aaaf719d0a64adc569f33f10175adcb5b6c
 AUX 3.1.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 3.1.6/resin.init 885 RMD160 f1d4543ffa15db428c0e39cb339b8620ddda65ae SHA1 f3bbde79651d4511628e335fe1ff924a9ecb5c16 SHA256 abdef88060b1b7dd707ca0fac1a48cf57d887df87c44d7045dfeeff5ceac6917
+AUX 3.1.8/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
+AUX 3.1.8/resin.init 885 RMD160 f1d4543ffa15db428c0e39cb339b8620ddda65ae SHA1 f3bbde79651d4511628e335fe1ff924a9ecb5c16 SHA256 abdef88060b1b7dd707ca0fac1a48cf57d887df87c44d7045dfeeff5ceac6917
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.0.26-src.zip 10762073 RMD160 767cf59c8f7b33175961b61a2132d7bec980cc75 SHA1 a1dc5607e8b0261feab544859b93f17b8a13fdf7 SHA256 e362b55b4d077a8b4277374edbcf478d34a7c1859d3b03f27f33c3b5479a230e
 DIST resin-3.1.6-src.zip 13579762 RMD160 c5d1b1ff590d8b11b35bf860e85a85cfd55a074c SHA1 40825e21fe3118c00978f64a5beec81d884cb1e4 SHA256 4e908672ab404f3cbab8bc05106e10e26f2227244930ff80d06ffc154c8fab08
+DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.0.26.tar.bz2 4802 RMD160 cd22d92dff92408de2bca180cc1872436a5bcee4 SHA1 9e48254e1bdbf8836f62c46590936cd93dbfec89 SHA256 83f4fe0ff5304bd03cb9e0ccda4d4f5350d5f6235ff0ca0aca19908d964a69da
 DIST resin-gentoo-patches-3.1.6-1.tar.bz2 3887 RMD160 16102913894154daaee2c528af92a5267db24b8b SHA1 2e80d8bb567b1bce8525fbb4bd640b44bd795db5 SHA256 de77e3e94d4a6b68ec88f56ac9df7ccb6557f15793374e373c7fd52bf2d3ba0f
+DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
 EBUILD resin-3.0.26.ebuild 4019 RMD160 30263145e7783b6cca419fc943549a20fa8e4ebd SHA1 f369d06dd59a0ba26f338c3e14b631bfc3b297a4 SHA256 46cf735b2c1be2649feb0d319432badb56a8dfdc12237c55beb0ebaaf4ce8710
 EBUILD resin-3.1.6-r2.ebuild 4181 RMD160 07cb0b60eeb5bf0db2d16736842d9daeaf3038d4 SHA1 ce37ef6095a9059858b8dba5219e33eb957ebba0 SHA256 f43a7297928664e11ca3a27753350805010aadf43f9d90a719b200a2b544f66e
-MISC ChangeLog 15581 RMD160 f84ee1313a0be64995b0cf3a5a6d0f6a06f18bd0 SHA1 68301f3d2bd7a3322e1ef8c7016c3d6b41ac6b8a SHA256 65799fe6e5ba82373569a69599868ffa6a68bcec07bb0878b88870e4f990d0c5
+EBUILD resin-3.1.8.ebuild 4176 RMD160 0ab87cd063b21404325cd61f49eeff7f73360188 SHA1 a1acf34cbf364e258e27d14ca41e01968909f5c2 SHA256 23e23fb2266715bb0fd9a144e84570080a6b73ca706b12be0118d82839e59b57
+MISC ChangeLog 15738 RMD160 76460fabbdb5d82805b8a05abb2a50599e16371e SHA1 58e38e3d585eb1ed32b767a0223159bd58d9e4ef SHA256 947e5057b11e9292a7ab26aa920ee0f80ff9424db62e61920605e5efe15220be
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivP5MACgkQoeSe8B0zEfxZfwCcDi3XuuBc8oh6Pdx/+j21MxGS
-CfkAn2x7lkJFywRUMu2NfoIN2xjXu0+R
-=3ERU
+iEYEARECAAYFAklouq0ACgkQgo/w9rxVVVGOcwCdG8GAxdWp6zF8Ehex/f5+jPwZ
+uPQAn3pHPWtxIiUMVPkpxu/of3gE6Bx6
+=Hmo5
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-3.1.8.ebuild b/www-servers/resin/resin-3.1.8.ebuild
new file mode 100644
index 000000000000..4a4f2469fcd5
--- /dev/null
+++ b/www-servers/resin/resin-3.1.8.ebuild
@@ -0,0 +1,179 @@
+# 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.1 2009/01/10 15:11:35 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}
+	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 --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
+
+}