diff options
| author |   William Thomson <wltjr@gentoo.org> | 2006-09-22 17:45:26 +0000 |
|---|---|---|
| committer | William Thomson <wltjr@gentoo.org> | 2006-09-22 17:45:26 +0000 |
| commit | 79be22101f523f955d86e1899fbb9c9db82079c9 (patch) | |
| tree | 39adb6bcc43a044811eed65dc048b524a6326046 /www-apache/mod_jk | |
| parent | Readding 4.0.1 so sparc will be happy :) (diff) | |
| download | gentoo-2-79be22101f523f955d86e1899fbb9c9db82079c9.tar.gz gentoo-2-79be22101f523f955d86e1899fbb9c9db82079c9.tar.bz2 gentoo-2-79be22101f523f955d86e1899fbb9c9db82079c9.zip | |
Updated ebuild to not use 1.6 jdks due to compilation issues
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'www-apache/mod_jk')
| -rw-r--r-- | www-apache/mod_jk/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index dca813ef005d..dfffc767dd1e 100644 --- a/www-apache/mod_jk/ChangeLog +++ b/www-apache/mod_jk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-apache/mod_jk # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.9 2006/09/17 01:24:35 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.10 2006/09/22 17:45:26 wltjr Exp $ + + 22 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> + mod_jk-1.2.18-r1.ebuild: + Updated ebuild to not use 1.6 jdks due to compilation issues *mod_jk-1.2.18 (17 Sep 2006) diff --git a/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild index e6a7187b2462..8bec62701ab5 100644 --- a/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.18-r1.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-apache/mod_jk/mod_jk-1.2.18-r1.ebuild,v 1.1 2006/09/21 16:08:17 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild,v 1.2 2006/09/22 17:45:26 wltjr Exp $ inherit apache-module autotools java-pkg-opt-2 @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="apache2 java" -DEPEND="java? ( >=virtual/jdk-1.4 )" +DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )" S="${WORKDIR}/${MY_P}/native" APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so" |