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

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

3 files changed, 46 insertions, 2 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index d30bd634ff88..5dd39a30cd12 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.118 2012/01/06 12:36:14 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.119 2012/01/21 23:31:25 fordfrog Exp $
+
+*tomcat-servlet-api-7.0.25 (21 Jan 2012)
+
+  21 Jan 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-servlet-api-7.0.25.ebuild:
+  Version bump
 
   06 Jan 2012; Miroslav Šulc <fordfrog@gentoo.org>
   -tomcat-servlet-api-6.0.33.ebuild:
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 8a9bd080c8d4..15a0ecbf4c09 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,6 +8,7 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 RMD160 d8c845a356f732dff656a21589cd
 DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
 DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
+DIST apache-tomcat-7.0.25-src.tar.gz 4114977 RMD160 2ba8934a16b994702722f15fac5511da7b2c9966 SHA1 009b5bf79bb155894d256061bdc141c2e520a05e SHA256 645bcf6e6f09e85c84d1ce9c000bd1eda6f4dac040063ef32531b4fc736b2a35
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 1012 RMD160 7162d724cf0b85b8892fe9e926e440875dbdf82e SHA1 cd2a7a4e7e6107fffec32e89707e8071ee7d82f2 SHA256 a101a43011c0e6d3c4ec9526191796015df9e67f963b194554841ea90c997c4e
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1124 RMD160 f22a99ac10fd8355a40f68ea761bfd85501e36c4 SHA1 4515a13611c64e16cf060abb5d8a2a59e8e0bef6 SHA256 6651724adea54fc7c46f80cd0772ca976fd073d63cfccbea273f5e667e262706
@@ -16,5 +17,6 @@ EBUILD tomcat-servlet-api-5.5.34.ebuild 1565 RMD160 717ccb930f6b4a690e1a4422f751
 EBUILD tomcat-servlet-api-6.0.32.ebuild 1005 RMD160 c8e74032f6786421216f83c2745a1382158ec7ca SHA1 d7296f1815a04d36790616e369311c4364276f1a SHA256 e0104a014337a4805370254e92f2257b7208fa8cb3f4a5729bee9b6a3cda5ea4
 EBUILD tomcat-servlet-api-6.0.35.ebuild 1009 RMD160 9ea8171846114addadd767474f8f290b384f7b8d SHA1 cfb03a4f24d8f3e46c575b16ef9a819bd2592b77 SHA256 f60415373191de4c335fd7634194495c928cbaebb6003c36396fc0c113b12217
 EBUILD tomcat-servlet-api-7.0.23.ebuild 1108 RMD160 d32def994bb7746adf7483a7ae7dcde091c31fdf SHA1 cb3806236cc0a5e4c28df1ba2b4b3048b89791fa SHA256 007a50e407cd5b099fbb37daa82946a55b66c510ad3bdf3427aae68673622fef
-MISC ChangeLog 19029 RMD160 bec171ba3d88af82470322b315162ea58685db03 SHA1 991e2e5f255609ff87176c7246b807c30511d6af SHA256 127347aa75798b66199acf6fc951a2d7b2251442636ad3acd9953ab407a1710a
+EBUILD tomcat-servlet-api-7.0.25.ebuild 1114 RMD160 39bfb860c7de79add49f70044bb854921862c2c9 SHA1 8264928e50616965b9db1ef6d74a5bd8dd764baa SHA256 161309d9e508fd1e41467c941004a7934c26fb89041e93b43d86d16e208d42df
+MISC ChangeLog 19176 RMD160 de540412ae3e6bd6686a2bff6718512aa75db1ac SHA1 db30a2e0825494bdb24023fa10fee0d40cc929ce SHA256 ad335a20b605017f9df012cf88fb17f112c97d6493a12a9d647c5c70148f85e1
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.25.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.25.ebuild
new file mode 100644
index 000000000000..577172430fd9
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.25.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 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.25.ebuild,v 1.1 2012/01/21 23:31:25 fordfrog Exp $
+
+EAPI="2"
+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 ~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/
+}