monsieurp 15/05/23 21:39:29 Modified: jss-4.3-r1.ebuild ChangeLog Log: Revert previous commit and declare linux_infos Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.3 dev-java/jss/jss-4.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild?r1=1.2&r2=1.3 Index: jss-4.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jss-4.3-r1.ebuild 23 May 2015 18:22:18 -0000 1.2 +++ jss-4.3-r1.ebuild 23 May 2015 21:39:29 -0000 1.3 @@ -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 @@ 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 @@ 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 1.29 dev-java/jss/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?rev=1.29&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?rev=1.29&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?r1=1.28&r2=1.29 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- ChangeLog 23 May 2015 18:22:18 -0000 1.28 +++ ChangeLog 23 May 2015 21:39:29 -0000 1.29 @@ -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 <[email protected]> jss-4.3-r1.ebuild: + Revert previous commit and declare linux_infos 23 May 2015; Patrice Clement <[email protected]> jss-4.3-r1.ebuild: Manually set JAVA_HOME since it is needed at compilation time. Fix bug 539100.
