Revbump Resin

6 files changed, 304 insertions, 2 deletions

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index db4eb0a..943e596 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,7 +1,12 @@
 AUX 4.0.44/build.xml.patch 2259 SHA256 80f3f9c3677b4c2e114485490409f5328f1855ff3d331f372557e4ad12909404 SHA512 a1792fa2afd100238967c3d93fbe14a276a647ea5902d7fbabe70fe2d2416233486bdb604a879bd0fe8564289c5d20fb4dba3b9a8dd3eadb51c5ae0ef635de93 WHIRLPOOL 6a2503a33495b7d348e029a4dbd0a7808f0d2f27ddd0b7936eb4cc9fd27b82be3f23c0739ece0912aaf74a3eaca1c9114a16485621953e679c6eca87031260f6
 AUX 4.0.44/resin.conf 542 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f WHIRLPOOL 39f0ea78e56c67a9d8c7129a10e19c4b7113ed5c5b4c1ca62b847f867ecbbbd1795c39a7b7febd261142fd725d47466083cf45f37fb22b90dc8181056922f1af
 AUX 4.0.44/resin.init 797 SHA256 54645e9ad791f08bb88da68de3b83a4fc4d439bef467d7b7fef8790b0b86ea21 SHA512 bf37f00a366b6b7afaaf7229c381a0d6c9e9166b3b4e30c84188874f13c5b43cff65ff635f62e70e612ce4cb4e97c0c451763334697c488e0a2dd24f4807ab0a WHIRLPOOL debb00cea116c89363cef29b357ba7219541871a7c349640a830fcfc8d6e7fe0d7ac3ee9439f5a2a1f7cb0e750cb8cc302abea6b48296d0812947991496ddf48
+AUX 4.0.46/build.xml.patch 2259 SHA256 80f3f9c3677b4c2e114485490409f5328f1855ff3d331f372557e4ad12909404 SHA512 a1792fa2afd100238967c3d93fbe14a276a647ea5902d7fbabe70fe2d2416233486bdb604a879bd0fe8564289c5d20fb4dba3b9a8dd3eadb51c5ae0ef635de93 WHIRLPOOL 6a2503a33495b7d348e029a4dbd0a7808f0d2f27ddd0b7936eb4cc9fd27b82be3f23c0739ece0912aaf74a3eaca1c9114a16485621953e679c6eca87031260f6
+AUX 4.0.46/resin.conf 547 SHA256 5b4cd0f731dab5f42bd41e81045891012b83018cd3677929683b0ff8134f96fe SHA512 bf1fff51c5720d904f80b58447256c62ecfd268f9c703b4d977a69131985a3310cf56d335ad0a14ace687780381a1a235291520f7c4fa299fee799cbddaa03e2 WHIRLPOOL 4e5ca5586e7de54e41b99988e0c07d707f708d6404bc3d4edf906376a35ed4f44bf4a975d785828c59c381f06c6944fa4c8fe231387e5b2f3792ca0c6cc531a3
+AUX 4.0.46/resin.init 797 SHA256 54645e9ad791f08bb88da68de3b83a4fc4d439bef467d7b7fef8790b0b86ea21 SHA512 bf37f00a366b6b7afaaf7229c381a0d6c9e9166b3b4e30c84188874f13c5b43cff65ff635f62e70e612ce4cb4e97c0c451763334697c488e0a2dd24f4807ab0a WHIRLPOOL debb00cea116c89363cef29b357ba7219541871a7c349640a830fcfc8d6e7fe0d7ac3ee9439f5a2a1f7cb0e750cb8cc302abea6b48296d0812947991496ddf48
 DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
-EBUILD resin-4.0.44-r5.ebuild 4678 SHA256 f3d910c0aadde729742462324453c0e9b9cc3940964be05903fcc3b75411739a SHA512 19b3dbbcd830c05cd5cc75f8cf9a5ae4e284116003994d81d7f62302027fb3e209316fccd31264018e84a3c5b790872caf2a93e133d0aa14e43a1eb1282776e2 WHIRLPOOL 1332734c44146f453906e86ee89ce7955e617674ea3ceca8e88405905f48ca393aacaf8fadf81236092059157add93cf67d12dd6c08aedb6bd4ffbc80f6c8965
+DIST resin-4.0.46-src.zip 40400255 SHA256 e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f WHIRLPOOL a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
+EBUILD resin-4.0.44-r5.ebuild 4676 SHA256 848e195e40cace2379490cb101d499a76fa8a2853858a1b2b3b634f4299d23ce SHA512 ec4360cde44b8b3a21e080848de2c181b95716996f19f38ca4bfb45a48e9543a892c367bcc53c8a230768a73e19145100b7349268aff6e7f46ab1e238df84d03 WHIRLPOOL ed88de1822d2d3d70501b30382d47f0041d42a70687394487b2636c11109f736f90f6bcd34dc82829a6259cbe130204e1620e74369019ef11410c617e8eb712d
+EBUILD resin-4.0.46.ebuild 4676 SHA256 848e195e40cace2379490cb101d499a76fa8a2853858a1b2b3b634f4299d23ce SHA512 ec4360cde44b8b3a21e080848de2c181b95716996f19f38ca4bfb45a48e9543a892c367bcc53c8a230768a73e19145100b7349268aff6e7f46ab1e238df84d03 WHIRLPOOL ed88de1822d2d3d70501b30382d47f0041d42a70687394487b2636c11109f736f90f6bcd34dc82829a6259cbe130204e1620e74369019ef11410c617e8eb712d
 MISC ChangeLog 22242 SHA256 1f459878766899ae094d51aa9ed2a000983f4038817be13567ee0973f329b636 SHA512 6540168f3dc33a70794dab9247d06e72fdcd3b92529101594c0e6d4fc4c9da56610fcebb6d0191e4766fa8c15f175bcd7bebd8dd0a52dd3f568e81c5c6abcd24 WHIRLPOOL 06a22d8a9ebc4c7b6acf15651f58a9e0d18fe1ec239924e22f45f128cda24818e22bfbb458a347cd01fd537107ddad7da4fcaca30862da2c8921cd288ec743e5
 MISC metadata.xml 231 SHA256 33d3f517124d06617e64c345f581fdd273eaef8c77bcc85ddbf4dd099fceb2d7 SHA512 de2d5cf2ccd9c18fa371274c350a3c6620e1e880f8a143619963e528c7306bb62826449d8bf5f34cb289eb91946ebe139cef35aacba93436dbd57c3c8e10b77a WHIRLPOOL dc0a422577c25ff52ddda0ac9e6272a1e7d6a72bebae2b5c063695b01b51913fe24eba913a25f540e54059e293bcfba8a4f465936dd89755cd2ace8c53ada490
diff --git a/www-servers/resin/files/4.0.46/build.xml.patch b/www-servers/resin/files/4.0.46/build.xml.patch
new file mode 100644
index 0000000..dc3a413
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/build.xml.patch
@@ -0,0 +1,59 @@
+--- build.xml.orig	2015-08-12 23:14:20.302000000 +0000
++++ build.xml	2015-08-12 23:14:47.909000000 +0000
+@@ -12,7 +12,7 @@
+   <property name="eclipse.home" value="${user.home}/eclipse"/>
+ 
+   <target name="compile"
+-          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink, gae, jasper">
++          depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus-dev, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, gae">
+   </target>
+ 
+   <!--
+@@ -27,10 +27,6 @@
+     </antcall>
+   </target>
+   -->
+-  <target name="resin-eclipselink" depends="eclipselink">
+-    <copy file="modules/eclipselink/dist/resin-eclipselink.jar"
+-          todir="${resin.lib}"/>
+-  </target>
+ 
+   <target name="richfaces" depends="init">
+     <antcall target="artifact" inheritRefs="true">
+@@ -92,13 +88,6 @@
+     </antcall>
+   </target>
+ 
+-  <target name="eclipselink" depends="init">
+-    <antcall target="module" inheritRefs="true">
+-      <param name="module.name" value="eclipselink"/>
+-      <param name="module.jar" value="resin-eclipselink.jar"/>
+-    </antcall>
+-  </target>
+-
+   <!-- gae APIs for quercus testing -->
+   <target name="gae" depends="init">
+     <antcall target="module" inheritRefs="true">
+@@ -437,13 +426,6 @@
+     </antcall>
+   </target>
+ 
+-  <target name="jasper" depends="init">
+-    <antcall target="module" inheritRefs="true">
+-      <param name="module.name" value="jasper"/>
+-      <param name="module.jar" value="resin-jasper.jar"/>
+-    </antcall>
+-  </target>
+-
+   <target name="version">
+     <copy file="${resin.modules}/kernel/src/com/caucho/Version.tmpl"
+           tofile="${resin.modules}/kernel/src/com/caucho/Version.java"
+@@ -903,7 +885,7 @@
+     <delete dir="${dist}/${dist.name}"/>
+   </target>
+ 
+-  <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
++  <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
+ 
+   <target name="configure" depends="init">
+      <copy tofile="modules/c/src/resin/Makefile.in"
diff --git a/www-servers/resin/files/4.0.46/resin.conf b/www-servers/resin/files/4.0.46/resin.conf
new file mode 100644
index 0000000..6f1b0dc
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/resin.conf
@@ -0,0 +1,16 @@
+# 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"
+
+# Select which server will be started, this is an advanced feature, please refer
+# to Resin documentation.
+SERVER_ID="app-0"
diff --git a/www-servers/resin/files/4.0.46/resin.init b/www-servers/resin/files/4.0.46/resin.init
new file mode 100644
index 0000000..6103369
--- /dev/null
+++ b/www-servers/resin/files/4.0.46/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 -server \"${SERVER_ID}\" -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-4.0.44-r5.ebuild b/www-servers/resin/resin-4.0.44-r5.ebuild
index f34b81f..23892e7 100644
--- a/www-servers/resin/resin-4.0.44-r5.ebuild
+++ b/www-servers/resin/resin-4.0.44-r5.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="admin doc"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/resin-servlet-api:3.1
 	dev-java/jsr101:0
diff --git a/www-servers/resin/resin-4.0.46.ebuild b/www-servers/resin/resin-4.0.46.ebuild
new file mode 100644
index 0000000..23892e7
--- /dev/null
+++ b/www-servers/resin/resin-4.0.46.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+
+DESCRIPTION="A fast Servlet and JSP engine"
+HOMEPAGE="http://www.caucho.com"
+SRC_URI="http://www.caucho.com/download/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="admin doc"
+
+KEYWORDS="amd64 x86"
+
+CDEPEND="dev-java/resin-servlet-api:3.1
+	dev-java/jsr101:0
+	dev-java/mojarra:2.2
+	dev-java/oracle-javamail:0
+	dev-java/validation-api:1.0
+	dev-java/glassfish-xmlrpc-api:0
+	dev-java/glassfish-deployment-api:1.2"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	dev-libs/openssl
+	dev-java/ant-core:0
+	${CDEPEND}"
+
+RESIN_HOME="/usr/$(get_libdir)/resin"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+jsr101
+mojarra-2.2
+oracle-javamail
+validation-api-1.0
+glassfish-xmlrpc-api
+resin-servlet-api-3.1
+glassfish-deployment-api-1.2"
+
+PATCHES=(
+	"${FILESDIR}"/"${PV}"/build.xml.patch
+)
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	local vm_version=$(java-pkg_get-vm-version)
+
+	epatch "${PATCHES[@]}"
+
+	# No bundled JARs!
+	rm -f "${S}/modules/ext/"*.jar || die
+	rm -rf "${S}/project-jars" || die
+
+	java-ant_bsfix_one "${S}/build.xml"
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	rm -rf lib/* || die
+
+	ln -s $(java-config --jdk-home)/lib/tools.jar || die
+}
+
+src_configure() {
+	append-flags -fPIC -DPIC
+
+	chmod 755 "${S}/configure" || die
+	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" || die
+
+	einfo "Fixing log directory ..."
+	rm -rf "${D}/${RESIN_HOME}/log" || die
+	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" || die
+
+	einfo "Fixing location of jars ..."
+	rm -f "${S}/lib/tools.jar" || die
+	java-pkg_dojar "${S}"/lib/*.jar
+	rm -fr "${D}/${RESIN_HOME}/lib" || die
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+	einfo "Symlinking directories from /var/lib/resin ..."
+	rm -rf "${D}/${RESIN_HOME}/resin-data" || die
+	rm -rf "${D}/${RESIN_HOME}/watchdog-data" || die
+	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" || die
+	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.1 resin-servlet-api.jar)" \
+		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar"
+
+	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" || die
+	rm -fr "${D}/${RESIN_HOME}/doc" || die
+	rm -fr "${D}/${RESIN_HOME}/keys" || die
+	rm -fr "${D}/${RESIN_HOME}/licenses" || die
+	rm -fr "${D}/etc/resin/"*.orig || die
+
+	einfo "Fixing ownerships and permissions ..."
+	fowners -R 0:root /
+	fowners -R resin:resin /etc/resin
+	fowners -R resin:resin /var/lib/resin
+	fowners -R resin:resin /var/log/resin
+
+	fperms 644 /etc/conf.d/resin
+	fperms 755 /etc/init.d/resin
+	fperms 750 /var/lib/resin
+	fperms 750 /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.properties."
+	elog
+}