summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2006-09-22 17:45:26 +0000
committerWilliam Thomson <wltjr@gentoo.org>2006-09-22 17:45:26 +0000
commit5087c457cd9a3d6ef730a554725165d3e0f0ef64 (patch)
tree61d97f2be4f3e2ae5dd49d27b15b6954e72a530e /www-apache
parentReadding 4.0.1 so sparc will be happy :) (diff)
downloadhistorical-5087c457cd9a3d6ef730a554725165d3e0f0ef64.tar.gz
historical-5087c457cd9a3d6ef730a554725165d3e0f0ef64.tar.bz2
historical-5087c457cd9a3d6ef730a554725165d3e0f0ef64.zip
Updated ebuild to not use 1.6 jdks due to compilation issues
Package-Manager: portage-2.1.2_pre1
Diffstat (limited to 'www-apache')
-rw-r--r--www-apache/mod_jk/ChangeLog6
-rw-r--r--www-apache/mod_jk/Manifest16
-rw-r--r--www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild4
3 files changed, 15 insertions, 11 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/Manifest b/www-apache/mod_jk/Manifest
index 19ad9e24b1e6..8b5a387efa69 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -26,18 +26,18 @@ EBUILD mod_jk-1.2.15.ebuild 1746 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278
MD5 097f26a843471eaaf31f6bd28e32f81d mod_jk-1.2.15.ebuild 1746
RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 mod_jk-1.2.15.ebuild 1746
SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c mod_jk-1.2.15.ebuild 1746
-EBUILD mod_jk-1.2.18-r1.ebuild 1859 RMD160 27a1247ff63ef6958d5fcb46157e51d16355417a SHA1 38d258ed569b3b703799aa1f434a4b575bf68579 SHA256 4a02a33a30080f6f5c889c99d008e3ad48336e3ca2904a1603ac7b57b5388d53
-MD5 81800b8d8877ec088f42e1b7b6400883 mod_jk-1.2.18-r1.ebuild 1859
-RMD160 27a1247ff63ef6958d5fcb46157e51d16355417a mod_jk-1.2.18-r1.ebuild 1859
-SHA256 4a02a33a30080f6f5c889c99d008e3ad48336e3ca2904a1603ac7b57b5388d53 mod_jk-1.2.18-r1.ebuild 1859
+EBUILD mod_jk-1.2.18-r1.ebuild 1884 RMD160 755d76698c756ae62e0b9f092ae22a6f2e67b6f6 SHA1 4515db8f89e7d90c13e9dd007f913ac0a8a6d0a9 SHA256 de4076b2aecb039e07a2961be2ea82aa4bdb7d10d4504fdf3b6eab3e50e8dd2f
+MD5 44179f011e8110ac4a4358588866cffd mod_jk-1.2.18-r1.ebuild 1884
+RMD160 755d76698c756ae62e0b9f092ae22a6f2e67b6f6 mod_jk-1.2.18-r1.ebuild 1884
+SHA256 de4076b2aecb039e07a2961be2ea82aa4bdb7d10d4504fdf3b6eab3e50e8dd2f mod_jk-1.2.18-r1.ebuild 1884
EBUILD mod_jk-1.2.18.ebuild 1796 RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 SHA1 d2d1c6fb855ba570474e37f3f1f4931cff5489f6 SHA256 f93fe4c85aa9e47de466485e70009fb5f891e8f73ac6866108fbd47e647b128c
MD5 958dbab934efa8bd13f3db394566d64f mod_jk-1.2.18.ebuild 1796
RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 mod_jk-1.2.18.ebuild 1796
SHA256 f93fe4c85aa9e47de466485e70009fb5f891e8f73ac6866108fbd47e647b128c mod_jk-1.2.18.ebuild 1796
-MISC ChangeLog 1915 RMD160 5e4464af1ab5f04b49004fa43d0810b9631f9bdd SHA1 b754cc29a99ff814a0bbef6ebafcd203ef742b09 SHA256 89d902a413961f67a4dd89dd85d652a9bc4fb34a05129b1cac80f107043e6bf6
-MD5 0bd7e5b792d5fa0ec438b54a59ed2512 ChangeLog 1915
-RMD160 5e4464af1ab5f04b49004fa43d0810b9631f9bdd ChangeLog 1915
-SHA256 89d902a413961f67a4dd89dd85d652a9bc4fb34a05129b1cac80f107043e6bf6 ChangeLog 1915
+MISC ChangeLog 2064 RMD160 bdc6fcd38a096f7c498241d790154a02b7222e56 SHA1 1a570a4a9f0d6beab7d5cae2f588f1963cc8e3f6 SHA256 f867ab35f8122d62b37cffd762ba895b22b81d17515f2af490d8c16bbbc8191d
+MD5 1b9a2a7c5b5126ac4215b508c1d7d644 ChangeLog 2064
+RMD160 bdc6fcd38a096f7c498241d790154a02b7222e56 ChangeLog 2064
+SHA256 f867ab35f8122d62b37cffd762ba895b22b81d17515f2af490d8c16bbbc8191d ChangeLog 2064
MISC metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 SHA1 719bc65c876fdef4ef13af0f4e4a27259e342815 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101
MD5 49773dac392214840f81ce9ed35bedf2 metadata.xml 473
RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 metadata.xml 473
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"