summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2006-09-26 21:19:41 +0000
committerWilliam Thomson <wltjr@gentoo.org>2006-09-26 21:19:41 +0000
commit169f898859be8cdcef8d260e3d9abae3e58284b0 (patch)
treea9a2ec1ebb3ac4313d5d8b53d2548c4d8c9e4fc5 /www-servers
parentAdapt kernel modules to the changes occured in 2.6.16 (#149143). Avoid pre-st... (diff)
downloadhistorical-169f898859be8cdcef8d260e3d9abae3e58284b0.tar.gz
historical-169f898859be8cdcef8d260e3d9abae3e58284b0.tar.bz2
historical-169f898859be8cdcef8d260e3d9abae3e58284b0.zip
Changed sun-jaf-1 to sun-jaf since it's slotted 0 not 1
Package-Manager: portage-2.1.2_pre1-r1
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog6
-rw-r--r--www-servers/tomcat/Manifest16
-rw-r--r--www-servers/tomcat/tomcat-5.5.17-r7.ebuild6
3 files changed, 16 insertions, 12 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 4e39575c056e..ab10d076c6f9 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.66 2006/09/26 20:16:19 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.67 2006/09/26 21:19:41 wltjr Exp $
+
+ 26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+ tomcat-5.5.17-r7.ebuild:
+ Changed sun-jaf-1 to sun-jaf since it's slotted 0 not 1
26 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org>
tomcat-5.5.17-r7.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 36586157ab2f..493676db3a90 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -121,14 +121,14 @@ EBUILD tomcat-5.5.17-r6.ebuild 10024 RMD160 e97c1373f46501a034a06eaaf214f47961a6
MD5 eaa1497616248ef70dd7419bd4b39d62 tomcat-5.5.17-r6.ebuild 10024
RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 tomcat-5.5.17-r6.ebuild 10024
SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 tomcat-5.5.17-r6.ebuild 10024
-EBUILD tomcat-5.5.17-r7.ebuild 10016 RMD160 245c11558297b0b618abfd6bdc4f88e15bff931a SHA1 00a40afe067c05640c49ffae46fd7fdd53dc3528 SHA256 3b38d3975e08618bba23dd525670904fe77c2acac0489ff49be5e0456bbf1353
-MD5 0e20a0de6c42459a669aeceb52d57fff tomcat-5.5.17-r7.ebuild 10016
-RMD160 245c11558297b0b618abfd6bdc4f88e15bff931a tomcat-5.5.17-r7.ebuild 10016
-SHA256 3b38d3975e08618bba23dd525670904fe77c2acac0489ff49be5e0456bbf1353 tomcat-5.5.17-r7.ebuild 10016
-MISC ChangeLog 23883 RMD160 2e20997242a9c76a0721ff9a2839069d1e86d74d SHA1 0140423e86bcfd76b1ae4d627236be8cb0e77bdb SHA256 7314928a6c50ca85ac0fd47d014b872338cee99b77951a26e15199990923bb0b
-MD5 45af2fe4c1c8b3786c0db4795a551b40 ChangeLog 23883
-RMD160 2e20997242a9c76a0721ff9a2839069d1e86d74d ChangeLog 23883
-SHA256 7314928a6c50ca85ac0fd47d014b872338cee99b77951a26e15199990923bb0b ChangeLog 23883
+EBUILD tomcat-5.5.17-r7.ebuild 10011 RMD160 5c1b71a8b51efc74566f2ba988d0f1ee69cf6193 SHA1 b9d0d3ce0cbfc4aff1fc7f3a19b8aaa570d2ad5a SHA256 5fa844d4c37027434ecb3758b1ad42dfc578a46e0a8fc668a317efba79170155
+MD5 2d97581c79d6bb3c4041f29bf5a26c62 tomcat-5.5.17-r7.ebuild 10011
+RMD160 5c1b71a8b51efc74566f2ba988d0f1ee69cf6193 tomcat-5.5.17-r7.ebuild 10011
+SHA256 5fa844d4c37027434ecb3758b1ad42dfc578a46e0a8fc668a317efba79170155 tomcat-5.5.17-r7.ebuild 10011
+MISC ChangeLog 24026 RMD160 a351cd1783bb1aa98f8b704458723b63a79dc711 SHA1 fd15c04c7596e88662878e4165ca4744807f02c5 SHA256 e6a7b24818fc79543f480f015300c2083433eee771483000aadd526005fc9e3b
+MD5 80b42d7336a22c4eb38a9a3a11b1f647 ChangeLog 24026
+RMD160 a351cd1783bb1aa98f8b704458723b63a79dc711 ChangeLog 24026
+SHA256 e6a7b24818fc79543f480f015300c2083433eee771483000aadd526005fc9e3b ChangeLog 24026
MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
diff --git a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
index 6e81031d9cfd..891d2cfc285c 100644
--- a/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.17-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.2 2006/09/26 20:16:19 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.17-r7.ebuild,v 1.3 2006/09/26 21:19:41 wltjr Exp $
inherit eutils java-pkg-2 java-ant-2
@@ -33,7 +33,7 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
!java5? (
=virtual/jre-1.4*
>=dev-java/commons-httpclient-2.0
- =dev-java/sun-jaf-1*
+ =dev-java/sun-jaf
~dev-java/jaxen-1.0
>=dev-java/junit-3.8.1
=dev-java/mx4j-3*
@@ -150,7 +150,7 @@ src_compile(){
antflags="${antflags} -Djasper.home=${S}/jasper"
if ! use java5; then
antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
- antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-1)"
+ antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf)"
antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"