Revision bumps to use new Java system.

(Portage version: 2.1.1_pre2-r4)

10 files changed, 141 insertions, 2 deletions

diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index cf1e6a6dae2b..f66475bc5596 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/servletapi
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.36 2005/12/27 14:29:52 axxo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.37 2006/07/20 23:26:32 nichoj Exp $
+
+*servletapi-2.4-r3 (20 Jul 2006)
+*servletapi-2.3-r3 (20 Jul 2006)
+*servletapi-2.2-r3 (20 Jul 2006)
+
+  20 Jul 2006; Joshua Nichols <jnichols@gentoo.org>
+  +servletapi-2.2-r3.ebuild, +servletapi-2.3-r3.ebuild,
+  +servletapi-2.4-r3.ebuild:
+  Revision bumps to use new Java system.
 
   27 Dec 2005; Thomas Matthijs <axxo@gentoo.org> servletapi-2.2-r2.ebuild,
   servletapi-2.3-r2.ebuild, servletapi-2.4-r2.ebuild:
diff --git a/dev-java/servletapi/files/digest-servletapi-2.2-r2 b/dev-java/servletapi/files/digest-servletapi-2.2-r2
index e41ce4ac8d1f..f9a8fc45e279 100644
--- a/dev-java/servletapi/files/digest-servletapi-2.2-r2
+++ b/dev-java/servletapi/files/digest-servletapi-2.2-r2
@@ -1 +1,3 @@
 MD5 4ab97805b2ba8b55ba21ff580f99ed6a servletapi-2.2-20021101.tar.gz 65342
+RMD160 9fc0def14700c4850455da1312e50135fd56eea9 servletapi-2.2-20021101.tar.gz 65342
+SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 servletapi-2.2-20021101.tar.gz 65342
diff --git a/dev-java/servletapi/files/digest-servletapi-2.2-r3 b/dev-java/servletapi/files/digest-servletapi-2.2-r3
new file mode 100644
index 000000000000..f9a8fc45e279
--- /dev/null
+++ b/dev-java/servletapi/files/digest-servletapi-2.2-r3
@@ -0,0 +1,3 @@
+MD5 4ab97805b2ba8b55ba21ff580f99ed6a servletapi-2.2-20021101.tar.gz 65342
+RMD160 9fc0def14700c4850455da1312e50135fd56eea9 servletapi-2.2-20021101.tar.gz 65342
+SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 servletapi-2.2-20021101.tar.gz 65342
diff --git a/dev-java/servletapi/files/digest-servletapi-2.3-r2 b/dev-java/servletapi/files/digest-servletapi-2.3-r2
index a28f1848bdb6..9614243c9dae 100644
--- a/dev-java/servletapi/files/digest-servletapi-2.3-r2
+++ b/dev-java/servletapi/files/digest-servletapi-2.3-r2
@@ -1 +1,3 @@
 MD5 93c8d908366f778d893ef672803a764a servletapi-2.3-20021101.tar.gz 127874
+RMD160 8abc64d7099de3a247e67acb5cb4fe9434ebe2d1 servletapi-2.3-20021101.tar.gz 127874
+SHA256 1f73439d3d0f6e95e24d4226c10829c1622a86911a346d93ceefed5035a6caee servletapi-2.3-20021101.tar.gz 127874
diff --git a/dev-java/servletapi/files/digest-servletapi-2.3-r3 b/dev-java/servletapi/files/digest-servletapi-2.3-r3
new file mode 100644
index 000000000000..9614243c9dae
--- /dev/null
+++ b/dev-java/servletapi/files/digest-servletapi-2.3-r3
@@ -0,0 +1,3 @@
+MD5 93c8d908366f778d893ef672803a764a servletapi-2.3-20021101.tar.gz 127874
+RMD160 8abc64d7099de3a247e67acb5cb4fe9434ebe2d1 servletapi-2.3-20021101.tar.gz 127874
+SHA256 1f73439d3d0f6e95e24d4226c10829c1622a86911a346d93ceefed5035a6caee servletapi-2.3-20021101.tar.gz 127874
diff --git a/dev-java/servletapi/files/digest-servletapi-2.4-r2 b/dev-java/servletapi/files/digest-servletapi-2.4-r2
index fbefd200c037..2d7060069885 100644
--- a/dev-java/servletapi/files/digest-servletapi-2.4-r2
+++ b/dev-java/servletapi/files/digest-servletapi-2.4-r2
@@ -1 +1,3 @@
 MD5 3555d6ee9374cf2afd2c01b72f71969a jakarta-tomcat-5.0.19-src.tar.gz 3645543
+RMD160 dd3b98c52d3f0ce4df341ee1d9baefb64ed0cba1 jakarta-tomcat-5.0.19-src.tar.gz 3645543
+SHA256 59bc6f5a7a49e9132ac4c58c33e0859bc806d6da6ee6042553d3b56beba337cb jakarta-tomcat-5.0.19-src.tar.gz 3645543
diff --git a/dev-java/servletapi/files/digest-servletapi-2.4-r3 b/dev-java/servletapi/files/digest-servletapi-2.4-r3
new file mode 100644
index 000000000000..2d7060069885
--- /dev/null
+++ b/dev-java/servletapi/files/digest-servletapi-2.4-r3
@@ -0,0 +1,3 @@
+MD5 3555d6ee9374cf2afd2c01b72f71969a jakarta-tomcat-5.0.19-src.tar.gz 3645543
+RMD160 dd3b98c52d3f0ce4df341ee1d9baefb64ed0cba1 jakarta-tomcat-5.0.19-src.tar.gz 3645543
+SHA256 59bc6f5a7a49e9132ac4c58c33e0859bc806d6da6ee6042553d3b56beba337cb jakarta-tomcat-5.0.19-src.tar.gz 3645543
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
new file mode 100644
index 000000000000..57ce375f2fdb
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r3.ebuild,v 1.1 2006/07/20 23:26:32 nichoj Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE="doc"
+S="${WORKDIR}/jakarta-servletapi-src"
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	cd ../dist
+	java-pkg_dojar servletapi/lib/servlet.jar || die "Unable to install"
+
+	use doc && java-pkg_dohtml -r servletapi/docs/*
+
+	dodoc dist/README.txt
+}
diff --git a/dev-java/servletapi/servletapi-2.3-r3.ebuild b/dev-java/servletapi/servletapi-2.3-r3.ebuild
new file mode 100644
index 000000000000..0ec5e78ddd01
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.3-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.3-r3.ebuild,v 1.1 2006/07/20 23:26:32 nichoj Exp $
+
+inherit java-pkg-2
+
+DESCRIPTION="Servlet API 2.2 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://gentoo/${P}-20021101.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.3"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.4
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3"
+S="${WORKDIR}/jakarta-servletapi-4"
+
+src_compile() {
+	eant all
+}
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/servletapi/servletapi-2.4-r3.ebuild b/dev-java/servletapi/servletapi-2.4-r3.ebuild
new file mode 100644
index 000000000000..4df94636dccb
--- /dev/null
+++ b/dev-java/servletapi/servletapi-2.4-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r3.ebuild,v 1.1 2006/07/20 23:26:32 nichoj Exp $
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Servlet API 2.4 from jakarta.apache.org"
+HOMEPAGE="http://jakarta.apache.org/"
+SRC_URI="mirror://apache/jakarta/tomcat-5/v5.0.19/src/jakarta-tomcat-5.0.19-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~ppc64"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.4"
+
+S="${WORKDIR}/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gentoo-${P}-patch
+}
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar ${S}
+
+	if use doc ; then
+		mkdir docs
+		cd ${S}/jsr154/build
+		mv docs ${S}/docs/servlet
+		mv examples ${S}/docs/servlet/examples
+
+		cd ${S}/jsr152/build
+		mv docs ${S}/docs/jsp
+		mv examples ${S}/docs/jsp/examples
+	fi
+
+	cd ${S}
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}