From a68fff31177abbae514ae4f0678b798a4799b517 Mon Sep 17 00:00:00 2001
From: William Thomson <wltjr@gentoo.org>
Date: Wed, 10 Jan 2007 16:52:40 +0000
Subject: [PATCH] Bumped 6.0.7 to beta from alpha Package-Manager:
 portage-2.1.2_rc4-r6

---
 dev-java/tomcat-servlet-api/ChangeLog         |  9 +++-
 .../digest-tomcat-servlet-api-6.0.7_beta      |  3 ++
 .../tomcat-servlet-api-6.0.7_beta.ebuild      | 49 +++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta
 create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta.ebuild

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 8a8e28a4d9b2..083743898573 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.1 2007/01/05 03:27:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.2 2007/01/10 16:52:40 wltjr Exp $
+
+*tomcat-servlet-api-6.0.7_beta (10 Jan 2007)
+
+  10 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-servlet-api-6.0.7_alpha.ebuild,
+  +tomcat-servlet-api-6.0.7_beta.ebuild:
+  Bumped 6.0.7 to beta from alpha
 
 *tomcat-servlet-api-6.0.7_alpha (05 Jan 2007)
 *tomcat-servlet-api-5.5.20 (05 Jan 2007)
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta
new file mode 100644
index 000000000000..1309a094c51c
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.7_beta
@@ -0,0 +1,3 @@
+MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405
+RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405
+SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta.ebuild
new file mode 100644
index 000000000000..f626e25c7424
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.7_beta.ebuild,v 1.1 2007/01/10 16:52:40 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P/_beta/}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/jakarta/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="source"
+
+DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )"
+RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
+
+S="${WORKDIR}/${MY_P}/"
+
+pkg_setup() {
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
+	rm */*/build.xml
+}
+
+src_compile() {
+#	local antflags="jar $(use_doc javadoc examples)"
+	local antflags="jar"
+	eant ${antflags}
+}
+
+src_install() {
+	cd ${S}/output/build/lib
+	java-pkg_dojar *.jar
+#	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc java/javax/servlet/
+}
-- 
2.26.2