7c7,9
< inherit java-vm-2 eutils prefix versionator
---
> inherit java-vm-2 eutils prefix versionator multilib-minimal
> 
> MULTILIB_COMPAT=( abi_x86_{32,64} )
25,26c27,28
< 	x86? ( ${X86_AT} )
< 	amd64? ( ${AMD64_AT} )
---
> 	abi_x86_32? ( ${X86_AT} )
> 	abi_x86_64? ( ${AMD64_AT} )
40,44c42,46
< 		x11-libs/libXext
< 		x11-libs/libXi
< 		x11-libs/libXrender
< 		x11-libs/libXtst
< 		x11-libs/libX11
---
> 		x11-libs/libXext[${MULTILIB_USEDEP}]
> 		x11-libs/libXi[${MULTILIB_USEDEP}]
> 		x11-libs/libXrender[${MULTILIB_USEDEP}]
> 		x11-libs/libXtst[${MULTILIB_USEDEP}]
> 		x11-libs/libX11[${MULTILIB_USEDEP}]
46,47c48,49
< 	alsa? ( media-libs/alsa-lib )
< 	fontconfig? ( media-libs/fontconfig )
---
> 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
> 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
56c58,59
< S="${WORKDIR}/jre${S_PV}"
---
> S="${WORKDIR}"
> BUILD_DIR="${WORKDIR}/jre${S_PV}"
59,71c62,64
< 	if use x86; then
< 		AT=${X86_AT}
< 	elif use amd64; then
< 		AT=${AMD64_AT}
< 	fi
< 
< 	einfo "Please download '${AT}' from:"
< 	einfo "'${JRE_URI}'"
< 	einfo "and move it to '${DISTDIR}'"
< 
< 	if use jce; then
< 		einfo "Also download '${JCE_FILE}' from:"
< 		einfo "'${JCE_URI}'"
---
> 	nofetch_msg() {
> 		einfo "Please download '${1}' from:"
> 		einfo "'${JRE_URI}'"
73c66,71
< 	fi
---
> 		einfo
> 	}
> 
> 	use abi_x86_32 && nofetch_msg "${X86_AT}" "${JRE_URI}"
> 	use abi_x86_64 && nofetch_msg "${AMD64_AT}" "${JRE_URI}"
> 	use jce && nofetch_msg "${JCE_FILE}" "${JCE_URI}"
75d72
< 	einfo
83,86c80,86
< src_prepare() {
< 	if use jce; then
< 		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
< 	fi
---
> src_unpack() {
> 	local i
> 	for i in ${A} ; do
> 		unpack "${i}"
> 		[[ $i = ${JCE_FILE} ]] && continue
> 		mv "${BUILD_DIR}" "${BUILD_DIR}-$([[ $i = *i586* ]] && echo abi_x86_32.x86 || echo abi_x86_64.amd64)" || die
> 	done
89,90c89,94
< src_install() {
< 	local dest="/opt/${P}"
---
> multilib_src_install() {
> 	local suffix=
> 	multilib_is_native_abi || suffix="-${ABI}"
> 	multilib_is_native_abi || local VMHANDLE="emul-linux-x86-${PN}-${SLOT}"
> 
> 	local dest="/opt/${P}${suffix}"
92a97,100
> 	if use jce; then
> 		cp "${WORKDIR}"/${JCE_DIR} lib/security/ || die
> 	fi
> 
100c108
< 	if use x86; then
---
> 	if [[ ${ABI} = x86 ]]; then
106,107c114,115
< 	local arch=${ARCH};
< 	use x86 && arch=i386;
---
> 	local arch="${ABI}";
> 	[[ ${arch} = x86 ]] && arch=i386;
121c129
< 	case ${ARCH} in
---
> 	case ${ABI} in
182,183c190,192
< 	set_java_env
< 	java-vm_revdep-mask
---
> 	sed -e "s:/opt/@P@:${dest}:g" "${FILESDIR}/${PN}-${SLOT}.env" > "${T}/${ABI}.env" || die
> 	set_java_env "${T}/${ABI}.env"
> 	java-vm_revdep-mask "${dest}"