summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2008-09-12 17:10:55 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2008-09-12 17:10:55 +0000
commit95eb0498aebb7e75472419fe94add0a211da792c (patch)
treed01b4632baa1e5da4206d4248ccbab726a704205 /www-servers
parentAdded blackdown-jdk-1.4.2 so we have a usable 1.4 JDK even on amd64 systems (diff)
downloadhistorical-95eb0498aebb7e75472419fe94add0a211da792c.tar.gz
historical-95eb0498aebb7e75472419fe94add0a211da792c.tar.bz2
historical-95eb0498aebb7e75472419fe94add0a211da792c.zip
Fixed compilation so JDK with com.sun.* packages is used as tomcat needs it
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/Manifest4
-rw-r--r--www-servers/tomcat/tomcat-5.5.27.ebuild5
3 files changed, 10 insertions, 5 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 947ea79cb072..9cd2c788b0c7 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.190 2008/09/11 17:27:05 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.191 2008/09/12 17:10:55 fordfrog Exp $
+
+ 12 Sep 2008; Miroslav Šulc <fordfrog@gentoo.org> tomcat-5.5.27.ebuild:
+ Fixed compilation so JDK with com.sun.* packages is used as tomcat needs
+ it
*tomcat-5.5.27 (11 Sep 2008)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 71cbd69cee53..107dce36bfb1 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,8 +12,8 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087
DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f
DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4
EBUILD tomcat-5.5.26.ebuild 10956 RMD160 def823fb1872b6a29fce27f2fbb3d821e02f0047 SHA1 c55fc5fe2815405cce9df2700e0194f2e5b23610 SHA256 fe7e7e9dc8bad29644611cc532ff6d6709056b5953929d8bf91e6ec3093ba4b7
-EBUILD tomcat-5.5.27.ebuild 10732 RMD160 26d691867e21cf096e11a183cd7e32da31e36472 SHA1 cd2b53855b33904015f034798f5e31ddcd6261d6 SHA256 7b01227a89fe29ec01f1fcf0dd31558a00f89cc24f34a70e86239d7a389f2a7b
+EBUILD tomcat-5.5.27.ebuild 10778 RMD160 6625b5c7fad9386d0d720e8a990eb4af4ef4286a SHA1 ae35d4d1c266cc82a1b20adbc83bb695803c3d8b SHA256 01d341f94576aab797256971bfcc1569044af7820da3425854c98a1218d69512
EBUILD tomcat-6.0.16.ebuild 6290 RMD160 8ddb427fbd5f776da58a1efbeafab9861f8ddcba SHA1 eedebefa220053bb55a5e500aba1f25129ae231d SHA256 6ea2a0011e98dd70235e7431b55a620e81b513fad110b10eda5b6c406bf634ef
EBUILD tomcat-6.0.18.ebuild 6292 RMD160 06ef935b55eb04a604b909dab996d2227ab03c7a SHA1 7519b3837e81c1c4a0ddeccceaa10ea73785d457 SHA256 47ba94b7be1df148216f6b0f7dd740a5d9b3bdc2dd2fd7fb2d21c0e703551e9d
-MISC ChangeLog 53437 RMD160 ae7c1672c460cbad228e3c887bd46b5ccccb356c SHA1 a181f25026921f021cd3ed7d5db6bcb2d67029ff SHA256 20d3650e743946d6f3f0d45fa254db551f0a601039fcc2cee1c70e7aa121fcee
+MISC ChangeLog 53592 RMD160 cf29a1d4d2dc3b0b912405cfed1de6669792b41b SHA1 a626fe9304cc238d920686719139b8f6e205ef17 SHA256 51ab4cb685b7a04f46d399ade21d1280656d9125316018b023baf14df370ccea
MISC metadata.xml 627 RMD160 2dab78e07362b6486455f4d572705ebecd9a291e SHA1 c4b4ef839599dded0996fc0feb31d70c0108580b SHA256 d321a949ce5495ef446bd75104539808e69fb6f6ae2e53b5fa583b48ea5f5749
diff --git a/www-servers/tomcat/tomcat-5.5.27.ebuild b/www-servers/tomcat/tomcat-5.5.27.ebuild
index 7ddee10ac3f7..9ee0f38e468c 100644
--- a/www-servers/tomcat/tomcat-5.5.27.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.27.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.1 2008/09/11 17:27:05 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.2 2008/09/12 17:10:55 fordfrog Exp $
EAPI=1
JAVA_PKG_IUSE="doc source"
@@ -48,7 +48,8 @@ RDEPEND="dev-java/eclipse-ecj:3.3
dev-java/mx4j-core:3.0
dev-java/xerces:2
dev-java/xml-commons-external:1.3
- )"
+ )
+ >=java-virtuals/jdk-with-com-sun-20080505-r1"
DEPEND="java5? ( >=virtual/jdk-1.5 )
!java5? ( =virtual/jdk-1.4* )
${RDEPEND}"