/[gentoo-x86]/eclass/java-vm-2.eclass
Gentoo

Diff of /eclass/java-vm-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.35 Revision 1.38
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.35 2011/10/29 14:36:34 caster Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.38 2011/11/15 09:02:15 caster Exp $
4 4
5# ----------------------------------------------------------------------------- 5# -----------------------------------------------------------------------------
6# @eclass-begin 6# @eclass-begin
7# @eclass-shortdesc Java Virtual Machine eclass 7# @eclass-shortdesc Java Virtual Machine eclass
8# @eclass-maintainer java@gentoo.org 8# @eclass-maintainer java@gentoo.org
94 eselect java-nsplugin set ${extra_args} ${VMHANDLE} 94 eselect java-nsplugin set ${extra_args} ${VMHANDLE}
95} 95}
96 96
97java-vm-2_pkg_prerm() { 97java-vm-2_pkg_prerm() {
98 # Although REPLACED_BY_VERSION is EAPI=4, we shouldn't need to check EAPI for this use case 98 # Although REPLACED_BY_VERSION is EAPI=4, we shouldn't need to check EAPI for this use case
99 if [[ "$(java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then 99 if [[ "$(GENTOO_VM="" java-config -f 2>/dev/null)" == "${VMHANDLE}" && -z "${REPLACED_BY_VERSION}" ]]; then
100 ewarn "It appears you are removing your system-vm!" 100 ewarn "It appears you are removing your system-vm!"
101 ewarn "Please run java-config -L to list available VMs," 101 ewarn "Please run java-config -L to list available VMs,"
102 ewarn "then use java-config -S to set a new system-vm!" 102 ewarn "then use java-config -S to set a new system-vm!"
103 fi 103 fi
104} 104}
195 195
196 local VMROOT="${1-"${EPREFIX}"/opt/${P}}" 196 local VMROOT="${1-"${EPREFIX}"/opt/${P}}"
197 197
198 dodir /etc/revdep-rebuild/ 198 dodir /etc/revdep-rebuild/
199 echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}" 199 echo "SEARCH_DIRS_MASK=\"${VMROOT}\""> "${ED}/etc/revdep-rebuild/61-${VMHANDLE}"
200}
200 201
201 elog "A revdep-rebuild control file was installed to prevent reinstalls due to" 202# -----------------------------------------------------------------------------
202 elog "missing dependencies (see bug #177925 for more info). Note that some parts" 203# @ebuild-function java-vm_sandbox-predict
203 elog "of the JVM may require dependencies that are pulled only through respective" 204#
204 elog "USE flags (typically X, alsa, odbc) and some Java code may fail without them." 205# Install a sandbox control file. Specified paths won't cause a sandbox
206# violation if opened read write but no write takes place. See bug 388937#c1
207#
208# @example
209# java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
210# -----------------------------------------------------------------------------
211java-vm_sandbox-predict() {
212 debug-print-function ${FUNCNAME} "$*"
213 [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument"
214
215 has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
216
217 local path path_arr=("$@")
218 IFS=":" path="${path_arr[*]}"
219 dodir /etc/sandbox.d
220 echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
221 || die "Failed to write sandbox control file"
205} 222}
206 223
207java_get_plugin_dir_() { 224java_get_plugin_dir_() {
208 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX= 225 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
209 echo "${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins 226 echo "${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.38

  ViewVC Help
Powered by ViewVC 1.1.20