|
Line
Link Here
|
| 0 |
-- icedtea-7.2.5.3.ebuild |
0 |
++ icedtea-7.2.5.3.ebuild |
|
Lines 147-159
Link Here
|
| 147 |
${X_DEPEND} |
147 |
${X_DEPEND} |
| 148 |
pax_kernel? ( sys-apps/elfix )" |
148 |
pax_kernel? ( sys-apps/elfix )" |
| 149 |
|
149 |
|
| 150 |
PDEPEND="webstart? ( |
150 |
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) |
| 151 |
dev-java/icedtea-web:0[icedtea7] |
151 |
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) |
| 152 |
) |
152 |
pulseaudio? ( dev-java/icedtea-sound )" |
| 153 |
nsplugin? ( |
|
|
| 154 |
dev-java/icedtea-web:0[icedtea7,nsplugin] |
| 155 |
) |
| 156 |
pulseaudio? ( dev-java/icedtea-sound )" |
| 157 |
|
153 |
|
| 158 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
154 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 159 |
|
155 |
|
|
Lines 230-239
Link Here
|
| 230 |
fi |
226 |
fi |
| 231 |
|
227 |
|
| 232 |
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... |
228 |
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... |
| 233 |
# In-tree JIT ports are available for arm, aarch64, amd64, ppc64, ppc64le, SPARC and x86. |
229 |
# In-tree JIT ports are available for amd64, arm, arm64, ppc64, sparc and x86. |
| 234 |
# Otherwise use CACAO |
230 |
# Otherwise use CACAO |
| 235 |
if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then |
231 |
if ! { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then |
| 236 |
if has "${ARCH}" ppc ; then |
232 |
if use ppc; then |
| 237 |
use_cacao="yes" |
233 |
use_cacao="yes" |
| 238 |
else |
234 |
else |
| 239 |
use_zero="yes" |
235 |
use_zero="yes" |
| 240 |
-- icedtea-6.1.13.5-r1.ebuild |
236 |
++ icedtea-6.1.13.5-r1.ebuild |
|
Lines 118-129
Link Here
|
| 118 |
${X_DEPEND} |
118 |
${X_DEPEND} |
| 119 |
pax_kernel? ( sys-apps/elfix )" |
119 |
pax_kernel? ( sys-apps/elfix )" |
| 120 |
|
120 |
|
| 121 |
PDEPEND="webstart? ( |
121 |
PDEPEND="webstart? ( dev-java/icedtea-web:0 ) |
| 122 |
dev-java/icedtea-web:0 |
122 |
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )" |
| 123 |
) |
|
|
| 124 |
nsplugin? ( |
| 125 |
dev-java/icedtea-web:0[nsplugin] |
| 126 |
)" |
| 127 |
|
123 |
|
| 128 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
124 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 129 |
|
125 |
|
|
Lines 198-204
Link Here
|
| 198 |
|
194 |
|
| 199 |
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... |
195 |
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... |
| 200 |
# Otherwise use CACAO |
196 |
# Otherwise use CACAO |
| 201 |
if ! has "${ARCH}" amd64 arm sparc x86; then |
197 |
if ! { use amd64 || use arm || use sparc || use x86; }; then |
| 202 |
enable_cacao=yes |
198 |
enable_cacao=yes |
| 203 |
elif use cacao; then |
199 |
elif use cacao; then |
| 204 |
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' |
200 |
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' |
