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

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

3 files changed, 49 insertions, 5 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index d251f9dab0b4..7e8369dca55d 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.157 2013/06/27 21:37:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.158 2013/07/08 16:55:36 fordfrog Exp $
+
+*tomcat-servlet-api-7.0.42 (08 Jul 2013)
+
+  08 Jul 2013; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-7.0.42.ebuild:
+  version bump
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   tomcat-servlet-api-6.0.37.ebuild, tomcat-servlet-api-7.0.41.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 6b4b70f86397..16cd67ed75d1 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -13,6 +13,7 @@ DIST apache-tomcat-6.0.37-src.tar.gz 3430692 SHA256 665d72f375a9bf9ec5b8f9300c0a
 DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
 DIST apache-tomcat-7.0.39-src.tar.gz 4295207 SHA256 d9b4daceb2040bff84dbc37ea07d442cf6b0a608b2d161f15740147fac76101d SHA512 f3c054e66f65ea2721c53280e69b069c035f0a870d57c898a4fec716f23bf66be833d2898ae36da44cd13201a3d43984e3b2266927aad5fe3e2245d7f499323d WHIRLPOOL b2b3572bb6c15147bd4c25f90d0b8e1cafe1151bd2736ce3d60828818f87481e1c94448684c825816c6741cda1d5e1c091440245c2ae48cde23779ad55d683e7
 DIST apache-tomcat-7.0.41-src.tar.gz 4407748 SHA256 283a80c5be1a1eda9fc8864b11dcd026ba3bf2433b0d8377a4da4c2536a07ea6 SHA512 dadff0f20e5e7b5c4b46ee7ba4c3bc8776568b6fff182cfd3764abd5eba6e7bb4239a3700969c6065b8991ba8a04061042a917e7bfe29de2afbcce788554fd9e WHIRLPOOL 2bd6dc37704709f0ce1096df1bd96faaf63aa1796d664777ad4f4280e22bbcd0acc06cc48eae852481ef60a16efdf8ae6a1ca2dd4c5dc06ea6ed684103dbfa65
+DIST apache-tomcat-7.0.42-src.tar.gz 4422120 SHA256 5dbc2194b894de0b620752f18f5dc69901627f49b87d9dfb5951750bb9c20c72 SHA512 02703483ceeb218fdbb9c57cd45af3572d0c482ff0914e29862646bf395d03f81efd94271ffa6a59412df1b6cbecc7380e7bfb9e83da8db6a8f63355b722bcd0 WHIRLPOOL 21ba3934169ef9672f0f160e45dad4cdf04827e64bb3fcce1eac6fa7a9d4cf5b699bb96dd07a900bbea1099d35a91fe0df3dbcbdeeef44ef3e969af78aaafcd2
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
 EBUILD tomcat-servlet-api-3.ebuild 1020 SHA256 61b963d839d4498080252504d95c0f0cb6d71a3ffbdfaef58c29439b39cc6e81 SHA512 13f4b0ed04cc6bf7c7d844629fb729271315542b019147d4a8e7d1ce6f573ffbc3ab2ce42059ae6f0d74160b18f0f9146ab5fb93a78df702b5574190ff6c4a76 WHIRLPOOL 1ca4fd948467c414bdb2025cbd6a17057866a7c87374d246c1e950106fb93c2907ef0a5c5c590a01866d3a7ed126a1bca93ab93ddcab2eabe2a2eeaa4b9c6f51
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1144 SHA256 760a639f1db06019140df2d3fae8bef8ba3acc07bc5e2aa589a14556470bc653 SHA512 be3c516dba70fdcb83ef5a14b73d17854ddecf66601a9f81df73db578e64aee0dfeaaad069ada7e9bcab3ff4d0dc0851393d7d089b05ee632324e85e1aa66277 WHIRLPOOL 2c371d8ead6f42024dad8c6e72bbe13b349e8cb911b52a0694cd1e7f74f9da0990c94f37967dda673efd8a5d98c7aa8ad37f3debb3aecc3a1c2a85c69612cdf5
@@ -23,12 +24,13 @@ EBUILD tomcat-servlet-api-6.0.37.ebuild 1039 SHA256 f151cbc93f7b0552e0721cc49a18
 EBUILD tomcat-servlet-api-7.0.32.ebuild 1111 SHA256 795ae51834bbdda9c658fda11c2ba45f1e09dfc45f253c0691bc7fd5661b07f9 SHA512 fa70dd0604ff243c57607f2d758de49467d8a4d1733252bc3694936ef52b0fc6baac1689ffb21582ba002b8589594c20ebb71f20519f0a8666248e49bce63ec2 WHIRLPOOL fb0a30d49fe1efb4aeb57299453d3c53cb380d0280bfd445c3773e37555b0904864357aa7214e2d6be80be823c9ab3148ab8de37be3a3176f44e03e11daec054
 EBUILD tomcat-servlet-api-7.0.39.ebuild 1120 SHA256 de8330bfc178542b36b3d222a0daa43fa348e0dc3127c16b4363250c82a12393 SHA512 5dca889edc3102317a736f1cc725e4d21522ffca01ab606da6dab54fda9c5bad0b8235358961272972c6cf2ac830f829f41d02b7675719ebb135bce9235728cc WHIRLPOOL 890d8753d7ba6cc6496ab1847a2ff56ce0df0a12099f36796aa720f40d3b893c34a1c38fcbbdb2e2fddee3f3e858aadebc98773c7dd57650ebb18745e9b5bb8b
 EBUILD tomcat-servlet-api-7.0.41.ebuild 1132 SHA256 978551a6b9fa51e0b70fa0febbd802ac660c9317a2cecced74acf7270e2e5056 SHA512 82dd69a77670ef136772b638e23c296eb89a6ca3b5cccc852d902436d91e2735fcc5263e2ec68f084a6b0134bd6a424b84b2c240dc239329be3bd72a58bea8b7 WHIRLPOOL f85772eaccc4a875e223d30901f73d90b351c81fca57b4184239e1fbbcd256367b28cc3e9015abef17cc61c9aafb9039725dac70c01d44ef29db48465f1efea7
-MISC ChangeLog 24707 SHA256 efd9ca942dac4569f99353a2b8f36d24aa3d17df44342846014ec1318996fb39 SHA512 d099292879865519b9e8da49cba55106c03d8d98bb26d89949569bd434c4338fd30252801bbbf8cfa37f68f98668c6e48203ed5e7b56c4816688fd5bd950454d WHIRLPOOL 3476d2a8a29ce2d82b13c074a1158115502074d8d614dfc17e0a23df1bc9711ff678478d392e962a082b6d656b7a4a78a1b7fef1315c85457ef2d8296a49619c
+EBUILD tomcat-servlet-api-7.0.42.ebuild 1132 SHA256 f3825dc04842d3a4417948b36f154b9bcd44700f29acbcb368d76dbedb828f92 SHA512 c8be771978ea9696ea2cca0f757399a39b4f787489397a357692319a39f6433df0e3da5068b000bbfea696c43e8566de1b029d6d697bc93b68ed8587f33db7ab WHIRLPOOL bf381af3a9f0b090a7561eb332fefc1f888f4cac1f5ebee35bee85b9702252ed9f9fc1670feec1eb6b69f0b202776ef3eeb8bbb7e27919d5347d365beefd5ecf
+MISC ChangeLog 24854 SHA256 4f859683f0c2f1c6648c711baa69685664140240de637c6e23fcb306528cd173 SHA512 45cbcf077f08e3716a649fe5a4b77e124f759368c2193f16fd554c624da7df08a9a9d218f0054e7ef8f52820260bdaf42369cad18ca9f37954d38ef075734441 WHIRLPOOL 1a09b1e00f8031a82cfc5c9d8d58d792c7168b6045ade640854e07ca0aa37ece8f0117a4e27db69a507cdff311ccc8352cb559639aa7fcf20d65578db2c1b265
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHMsJ8ACgkQvFcC4BYPU0q//QCgtkZZVlU65pi/A4fAec6KYci9
-87UAnRo39zBwjF0mcsWyI2Y7YsCaeXEo
-=gsh4
+iF4EAREIAAYFAlHa7xAACgkQ5LnnVc/kfi+skgD+Ogl1p7LjjFfkYFv2rduAcqpo
+VeY6oATLwG9ABL1juzsA/RpPtlZDqMKOLL3eZ/Jt2RA3Teawr5v+m7scQsAj13Dw
+=h/MN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.42.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.42.ebuild
new file mode 100644
index 000000000000..53a9ecda3403
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.42.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 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.42.ebuild,v 1.1 2013/07/08 16:55:36 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.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 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~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/
+}