Pass --disable-jni to configure script.

Package-Manager: portage-2.1.2.3

4 files changed, 24 insertions, 22 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 37169bed772b..361927124c1e 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.14 2007/04/13 14:55:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.15 2007/04/14 19:49:17 nelchael Exp $
+
+  14 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  mod_caucho-3.0.22.ebuild, mod_caucho-3.1.0.ebuild:
+  Pass --disable-jni to configure script.
 
   13 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/mod_caucho-3.1.0-ssl.patch, mod_caucho-3.1.0.ebuild:
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index ecff4bfce666..41b1383c7fd8 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -23,18 +23,18 @@ RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 files/mod_caucho-3.1.0-ssl.patch
 SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e files/mod_caucho-3.1.0-ssl.patch 707
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.1.0-src.tar.gz 5708227 RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 SHA1 2f3f7c5d6003424f2f1afc27f38f9f36cc312466 SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440
-EBUILD mod_caucho-3.0.22.ebuild 1273 RMD160 53efea17e4aa3380fb8d133c2584102e1edc62a7 SHA1 0387ca77e97a65ddceb45bb31e80f9b3b2e1c4d5 SHA256 96d98e4ca0094e9a9c4254e703c43a2d807c0042835949e23736322ae71fc36c
-MD5 0315bc60e74408e38834b01fbd8243d4 mod_caucho-3.0.22.ebuild 1273
-RMD160 53efea17e4aa3380fb8d133c2584102e1edc62a7 mod_caucho-3.0.22.ebuild 1273
-SHA256 96d98e4ca0094e9a9c4254e703c43a2d807c0042835949e23736322ae71fc36c mod_caucho-3.0.22.ebuild 1273
-EBUILD mod_caucho-3.1.0.ebuild 1296 RMD160 355a5b42d3927f414e0beda42538e77136fee951 SHA1 3b096b717621b6dbd01049d2a8997fb957fc0e88 SHA256 e6c7105a6e65c2910a6a38f097cc159377fbc5fd28a6a0879a936bb81fb23196
-MD5 1d80004dd5699bf84dc2852258076750 mod_caucho-3.1.0.ebuild 1296
-RMD160 355a5b42d3927f414e0beda42538e77136fee951 mod_caucho-3.1.0.ebuild 1296
-SHA256 e6c7105a6e65c2910a6a38f097cc159377fbc5fd28a6a0879a936bb81fb23196 mod_caucho-3.1.0.ebuild 1296
-MISC ChangeLog 2495 RMD160 31ad27ebbd5a8233fd2bdbf30c386d477159bec9 SHA1 f22355dd1f5ace79c9b8cf20eddd60af9b0e7957 SHA256 d0f98755d0fcc4561b610798e4cdbc4752989ae6a4e6bd966ba493f6a13252d5
-MD5 19ecde0f7454c75c4e5056246a1a5a2f ChangeLog 2495
-RMD160 31ad27ebbd5a8233fd2bdbf30c386d477159bec9 ChangeLog 2495
-SHA256 d0f98755d0fcc4561b610798e4cdbc4752989ae6a4e6bd966ba493f6a13252d5 ChangeLog 2495
+EBUILD mod_caucho-3.0.22.ebuild 1222 RMD160 5982dfe9feb6419e7e4465fd9714308cbb1c8cb4 SHA1 8f736469854ae7a7b33e2ca6202b22e47f70895b SHA256 48f97364a677ea94193cebdb9f885584ff90a4e973782fb3212bbe2ae9d3d750
+MD5 ee726ae9587671b76f9a07b797cb3803 mod_caucho-3.0.22.ebuild 1222
+RMD160 5982dfe9feb6419e7e4465fd9714308cbb1c8cb4 mod_caucho-3.0.22.ebuild 1222
+SHA256 48f97364a677ea94193cebdb9f885584ff90a4e973782fb3212bbe2ae9d3d750 mod_caucho-3.0.22.ebuild 1222
+EBUILD mod_caucho-3.1.0.ebuild 1245 RMD160 40ecd2ce901cd90d172628a04324e0309c4686b7 SHA1 4fdd6cc8e3112a6f085f2cca20d2342c43d6d377 SHA256 e70c15cec6aab3f64d4d10c40f5c516e5bd7f236a894861c83582d14c603589f
+MD5 06b38ed579fa813bda47f648be7abfd4 mod_caucho-3.1.0.ebuild 1245
+RMD160 40ecd2ce901cd90d172628a04324e0309c4686b7 mod_caucho-3.1.0.ebuild 1245
+SHA256 e70c15cec6aab3f64d4d10c40f5c516e5bd7f236a894861c83582d14c603589f mod_caucho-3.1.0.ebuild 1245
+MISC ChangeLog 2644 RMD160 0cc021d7b6930ad3bf4e11a476bd72496b2a4296 SHA1 1498ad28abd6b11584d3d8a5b183a1803891e406 SHA256 6a90c47c7aabc3b2039f9dacd34ed1134d05bb9fc5cb5d47a3de183c6546283b
+MD5 7c288606601264b477745a19080af352 ChangeLog 2644
+RMD160 0cc021d7b6930ad3bf4e11a476bd72496b2a4296 ChangeLog 2644
+SHA256 6a90c47c7aabc3b2039f9dacd34ed1134d05bb9fc5cb5d47a3de183c6546283b ChangeLog 2644
 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245
 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245
@@ -48,7 +48,7 @@ SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGH5oJgo/w9rxVVVERAhl1AJ4hQJxC3Sp3T887LkQVYLzIZKpLagCfexwW
-5rjyWlsMPH1WlTEdTlaDARY=
-=hG1j
+iD8DBQFGITBigo/w9rxVVVERAhLaAKCNEOjN5axwOEU4ApKYNAirEs2HQgCgtgiu
+Z/NKVAe0IDTpX8A+nJgOxbk=
+=CrXC
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
index 071790000da8..b167a8c196db 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.6 2007/04/13 14:45:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.7 2007/04/14 19:49:17 nelchael Exp $
 
 inherit eutils apache-module autotools
 
@@ -32,9 +32,8 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --disable-jni --with-apxs=${APXS2} || die "econf failed"
 
-	emake -j1 -C "${S}/modules/c/src/common/" || die "emake failed"
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }
 
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
index e3522e7ec910..29ef8f143a67 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.4 2007/04/13 14:55:36 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.5 2007/04/14 19:49:17 nelchael Exp $
 
 inherit eutils apache-module autotools
 
@@ -35,9 +35,8 @@ src_unpack() {
 }
 
 src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
+	econf --disable-jni --with-apxs=${APXS2} || die "econf failed"
 
-	emake -j1 -C "${S}/modules/c/src/common/" || die "emake failed"
 	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
 }