Version bump.

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

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 34218ff1c238825d9c040b3e6562038bb98b8cc4..3faac9879c46745b2e2e5fecc16c162c53a7b6a7 100644 (file)
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.91 2009/12/12 13:16:58 nelchael Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.92 2010/04/02 15:41:27 nelchael Exp $
+
+*resin-4.0.5 (02 Apr 2010)
+
+  02 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  +files/4.0.5/resin.conf, +resin-4.0.5.ebuild, +files/4.0.5/resin.init:
+  Version bump.
 
 *resin-3.1.9 (12 Dec 2009)
 

diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index a9f29d74ed9eb10298da9121ac8ff1759cda80aa..3bef34da5536989ab3dd6a608decacceeadba5aa 100644 (file)
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -9,24 +9,33 @@ AUX 3.1.9/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db
 AUX 3.1.9/resin.init 885 RMD160 12576668fc5e41b6a635c9bf50a6791c43a5b93b SHA1 88981660e5f34f51c2bd6d777d721fccd8df8ead SHA256 d061817a68b51c5d51ef95c069ee94c9d8a50739cee97cf90abf15964df3e566
 AUX 3.2.1/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 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
 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-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
 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 4095 RMD160 d972eb56398156b5d830eb618db311f2df148c59 SHA1 ffe6cc9350aec0791aea62e5c369e51572d3ce5d SHA256 c526874025d8fddd121aa296be092503dea0b73b5277df4eba973cc51e27f57b
 EBUILD resin-3.2.1-r3.ebuild 4049 RMD160 7c6d56f1883609f6a6dfd1bab81328387f0087da SHA1 8137be15da5837a810603ca758eeea82321d39f8 SHA256 3fb6f4497a1d565bce9f61a11b6751c2a7977772aa3c46906c798d376d6947c5
-MISC ChangeLog 17345 RMD160 bc7b8b076501435c2cd243920132ef7f08237916 SHA1 2abf38bff3b99b328e3befe58c7ef28edfd59c79 SHA256 480dbca89012728f5f35667bc881b870223432357d29d4dfe186de48e7b2b0d5
+EBUILD resin-4.0.5.ebuild 4086 RMD160 4c12df2f47c4ceb3096f67795a8c1111e8841f30 SHA1 2478971f4e09799ec45cc5953ecfbac86f5e64a1 SHA256 d22c94080dc9ff3135411408cea414dcc5bb40ecbb26079d6b8775b12c80db44
+MISC ChangeLog 17517 RMD160 272c73e91de4c1886ec81a6ebbb75c81ecfdb2cd SHA1 9739cb0d7b8c1c76f1b67dcdecbf935fd37364a2 SHA256 4a52cb60382228f7729be74de2fe1d45d1015b6f2ffbf09f3ec8b12b9a79f3e8
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAksjl9AACgkQgo/w9rxVVVEofQCeJ2BnG5STWQYkOxLZ3rkE2oR6
-gKUAn3NvcNbsCY7WgOQNXe1JViZr4OYd
-=VUt8
+iQEcBAEBAgAGBQJLthAtAAoJEBZyv1r2qA5GBocIAIZPU9uOkeZCjSfDvDjWA/wP
+NXeJaKslSbahWr2cAfhEB8SjRRipGefpPglq7KyAw6BFCSJALWi3olY7ucm7a3xk
+v/rXyailXcX+2zfLaJMXyecSNl5qhqjCmOVr39E+lOWEGOrJH8ffUZANtCn++zQB
+3D+tRiAacJZh6hZZDRCe9JG4R2ZeWRyC2kar5BLlJ+TBTVBe8whpIWYANp1JmzoW
+vym1b5ws/b/C9wXEkjnN29xZKg98wiBLqPWnYqO2OWZMifvIv2+flKg6QdSCj34j
+YZ2vFVU0ncnUCPmnk7OBtXKEY1WlvRr/xjIEgC9mGoWsucWYVetOV1xaZm82BnQ=
+=qKS0
 -----END PGP SIGNATURE-----

diff --git a/www-servers/resin/files/4.0.5/resin.conf b/www-servers/resin/files/4.0.5/resin.conf
new file mode 100644 (file)
index 0000000..b205f67
--- /dev/null
+++ b/www-servers/resin/files/4.0.5/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.5/resin.init b/www-servers/resin/files/4.0.5/resin.init
new file mode 100644 (file)
index 0000000..3cc0be3
--- /dev/null
+++ b/www-servers/resin/files/4.0.5/resin.init
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.5/resin.init,v 1.1 2010/04/02 15:41:27 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" "stop"
+
+}

diff --git a/www-servers/resin/resin-4.0.5.ebuild b/www-servers/resin/resin-4.0.5.ebuild
new file mode 100644 (file)
index 0000000..b7b1c6b
--- /dev/null
+++ b/www-servers/resin/resin-4.0.5.ebuild
@@ -0,0 +1,163 @@
+# 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.5.ebuild,v 1.1 2010/04/02 15:41:27 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"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="~dev-java/resin-servlet-api-${PV}.3.0
+       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
+       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"
+
+       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/*.xml
+
+       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
+
+       dodir /usr/lib/resin/project-jars
+       cp -a "${S}"/project-jars/*.jar "${D}/usr/lib/resin/project-jars"
+
+       use admin && {
+               cp -a "${S}/doc/admin" "${D}/var/lib/resin/webapps/" || 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 -fr "${D}/${RESIN_HOME}/doc"
+       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.xml."
+       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.xml."
+       elog
+}