Version bump.

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

3 files changed, 209 insertions, 2 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index fc5294ad7feb..7e2db3f33552 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.99 2010/10/14 20:44:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.100 2010/12/12 14:04:02 nelchael Exp $
+
+*resin-4.0.13 (12 Dec 2010)
+
+  12 Dec 2010; Krzysztof Pawlik <nelchael@gentoo.org> +resin-4.0.13.ebuild:
+  Version bump.
 
   14 Oct 2010; Vlastimil Babka <caster@gentoo.org> -files/3.0.25/resin.conf,
   -resin-3.0.25.ebuild, -files/3.0.25/resin.init, -resin-3.1.8.ebuild,
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 34368f91bf7c..1aeb5f49e4fa 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -7,16 +10,30 @@ AUX 4.0.6/resin.init 882 RMD160 60fdac73535024f7397ab605298a18f5a1ae3914 SHA1 3c
 AUX 4.0.9/resin.conf 421 RMD160 5869858f10bdd568a0121146cc4529faa5cee45b SHA1 db9c4d43297180c6c2e4905bcc2b226c8025ee32 SHA256 a8452f209faf7224db93d325978e559ffd7742540af9190c649f793faaf7d0df
 AUX 4.0.9/resin.init 882 RMD160 5e6d2accb8ae6a6066bf3d6ed383121ccb45eee1 SHA1 49304a452daadfb740cbaf82574a30120466e9c1 SHA256 9a51f28c3b69752ea3698f55cae05b92efef409926f95fc4c6c6c43bacfee117
 DIST resin-3.2.1-src.zip 14228533 RMD160 42ab0609d1c00a5bba8f5d3be64b09ca81a8b0a9 SHA1 25c74bb307bd2fbce6e6324effb644b33715c1fb SHA256 d51d81b7748f90936c9f13ad4dea704d250fe9bd4cc73ddf2387def05ed3f591
+DIST resin-4.0.13-src.zip 17439983 RMD160 943355c103cde76fa24dbeee7e05d194aceed44a SHA1 11a48ed5e36554de16585a1b74147710e189e64b SHA256 2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e
 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-4.0.9-src.zip 16980516 RMD160 2fb2367585907ed0a3abefa790b1735418790c39 SHA1 50dc6919b0ff114e07eef68a3f2f90a8889f8fe1 SHA256 ff825948e07306a1f92ceec6a40f5eedb19a5c05142e35fed66992f5f47e0cb7
 DIST resin-gentoo-patches-3.2.1-r1.tar.bz2 4202 RMD160 012888c1b89943a78919cdbe046480c99eac3315 SHA1 a467cb8db54a1660ad0deedfed12d4786809b2ed SHA256 18c145d94d2f9a56ac582e6401639588d5597bcde0b69c5702ccf86ec154126a
+DIST resin-gentoo-patches-4.0.13.tar.bz2 2487 RMD160 f6615dda025bb8a0ac322d5194fe9b76844a7ff6 SHA1 1e69e6c80641904ba42f08c1110dec4fb2eb2ce6 SHA256 56bc88cb760d683f893b68f9421465c2205681de5d3ad7a5f58888d6d0e5a6e4
 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
 DIST resin-gentoo-patches-4.0.9.tar.bz2 2820 RMD160 2f115b563683db34a2aafb2c5e62980b0660022e SHA1 34e8c5837c910209af6ff564e9a938ff62fa0bf2 SHA256 606a3489d2eba330fec96df8c953623ee0ce3c03fbee0f52192a553cdc614af0
 EBUILD resin-3.2.1-r3.ebuild 4122 RMD160 22649cee4681b83514118bd19e4a9e4be1905e4d SHA1 0abfffa06198148d3517bd9208d7819b2c2706ab SHA256 a42d7cd807efdc79f36e71d6052d2f1f72d42bd046ebde5edfa3d5fcd5696aca
+EBUILD resin-4.0.13.ebuild 4976 RMD160 4e678140e4e62b7bdb46a2f46cc0842fb5b11523 SHA1 e738641b689732b52076db02aca6fb1eda0a1e27 SHA256 afae79ac9be4ed9a212b55b31bf341d11d47590aa2ccd4f2ae5f543c2eb3d937
 EBUILD resin-4.0.5.ebuild 4164 RMD160 97bda6a104c780f4f692a969a52af3e054515ff0 SHA1 d8067c23549d6bb5166948fb45319410633d79a5 SHA256 6c2e9b8a738a7639a896d89d9a1c5b4f77e60ab568222ad0624d21ed1c083897
 EBUILD resin-4.0.6.ebuild 4819 RMD160 ba575be76825f7c35eb94e57c824a99a453db8d1 SHA1 eb030fc07ce8d93b0367e8efddbfda5526d89b7f SHA256 3b9d3fe101c66ec96accb9a92f3fc32ca01f6888780ee303594e65fe7b9c0e0a
 EBUILD resin-4.0.9.ebuild 4975 RMD160 8cb37adc8f083a094b68a81e8ab08d5e61e147b7 SHA1 4900e120ff8720f15ca4499b8726a5ff6f25ce23 SHA256 db01f1fe09cdae4c23fc7a01d0c0bc08c0288dfd1f446c7d86df23d63fa93513
-MISC ChangeLog 18803 RMD160 41416e1d12d636dc259d26f479b38a36863faf91 SHA1 fa345d92b3aaa8f0ba58d77d1c7f7637c1d745ef SHA256 e2b191d8ce671e25aeca49b3b8434e6e6ac9ef18eccf7f35982e4565c2e33351
+MISC ChangeLog 18928 RMD160 d1d4b0ebba1dd06e2c03b4f5e445db393dc28269 SHA1 9b8aeefce25ade024a5bb915133cfe904a97cf84 SHA256 764fb7c003c903b074c94e565333a1d1410ebd89fb33c2dc9bf0a71a20ab26b9
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNBNZYAAoJEBZyv1r2qA5GiywH/iYbdafmj45EfIHkpgpPWzXp
+OUuClcFoGnHbngHkdZteLHbKdSSHcqoBb2gHqJNcnrq4S441itgyIoarbII36fJ/
+EUsmQmAIw1ahf45jiP/txVEcOnrFy9UsZFzmBmDYI+b4df97xqLt05hZ6lsKQZYz
+aFBDXltS/2EvM5mo8kieKLAfldQe+PojWuB8EPkUV/EnmmL0UVZqMmiy/GyRkTek
+M6pwLSEtq29IToCyAN5DXJiCjkCOluk6QwGEsVXIRJj2Ebx6JXDYp+nzhNbT8JC4
+sQmb63wqlD8/H05kyTfo1K/9farL6vJnakg2bU7pCiykdrDUw8hfVqQPh8ySJL4=
+=6Evm
+-----END PGP SIGNATURE-----
diff --git a/www-servers/resin/resin-4.0.13.ebuild b/www-servers/resin/resin-4.0.13.ebuild
new file mode 100644
index 000000000000..b3733ea55229
--- /dev/null
+++ b/www-servers/resin/resin-4.0.13.ebuild
@@ -0,0 +1,185 @@
+# 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.13.ebuild,v 1.1 2010/12/12 14:04:02 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
+	dev-java/validation-api:1.0"
+
+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;
+
+	# Respect LDFLAGS:
+	sed -i -e 's/-o/$(LDFLAGS) -o/' modules/c/src/resin_os/Makefile.in
+
+	# 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
+	java-pkg_jar-from validation-api-1.0
+	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
+}