Version bump.

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

5 files changed, 260 insertions, 11 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 63c653ed3553..8f4b24c35ad0 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/resin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.107 2011/03/15 20:12:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.108 2011/09/06 16:46:05 nelchael Exp $
+
+*resin-4.0.22 (06 Sep 2011)
+
+  06 Sep 2011; Krzysztof Pawlik <nelchael@gentoo.org> +files/4.0.22/resin.conf,
+  +files/4.0.22/resin.init, +resin-4.0.22.ebuild:
+  Version bump.
 
 *resin-4.0.15 (15 Mar 2011)
 
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 06004616f34d..0da0fb27e4bf 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 4.0.13/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
 AUX 4.0.13/resin.init 908 RMD160 1eaf21ce2f732030d99a80540517c33cd25328b1 SHA1 37fdacdfb502f38eabce074d5b2438ced65dceeb SHA256 c0f70f050e8fc700913ba4073072a9f3910a7f8dcb8ebde8f7484a1f8e3cb9e1
@@ -7,25 +7,30 @@ AUX 4.0.14/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4
 AUX 4.0.14/resin.init 908 RMD160 ca04eda90a854e8d778a994741fd5bba24abd0dc SHA1 10678cd1bcb379949496d80eb3be875c3664092b SHA256 218bc0e124ce053cf2bc8c117aab72bd7e190ccd645bb4d9ed135579ad7f6b74
 AUX 4.0.15/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
 AUX 4.0.15/resin.init 908 RMD160 22d49d34fa12f279e20c025f4c901bc0266b1b41 SHA1 111b582eb2afc169230cba98ef0059ced3c80f87 SHA256 bcaafac942230e63839dd715a0f29d6791b06b6d28d61b863531f6adc3be6c52
+AUX 4.0.22/resin.conf 542 RMD160 a2f3d5f14e25d86e48a81083ebb92cb312487e30 SHA1 4b19701e4826f9ea497de3b6b092fcf4e508c0b6 SHA256 d240091b3306ae4562c82cfcaf016e1d21e8abbd92a927a069beecd74383bd1e
+AUX 4.0.22/resin.init 908 RMD160 b85bb7817f876048e591be0213c487acc189d52e SHA1 8b436642076056a79c776eebb1001c4d1bac286e SHA256 77b1f1bf28a5ce801078032b0efaa6b99e8736a4163f724f00822be42902e2cb
 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-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.tar.bz2 2489 RMD160 966e227dc41c17c5661c0dc5e192459ceb6a3a4a SHA1 ce7a1f15518e143a1ef3b465c4f965e49d577f0b SHA256 ba5494cd88c10bdfb3d382d9c5a563d69db4ab7435f0296783dd3ab665ad093e
 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
-MISC ChangeLog 20299 RMD160 7747493653cad9554c853c7c5088764732e79232 SHA1 80358b45d1d7e78d273c700ed44a2c77ab6a5193 SHA256 7b96765999d7d2ee2b1686e44c2fb994caafa4c1c4c4ff73bbfedaf787e2c557
+EBUILD resin-4.0.22.ebuild 4976 RMD160 d4b95b9b5e7a1bb00c9a742debcb8da17b6ac9d9 SHA1 99be822992d4d84469a39490a661c5f6728b9963 SHA256 732b1f8b7979043573f9fcf758b7d4dbf310715a6677848139f2e40a1cd08eb0
+MISC ChangeLog 20475 RMD160 ef8ee148a98fb81b34bb23585db877c5bc37640a SHA1 fc40565534145079d4dd07620cd0ab0e2793ef55 SHA256 ef4beae2cb38880ee3f21045c1fc2a6d393bfb4d0bdacff83e867e63551d0bf9
 MISC metadata.xml 301 RMD160 538a8bd3441672377f3b6cbd4379f28cf9f88322 SHA1 b7a6235c113394ffc793eb809466e90675b06fb8 SHA256 3b0fbe1b181439b3be84c84aad1999588b0b4a40fcfe43c3158e114bf2acf8e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNf8g+AAoJEBZyv1r2qA5G8hsH/1IYbDe/CLeoan3oxKKUcV0i
-B6v626fBlTlBvJHM0eFAWkd8SehWBWvOJkOELcwFBFb6hO9RZpevMPcYo3KHqK3z
-pmuohwQNOhGJNH4HqGoFdreHYYoBC+3nC/4CdHcZhq6a3M7KQ0xYZD3sTjg1Yl1e
-1Tq6MzF0/3kRIIQqenqPd8ilP/UsvsPXG3+GdC6X4KZriAyyx1VvtEpJor/AaGAp
-bP9T5wdT8rakuqnvLhVrbzlTXlhJYVRK59BOLG5ntx17eb/jvE8l8uNeUr+VgTZt
-P3G2edjdS2R1NfojoNZZCuJK9TOg5xUmHYO0fndc1YfJjRdcVL40IPqtNbEEkOQ=
-=24KW
+iQEcBAEBCgAGBQJOZk5UAAoJEBZyv1r2qA5GDh8H/1O0cdcOz7zuaVF8FtkazFvW
+VGU/YkViMHN920DhQSoS3NqbtcLpDny2ca/NkiPUDDUwXhy45qEv7TChq+oXLqIT
+Rgqw/nD3/ClSCtZP/05IPOE3D2Pl2vsw+gpS2IJKd+dehtnLqTBPPO1pgEdfZkWf
+JZNV65/UkUqYpnL4nEgpYfMVC73Pbla8bqcrYAA0UfOqLfdLb7+d8p/NunitmWlh
+hw4Ub8mkCWowf2qfnteLhti8wmOM9b9qVNEzlF9SIQ4EhAeguQ7ilqtctGH6NtMN
+9lmD6J1ZzBUOH9rwVcvrjX2by9Y9XTpwlfMTYJrdalJ73EAV9XdeiWGDhNQMk0g=
+=MjDz
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/4.0.22/resin.conf b/www-servers/resin/files/4.0.22/resin.conf
new file mode 100644
index 000000000000..a48840b5e9f2
--- /dev/null
+++ b/www-servers/resin/files/4.0.22/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.22/resin.init b/www-servers/resin/files/4.0.22/resin.init
new file mode 100644
index 000000000000..7cc85522ef28
--- /dev/null
+++ b/www-servers/resin/files/4.0.22/resin.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/4.0.22/resin.init,v 1.1 2011/09/06 16:46:05 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.22.ebuild b/www-servers/resin/resin-4.0.22.ebuild
new file mode 100644
index 000000000000..e5ea1ed40c79
--- /dev/null
+++ b/www-servers/resin/resin-4.0.22.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-4.0.22.ebuild,v 1.1 2011/09/06 16:46:05 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
+}