|
Line 7
Link Here
|
| 7 |
inherit java-vm-2 eutils prefix versionator |
7 |
inherit java-vm-2 eutils prefix versionator multilib-minimal |
| 8 |
-- |
8 |
|
|
|
9 |
MULTILIB_COMPAT=( abi_x86_{32,64} ) |
|
Lines 25-26
Link Here
|
| 25 |
x86? ( ${X86_AT} ) |
27 |
abi_x86_32? ( ${X86_AT} ) |
| 26 |
amd64? ( ${AMD64_AT} ) |
28 |
abi_x86_64? ( ${AMD64_AT} ) |
| 27 |
-- |
|
|
|
Lines 40-44
Link Here
|
| 40 |
x11-libs/libXext |
42 |
x11-libs/libXext[${MULTILIB_USEDEP}] |
| 41 |
x11-libs/libXi |
43 |
x11-libs/libXi[${MULTILIB_USEDEP}] |
| 42 |
x11-libs/libXrender |
44 |
x11-libs/libXrender[${MULTILIB_USEDEP}] |
| 43 |
x11-libs/libXtst |
45 |
x11-libs/libXtst[${MULTILIB_USEDEP}] |
| 44 |
x11-libs/libX11 |
46 |
x11-libs/libX11[${MULTILIB_USEDEP}] |
| 45 |
-- |
|
|
|
Lines 46-47
Link Here
|
| 46 |
alsa? ( media-libs/alsa-lib ) |
48 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 47 |
fontconfig? ( media-libs/fontconfig ) |
49 |
fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) |
| 48 |
-- |
|
|
|
Line 56
Link Here
|
| 56 |
S="${WORKDIR}/jre${S_PV}" |
58 |
S="${WORKDIR}" |
| 57 |
-- |
59 |
BUILD_DIR="${WORKDIR}/jre${S_PV}" |
|
Lines 59-71
Link Here
|
| 59 |
if use x86; then |
62 |
nofetch_msg() { |
| 60 |
AT=${X86_AT} |
63 |
einfo "Please download '${1}' from:" |
| 61 |
elif use amd64; then |
64 |
einfo "'${JRE_URI}'" |
| 62 |
AT=${AMD64_AT} |
|
|
| 63 |
fi |
| 64 |
|
| 65 |
einfo "Please download '${AT}' from:" |
| 66 |
einfo "'${JRE_URI}'" |
| 67 |
einfo "and move it to '${DISTDIR}'" |
| 68 |
|
| 69 |
if use jce; then |
| 70 |
einfo "Also download '${JCE_FILE}' from:" |
| 71 |
einfo "'${JCE_URI}'" |
| 72 |
-- |
|
Line 73
Link Here
|
| 73 |
fi |
66 |
einfo |
| 74 |
-- |
67 |
} |
|
|
68 |
|
| 69 |
use abi_x86_32 && nofetch_msg "${X86_AT}" "${JRE_URI}" |
| 70 |
use abi_x86_64 && nofetch_msg "${AMD64_AT}" "${JRE_URI}" |
| 71 |
use jce && nofetch_msg "${JCE_FILE}" "${JCE_URI}" |
|
Line 75
Link Here
|
| 75 |
einfo |
|
|
|
Lines 83-86
Link Here
|
| 83 |
src_prepare() { |
80 |
src_unpack() { |
| 84 |
if use jce; then |
81 |
local i |
| 85 |
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
82 |
for i in ${A} ; do |
| 86 |
fi |
83 |
unpack "${i}" |
| 87 |
-- |
84 |
[[ $i = ${JCE_FILE} ]] && continue |
|
|
85 |
mv "${BUILD_DIR}" "${BUILD_DIR}-$([[ $i = *i586* ]] && echo abi_x86_32.x86 || echo abi_x86_64.amd64)" || die |
| 86 |
done |
|
Lines 89-90
Link Here
|
| 89 |
src_install() { |
89 |
multilib_src_install() { |
| 90 |
local dest="/opt/${P}" |
90 |
local suffix= |
| 91 |
-- |
91 |
multilib_is_native_abi || suffix="-${ABI}" |
|
|
92 |
multilib_is_native_abi || local VMHANDLE="emul-linux-x86-${PN}-${SLOT}" |
| 93 |
|
| 94 |
local dest="/opt/${P}${suffix}" |
|
Line 93
Link Here
|
|
|
97 |
if use jce; then |
| 98 |
cp "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
| 99 |
fi |
| 100 |
|
|
Line 100
Link Here
|
| 100 |
if use x86; then |
108 |
if [[ ${ABI} = x86 ]]; then |
| 101 |
-- |
|
|
|
Lines 106-107
Link Here
|
| 106 |
local arch=${ARCH}; |
114 |
local arch="${ABI}"; |
| 107 |
use x86 && arch=i386; |
115 |
[[ ${arch} = x86 ]] && arch=i386; |
| 108 |
-- |
|
|
|
Line 121
Link Here
|
| 121 |
case ${ARCH} in |
129 |
case ${ABI} in |
| 122 |
-- |
|
|
|
Lines 182-183
Link Here
|
| 182 |
set_java_env |
190 |
sed -e "s:/opt/@P@:${dest}:g" "${FILESDIR}/${PN}-${SLOT}.env" > "${T}/${ABI}.env" || die |
| 183 |
java-vm_revdep-mask |
191 |
set_java_env "${T}/${ABI}.env" |
| 184 |
-- |
192 |
java-vm_revdep-mask "${dest}" |
