/[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.39 Revision 1.43
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 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.39 2011/11/21 10:15:46 sera Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.43 2012/06/11 19:46:32 sera 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
12# 12#
13# ----------------------------------------------------------------------------- 13# -----------------------------------------------------------------------------
14 14
15inherit eutils fdo-mime multilib pax-utils prefix 15inherit eutils fdo-mime multilib pax-utils prefix
16 16
17RDEPEND="
17DEPEND="=dev-java/java-config-2*" 18 =dev-java/java-config-2*
19 || ( app-admin/eselect-java <dev-java/java-config-2.2 )"
20DEPEND="${RDEPEND}"
18has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1" 21has "${EAPI}" 0 1 && DEPEND="${DEPEND} >=sys-apps/portage-2.1"
19
20RDEPEND="
21 =dev-java/java-config-2*"
22 22
23export WANT_JAVA_CONFIG=2 23export WANT_JAVA_CONFIG=2
24 24
25JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm" 25JAVA_VM_CONFIG_DIR="/usr/share/java-config-2/vm"
26JAVA_VM_DIR="/usr/lib/jvm" 26JAVA_VM_DIR="/usr/lib/jvm"
66 fi 66 fi
67 67
68 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX= 68 has ${EAPI:-0} 0 1 2 && ! use prefix && EPREFIX=
69 69
70 # Install a default nsplugin if we don't already have one 70 # Install a default nsplugin if we don't already have one
71 if has nsplugin ${IUSE} && use nsplugin; then 71 if in_iuse nsplugin && use nsplugin; then
72 if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then 72 if [[ ! -f "${EPREFIX}"/usr/${libdir}/nsbrowser/plugins/javaplugin.so ]]; then
73 einfo "No system nsplugin currently set." 73 einfo "No system nsplugin currently set."
74 java-vm_set-nsplugin 74 java-vm_set-nsplugin
75 else 75 else
76 einfo "System nsplugin is already set, not changing it." 76 einfo "System nsplugin is already set, not changing it."
148 sed \ 148 sed \
149 -e "s/@P@/${P}/g" \ 149 -e "s/@P@/${P}/g" \
150 -e "s/@PN@/${PN}/g" \ 150 -e "s/@PN@/${PN}/g" \
151 -e "s/@PV@/${PV}/g" \ 151 -e "s/@PV@/${PV}/g" \
152 -e "s/@PF@/${PF}/g" \ 152 -e "s/@PF@/${PF}/g" \
153 -e "s/@SLOT@/${SLOT}/g" \
153 -e "s/@PLATFORM@/${platform}/g" \ 154 -e "s/@PLATFORM@/${platform}/g" \
154 -e "s/@LIBDIR@/$(get_libdir)/g" \ 155 -e "s/@LIBDIR@/$(get_libdir)/g" \
155 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \ 156 -e "/^LDPATH=.*lib\\/\\\"/s|\"\\(.*\\)\"|\"\\1${platform}/:\\1${platform}/server/\"|" \
156 < "${source_env_file}" \ 157 < "${source_env_file}" \
157 > "${env_file}" || die "sed failed" 158 > "${env_file}" || die "sed failed"
247 [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument" 248 [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument"
248 249
249 has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}" 250 has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
250 251
251 local path path_arr=("$@") 252 local path path_arr=("$@")
252 IFS=":" path="${path_arr[*]}" 253 # subshell this to prevent IFS bleeding out dependant on bash version.
254 # could use local, which *should* work, but that requires a lot of testing.
255 path=$(IFS=":"; echo "${path_arr[*]}")
253 dodir /etc/sandbox.d 256 dodir /etc/sandbox.d
254 echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \ 257 echo "SANDBOX_PREDICT=\"${path}\"" > "${ED}/etc/sandbox.d/20${VMHANDLE}" \
255 || die "Failed to write sandbox control file" 258 || die "Failed to write sandbox control file"
256} 259}
257 260

Legend:
Removed from v.1.39  
changed lines
  Added in v.1.43

  ViewVC Help
Powered by ViewVC 1.1.20