Version bump.

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

3 files changed, 68 insertions, 10 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index e59cf9cb3330..68920d1d414b 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.53 2011/09/06 16:38:38 nelchael Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.54 2012/02/11 18:45:40 nelchael Exp $
+
+*resin-servlet-api-4.0.25 (11 Feb 2012)
+
+  11 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org>
+  +resin-servlet-api-4.0.25.ebuild:
+  Version bump.
 
 *resin-servlet-api-4.0.22 (06 Sep 2011)
 
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index b5d435e322a9..bee137ed42b6 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -9,6 +9,7 @@ DIST resin-4.0.13-src.zip 17439983 RMD160 943355c103cde76fa24dbeee7e05d194aceed4
 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-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
@@ -21,16 +22,17 @@ EBUILD resin-servlet-api-4.0.13.ebuild 1272 RMD160 4b68096bc0dbe9cfde0feb3e6bcdb
 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
 EBUILD resin-servlet-api-4.0.22.ebuild 1292 RMD160 f758d0f998e9ced8388337c7a835471ba24d29bb SHA1 8ffa531f1884d10e8a6b1440f2dd92846c72de17 SHA256 c216c353d77135ffeec93bc014bdb3b5aea83d1158dd47e618a3c1376fc171ad
-MISC ChangeLog 8947 RMD160 6d47abb832c6241eaf4657c61495e20a9d86eb53 SHA1 63d3e7ce0414e1652e71ee87f8d2b637eec1bd06 SHA256 e9739f5f03a49bb387e00e11b641647850f524b274866544687097c345c77d7b
+EBUILD resin-servlet-api-4.0.25.ebuild 1292 RMD160 89cb09c8d117085a89c89d7ac46ae9546dfefa07 SHA1 c83b08433abffc0b55b15c12a8676c103a088475 SHA256 18954745837dd16b1b9721d301a009c023f031f817f43807e94429f0dab2474d
+MISC ChangeLog 9095 RMD160 c75ca84133ebaeb8b1ae4e1a38a28d4c86a37311 SHA1 c6c1225af05a1d5eefd7a1ff4751f357310fd046 SHA256 bf51766b53197ee49a1252bb55103f5f1d1571bde12111dbe2e3f17c478d1620
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOZkyVAAoJEBZyv1r2qA5Gui0IAIEeeb5ElWtef+ae0mo5F8Zx
-G5nP54CPErGj/kfhZwnrSgbprfuoXe1hfYyY3xhQNeX/QjPpZuAdj4zMqE1A3gzy
-k1V/dtmOXODXdD85VrbcZQ/P6Q0Ba+lAYd9o1A2hO0jk62c4w1sTIbkoMYddMe0s
-OtP69NLlSHeIrAtHg9o7dT8GqYE5jB0chzRl/fCgOvSuch/nEc+UHDA25JzBEjsD
-Yi0VWsF70/FH6G2lZ9bldOF/amnDSCEp4xCR70PRP/Lk1cr32O5PlX7ixALYEC6Q
-vBtLilUSUm+E3kWrjWT4MkXxL2Vc782nb7HsGKqbaRDacpcjZT5Wo+2MX+Ct6/I=
-=5hKD
+iQEcBAEBCgAGBQJPNrdjAAoJEBZyv1r2qA5GyMMH/j8AY6H196KNpMZaaAK0b6ic
+T8+Bj5Zw5IFp/PyWZTOW4/vI6LtKFBO4HYWkfY3OvS62rXqKB9HmW1gZD/Vzmr3T
+nA1clK40081zZI2uCudX4xQEFe+AsJ/6DuMbJ90jeqAb5T7hLSfSrR6pXSOUgtKb
+Pd+h6BWgFIP5YQWX3h/yCNcNU4O8qZNdg/lpXc1FQsPpL6PwiDBbA24GRw6l4XzI
+6CCawimXoq57CKXPBB4dv6Bo0v6YNKTLVk1ctJyTCEyPBHIYLLypl/q72arHFio1
+4sHvHHO6yYfOk0q7P5vDU8EmeaqWcaOnNnHmODxmEE1KZazxt1ucEEbqcOiYuik=
+=3V14
 -----END PGP SIGNATURE-----
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.25.ebuild
new file mode 100644
index 000000000000..9dbb89062d76
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.25.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 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.25.ebuild,v 1.1 2012/02/11 18:45:40 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"
+}