haubi 14/07/22 06:38:57 Modified: ChangeLog java-vm-2.eclass Log: java-vm-2.eclass: Respect EPREFIX in pkg_postinst, bug#517236.
Revision Changes Path 1.1324 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1324&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1324&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1323&r2=1.1324 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1323 retrieving revision 1.1324 diff -u -r1.1323 -r1.1324 --- ChangeLog 19 Jul 2014 10:18:41 -0000 1.1323 +++ ChangeLog 22 Jul 2014 06:38:56 -0000 1.1324 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1323 2014/07/19 10:18:41 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1324 2014/07/22 06:38:56 haubi Exp $ + + 22 Jul 2014; Michael Haubenwallner <[email protected]> java-vm-2.eclass: + Respect EPREFIX in pkg_postinst, bug#517236. 19 Jul 2014; Fabian Groffen <[email protected]> mysql.eclass, mysql-autotools.eclass, mysql-cmake.eclass, mysql-v2.eclass: 1.47 eclass/java-vm-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-vm-2.eclass?r1=1.46&r2=1.47 Index: java-vm-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- java-vm-2.eclass 23 Jul 2012 19:06:20 -0000 1.46 +++ java-vm-2.eclass 22 Jul 2014 06:38:56 -0000 1.47 @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.46 2012/07/23 19:06:20 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.47 2014/07/22 06:38:56 haubi Exp $ # @ECLASS: java-vm-2.eclass # @MAINTAINER: @@ -70,15 +70,16 @@ # setting is invalid. Also update mime database. java-vm-2_pkg_postinst() { + has ${EAPI:-0} 0 1 2 && ! use prefix && EROOT=${ROOT} # Note that we cannot rely on java-config here, as it will silently recognize # e.g. icedtea6-bin as valid system VM if icedtea6 is set but invalid (e.g. due # to the migration to icedtea-6) - if [[ ! -L "${ROOT}${JAVA_VM_SYSTEM}" ]]; then + if [[ ! -L "${EROOT}${JAVA_VM_SYSTEM}" ]]; then java_set_default_vm_ else - local current_vm_path=$(readlink "${ROOT}${JAVA_VM_SYSTEM}") + local current_vm_path=$(readlink "${EROOT}${JAVA_VM_SYSTEM}") local current_vm=$(basename "${ROOT}${current_vm_path}") - if [[ ! -L "${ROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then + if [[ ! -L "${EROOT}${JAVA_VM_DIR}/${current_vm}" ]]; then java_set_default_vm_ fi fi
