Version bump.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 105 insertions, 1 deletions

diff --git a/dev-java/resin-servlet-api/ChangeLog b/dev-java/resin-servlet-api/ChangeLog
index 408eb5dc0934..17937c5c445d 100644
--- a/dev-java/resin-servlet-api/ChangeLog
+++ b/dev-java/resin-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/resin-servlet-api
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.38 2010/04/02 12:38:10 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/resin-servlet-api/ChangeLog,v 1.39 2010/04/19 21:13:20 nelchael Exp $
+
+*resin-servlet-api-4.0.6 (19 Apr 2010)
+*resin-servlet-api-3.1.10 (19 Apr 2010)
+
+  19 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
+  +resin-servlet-api-3.1.10.ebuild, +resin-servlet-api-4.0.6.ebuild:
+  Version bump.
 
 *resin-servlet-api-4.0.5.3.0 (02 Apr 2010)
 *resin-servlet-api-4.0.5.2.5 (02 Apr 2010)
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.10.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.1.10.ebuild
new file mode 100644
index 000000000000..1f3bb607bb8f
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.1.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 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-3.1.10.ebuild,v 1.1 2010/04/19 21:13:20 nelchael Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
+	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_prepare() {
+	mkdir -p "${S}/lib"
+	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+}
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+src_install() {
+	java-pkg_newjar "lib/jsdk-15.jar"
+	use source && java-pkg_dosrc "${S}"/modules/jsdk/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/dev-java/resin-servlet-api/resin-servlet-api-4.0.6.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-4.0.6.ebuild
new file mode 100644
index 000000000000..469bc0e5668e
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 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.6.ebuild,v 1.1 2010/04/19 21:13:20 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}"
+	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"
+}