Fix bug #404533 and bug #405193: compilation without JDK and using LDFLAGS.

Package-Manager: portage-2.1.10.47/cvs/Linux x86_64

4 files changed, 32 insertions, 17 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 96e84fa36e38..6434d69e9109 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.63 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.64 2012/02/22 20:52:53 nelchael Exp $
+
+  22 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> mod_caucho-4.0.22.ebuild,
+  mod_caucho-4.0.25.ebuild:
+  Fix bug #404533 and bug #405193: compilation without JDK and using LDFLAGS.
 
   17 Feb 2012; Krzysztof Pawlik <nelchael@gentoo.org> mod_caucho-4.0.22.ebuild,
   mod_caucho-4.0.25.ebuild:
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index f051744328de..f40916ae7cd9 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -15,18 +15,18 @@ DIST resin-gentoo-patches-4.0.25.tar.bz2 2482 RMD160 085efaa3fff7359231b583b460d
 EBUILD mod_caucho-4.0.13.ebuild 1086 RMD160 c2445933a00e40e6db89916bdc452bcba14496c3 SHA1 df9a8e5f83f1c47c836d22e1dcb985034babcce6 SHA256 50b28e7cde3f8dee273940314e66ecfcf1fdb0714ded6d4248b4e2635a484b60
 EBUILD mod_caucho-4.0.14.ebuild 1091 RMD160 dab37ee4bb22a95d2eb47af9db1c7aeaf2c4dd10 SHA1 df705dc8b45e7bca8cc2d653712a5262c2e23d90 SHA256 155e78410e36e12b6495a380815a7854d46b13b04c408168d2bac72563c110ed
 EBUILD mod_caucho-4.0.15.ebuild 1091 RMD160 08a5b29deb556955cd29a428357b4583de923d89 SHA1 d3cdf7b19b65c13e9a1ab20603ce93b44ac86c8f SHA256 a4cf068d83674e42fc308c480c36d0072dcb34bfae23a12803274697eab7b08b
-EBUILD mod_caucho-4.0.22.ebuild 1160 RMD160 f8dbee510d5321b28426212d16f66518c4c9f829 SHA1 ecb17d5950d907a8f929fee93ed20ea6837cdff9 SHA256 2115dec274b71b3ccceaaff88e13ea170066d398303c5df8a12111657907d8b3
-EBUILD mod_caucho-4.0.25.ebuild 1160 RMD160 cd02f865e458f36e3b71b286fe8d6241f374621d SHA1 6a31f2a52c384f478acd6728df01085f8e9686d0 SHA256 f57835ecd84a864a8d57e43b62f19f2cc0a8c5836d44e15d5d5368085b7aaf38
-MISC ChangeLog 11137 RMD160 ed96ee0479426c251be892bc6a9228979fc2221f SHA1 ad8316c434d1e048b3e2320b40ab6b9f91a7b8d3 SHA256 bd7c16d8f6cd26efb2bb1d19dd2b4575b176d21b6819294a7047f68121d5cb1b
+EBUILD mod_caucho-4.0.22.ebuild 1376 RMD160 d0d19f6f9d3686d930a42148eb357d8ff46f9374 SHA1 e1358179eac15b39159cc9ce5a3e148fc09d82fd SHA256 c5a95f4e28e96e1f00aff8d83e9d281a50514c3ef030b115f4b75586499ea8fc
+EBUILD mod_caucho-4.0.25.ebuild 1342 RMD160 909c09de5f52adc45c5e9ab473e86695205363fd SHA1 1d3a1a073f71c7efce57de20961ae81d18c080c0 SHA256 0b5d8ba188a0c6cbab5437a36e84fd97fd3f632024a293186ac48a5e2b96afef
+MISC ChangeLog 11324 RMD160 91b7208e2869c8534f6c874233ada9185c8bc273 SHA1 1097077ac1ac51c22d9f4905f5d77b47d862186d SHA256 fc305ffb6d450bcc9e45ff5fbef6ba55247c63a251555e144565e04e1b73ccd4
 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPPpihAAoJEBZyv1r2qA5GjHUIAJX/5NHxs01uyo453h6z7ETb
-QzLYrnWYtsqMrS9H+bXdlze2DpCrJLgEf44eIPpuzjkdEiR6tnNjHh7qTNmmMYKl
-BRA+WuHtX5xmeGLadeZjbd72vRC7jIdzLjpeULQqDCn1nyJ++RMdNe5Z4ZFiNz3N
-SnR1fhfLZbnqaGZaNSSKdeh4NHWKhvcIXBOT+Cxj+dbfmGWGglUH2BuoiP4RLRzq
-pVZdNN5D+PrlbwFV1D4sN1h4SCULdJj1hpzpuA8Du3tdjJ65NW2qVJui0VX4ll1I
-eamTg/Y5GO8BC9j2xwUsNvs2TBrI/7azLSAvnbGfKZSzFwgnl+e1bpbET0lTxrE=
-=olAa
+iQEcBAEBCgAGBQJPRVWxAAoJEBZyv1r2qA5GSy4IAICxYJ+7WAx4SCX5/MsmlpRz
+S1oEKbLaQu5/ezpr598MJt/pX5mUvKpQv47pK5U7G1oXgAy+IukRV89AXxly5GBx
+nK1YGUsdb8JxJqz9UVUxPX7nTaJcD6oUCZg8gNUnP8wT3RoouspYr70cphJa/nFX
+pvjS3xQKb9VABN6nVuw6KslTS0TfhtKPryvl1ko82/vsRJ1hyycVvlXDNi9ezRV2
+um4YJOgCS7jzzlZNC0w8K+bj5+hVZMHkrqP37pH3jmpwtrJ6dqhrdbtIgl3BGM8L
+w0v4aYGFK2M/YHWybRo9DnTzUdSJEui1DTUvBsFfZDIKYPbTKmllt3muuy9fMwI=
+=vylL
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
index 882778e50525..d3f29e0129d8 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.2 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.22.ebuild,v 1.3 2012/02/22 20:52:53 nelchael Exp $
 
 EAPI="2"
 
@@ -34,7 +34,13 @@ src_prepare() {
 		epatch "${i}"
 	done
 
-	sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+	sed -i \
+		-e 's,-m32,,g; s,-m64,,g;' \
+		-e '/.*Java 1.6 required.*/d' \
+		configure.ac || die "sed for configure.ac failed"
+	sed -i \
+		-e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
+		modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
 
 	mkdir m4
 	eautoreconf
@@ -42,7 +48,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-apxs=${APXS} || die "econf failed"
+	econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
 }
 
 src_compile() {
diff --git a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild b/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
index eb3856765a5a..2a4f0551c8d8 100644
--- a/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.2 2012/02/17 18:12:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-4.0.25.ebuild,v 1.3 2012/02/22 20:52:53 nelchael Exp $
 
 EAPI="2"
 
@@ -34,7 +34,12 @@ src_prepare() {
 		epatch "${i}"
 	done
 
-	sed -i -e 's,-m32,,g; s,-m64,,g;' configure.ac || die "sed failed"
+	sed -i \
+		-e 's,-m32,,g; s,-m64,,g;' \
+		configure.ac || die "sed for configure.ac failed"
+	sed -i \
+		-e 's,\$(LIBS_SHLIB),$(LDFLAGS) $(LIBS_SHLIB),g' \
+		modules/c/src/apache2/Makefile.in || die "sed for Makefile.in failed"
 
 	mkdir m4
 	eautoreconf
@@ -42,7 +47,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-apxs=${APXS} || die "econf failed"
+	econf --with-apxs=${APXS} --with-java-home=/usr || die "econf failed"
 }
 
 src_compile() {