Version Bump. Thanks to wltjr. You should come back.

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

4 files changed, 143 insertions, 16 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 5ded38e81ec3..8997af32f1e1 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.80 2010/08/31 15:12:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.81 2010/12/21 08:52:51 ali_bush Exp $
+
+  21 Dec 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.0-build.xml,
+  +tomcat-servlet-api-7.0.5.ebuild:
+  Version Bump.
+
+*tomcat-servlet-api-7.0.5 (21 Dec 2010)
+
+  21 Dec 2010; Alistair Bush <ali_bush@gentoo.org> +files/3.0-build.xml,
+  +tomcat-servlet-api-7.0.5.ebuild:
+  Version Bump
 
 *tomcat-servlet-api-6.0.29 (31 Aug 2010)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b0a6d6ef5bb5..02c420189371 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.5-build.xml 2864 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b SHA1 f3da528002c5463406141bf63b5301d5518577f5 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a
+AUX 3.0-build.xml 3192 RMD160 e17bae60d4fe6ac0e9242a06bc61dc1ffa662ef6 SHA1 578f48ea0a52de8339ef061932f44d0fe45bd723 SHA256 94539ae9bb8360efcdcb3c9529a21cad7f3a744ef6491f54c8baea2a656a4a9a
 AUX jsp-api-2.0-manifest 474 RMD160 a443fc3b2085d4eb9bb494202025e03e8123f9e9 SHA1 b2886991939e7270a006bc91e17524c3a75fc68d SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0
 AUX servlet-api-2.4-manifest 310 RMD160 7ac278202ae5e30561cea42d602504bbdbb84dae SHA1 4faf5f3e370e8b2741b7eeae9a5181853b496eda SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 RMD160 344230cac551a483cef439153dd18bc5ff570f1a SHA1 7116af55e2e3f964d834da325694e2d4f9a27a36 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951
@@ -11,6 +9,7 @@ DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b7
 DIST apache-tomcat-6.0.26-src.tar.gz 3472211 RMD160 84f8ad4d894204a8930fa57633c3aed43bf66cd2 SHA1 afe0aa87d004a89f4ad314314b17bd4e7222250b SHA256 376a02d4fa56c4bbdc981965e62db74aa6c63fe0f056d9c82b4558013a74a88c
 DIST apache-tomcat-6.0.28-src.tar.gz 3325872 RMD160 4a699324f332b8c32fa79615f14681a0fa9924b1 SHA1 0df5e58518607ff738bbf440d829747df6acb9ce SHA256 0d6354d45de39e3593ae8f8e6e1361caaa55835e73838f003000e53c6c7ff73a
 DIST apache-tomcat-6.0.29-src.tar.gz 3330475 RMD160 eb789c63aaf629ec897b4280924e086c969169f6 SHA1 255e080706578be0b0f15c67989718ab94e52837 SHA256 9746483edb46b112a81b57376701c7c23c5c657675c2c7efa3187447c07b9d28
+DIST apache-tomcat-7.0.5-src.tar.gz 3790790 RMD160 c09630d499c2bc3e5dfa69b8ff345f53e969a811 SHA1 e69524cca265a34c1abf7c8d53dd52622e22299d SHA256 f289474b8deb869682f5f8fad4355600caa99d779b4414917401ab9a647ee737
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 1020 RMD160 3ff4d9ad796f8ab50184cb320ea4ea70dbed90f8 SHA1 274595f3f036af8e7070485848126279b5a0459b SHA256 db3bb41efebee7c7a34a4ec5366ea161f6a4617af17e52ef62229197572bdce6
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1132 RMD160 0015dbbe52367b5f0b984dc2c6238a8976122667 SHA1 9445f4f17a3ee1009177ed614cba92214e31f05c SHA256 53159cd44962ea7175a0bdb4c62500f2ba59a00382ea4e1caf3f9fd643a429af
@@ -20,16 +19,6 @@ EBUILD tomcat-servlet-api-6.0.20.ebuild 1004 RMD160 e1c3406a677c97e3e57239cc8624
 EBUILD tomcat-servlet-api-6.0.26.ebuild 1003 RMD160 b20f524bf4727d8025451a83f28763e7be1d4e35 SHA1 046cf96de053421e10d6aed90833b6f23d9f426c SHA256 4f03c7659df08cac63faecea291b75d47704f3c19dffdc05b92297da5d550af8
 EBUILD tomcat-servlet-api-6.0.28.ebuild 1011 RMD160 4f32ad1192f3b6e96057554419e04c90f4496cf8 SHA1 1dd611dcf0edcbc41d0141251c027f42ca0068a8 SHA256 8f05c975ef63c5f9037d73d276f2421e59f4e421a9c1b33be3d9a3682cbd9e08
 EBUILD tomcat-servlet-api-6.0.29.ebuild 1009 RMD160 fb863534c730913179f0e4c401d15e211ce5ff0e SHA1 dff3d348ba11015bfe0bfe62f36883da56b33b47 SHA256 1d8a7eef754546daff07695a76c11434845cb1b4f0e2508825526097b50ddce5
-MISC ChangeLog 13274 RMD160 554912f9973f1d8cfdb66b4f4c43ae497c160484 SHA1 ba7b4dcb57a8690a2b93d6b02b2de0084bfdee45 SHA256 149d7eb16ce07768cd72356613f1d4ec277cdbd55cebbc2a8fb08e8a2c52e2b0
+EBUILD tomcat-servlet-api-7.0.5.ebuild 1124 RMD160 3779ba3a7436816366503a745c9e752b8613f9e5 SHA1 4881bc835fb0320b7a339f54f02908fd16daf53e SHA256 2e0345b0d07a7b3ed8734edb45aa51d2c008eab058dd66d0132452215389e20f
+MISC ChangeLog 13566 RMD160 7bfbc74e372282e16abc04a1513c45e475cf5057 SHA1 230568a1e59b36799ffa7ed5516592b98de9d3d3 SHA256 82cadfdd987f34c3e11c7e1016731bba74296c1711f03f7bb3b4d6c0b11a9da6
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQEcBAEBAgAGBQJMfRvXAAoJEBZyv1r2qA5GPOgH/1fLZh+c5Wae4yQ5dfrqSZGW
-oyNa2z1TlwlmYJmng2EORctOLC6jAwkU4RycUqjacP2S/vppInbRsMugEzLnWe7F
-skiD7IMfFpb4au5BfD66yFyWoDDkS/2RQvc5acPnyBCuhw8S6m08iYBasE5x+uH3
-7glgbcHoyHChJSKjDSFVD3CHUywb2WYvRCB58j4XLyEW8LgULCVenX41hqpdbzdM
-rimBFkpw5d10DrAE0MoeK8j22JgvHrk8Ee1szPXAzt2wf4rrG0Cd1dvHCW7qXaSM
-IOL6srQmEyd2Ke54hM9qBCH8SrcVGJjyqZUj4gdslOkuKUmvAKhhgaaNkPKaiyI=
-=toTZ
------END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/files/3.0-build.xml b/dev-java/tomcat-servlet-api/files/3.0-build.xml
new file mode 100644
index 000000000000..c685394d83f9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/3.0-build.xml
@@ -0,0 +1,92 @@
+<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.5"/>
+
+  <property name="tomcat.build"      value="${basedir}/output/build"/>
+  <property name="tomcat.classes"    value="${basedir}/output/classes"/>
+  <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+  <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+  <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+  <!-- Just build Tomcat -->
+  <target name="build-prepare">
+
+    <available classname="junit.framework.TestCase" property="junit.present" />
+
+    <mkdir dir="${tomcat.build}"/>
+    <mkdir dir="${tomcat.build}/lib"/>
+    <mkdir dir="${tomcat.classes}"/>
+
+  </target>
+
+  <target name="compile">
+
+    <!-- Compile internal server components -->
+    <javac srcdir="java" destdir="${tomcat.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**,**/.svn/**">
+      <exclude name="java/javax/annotation/**" />
+      <exclude name="java/javax/ejb/**" />
+      <exclude name="java/javax/mail/**" />
+      <exclude name="java/javax/persistence/**" />
+      <exclude name="java/javax/xml/**" />
+      <exclude name="org/**" />
+    </javac>
+    <tstamp>
+      <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+      <format property="TSTAMP" pattern="hh:mm:ss"/>
+    </tstamp>
+    <!-- Copy static resource files -->
+    <filter token="VERSION" value="${version}"/>
+    <filter token="VERSION_NUMBER" value="${version.number}"/>
+    <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+    <copy todir="${tomcat.classes}" filtering="true">
+      <fileset dir="java">
+        <include name="**/*.properties"/>
+        <include name="**/*.dtd"/>
+        <include name="**/*.tasks"/>
+        <include name="**/*.xsd"/>
+        <include name="**/*.xml"/>
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="jar" depends="build-prepare,compile">
+    <!-- Servlet 3.0 Implementation JAR File -->
+    <jar  jarfile="${servlet-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/*" />
+        <include name="javax/servlet/annotation/*" />
+        <include name="javax/servlet/descriptor/*" />
+        <include name="javax/servlet/http/*" />
+        <include name="javax/servlet/resources/*" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.2 Implementation JAR File -->
+    <jar  jarfile="${jsp-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/servlet/jsp/**" />
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+      </fileset>
+    </jar>
+
+    <!-- JSP 2.2 EL Implementation JAR File -->
+    <jar jarfile="${el-api.jar}">
+      <fileset dir="${tomcat.classes}">
+        <include name="javax/el/**" />
+      </fileset>
+    </jar>
+
+  </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild
new file mode 100644
index 000000000000..845b7c52fd73
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 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-7.0.5.ebuild,v 1.1 2010/12/21 08:52:51 ali_bush Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+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 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV/_/-}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}