Version bump.

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

5 files changed, 255 insertions, 9 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 31b7173d83ae..7e1299ca4c55 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.114 2012/02/24 17:42:49 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.115 2012/03/04 11:22:24 nelchael Exp $
+
+*resin-4.0.26 (04 Mar 2012)
+
+  04 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org> +files/4.0.26/resin.conf,
+  +files/4.0.26/resin.init, +resin-4.0.26.ebuild:
+  Version bump.
 
   24 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> resin-4.0.25.ebuild:
   Update ebuild for EAPI 4.
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 1dc312d9bc12..1f95a31edbdf 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -11,31 +11,36 @@ AUX 4.0.22/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4
 AUX 4.0.22/resin.init 908 RMD160 b85bb7817f876048e591be0213c487acc189d52e SHA1 8b436642076056a79c776eebb1001c4d1bac286e SHA256 77b1f1bf28a5ce801078032b0efaa6b99e8736a4163f724f00822be42902e2cb
 AUX 4.0.25/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
 AUX 4.0.25/resin.init 908 RMD160 dbfa049693fc7373d30d481a76b8066a21f1c33a SHA1 69abf9be9bbb0c87b3072ac073ae6ef1c700d7b1 SHA256 44bbee11c62b17f1af1d89ef8e280ab7be90f5720e167ba4d0d97fad03e9b39f
+AUX 4.0.26/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
+AUX 4.0.26/resin.init 908 RMD160 46b2bbde2412e052e95b10a5a822ff5b19b0bff2 SHA1 74f18fabdfb3eeb12b08f1b8c081555aa9e10c1c SHA256 2f439af29c448bcfd062a6b53ddcff80db997814014ee06727ee3dc155ec360e
 DIST resin-4.0.13-src.zip 17439983 RMD160 943355c103cde76fa24dbeee7e05d194aceed44a SHA1 11a48ed5e36554de16585a1b74147710e189e64b SHA256 2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e
 DIST resin-4.0.14-src.zip 17542066 RMD160 78e08e690c14b6a492732d0268022e2baa7d0c2e SHA1 14a2408c16bac2a076bbfbea789e5254f75faf32 SHA256 6a0b1bed5240609672041529a1b6b926f45356f47114ce4db0df1262a0b98fa5
 DIST resin-4.0.15-src.zip 17560013 RMD160 9bd57ff57a283660a38e4c186d98e967f29a16d0 SHA1 b087614d22683481f2a01c57220382f44d028dd0 SHA256 e9dcedcc4de44d738571d0bbb2cce747aaeff517ae571ab6e46f74fa969d4f39
 DIST resin-4.0.22-src.zip 17540820 RMD160 4d913c9ce9b8e7d05f7df55ce88662ea8980f218 SHA1 7717c3bf1250a39c00eda9e254fd094abc17ee60 SHA256 5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a
 DIST resin-4.0.25-src.zip 17971688 RMD160 76f5fbf89f1e032ac4b985fb7aa10bf4615024cd SHA1 63d891d369d8706c5049b49701ba8dc8b1449db4 SHA256 e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a
+DIST resin-4.0.26-src.zip 17879008 RMD160 b50421da70d5755d01568f1fa241e92d557ab32b SHA1 640c5b5511312d846d256d1269ed981c3122a57f SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e
 DIST resin-gentoo-patches-4.0.13.tar.bz2 2487 RMD160 f6615dda025bb8a0ac322d5194fe9b76844a7ff6 SHA1 1e69e6c80641904ba42f08c1110dec4fb2eb2ce6 SHA256 56bc88cb760d683f893b68f9421465c2205681de5d3ad7a5f58888d6d0e5a6e4
 DIST resin-gentoo-patches-4.0.14.tar.bz2 2486 RMD160 dfdfa5f327374122088e4a81d29f1fd9842cddb6 SHA1 d14360ef94bbb296c46977cab8d6f541c02727ed SHA256 716f23fa775a8a6460e8ebdf2873932433f18fbe1f05ef868c4769ab4db5c30e
 DIST resin-gentoo-patches-4.0.15.tar.bz2 2494 RMD160 7ace79eaeda84fd5f79396e9fdb7bea337f06b35 SHA1 2d731ebf597705485e57cc1ef656aaef1a7ac1c4 SHA256 e404a734c715123625541d4a4770c8709855a81abc9336b81be5bd6b3be81fee
 DIST resin-gentoo-patches-4.0.22-r1.tar.bz2 2625 RMD160 6533334de58d2ea470c2643485c129643efaa9ae SHA1 f69ca9603b0a54474f0fb41e09c4370479bf02e4 SHA256 4f29cabe826f535d9b2d324d7f70b9983410cd4b8c250a166fa1e74f1ab3d828
 DIST resin-gentoo-patches-4.0.25-r1.tar.bz2 3208 RMD160 222da0db88576d7c6be8a379b9285aa935dd1aad SHA1 0f90ac7d0ff02715fe7c41e3f7fa3b1ac55aff6f SHA256 bbdcd0ba71670869171356ff15dd13461aac667e75b6998019864d75876132d2
+DIST resin-gentoo-patches-4.0.26.tar.bz2 3826 RMD160 846fe3cd0cc097ffa510eca87ffd480342b57a4b SHA1 c800cc8d1ab9d977341491520d37aa5ca46d7e65 SHA256 adff1fb68e38af68add2e16e3832406a105e14532ee022ad315a955d6d6f4f31
 EBUILD resin-4.0.13-r1.ebuild 4977 RMD160 590d16626e5bdcb29dcf29d143c0acfe16b97f11 SHA1 7b65d4ba5264379067038529170b7398417200fc SHA256 29254bd9ea5fcb5028fa99a8ee2b1b06fc238a15603a885ed27528b8a3fc5b03
 EBUILD resin-4.0.14.ebuild 4976 RMD160 1aecf62dbb6f9d7c247ab32707b9d734c101e971 SHA1 0f9c882c4ffc6d00de6403dcf8d01f8d37ba2e58 SHA256 a9c4b2c10bf5b7b60b04e25ff7035366278d335adcde39dbedd01401d810b51d
 EBUILD resin-4.0.15.ebuild 4976 RMD160 846f97b4cbcb902b1e4a4c1421b75af9676a47db SHA1 d07c321a48c399c738e38f544ca9e22712c89336 SHA256 b39195c6a36def94f68003f737643bef1194bfbd02765c4b8f829a30905f171a
 EBUILD resin-4.0.22.ebuild 5047 RMD160 367c35caa2fe68ed625c2d2288a7c94d4999722b SHA1 623effc96592f339dbf3edc8903919a7a09723b5 SHA256 1d7f71d134a43d94f37725877583eaf0b27f5281037d2897b226cf5285d23fc2
 EBUILD resin-4.0.25.ebuild 5125 RMD160 5663b56b7a301945d9cf1f06b6c529e5222009eb SHA1 8370d8a91b46d7f8abd5c01608d7cd58518e02a0 SHA256 bb988fac94f4a57d65687f99c0ae403c5111e1a88e53c3ad1a208fe6bf990ffd
-MISC ChangeLog 21276 RMD160 6631095bd3f118910be2ea4c885ace79dc2bca8d SHA1 edcbd9d528f17c087483d65c15930e7037a57db7 SHA256 dce83cfce2d65e4bbc3e662a0dffcc7cb1806b16d42f7f95b73afc8e079e5000
+EBUILD resin-4.0.26.ebuild 4984 RMD160 6e8afb303b33c16dd10ab2ed5fb80b984b9697e2 SHA1 2277549ab46ef441663dbfcb425aa7807e9d57b3 SHA256 bb93f5940d81ed46feffcbc19369f82b7f05f14853c458b76acc136a3546c010
+MISC ChangeLog 21452 RMD160 2930f9d3cfbd0855c0c0dc56363a75109b1e8e8a SHA1 e310f972f2994136c16902da1facdbc5e0715ec7 SHA256 d9358ed2774a3ee4c563288213a137eae30e97c531d149e33546fc173b8dd1fe
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPR8whAAoJEBZyv1r2qA5GBHkH/29whG8UB2T+UN17Qt6cNDNZ
-eBGNNa8nEKQW4jS0ja2HPwh+H2Ifcf/aPkkNZvT704sEFbhXnoTQ4rn3MmrwCzrX
-yh3p2HJ6CYCZv0S9UIbTsdXo5oDZ12re5RVLn1AH2kaB2uaXoO7Px77Q9w4Ck+oZ
-BFVtEj2z4vawU2pbavPJ+WgwpOTGFPc6Eae8T1BbVKfHdg6cjozqWPVdNSeLZaSw
-J6kTA1/d9uAlO3OCYeAtrwMxhBubkI4QRgDXicW15RSMZjku21AKV2LsTe+t3Ng0
-8319b+CBl10USls2v5Vdf1u0GXVPVRWPQ48mfp11x1ayJmEbzcvhUsjf7tJLvcM=
-=WiQa
+iQEcBAEBCgAGBQJPU1B2AAoJEBZyv1r2qA5G4fgH/0zbGBWIBSS3LkS9LS9/sPVA
+CKRihrzcV0YUU4pXzE9ziJavv42j1JTVqSFDXnl4r0pBPbaQr2QksMSbT18KDQBQ
+RZ2fOyz4vuurgKEqoVPGW/Z6kHoZRLX0fzjfL4aGa/RafFFXy9psMe/KahTe07vq
+49FyOSz0NkrZPHz8R3uvlTPcV2hMEA4rxM5WwxNGzy7sLcORnL+dFUUBkVzXRgtt
+RLASoBxSIbqJLOeEe7bzRIWtHM/QRm2kYcLigQ3f1ugRpELabbDBBffQrjPcbYgI
+PErftkFzMOnU7QpLScxHfORJExXG+3F/xVPlkMvMSB0zby5Rzk0ie1vXNY38MKk=
+=1Hmj
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/4.0.26/resin.conf b/www-servers/resin/files/4.0.26/resin.conf
new file mode 100644
index 000000000000..a48840b5e9f2
--- /dev/null
+++ b/www-servers/resin/files/4.0.26/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=""
diff --git a/www-servers/resin/files/4.0.26/resin.init b/www-servers/resin/files/4.0.26/resin.init
new file mode 100644
index 000000000000..60902eb97f77
--- /dev/null
+++ b/www-servers/resin/files/4.0.26/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.26/resin.init,v 1.1 2012/03/04 11:22:24 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 -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.26.ebuild b/www-servers/resin/resin-4.0.26.ebuild
new file mode 100644
index 000000000000..26203fdab182
--- /dev/null
+++ b/www-servers/resin/resin-4.0.26.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.26.ebuild,v 1.1 2012/03/04 11:22:24 nelchael Exp $
+
+EAPI="4"
+
+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;
+
+	# 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"
+
+	mkdir -p "${S}/m4" || die
+	eautoreconf
+
+	# Symlink our libraries:
+	mkdir -p "${S}/gentoo-deps" || die
+	cd "${S}/gentoo-deps/" || die
+	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 || 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.0 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.xml."
+	elog
+}