Version bump.

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

3 files changed, 67 insertions, 9 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index b1178fd1bfcd..e59cf9cb3330 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/resin-servlet-api
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.52 2011/09/06 16:26:16 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.53 2011/09/06 16:38:38 nelchael Exp $
+
+*resin-servlet-api-4.0.22 (06 Sep 2011)
+
+  06 Sep 2011; Krzysztof Pawlik <nelchael@gentoo.org>
+  +resin-servlet-api-4.0.22.ebuild:
+  Version bump.
 
 *resin-servlet-api-3.1.12 (06 Sep 2011)
 
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 210968149ca5..b5d435e322a9 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -8,6 +8,7 @@ DIST resin-3.1.12-src.zip 13579367 RMD160 1bbd5cb11e2d8b6e89be6b28dc6f6f283a8c5c
 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-3.0.25.tar.bz2 4781 RMD160 b7e370e5ce5869e22659caa77f81fe341894e8e6 SHA1 b11675e71cd0a5c019ad4368a2c4440bbe42226a SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd
 DIST resin-gentoo-patches-3.1.10.tar.bz2 1626 RMD160 cd59d0bfc45f61af2670a563a3eeca10d873ba08 SHA1 5a43c7027480b90ec40ff7d3af9f9146646eb19d SHA256 c1cd5b5631e534d670173c465436822980e9df6b9bcfd15f7a25efa09b8faedf
 DIST resin-gentoo-patches-3.1.11.tar.bz2 1625 RMD160 05d2a9e21f95bed8f2ef49cd21de4868f77adef8 SHA1 70cb2bb56e6c5bcf34e96b91b9473b4cb17a9f07 SHA256 a071d2d1af5e9eae56c80035c4efef02d546e0d007c3a2d7cd6a529152df9484
@@ -19,16 +20,17 @@ EBUILD resin-servlet-api-3.1.12.ebuild 1256 RMD160 218284f2510e937996e0df628e4f7
 EBUILD resin-servlet-api-4.0.13.ebuild 1272 RMD160 4b68096bc0dbe9cfde0feb3e6bcdb7b6e8546ae7 SHA1 fc22200d21d9feb745cb1abdef796f704efb9ac2 SHA256 467d85716ec19e3f5a004c94046436f413917e51fbc10714c5a58736fe18c2a4
 EBUILD resin-servlet-api-4.0.14.ebuild 1274 RMD160 4b3ebe3122d7a98afd3e1b35dbf8f8c2c47f0d8d SHA1 05d313f7bdd1af3e4d87fa86488032ef42e95310 SHA256 19e8ee96b7221ff167bc91183f5e6b1fa2800c6ec5d6570f516d085d5aeeb59f
 EBUILD resin-servlet-api-4.0.15.ebuild 1274 RMD160 b3ae2d2dbe60c36621e4e72d543ad32c748ac6c9 SHA1 f12b0ea2bd6dd4dfeaeffeca54a2a7c8741dbf3f SHA256 e0d608c177f8d36afa353b760500fd9276d0bf8def09a4902877a9db24e58f26
-MISC ChangeLog 8799 RMD160 eacacfa7492e917ab9843bc0afb2060a02321b85 SHA1 f390948c7c3b7a44d0a7b17ee2892bbcab7e5c30 SHA256 3e446cd2ea40073721843cef73572fc1862c3cc8892a956b86be6d08deee040a
+EBUILD resin-servlet-api-4.0.22.ebuild 1292 RMD160 f758d0f998e9ced8388337c7a835471ba24d29bb SHA1 8ffa531f1884d10e8a6b1440f2dd92846c72de17 SHA256 c216c353d77135ffeec93bc014bdb3b5aea83d1158dd47e618a3c1376fc171ad
+MISC ChangeLog 8947 RMD160 6d47abb832c6241eaf4657c61495e20a9d86eb53 SHA1 63d3e7ce0414e1652e71ee87f8d2b637eec1bd06 SHA256 e9739f5f03a49bb387e00e11b641647850f524b274866544687097c345c77d7b
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOZkm1AAoJEBZyv1r2qA5G9XgH/Rwg95z3zsBjEFgA0u3tJshz
-M/XNCbk8CJIaRLSr39o+GsIP8CfiHDu7k/4MU/6OJd+L8PjrPKJu1xve7xkfQb12
-jp3Xt+kbo5rtNOVujioPYj1efo8dJypcI3Aa3mrIpG4zGjmvrx8hMMC1y/lvhEX6
-c5+4d4j1FFnhAzX7b20EuCUYlK4sT2XTBr7ptYJH5hTXThlOIOHHdkXwaVs6hAFI
-hWHtOwCS+2AQJEtHez53Ja5jJW8PmU2RtVbvltn59gAPfq/vC6i64szN4S+Ygizk
-ztr/uHk+4Wi6l4NUJ0WLahOkzwttH5pa+Cv2J4lDiHMTFNLzGOZmJmDEhBKw/mA=
-=qZJF
+iQEcBAEBCgAGBQJOZkyVAAoJEBZyv1r2qA5Gui0IAIEeeb5ElWtef+ae0mo5F8Zx
+G5nP54CPErGj/kfhZwnrSgbprfuoXe1hfYyY3xhQNeX/QjPpZuAdj4zMqE1A3gzy
+k1V/dtmOXODXdD85VrbcZQ/P6Q0Ba+lAYd9o1A2hO0jk62c4w1sTIbkoMYddMe0s
+OtP69NLlSHeIrAtHg9o7dT8GqYE5jB0chzRl/fCgOvSuch/nEc+UHDA25JzBEjsD
+Yi0VWsF70/FH6G2lZ9bldOF/amnDSCEp4xCR70PRP/Lk1cr32O5PlX7ixALYEC6Q
+vBtLilUSUm+E3kWrjWT4MkXxL2Vc782nb7HsGKqbaRDacpcjZT5Wo+2MX+Ct6/I=
+=5hKD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild
new file mode 100644
index 000000000000..61891d8391e2
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/resin-servlet-api-4.0.22.ebuild,v 1.1 2011/09/06 16:38:38 nelchael Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+	java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+	use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+	dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+	java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}