Merge remote-tracking branch 'remotes/github/pr/134' courtesy of William L. Thomson Jr <wlt@o-sinc.com>.

4 files changed, 73 insertions, 1 deletions

diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index c26d82662ff0..c314434fbd3f 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -9,6 +9,7 @@ DIST resin-4.0.22-src.zip 17540820 SHA256 5b79a28e82849f97fc6bbf670306e29c19159b
 DIST resin-4.0.25-src.zip 17971688 SHA256 e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a SHA512 c978148674e00101f24702f2ffe4b3220bfd82cad35b0263296efda0b001cdceaa5f18ae170a589aec763627d6cf39ff2ccdd5e195b65c90d04416939bb442d9 WHIRLPOOL 843dc74888f63f96b9ea8526afc88846d55c58a54b4233140984cfe7a0ba365a04b230ef8047caef7e27a413d8e775a15f6fa649c3d8e3a19cc0058abb50f58a
 DIST resin-4.0.26-src.zip 17879008 SHA256 0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512 WHIRLPOOL a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
 DIST resin-4.0.27-src.zip 17990178 SHA256 33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53 WHIRLPOOL 6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa
+DIST resin-4.0.44-src.zip 40342346 SHA256 dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8 WHIRLPOOL bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035 WHIRLPOOL ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
 DIST resin-gentoo-patches-3.1.10.tar.bz2 1626 SHA256 c1cd5b5631e534d670173c465436822980e9df6b9bcfd15f7a25efa09b8faedf SHA512 edd1a115169c7fb2a1cf39a8c5f5dc2325a401ae8ac5a1788813b9ba13aff5e974d296120818310e23e5c0dc205ac2785050dd9c5d7961279b6ffc146342b6bf WHIRLPOOL ee321a16df5fdfc4eb5e4fe1afac660734da77796d6ea13f0d84a00171ca3579436d4f5aa84a6c6b9c242d4c245552b3ffd212cedeb264f518f575dcb517ae6d
 DIST resin-gentoo-patches-3.1.11.tar.bz2 1625 SHA256 a071d2d1af5e9eae56c80035c4efef02d546e0d007c3a2d7cd6a529152df9484 SHA512 5b7b4e1e4ff25bbda2a968d808cd868d8ec19f0d12344039d21a85c4e9b76538b22e998e1390cd83660e878b2e5a7bac8b879a9a540a8f4dc29a49b83ed8987b WHIRLPOOL 728512044037d11ac5a7e3e3b86409fa61ca44c6936272df66de45ca4961ac475d8f97f4b4410c7318597f50748fac820961d9b5b29c3e19ffe6f5755f9a53bc
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
new file mode 100644
index 000000000000..ad72b6b60c84
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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.1"
+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}"
+
+java_prepare() {
+	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"
+}
diff --git a/java-virtuals/servlet-api/servlet-api-3.1.ebuild b/java-virtuals/servlet-api/servlet-api-3.1.ebuild
new file mode 100644
index 000000000000..334cac99605b
--- /dev/null
+++ b/java-virtuals/servlet-api/servlet-api-3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual for servlet api"
+HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="|| (
+		dev-java/tomcat-servlet-api:${SLOT}
+		dev-java/resin-servlet-api:${SLOT}
+	)"
+
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/www-servers/resin/resin-4.0.44-r3.ebuild b/www-servers/resin/resin-4.0.44-r4.ebuild
index 93b73cc83077..99cb5e885e75 100644
--- a/www-servers/resin/resin-4.0.44-r3.ebuild
+++ b/www-servers/resin/resin-4.0.44-r4.ebuild
@@ -18,7 +18,7 @@ IUSE="admin doc"
 
 KEYWORDS="~amd64 ~x86"
 
-CDEPEND="dev-java/resin-servlet-api:3.0
+CDEPEND="dev-java/resin-servlet-api:3.1
 	dev-java/jsr101:0
 	dev-java/mojarra:2.2
 	dev-java/oracle-javamail:0