export JAVA_HOME queried from java-config, fixes bug 280629

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index ec0355b7c3d6c6f2f39068aa72036d59134d2dcf..ccbb3d0a5e6882fafac16e0b43386deb776a0048 100644 (file)
--- a/kde-base/krossjava/ChangeLog
+++ b/kde-base/krossjava/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/krossjava
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.30 2010/06/06 14:42:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/ChangeLog,v 1.31 2010/06/11 02:01:46 reavertm Exp $
+
+  11 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  krossjava-4.3.3.ebuild, krossjava-4.3.5.ebuild, krossjava-4.4.4.ebuild:
+  export JAVA_HOME queried from java-config, fixes bug 280629
 
 *krossjava-4.4.4 (06 Jun 2010)
 

diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest
index 5f99661f9cb6678385525ff45df54fa5d8255b1d..33d6a2a4cf249f72d75b14c40d2cbc738cc4d5a0 100644 (file)
--- a/kde-base/krossjava/Manifest
+++ b/kde-base/krossjava/Manifest
@@ -2,8 +2,8 @@ AUX krossjava-4.2.3_includes.patch 573 RMD160 17511c084bb188113546cf5e867a511715
 DIST kdebindings-4.3.3.tar.bz2 4881799 RMD160 587fd37cc2369a39fb1cf97e164afc40294f97b2 SHA1 34ddcfd5d338962b8623b9dd9c2b850a621e4040 SHA256 d182e110201ac9dc63dbdbc1baecf845b90a56d6ba2c9c0a5b34dee211358f8d
 DIST kdebindings-4.3.5.tar.bz2 4881006 RMD160 96fd389226116717f1ab28e71c788a99a1a15981 SHA1 0273013e4b74a7b1bc4cfc8375c80b5c19cf33e6 SHA256 7ff4a3e95dde89b59bb9fc13cd32feca7bad7b096703c7710bcd82fc326c53be
 DIST kdebindings-4.4.4.tar.bz2 5091453 RMD160 38725fb1fec359e2b3e3acf23baf07e6d615dfdf SHA1 db5afa2a70558e34838a0f9296f008035e03f064 SHA256 bcfd514e8e4a88f1a36750b8b5fc3cbc52497f5ea22f811ff718301d7687c5f2
-EBUILD krossjava-4.3.3.ebuild 1341 RMD160 141b68125d684a09ffc251c547daa331f8fafccc SHA1 aa8e498bfab5ec0081223199690caf8bf9f61264 SHA256 827683aafe3101330d7d06c9292072f3c3f73d6c5b71d353440dc0a9b52d564a
-EBUILD krossjava-4.3.5.ebuild 1337 RMD160 abfdc1fe56f3a4ab0a96e2e67f36e3de18e93fe9 SHA1 cc6e0aa6851e5feb7bf906e36119eb913f8ebf01 SHA256 92e37be5743afef50f4f609c0e812b2bcafbae65f46f7bbaa00b86429ae5c16f
-EBUILD krossjava-4.4.4.ebuild 1339 RMD160 3afdfcef00fb69b18ad58fdcc2b26ca0f5d46e8d SHA1 3e8982b9a1147766db1a30759d65a2b42f384cb1 SHA256 1594bce7e2b25f54f084d63da0e580cc8777544d160e3882abff7282f65d4920
-MISC ChangeLog 3758 RMD160 8396aed4e3cc8cf4e41ac438b11e75b85efbfc4d SHA1 f6500c7a8ce5ad6b5b8aa848384decc779ada464 SHA256 ac16111a362bbb6512749c9e44afc13b3c866b8a21c7a1be99c2362fb636d98d
+EBUILD krossjava-4.3.3.ebuild 1383 RMD160 87618567df8da96d3eb0e89e80443268fd54f26f SHA1 b390728a10c4d2cf8cb33d9159c6a2ddff9ecfa9 SHA256 f5390336bfc45562e779009ad0f5908cc77df0b1814467cc35ca47ee044d799b
+EBUILD krossjava-4.3.5.ebuild 1382 RMD160 af7675597b33d64191e384d4e0d75d95fcd26c7f SHA1 7c0f3422615520b3c41ad88bf5705e7014bb435f SHA256 32108d84fc5afb4e4ccb88d1d0dcc09a2abab08ef6f2fe55d14cf1c238d54ae7
+EBUILD krossjava-4.4.4.ebuild 1384 RMD160 93a5de7d2d7f2c46860701608dbfc0295e879380 SHA1 5d98d26f7110fad862f566cb4fd6c7a5bdf9e966 SHA256 6c2fe72c17b4094e2e13779472b78663ef657a5a9c7171d124b8d754dea26f87
+MISC ChangeLog 3948 RMD160 927a17165ca413ff2e1398b4f1bba2f5a0e62d63 SHA1 8338e208375adbdb8fb7c05458c1932d744b3e1d SHA256 9ca4380670457a546b90cd943942f6a142ea82bec22cb32bb2d5856014a14a48
 MISC metadata.xml 321 RMD160 1c9bbcab13cb180c109d2f9057fa7617023ddc3b SHA1 de6893f3efb267f4f5e8ccdbc610b6176a1980e2 SHA256 8807987b34c460c021e243de234498b311431850245a438b453084192db06133

diff --git a/kde-base/krossjava/krossjava-4.3.3.ebuild b/kde-base/krossjava/krossjava-4.3.3.ebuild
index 00a4d3c3ed6c62cfd495ef993b12815e1985c30f..d2b55779bd19f45344ff0f7634921c4ec8065a0f 100644 (file)
--- a/kde-base/krossjava/krossjava-4.3.3.ebuild
+++ b/kde-base/krossjava/krossjava-4.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.3.3.ebuild,v 1.3 2009/12/10 16:33:08 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.3.3.ebuild,v 1.4 2010/06/11 02:01:46 reavertm Exp $
 
 EAPI="2"
 
@@ -30,7 +30,8 @@ src_prepare() {
 }
 
 src_configure() {
-       export mycmakeargs="-DENABLE_KROSSJAVA=ON"
+       mycmakeargs=(-DENABLE_KROSSJAVA=ON)
+       export JAVA_HOME=$(java-config -g JAVA_HOME)
        kde4-meta_src_configure
        java-ant-2_src_configure
 }

diff --git a/kde-base/krossjava/krossjava-4.3.5.ebuild b/kde-base/krossjava/krossjava-4.3.5.ebuild
index 570181fc022824f5b165aaefc2b52bec9602ce58..74e5dbfb687672f5bcc0e64277463240fdf5a097 100644 (file)
--- a/kde-base/krossjava/krossjava-4.3.5.ebuild
+++ b/kde-base/krossjava/krossjava-4.3.5.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/kde-base/krossjava/krossjava-4.3.5.ebuild,v 1.2 2010/02/20 11:27:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.3.5.ebuild,v 1.3 2010/06/11 02:01:46 reavertm Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
        mycmakeargs=(-DENABLE_KROSSJAVA=ON)
+       export JAVA_HOME=$(java-config -g JAVA_HOME)
        kde4-meta_src_configure
        java-ant-2_src_configure
 }

diff --git a/kde-base/krossjava/krossjava-4.4.4.ebuild b/kde-base/krossjava/krossjava-4.4.4.ebuild
index 7257b011eb87e0f3cd1fa2de4111f55843f8c510..9e5f10775a3cf7c462accdb61ffadaddb4c30c52 100644 (file)
--- a/kde-base/krossjava/krossjava-4.4.4.ebuild
+++ b/kde-base/krossjava/krossjava-4.4.4.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/kde-base/krossjava/krossjava-4.4.4.ebuild,v 1.1 2010/06/06 14:42:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krossjava/krossjava-4.4.4.ebuild,v 1.2 2010/06/11 02:01:46 reavertm Exp $
 
 EAPI="3"
 
@@ -31,6 +31,7 @@ src_prepare() {
 
 src_configure() {
        mycmakeargs=(-DENABLE_KROSSJAVA=ON)
+       export JAVA_HOME=$(java-config -g JAVA_HOME)
        kde4-meta_src_configure
        java-ant-2_src_configure
 }