diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-05-23 21:39:29 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-05-23 21:39:29 +0000 |
| commit | 021cfb8182c74386a82b33781e10545dc92198e8 (patch) | |
| tree | 4cdb860a6660c87437f4ddbb10df4a009e2ba3e7 /dev-java/jss | |
| parent | x86 stable wrt bug #530910 (diff) | |
| download | gentoo-2-021cfb8182c74386a82b33781e10545dc92198e8.tar.gz gentoo-2-021cfb8182c74386a82b33781e10545dc92198e8.tar.bz2 gentoo-2-021cfb8182c74386a82b33781e10545dc92198e8.zip | |
Revert previous commit and declare linux_infos
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'dev-java/jss')
| -rw-r--r-- | dev-java/jss/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jss/jss-4.3-r1.ebuild | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/dev-java/jss/ChangeLog b/dev-java/jss/ChangeLog index 552018f92792..7ece5b9a260c 100644 --- a/dev-java/jss/ChangeLog +++ b/dev-java/jss/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jss # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.28 2015/05/23 18:22:18 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.29 2015/05/23 21:39:29 monsieurp Exp $ + + 23 May 2015; Patrice Clement <monsieurp@gentoo.org> jss-4.3-r1.ebuild: + Revert previous commit and declare linux_infos 23 May 2015; Patrice Clement <monsieurp@gentoo.org> jss-4.3-r1.ebuild: Manually set JAVA_HOME since it is needed at compilation time. Fix bug 539100. diff --git a/dev-java/jss/jss-4.3-r1.ebuild b/dev-java/jss/jss-4.3-r1.ebuild index 386b1f2c75e8..baf752753dca 100644 --- a/dev-java/jss/jss-4.3-r1.ebuild +++ b/dev-java/jss/jss-4.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild,v 1.2 2015/05/23 18:22:18 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild,v 1.3 2015/05/23 21:39:29 monsieurp Exp $ EAPI="5" @@ -45,6 +45,12 @@ java_prepare() { epatch "${FILESDIR}"/${P}-secitem.patch } +# bug 539100 +pkg_setup() { + linux-info_pkg_setup + java-pkg-2_pkg_setup +} + src_compile() { export JAVA_GENTOO_OPTS="-source $(java-pkg_get-source) -target $(java-pkg_get-target)" @@ -58,11 +64,6 @@ src_compile() { cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die fi - # workaround for bug 539100 - local MY_JAVA_HOME=/etc/java-config-2/current-system-vm/ - JAVA_HOME=${MY_JAVA_HOME} - export JAVA_HOME - emake -j1 BUILD_OPT=1 cd "${S}/security/jss" || die |