dev-java/tomcat-servlet-api: version bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xCFE47E2F

4 files changed, 141 insertions, 2 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index d83ea5702fbf..f4277d088a6b 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.176 2015/02/10 12:16:27 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.177 2015/02/19 21:39:54 fordfrog Exp $
+
+*tomcat-servlet-api-8.0.18 (19 Feb 2015)
+
+  19 Feb 2015; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-8.0.18.ebuild, +files/3.1-build.xml:
+  version bump (per bug #540694, ebuild by William L. Thomson Jr.
+  <wlt@obsidian-studios.com>)
 
 *tomcat-servlet-api-6.0.43 (10 Feb 2015)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 77710d08193b..11f6b7f320f2 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,5 +1,6 @@
 AUX 2.5-build.xml 2864 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a SHA512 729fa2287e7178fdbc15747e57c9792de7a34366af3ab7bb703f17168ad1b296e395883e1d859dce0edb9640ca65e495b3b3224d5c2c91275f2fb35852cf4c0e WHIRLPOOL b882958a2be6610ccd81a21e74446c9f6f31dd306896360a42fc6929774159c1f71b7101ed9d19b855a6ddbe2c0d54e9841c5f28a5ab31532f27109521284506
 AUX 3.0-build.xml 3192 SHA256 94539ae9bb8360efcdcb3c9529a21cad7f3a744ef6491f54c8baea2a656a4a9a SHA512 fff70f29b7b8025ce10261c9afc140b0765aee35821fbbdc161872ecec4819832ed12a71bb54e9eea96ecf8418f51a11a8716b07bfdfb957dde6bc1abe8ee7e8 WHIRLPOOL b4ed25230c69d896003e53e66f17512b9c2a67ed8360207aa8ac5e3c20daa28885ddd8410b85e18b8a4fcf6ff3bf0a91eaf145500d1687db808c7f4ecc194800
+AUX 3.1-build.xml 3193 SHA256 4021d32b23fea3b34f37a2552c3021f9945d1d0f1b472319800d4e8323b15b21 SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8 WHIRLPOOL 48424ae2709c6d9b5ea4caab2b1fd4f1d1914b7c6925b3f8aa7a2012d55f6ad1a32af7170d3bb97e9f779c8ecc6bc6e645bee26b0dba8182f9a1a057b062a603
 AUX jsp-api-2.0-manifest 474 SHA256 62c4ac2cef5685a2a631270034a945b1eaf774e89362486e27fd357dd928cfd0 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41 WHIRLPOOL 72e236694417c2b34d38ad3cc3fd64ffd66dffce57f7eb69de58dcf87dcde5e29c8e67ef18043e25c29ec910cf3b99b1d74daaec2147052718b752fabc07267d
 AUX servlet-api-2.4-manifest 310 SHA256 134371e8d3d0b137096e268df05751c4bcb29911d62746c70510253d6b334fd5 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca WHIRLPOOL 3ac699acb5527d6682c7960f650871b1ce370848e6a24b8c77105a47ed3afadffa4302a04cc4298e20369c8d7447c598c06d5304d121d9da2cd19caba9445d9d
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
@@ -10,6 +11,7 @@ DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02
 DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
 DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
+DIST apache-tomcat-8.0.18-src.tar.gz 5019289 SHA256 ab1085912c26356ea1526c1679f3a950fe97483d9ee2041e63a17cb058c763bd SHA512 4aa908fc5d59ee2070a10d688c5977b7a8ba3507df2ed067c76f1a3e41fff369a7b7323ef1330f2227e4b1c3e3b1c3172a800f194f62fc1c9a594c79da362f67 WHIRLPOOL f23109f0e3c5fd9f01231cc844c9e35e202f33f81b87ca84ac120f43abc2316cd97679c8c5b9ca8a46b5c1bf04ead4bcb9ce85bcd588189dfd6a41e9b98dc5ba
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
 EBUILD tomcat-servlet-api-3.ebuild 1007 SHA256 c80db78ac3e23f5f8f78929aad52c1a8c0a05b37fea13d625255fbc449deccec SHA512 324b65194811d1ece66c095049b684793cd9cbc77b0015b88b8cdb76ff6a7ea9c2ecddd4d45d7a67767bef13d3bad5dfd47e4dc55b9c061357bee2dc74ed4646 WHIRLPOOL a92b67d64bbc384f04fcba39578e8681cd8a0556a7af8a626fbf8ee75c50f8e3d2adb96e3afe79b322c772f75b612c5135fc88c8e7f207fdd5f4ced09d30326b
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1144 SHA256 760a639f1db06019140df2d3fae8bef8ba3acc07bc5e2aa589a14556470bc653 SHA512 be3c516dba70fdcb83ef5a14b73d17854ddecf66601a9f81df73db578e64aee0dfeaaad069ada7e9bcab3ff4d0dc0851393d7d089b05ee632324e85e1aa66277 WHIRLPOOL 2c371d8ead6f42024dad8c6e72bbe13b349e8cb911b52a0694cd1e7f74f9da0990c94f37967dda673efd8a5d98c7aa8ad37f3debb3aecc3a1c2a85c69612cdf5
@@ -20,5 +22,6 @@ EBUILD tomcat-servlet-api-6.0.43.ebuild 1039 SHA256 a4ca9615a51a42a42267e4366e34
 EBUILD tomcat-servlet-api-7.0.56.ebuild 1134 SHA256 0371eadf576eedc6dce14742b7bf2eb69924c49cdf202456f291f3501ec3b902 SHA512 3201128be640a5b7fdf3485bec52db3e8c6ce5dbe567bf5a9e0372c118bc5e817ed56e6dae4a845f39e1ecd43807aace9102e8c577fdd05c0e492047e6797ea1 WHIRLPOOL f1a8f4943bfdcc54932cc6544d79cf825273c2c32deca88c898ade57c33070a37b913c992965ccc61c77d02596ca1f13833d19addfd2768d406129306c26d9ed
 EBUILD tomcat-servlet-api-7.0.57.ebuild 1110 SHA256 8326083751f71d688f3577b20c465f7177aadc01f17afd5394e929f937040d4e SHA512 844fb1501abad37e15d51a52c023dc07a24fcec0d53e8243930aeb30cc39e2239c8a60ff2a9b48e852efd749d85bd601ee8d9d562e9bfbd76bcd71de2b36b46f WHIRLPOOL 3f7f5bcd5593553b07575c05f67fb1034950a02d9376acc29d1c7be571dea85c06ec12d9b87287f34e334cf97293f5b2a7ecd0d8e345d2ae9eac49546eb4ac4d
 EBUILD tomcat-servlet-api-7.0.59.ebuild 1113 SHA256 bd5a84828befd6fb4d22cb6937070dd1b86bd697163c1007062fbfe5364a1406 SHA512 c23d3b1b7416f7447c8318b8c2b74f682e502d84fd922734f5a318d45db49891486cc2fe26a449c35cd51a02328e560413a78d0ed3af45c427838496268f9ac0 WHIRLPOOL 438c446e8de6a8217eca816f58b26c6e51c3d8dc2abacf234f830d0068611a1bd326635b78d766f80dbfb15b260a54e47cb037757ce93341e40ad1944f3ae67f
-MISC ChangeLog 28028 SHA256 b4ed576d4e3af6086edfb8e612ade102ed8e4662e973466cbc433edc9df10d42 SHA512 e1136b56d61578303d754585bedbbfd071664a2dc67353e3c460435215ac83367afe9ce2623f24f5d042e0d0202dd259221408b8a0ef7b455918f389b817b4e4 WHIRLPOOL fa3256eed236b240a213442c4db4cb0e3d9e26bd3e6a6be8cde66ea312e1543e0223ae0108d8ac30008a16089dfc2698ca4014c9a583c2b7d0e6124d83ad6a98
+EBUILD tomcat-servlet-api-8.0.18.ebuild 1131 SHA256 76fa50c606265fb4fbd9821b13bc289234b5801056dc970549b0181a41290d78 SHA512 a5aacfa30278ee3dc3de37cd057687c2d603f918ba822b4519751fa0360892eed268b5ad8f5b7e69544ffdb4a40a4c4f036d2a3e8908ce8be642cd82fb58b6fb WHIRLPOOL 9ccbe089bd6fa1bef707c421c8012e5e172836fcd9dce3898b183b51e290b9caa48d328c76d88df7a441cf917be1bf3c6e6a8bb5d4e4b80930d98853eef11d0c
+MISC ChangeLog 28278 SHA256 542a854cfecee1daf11d79d1a5fe72255b4660144f1a934075e6deadfa8b5e46 SHA512 375417585d3bcb78d9e57c1040fe442756e19d682b5635dacf4100d4ab21775429be41d691af6e4c0eff8484694906c623676bf9b9193f788c8ad94f3f0154f1 WHIRLPOOL 419744de5f543446a3ac5957665c8c1123b72ccdf8492c7be5c5c66bf2da1579b0a196ecc1974085d691c59cb3519ba91325934fa8786019317a19083676b4a6
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
diff --git a/dev-java/tomcat-servlet-api/files/3.1-build.xml b/dev-java/tomcat-servlet-api/files/3.1-build.xml
new file mode 100644
index 000000000000..ea0ef877570d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/3.1-build.xml
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir=".">
+
+  <property name="compile.source" value="1.7"/>
+
+  <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.1 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.3 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.3 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-8.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.18.ebuild
new file mode 100644
index 000000000000..18c5384b7719
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.18.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 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-8.0.18.ebuild,v 1.1 2015/02/19 21:39:54 fordfrog Exp $
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+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' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}