Fixes #74858.

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index be2575a61e0686423ce62ef2944650ce19f60580..ba4a3cbff6deb4a5c4cfae355aba4c2322a4da99 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.11 2004/11/17 16:58:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.12 2004/12/18 19:32:12 karltk Exp $
+
+  18 Dec 2004; <karltk@gentoo.org> tomcat-5.0.28.ebuild:
+  Fixes #74858 thanks to Petteri Räty <petteri.raty@welho.com>
 
   17 Nov 2004; Markus Rothe <corsair@gentoo.org> tomcat-5.0.27-r4.ebuild,
   tomcat-5.0.28.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ed348d1dcc92d77433325127f8b331e66834cbb9..866c127cc4f2472cbe64578f730854fcedf94012 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,27 +1,27 @@
-MD5 02fee17850ac04fdbf9850d200107d65 ChangeLog 12586
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-MD5 9f43fb32ba8bd0c3316be682bc796c48 tomcat-3.3.2-r2.ebuild 3212
-MD5 ff159c6e5e2e2aa736a45b8649e387a5 tomcat-4.1.30-r5.ebuild 3614
 MD5 1ea6e2a932ade07c0984cf7183eb5d96 tomcat-5.0.27-r4.ebuild 3648
-MD5 340d3df56904b9c399146402227be99d tomcat-5.0.28.ebuild 6954
-MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r2 73
+MD5 3549f3025758ef0a4edb467aeb85b3ee tomcat-5.0.28.ebuild 6953
+MD5 ff159c6e5e2e2aa736a45b8649e387a5 tomcat-4.1.30-r5.ebuild 3614
+MD5 9f43fb32ba8bd0c3316be682bc796c48 tomcat-3.3.2-r2.ebuild 3212
+MD5 c9ad9da77efecd8fec52718d0ded6a44 ChangeLog 12706
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r5 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28 78
+MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r2 73
 MD5 eb7830519ae94bb563d39f1f51ab590a files/3.3.2/gentoo.diff 368
 MD5 04d838f36e57a63e574b2aea1c70dc47 files/3.3.2/tomcat.conf 904
 MD5 78271965848d01760914766b1d1ae425 files/3.3.2/tomcat.init 627
 MD5 69ec5e00d8708345bd24af96c9c3fab4 files/4.1.30/gentoo.diff 463
-MD5 c19b85e130d0e0a565eebc406d699965 files/4.1.30/jikes.diff 510
 MD5 1b596708b069c5ac88ac293e1a759625 files/4.1.30/tomcat.conf 2660
 MD5 dbbe111e7f2dae8a4e01b7b2f0f76ba9 files/4.1.30/tomcat.init 636
+MD5 c19b85e130d0e0a565eebc406d699965 files/4.1.30/jikes.diff 510
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
-MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 MD5 bf74c2bd8c21359ada1793cddfa95f37 files/5.0.27/tomcat.conf 2660
 MD5 d6b2ebda71fd769327f49bcb51f92db2 files/5.0.27/tomcat.init 636
-MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
-MD5 b4e47e52a6f3b3c69baad3ccfbd2fd14 files/5.0.28/build.xml-02.patch 1065
+MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
 MD5 c51b5f0fe2e164a8ec2712dca47d5e14 files/5.0.28/gentoo.diff 535
-MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
+MD5 6eaf54e60fd0b74ae37ec1dbd8540598 files/5.0.28/build.xml-01.patch 623
 MD5 b86e1b48fdd506ecbff14c2e811578ac files/5.0.28/tomcat.conf 2658
 MD5 851c137a8916df40729fcd9c01f17906 files/5.0.28/tomcat.init 636
+MD5 b4e47e52a6f3b3c69baad3ccfbd2fd14 files/5.0.28/build.xml-02.patch 1065
+MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584

diff --git a/www-servers/tomcat/tomcat-5.0.28.ebuild b/www-servers/tomcat/tomcat-5.0.28.ebuild
index a64a74bc3ba64228f8d53071ac1eebc9035cab22..e871040eb8fea9a5b9955c4e9a0595684afe1409 100644 (file)
--- a/www-servers/tomcat/tomcat-5.0.28.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.2 2004/11/17 16:58:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.3 2004/12/18 19:32:12 karltk Exp $
 
 inherit eutils java-pkg
 
 DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 
+SLOT="${PV/.*}"
 SRC_URI="mirror://apache/tomcat-${SLOT}/v${PV}/bin/jakarta-${P}-src.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
 KEYWORDS="~x86 ~ppc64"
 LICENSE="Apache-2.0"
-SLOT="${PV/.*}"
 DEPEND="sys-apps/sed
           >=virtual/jdk-1.4
           >=dev-java/commons-beanutils-1.7.0