Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 250 insertions, 10 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 94bb80ba9500..a6002d0c2ff6 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.94 2010/04/06 20:11:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.95 2010/04/19 23:02:48 nelchael Exp $
+
+*resin-4.0.6 (19 Apr 2010)
+
+  19 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  +files/4.0.6/resin.conf, +resin-4.0.6.ebuild, +files/4.0.6/resin.init:
+  Version bump.
 
   06 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> resin-3.1.9.ebuild,
   resin-3.2.1-r3.ebuild:
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 00751f972671..46af42de2963 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -11,32 +11,37 @@ AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db
 AUX 3.2.1/resin.init 884 RMD160 95bd8a0942467288375f008a968aa43aad14b62f SHA1 b398a2200a5303d75bb2d585801e5b88cdb89805 SHA256 1d4aee8d731394911cd5cb90b09a3e8a6cc302746572008ee55c1190b3130fe5
 AUX 4.0.5/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 4.0.5/resin.init 884 RMD160 060b7bd06e16a5d6f36909dd24e09fced55c2bc0 SHA1 fc7ed3336edeb17fcd35a7781e0127687df16217 SHA256 9c274a3a23d5ebc09056977a5776b29acc77e1a9822e7bb09f6ac51eba887c3a
+AUX 4.0.6/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
+AUX 4.0.6/resin.init 882 RMD160 60fdac73535024f7397ab605298a18f5a1ae3914 SHA1 3ca5037c03e4b60f0ee1049ced6308b5ac8d805f SHA256 802be0c092908386c3f9af2568a4d0765a319ab10ff63a70190bcb3530a79adc
 DIST resin-3.0.25-src.zip 10690692 RMD160 f613bf9f35a2fb99f16a2253aed715104575d3ca SHA1 48e1cdbb7e1e1501d6c1a920361558c70930463a SHA256 ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc
 DIST resin-3.1.8-src.zip 13604988 RMD160 0d72302adb320758224626f7a4863f53e9dfa83b SHA1 189d05af3d1a411cbe224c1482bc118888ab75ff SHA256 fbc9dc0253ca741b5642df761e2008ed82d4b663fa752a6cec0564ebae404abc
 DIST resin-3.1.9-src.zip 13611096 RMD160 6a4c7eec574eeee73cce38ec17b0d997bada52f1 SHA1 28d91e510e5f9a1e861490dc81b484951ba13370 SHA256 f64825ac061122517cb4fb092122272d8af32ef7d63f7d158ba3a2d56a4a9b08
 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
 DIST resin-4.0.5-src.zip 16494405 RMD160 415116a3820288d5145a07fcd81571c5feb71424 SHA1 fddb58a6e31f413a452eb7d5003ceb2f928e7330 SHA256 e11e6d885e1ceec6eb0c4d524fb9904fbea5a7c894786f2f99a5bdc23e8c9aad
+DIST resin-4.0.6-src.zip 16635845 RMD160 c61c6f13cd48d572abda8fb103c404a4b439dbb8 SHA1 1cbd1fbf2ce5cdee47714f2d57c2e4831feee2d0 SHA256 3b653383c8417496e4ae22b9bda9e521842a2115d51a3743e9608d65402b2a91
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.8.tar.bz2 3883 RMD160 af457d88928c2d817524434dce917de78baa8915 SHA1 794b493060b684a492619c3ad80ad5badb94b0f5 SHA256 6b304e3e593d1c2727d945b2b3d9e41ea2880e96b3e3691ccc1dfcf7ae4759a6
 DIST resin-gentoo-patches-3.1.9.tar.bz2 3872 RMD160 0fea48e0b94c19e6dc6946f0d85be7808f7b4f3d SHA1 f828d981380430dedf6617c07d2d09ba583dc4c9 SHA256 c22dd2a7933385b76f239a89dff4eddd2895bc503b8821c5474a3b3a56260506
 DIST resin-gentoo-patches-3.2.1-r1.tar.bz2 4202 RMD160 012888c1b89943a78919cdbe046480c99eac3315 SHA1 a467cb8db54a1660ad0deedfed12d4786809b2ed SHA256 18c145d94d2f9a56ac582e6401639588d5597bcde0b69c5702ccf86ec154126a
 DIST resin-gentoo-patches-4.0.5.tar.bz2 2772 RMD160 0b8a9a39eacc35054e1ed0dc64194aeb92858205 SHA1 7b348cf2840b592909f0902711ddebe93ebd743d SHA256 308c6fb071346ed3d25e73d2a1b396733f65142bcdea1c431930dba4ffd5a990
+DIST resin-gentoo-patches-4.0.6.tar.bz2 2804 RMD160 5163ba0b608b99ab3bed8e3616e3c7b71f7a9f58 SHA1 42d145947b504a3d1c56e2c0e32d5cde264fd766 SHA256 3be0748f1aad2793cec4f7e5f5cebb5883f5ebcafc6aa3fb43369d12ef613523
 EBUILD resin-3.0.25.ebuild 4014 RMD160 f721e434c133e23e4b243562edb64be24e239734 SHA1 2fc94d091e172d57c7623a979c5e8de0f42ab400 SHA256 3b2185a278807de01963be13d934239eb8417e17baf779702d405eca3b05521d
 EBUILD resin-3.1.8.ebuild 4095 RMD160 da5c86497aeb0a6a2c1536f9e76b14b3c1b24c5b SHA1 21c978377ac7450df9ae582958673b2ccfa0d4e2 SHA256 ba0dd18156f76f9b0d3544ea1e13c28d0d124cd39d33d92a267fab6a20d358f8
 EBUILD resin-3.1.9.ebuild 4173 RMD160 a1b6da82a540405d6621a737fe52c8ab00ff4d88 SHA1 ca79557ad73a014966a8919426b73e45992072ec SHA256 ac073bbee06a975b181c1ca8440b63cf11af068a82bfbba11f20a245ea91a608
 EBUILD resin-3.2.1-r3.ebuild 4129 RMD160 cc6582992f132c2bd61166bfb121246939b82af5 SHA1 10e1208aa292b107a5fda862e038516d80a3c513 SHA256 fed376025500713d9f3c71cbfcf06d47bac881bc61e810087577314ee944207e
 EBUILD resin-4.0.5.ebuild 4164 RMD160 97bda6a104c780f4f692a969a52af3e054515ff0 SHA1 d8067c23549d6bb5166948fb45319410633d79a5 SHA256 6c2e9b8a738a7639a896d89d9a1c5b4f77e60ab568222ad0624d21ed1c083897
-MISC ChangeLog 17841 RMD160 12cd6f3492876add08910889950bd303b90606d2 SHA1 8fd37305d7afd4a3667d581d02cc00d5dbc2402f SHA256 282bfb9489f71f83a9aa4c2df6c6aec1bf4b5d73560e19d61a0b2687362dbd3b
+EBUILD resin-4.0.6.ebuild 4819 RMD160 ba575be76825f7c35eb94e57c824a99a453db8d1 SHA1 eb030fc07ce8d93b0367e8efddbfda5526d89b7f SHA256 3b9d3fe101c66ec96accb9a92f3fc32ca01f6888780ee303594e65fe7b9c0e0a
+MISC ChangeLog 18013 RMD160 6b00166d23bce744e516a940249b17ca83bdc36b SHA1 3ab58c46cd76743ec2828d043f104e997df04b83 SHA256 4099ef841b2ee55d11e73911d0c5b2522957f241b41f59a19175f7c128f61a24
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 MISC resin-3.1.9.ebuild.orig 4095 RMD160 d972eb56398156b5d830eb618db311f2df148c59 SHA1 ffe6cc9350aec0791aea62e5c369e51572d3ce5d SHA256 c526874025d8fddd121aa296be092503dea0b73b5277df4eba973cc51e27f57b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBAgAGBQJLu5V4AAoJEBZyv1r2qA5Gy18H/R+3N6pb9bScp+bE/r2wDX44
-H9JEycruMJgsvynFCqrXtsZneT+WnIRYa/MVb22tIZKi6nSERikvbQyCViBvff7t
-WrqvAzyS5OvhvDKMirySahzNHIdbVBjGKMgKrst2bVB6Ea8T6xV/dvoA6j8M9Qsf
-z8LJ/+yogjMByABu7pXxjIbuholpKWj3pjdpuTNwWdWaESWcuTz943CWfs2yHFYX
-cEMaeJQAdleXlQLm3IjEefn9T5HCQsl6sydzimZE/JPeeF/BDcNu8mC2HY9H4eNl
-j2wjGCvdSvXz8HTgg8pI83pxvicTWmKajSCfGxUMmz8BL5PZhKaIEpP9PAM5Qic=
-=NvLL
+iQEbBAEBAgAGBQJLzOEeAAoJEBZyv1r2qA5Gc3sH+I/0m+n5+FsqWjar1jgxun0N
+LHNVO1tpGfK5hEdCPfkZqedlonenzRqJ8Ndy/FZimlAPJ4sn5Fi1H19Q3zJLIE2/
+/eqpCs/lJTbb3IQh9JABpQtupI8pyEHCJViL8qx6/Bb/qVCa5C6BQDOX/f9SbaXO
+tnUg6U2Hl+qz+juyWFITWMQg8EQvaNYuUtJZ5LE3D55npxQ65jpohBgm6p1OcYlx
+6yC5PxD8QKEn1y/S0sYyL7/H67TeIrXhyyBbxbxQL28ULBsTkC5bUFNYhTIyaiwg
+PU+h/+voKJcK631kuK7q3wl/eHvXa7bVMcDtRPjRbIcOn+jm8OC/s5TbKxLf+Q==
+=lORX
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/4.0.6/resin.conf b/www-servers/resin/files/4.0.6/resin.conf
new file mode 100644
index 000000000000..b205f671a22d
--- /dev/null
+++ b/www-servers/resin/files/4.0.6/resin.conf
@@ -0,0 +1,12 @@
+# 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"
diff --git a/www-servers/resin/files/4.0.6/resin.init b/www-servers/resin/files/4.0.6/resin.init
new file mode 100644
index 000000000000..ee39862047d9
--- /dev/null
+++ b/www-servers/resin/files/4.0.6/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.6/resin.init,v 1.1 2010/04/19 23:02:47 nelchael Exp $
+
+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 -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.6.ebuild b/www-servers/resin/resin-4.0.6.ebuild
new file mode 100644
index 000000000000..d109bc4a009a
--- /dev/null
+++ b/www-servers/resin/resin-4.0.6.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.6.ebuild,v 1.1 2010/04/19 23:02:48 nelchael Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib autotools
+
+DESCRIPTION="A fast Servlet and JSP 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 doc"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}
+	dev-java/glassfish-deployment-api:1.2
+	java-virtuals/javamail
+	dev-java/jsr101
+	dev-java/mojarra:1.2"
+
+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"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+}
+
+src_prepare() {
+	for i in "${WORKDIR}"/${PV}/resin-${PV}-*; do
+		epatch "${i}"
+	done;
+
+	# No bundled JARs!
+	rm -f "${S}/modules/ext/"*.jar
+	rm -rf "${S}/project-jars"
+
+	java-ant_bsfix_one "${S}/build.xml"
+	java-ant_bsfix_one "${S}/build-common.xml"
+
+	mkdir -p "${S}/m4"
+	eautoreconf
+
+	# Symlink our libraries:
+	mkdir -p "${S}/gentoo-deps"
+	cd "${S}/gentoo-deps/"
+	java-pkg_jar-from --virtual javamail
+	java-pkg_jar-from glassfish-deployment-api-1.2
+	java-pkg_jar-from resin-servlet-api-3.0 resin-servlet-api.jar
+	java-pkg_jar-from mojarra-1.2
+	java-pkg_jar-from jsr101
+	ln -s $(java-config --jdk-home)/lib/tools.jar
+}
+
+src_configure() {
+	append-flags -fPIC -DPIC
+
+	chmod 755 "${S}/configure"
+	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"
+
+	einfo "Fixing log directory ..."
+	rm -rf "${D}/${RESIN_HOME}/log"
+	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"
+
+	einfo "Fixing location of jars ..."
+	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
+
+	einfo "Symlinking directories from /var/lib/resin ..."
+	rm -rf "${D}/${RESIN_HOME}/resin-data"
+	rm -rf "${D}/${RESIN_HOME}/watchdog-data"
+	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"
+	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.0 resin-servlet-api.jar)" \
+		"${JAVA_PKG_JARDEST}/resin-servlet-api.jar" || die
+
+	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"
+	rm -fr "${D}/${RESIN_HOME}/doc"
+	rm -fr "${D}/${RESIN_HOME}/keys"
+	rm -fr "${D}/${RESIN_HOME}/licenses"
+	rm -fr "${D}/etc/resin/"*.orig
+
+	einfo "Fixing ownerships and permissions ..."
+	chown -R 0:root "${D}/"
+	chown -R resin:resin "${D}/etc/resin"
+	chown -R resin:resin "${D}/var/lib/resin"
+	chown -R resin:resin "${D}/var/log/resin"
+
+	chmod 644 "${D}/etc/conf.d/resin"
+	chmod 755 "${D}/etc/init.d/resin"
+	chmod 750 "${D}/var/lib/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.xml."
+	elog
+}