diff options
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.0.28-r2.ebuild | 8 |
2 files changed, 8 insertions, 5 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/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)" |