summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-06-11 02:01:46 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-06-11 02:01:46 +0000
commit487ea3b833dcfc2958f7256894316cbc400ed419 (patch)
tree6f1bc56872010a99e294acbd15d1d919b0f32c32 /kde-base/krossjava
parentConvert to ruby-fakegem. Fixed to work with ruby19. (diff)
downloadgentoo-2-487ea3b833dcfc2958f7256894316cbc400ed419.tar.gz
gentoo-2-487ea3b833dcfc2958f7256894316cbc400ed419.tar.bz2
gentoo-2-487ea3b833dcfc2958f7256894316cbc400ed419.zip
export JAVA_HOME queried from java-config, fixes bug 280629
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/krossjava')
-rw-r--r--kde-base/krossjava/ChangeLog6
-rw-r--r--kde-base/krossjava/krossjava-4.3.3.ebuild7
-rw-r--r--kde-base/krossjava/krossjava-4.3.5.ebuild3
-rw-r--r--kde-base/krossjava/krossjava-4.4.4.ebuild3
4 files changed, 13 insertions, 6 deletions
diff --git a/kde-base/krossjava/ChangeLog b/kde-base/krossjava/ChangeLog
index ec0355b7c3d6..ccbb3d0a5e68 100644
--- 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/krossjava-4.3.3.ebuild b/kde-base/krossjava/krossjava-4.3.3.ebuild
index 00a4d3c3ed6c..d2b55779bd19 100644
--- 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 570181fc0228..74e5dbfb6876 100644
--- 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 7257b011eb87..9e5f10775a3c 100644
--- 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
}