summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-03-27 17:23:14 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-03-27 17:23:14 +0000
commit2e990093d03ca7a3eac31a79a65bc55a76416d5e (patch)
treeb7b984fa053db0995174679d4fc60e5881d33d77 /www-servers/tomcat
parentmoved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336 (diff)
downloadhistorical-2e990093d03ca7a3eac31a79a65bc55a76416d5e.tar.gz
historical-2e990093d03ca7a3eac31a79a65bc55a76416d5e.tar.bz2
historical-2e990093d03ca7a3eac31a79a65bc55a76416d5e.zip
moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/ChangeLog5
-rw-r--r--www-servers/tomcat/Manifest10
-rw-r--r--www-servers/tomcat/tomcat-5.0.28-r2.ebuild8
3 files changed, 13 insertions, 10 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 8d838a87b84b..6c6178cabbf2 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.22 2005/03/22 20:30:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.23 2005/03/27 17:23:14 luckyduck Exp $
+
+ 27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> tomcat-5.0.28-r2.ebuild:
+ moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
22 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -tomcat-5.0.28-r1.ebuild,
tomcat-5.0.28-r2.ebuild, -tomcat-5.0.28.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 452d3d94a791..46e5d39d81ae 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,8 +2,8 @@
Hash: SHA1
MD5 0111243c02d84f0284685e7647620eb8 tomcat-5.0.27-r4.ebuild 3776
-MD5 753a5a04e2a95b030f97e14536dfd078 tomcat-5.0.28-r2.ebuild 9810
-MD5 1770ff00b30a72e9e2b113cde9f9a491 ChangeLog 14848
+MD5 7b8b78d293cbecf0cb661181b82beaa2 tomcat-5.0.28-r2.ebuild 9842
+MD5 81bd17c403dd6656898c99b4fc824f9a ChangeLog 15005
MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28-r2 78
@@ -23,7 +23,7 @@ MD5 98a29b32de00d97f156dc31dfe3cf472 files/5.0.28/jikes.diff 584
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFCQIB+06ebR+OMO78RAkY7AJ9BleudeaASI2RlGdPMQOPgnxZ+zgCfQkOl
-KZo3W41OCXtVKmRclqhJke0=
-=jHZb
+iD8DBQFCRuwW06ebR+OMO78RAiygAJwLO0ijsuv7d9uAIcdFMm/gUraqfgCeOTy4
+mL7UI1flxVWeD40d0sFsgCY=
+=IfM6
-----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
index 69c21efe17af..5d2c8c67231b 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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-r2.ebuild,v 1.2 2005/03/22 20:30:33 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r2.ebuild,v 1.3 2005/03/27 17:23:14 luckyduck Exp $
inherit eutils java-pkg
@@ -31,7 +31,7 @@ RDEPEND=">=virtual/jdk-1.4
>=dev-java/junit-3.8.1
dev-java/jmx
>=dev-java/log4j-1.2.8
- >=dev-java/regexp-1.3
+ =dev-java/jakarta-regexp-1.3*
>=dev-java/saxpath-1.0
~dev-java/servletapi-2.4
=dev-java/struts-1.1*
@@ -81,7 +81,7 @@ src_unpack() {
java-pkg_jar-from commons-digester
java-pkg_jar-from commons-fileupload
java-pkg_jar-from commons-modeler
- java-pkg_jar-from regexp
+ java-pkg_jar-from jakarta-regexp-1.3
}
src_compile(){
@@ -100,7 +100,7 @@ src_compile(){
antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
- antflags="${antflags} -Dregexp.jar=$(java-config -p regexp)"
+ antflags="${antflags} -Dregexp.jar=$(java-config -p jakarta-regexp-1.3)"
antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts struts.jar)"
antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils commons-beanutils.jar)"
antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"