diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2010-07-25 17:31:33 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2010-07-25 17:31:33 +0000 |
| commit | 9b226e309d80e34659b9604648d63bb258bc30ec (patch) | |
| tree | 41dbc76d9d6ba6740b82aa42e36101b5b772c1a3 /www-servers/tomcat | |
| parent | fix permission for /proc/av7110_ir , bug #328719 (diff) | |
| download | gentoo-2-9b226e309d80e34659b9604648d63bb258bc30ec.tar.gz gentoo-2-9b226e309d80e34659b9604648d63bb258bc30ec.tar.bz2 gentoo-2-9b226e309d80e34659b9604648d63bb258bc30ec.zip | |
Block tomcat-native older than 1.1.20. Fixes bug #316545.
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 5 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.28.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index d1895e243d45..c1123fa8a88c 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.231 2010/07/10 18:53:47 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.232 2010/07/25 17:31:33 betelgeuse Exp $ + + 25 Jul 2010; Petteri Räty <betelgeuse@gentoo.org> tomcat-6.0.28.ebuild: + Block tomcat-native older than 1.1.20. Fixes bug #316545. *tomcat-6.0.28 (10 Jul 2010) diff --git a/www-servers/tomcat/tomcat-6.0.28.ebuild b/www-servers/tomcat/tomcat-6.0.28.ebuild index f83582951a5d..d3a8b4f99ec2 100644 --- a/www-servers/tomcat/tomcat-6.0.28.ebuild +++ b/www-servers/tomcat/tomcat-6.0.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.28.ebuild,v 1.1 2010/07/10 18:53:47 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.28.ebuild,v 1.2 2010/07/25 17:31:33 betelgeuse Exp $ EAPI=2 JAVA_PKG_IUSE="doc examples source test" @@ -27,7 +27,9 @@ COMMON_DEPEND="dev-java/eclipse-ecj:3.3 ~dev-java/tomcat-servlet-api-${PV} examples? ( dev-java/jakarta-jstl )" -RDEPEND=">=virtual/jre-1.5 +RDEPEND=" + !<dev-java/tomcat-native-1.1.20 + >=virtual/jre-1.5 >=dev-java/commons-daemon-1.0.1 dev-java/ant-core ${COMMON_DEPEND}" |