commit: 8ea0981804770548296563aa037fcbd476c084fe
Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Sun Jan 11 17:57:08 2015 +0000
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Sun Jan 11 17:57:08 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=8ea09818
Synchronise arch selection across all ebuilds, update to match Gentoo values
and use 'use' over 'has'.
Resolves #528186 and #481266.
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 35964222
---
dev-java/icedtea/ChangeLog | 6 +++
dev-java/icedtea/Manifest | 28 ++++--------
dev-java/icedtea/icedtea-3.9999.ebuild | 47 ++++++++++++++++++---
dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild | 61 ++++++++++++++++++---------
dev-java/icedtea/icedtea-6.9999.ebuild | 61 ++++++++++++++++++---------
dev-java/icedtea/icedtea-7.2.5.3.ebuild | 29 +++++++------
dev-java/icedtea/icedtea-7.2.6.0_pre11.ebuild | 31 ++++++++------
7 files changed, 175 insertions(+), 88 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 7564ca7..790ddb4 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Jan 2015; Andrew John Hughes <gnu_and...@member.fsf.org>
+ icedtea-3.9999.ebuild, icedtea-6.1.13.5-r1.ebuild, icedtea-6.9999.ebuild,
+ icedtea-7.2.5.3.ebuild, icedtea-7.2.6.0_pre11.ebuild:
+ Synchronise arch selection across all ebuilds, update to match Gentoo values
+ and use 'use' over 'has'. Resolves #528186 and #481266.
+
03 Jan 2015; Andrew John Hughes <gnu_and...@member.fsf.org>
+files/7085757-currency_fix.patch, icedtea-7.2.5.3.ebuild:
Fix currency generation failure caused by 2014-12-31 being > 10 years ago;
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d24bf97..11c89bc 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -40,27 +40,17 @@ DIST icedtea7-langtools-510234036e06.tar.bz2 1701912 SHA256
cc85aa73a186475590c5
DIST icedtea7-openjdk-05e485acec14.tar.bz2 126830 SHA256
56d5f39698e91571c8155767577126b4106cf67fad0a6743918063970c208b93 SHA512
18907d9073d440e27fc52b6b74e7ba247241855ba83c645fa3b74a1a7e39f0592be898730edaa7f8700b28d3c7426551cd215b52794db6ba5b1800e3b391b722
WHIRLPOOL
bef46252b136555b1a103e6d42673c34c8a28bc26bfa40e5fa71fd39af7f0da97b2054aff7ae8f898151775c3b48c7b780a4ac035c2afe2f8ae735b724c06a81
DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256
ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512
3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55
WHIRLPOOL
4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
DIST openjdk-6-src-b33-14_oct_2014.tar.xz 33476800 SHA256
cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293 SHA512
e3e195b069101c352ae8ed8f59558a464ba61c9966add815cb58c9151c8fefda721dd1650ebd335350af95cbebdd3fedb1b4ac2736fb2625bb83f13b94a85c8c
WHIRLPOOL
bcd51fe1ce52ec275ef24d03914f0d151a8765c432713a9bfef39618c01587dc7f9ff9a58b86785761c4b69130afa643964c6cf5caad13d7778baa0a346ea291
-EBUILD icedtea-3.9999.ebuild 10711 SHA256
fc6a22bf47db40c0f25d0bdc321901dd2585680b7c98e3e2d47b8235476182da SHA512
c1e36c3022f8712d32fa1d68191d97a1f0dbec2139ef4e8bc8f5b92494523c248c5731b9ada45afee2c275de8d233624cb1581b15041bd078fbbc44860ce236c
WHIRLPOOL
df90a1f053354da1330de836d08ab5f52fb00e02dbc15dfd6d9d58481d42a17805b4550f013171044a4913f103d08765042a8a1cbdd951e06948b439c153f142
-EBUILD icedtea-6.1.13.5-r1.ebuild 10311 SHA256
822d0b24e1c81491fe292eb218aeada638a7f63c4096ad336df73a5bf219946a SHA512
c91327f708f4a42b2788a160ae5682f4f4c9d5600ab42b34149e083e8c5ba5ea1b1af4714e613ac7eaa3c53755346f63c6256597408af95cbccf2fcacd2fff7b
WHIRLPOOL
a2cabedc8e72c1703f9aaea659cebb3a59a461514b73e382b524d1c57e3d52150d1d90cf82c197fadb187155310eb7397bbb758bbd662ec7efd19435fd1e04b3
-EBUILD icedtea-6.9999.ebuild 10014 SHA256
33a297abe609e27f3ca3c93ba374327c8e0beca9b277806a072715f61bd45784 SHA512
6507b894510471668698e7be1fa355e77033a9204f5e96351a37ff0abc67fe606d2c71213c2fa4810c6dedf3884da18d5a39cbcc7130303c98d95c0e7e737f46
WHIRLPOOL
79182d9db491f3900264680541e675ca033f174dfb223037fefe21abf8260a47dbc7e6d1d86e062655e76c15a23070f503d6757a0d71959f24f918261eff32a5
-EBUILD icedtea-7.2.5.3.ebuild 12368 SHA256
215bb04afea4a560627c3b0252022e9d0c50ac881bf24ff8a742fd9f73415e97 SHA512
c38914d08a7fc323dc6257ead6cadb14b28f98255952acdc5e5bb3ce1118ebdef82ccecab2b20f9a38cda5fb0d07bb69007a3cbec49b6d3f71c964282c1afec6
WHIRLPOOL
265ae035b8fcaf3ddc29376d9dbee460a873e9061a09057ccc9f86e65dd56d6ecfff8578086080b1552a11beb454880fecd66b02c856a19d2c09999bb10a2ca5
-EBUILD icedtea-7.2.6.0_pre11.ebuild 12228 SHA256
a93b555be8a38542c367461862d729cace970dee5cd437e7ba4684d6b77a9a13 SHA512
7fa0ed72dae3c87ddf33cbda2a18a2999d06f9c1e75016536790df3ea81bc6a84edde1923a45aa7751198ea67409bd2e28d21e4d008ac03916f151c5376bc3c1
WHIRLPOOL
903cc4312916107cb2d7db7e01c9cc14fc5fbce829e152c5ad0987d68b845e56e42bc8d21b9d9196a8b28300422b22895a0ceeeb352eeeaab6613efd6505ce08
-MISC ChangeLog 87425 SHA256
478dc44a6caab7a7bf5ed6430b7a3a087f42605cf74fdbcfabc14e8f7323021d SHA512
49835bc07c3da39457375f77ae3eb2c54380ef13839775d87d7297ade59e8294f1fc89da92c95e1116af2bdf8af1b4513416d059acf783eaec5589eed459874f
WHIRLPOOL
88b116fa006e8f5a01ed70922245f1c6f6779c89b8e39a47c8f7bc776407f0dde53759ed7493b190c8c0dbf80879bbebce8cfd2e47fbc0e7cb06e0b06e2eb563
+EBUILD icedtea-3.9999.ebuild 11661 SHA256
3a2f3d9c6ecd7305c36118d1984917ca7e3d0ed3ac0063a5e450181786327523 SHA512
1287f5518f64cc991365d0d271bee9531d955690f3128dabf7432e928a72d2413b396c1523a91d1d47cb63d7abe891f52a72e05b7c2e7ab1214639b98510c8ac
WHIRLPOOL
878ab905a55d29dd5e60caa57bcf9c7e829fd28b10c83c4d3d965cebe932d87e65dd6b69580e6e2fe87d247973bf86d1dd2abff0be693152330e12a5f885aebc
+EBUILD icedtea-6.1.13.5-r1.ebuild 11011 SHA256
79927c530660fbc7e2d21bb50da6ce6a11b9075d141cffdc742ce31570a1ced8 SHA512
98dd5a074a842a6870349d22d2b5a85eb988f2cf7e2941f8ece5480c91f75749ff226d099ab8f9d4e94aa7090b35d9e2aedf9d25b68efb4a48adbfb7dc1887d8
WHIRLPOOL
5aba919a6f8a84deb6505f594b5f34add0d64e005eb63d8856d88d09003adf8e7d8fd29afd811e456a09a96b8f92fc679afe6a0d52429db3f5a8b9e6d4c43a5e
+EBUILD icedtea-6.9999.ebuild 10718 SHA256
e9641f8cd7506f26c9c1c55c12b11df5ff50c573fefcd27039b81b91ef649540 SHA512
6963e41a00d5b4f09a972b07bc65a9c86e2aef339a726ce0eac6ff92d8dd1c886ce66a8b308c02629fcca8592405792459bdec81f2ee95f3f7d8b02d3b662a94
WHIRLPOOL
5cea7be6c2187ef2892f08addab7179aab57a1635d621f8e2ff1fdf326fb33a54e22c7056a94db27d741d2745677a4076b4505552b486a8b0af45e9449b87fb3
+EBUILD icedtea-7.2.5.3.ebuild 12710 SHA256
f6707610fccc5f9cabb6069cfb2c6cf76025d2051d2df74b7ba04fb2b25fdd74 SHA512
6161e431ed56f3e3fd5d6b5391d7090db3140788730c3e1c96277491a47f416f12f9eaa852a634f43b645743254638f9b645e7a77362c8a301157395b72aa255
WHIRLPOOL
ca0ae74585fee47fdb105c801d0a51f33448d267bf4bcf5289f553e7c1be6e2af44374bc07afe070742c3cfafa204ff76615ccc3a2488d367e355613899e173b
+EBUILD icedtea-7.2.6.0_pre11.ebuild 12570 SHA256
0644ba31949bb0d2ccd5d78ee3577f458b9aa00a59565f7cdb81787b134aa927 SHA512
1e6610482a02360534232a96bd607cda6fbf4f1651e62b2c66011a6f34cf8bc1828ade48ee00315e679c5bd4435e0cec0d4e1be81aa82ee0bea027a4522bfdab
WHIRLPOOL
4db1f14099cc1563077f75246bf9b9efb83d39955a8039e89323c5dfdc35fcd4a5c83f707f8af3494e763f7bda08a323a4f00b037337fb7caf7f4d7aea0fb884
+MISC ChangeLog 87757 SHA256
3b2ca5835913865115bf231708cf256881b9e94ac0f6d67f2f52a0a9f9c2db05 SHA512
af2c6674e0da4ea4fd2b83d86f454fa5ba261548ee76f3694773752f2d85945b38f170e3b3ce4481855f0285eca77dc9cc908eb6e560a4e9d5a94e9e7acec0c2
WHIRLPOOL
10b126564b2c1e10ff33242dde327c4332836bf47ebf096824d8324b874d11ffd063da5a8700f6a32245683e6cfaba7dc58dc6d5e158d6febb61b08440c734a9
MISC metadata.xml 1680 SHA256
41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512
5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c
WHIRLPOOL
5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUqDGNAAoJEDuWpXgki9wHvUMQAI49mD8CPwUiF6LtUE5gHV7y
-F5JuhfIQDJKeqKP7X80mexZdTj19qT80nS+KtexzdktFolpJidZ6qVoPE6J1Heb5
-6UENEOwCzQGUuMG7omKrsfYjaB2NHbNdFrny5CKGQK2FtIP6hPQTQLkBYE4IlZHB
-aIqRmaylAt4EWtHrpfSWRlNLp55TrAGQ2sZekWYYFS++YpQWzJkP33j5XRO8cIKO
-9Tc/H3LGgi337MXmwxQVMdt3/g179OApCV3sLNUh7eTSR8PSW/JCeI05qNqnesjw
-G6fgx1qD03iqsih3tMun+r4vOa8GP6fSYQiGP3HpkeSRJHvz0I9/hfy4vvliH6CC
-TZcyaMGrSOpFqwsah4fXi7CA2VCUfLNrmhIkP4uOHeqGT0QI9bg+lYRg49p99ztn
-tLIrGMOjHMn5tvHO/+oEvHaSTri7i8BAL1hG0ggw9HawMUwMJmrEm53C8DJCRLWQ
-yjUrg2g/bJFfq6yiVOxlTcDkg1ItL1SHgdTQ9IQSikY6MmCHDbHVtBQKTuxQ0Xlp
-lAJQlBTHVEDuTfi1dwhQw7Zb/5+scQ4bAuyc6K1NurngXcdgwQIh8N2qHwDnRG0D
-tgWuuW4BEjGpOWFVDjfBsQoQNGIRWLrMkwZXhOxutB6sCcZCjK8fnCIVe+Kdm1J7
-GFKNZyKdmCoCSC29f49S
-=jNs0
+iF4EARYIAAYFAlSyuWsACgkQz9oPmzWWQiIUGQEA5Pu4ixNw0C0oij6GgIvOhY8z
+5+8pcIUU0WvccXLe5c4BAEOk8I64LlpvtgdbvQsPcirBIs6KlDJbwO47J2XelJ4F
+=qk2O
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild
b/dev-java/icedtea/icedtea-3.9999.ebuild
index 839502b..ab24bf9 100644
--- a/dev-java/icedtea/icedtea-3.9999.ebuild
+++ b/dev-java/icedtea/icedtea-3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v
1.1 2011/12/02 12:27:17 sera Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
@@ -199,7 +199,7 @@ bootstrap_impossible() {
}
src_configure() {
- local bootstrap config
+ local bootstrap config hotspot_port jamvm_config use_jamvm use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
@@ -222,10 +222,44 @@ src_configure() {
config+=" --${bootstrap}-bootstrap"
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, ppc64 (le&be), sparc and
x86.
+ if { use amd64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
- # Otherwise use JamVM as it's the only possibility right now
- if ! has "${ARCH}" amd64 sparc x86; then
- config+=" --enable-jamvm"
+ # Otherwise use JamVM on arm & ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if { use arm || use ppc; }; then
+ use_jamvm="yes"
+ else
+ use_zero="yes"
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot
support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ zero_config="--enable-zero"
fi
config+=" --with-parallel-jobs=$(makeopts_jobs)"
@@ -256,7 +290,8 @@ src_configure() {
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax paxctl)
+ $(use_with pax_kernel pax paxctl) \
+ ${zero_config} ${jamvm_config}
}
src_compile() {
diff --git a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
index 990bb93..98da314 100644
--- a/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5-r1.ebuild,v 1.1
2014/11/01 17:59:37 caster Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
@@ -37,7 +37,7 @@ SLOT="6"
KEYWORDS="~amd64 ~x86"
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap
kerberos +nsplugin
- +nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
+ +nss pax_kernel pulseaudio selinux +source systemtap test zero
+webstart"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -118,12 +118,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? (
- dev-java/icedtea-web:0
- )
- nsplugin? (
- dev-java/icedtea-web:0[nsplugin]
- )"
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+ nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -174,7 +170,7 @@ bootstrap_impossible() {
}
src_configure() {
- local bootstrap config enable_cacao
+ local bootstrap cacao_config config hotspot_port use_cacao use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
# IcedTea6 can't be built using IcedTea7; its class files are too new
@@ -196,18 +192,44 @@ src_configure() {
config+=" --${bootstrap}-bootstrap"
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, sparc and x86.
+ if { use amd64 || use arm || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
- # Otherwise use CACAO
- if ! has "${ARCH}" amd64 arm sparc x86; then
- enable_cacao=yes
- elif use cacao; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support;
issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- enable_cacao=yes
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
+ use_cacao="yes"
+ else
+ use_zero="yes"
+ fi
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot
support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ cacao_config="--enable-cacao"
fi
- if [[ ${enable_cacao} ]]; then
- config+=" --enable-cacao"
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ zero_config="--enable-zero"
fi
config+=" --with-parallel-jobs=$(makeopts_jobs)"
@@ -234,7 +256,8 @@ src_configure() {
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh")
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ ${zero_config} ${cacao_config}
}
src_compile() {
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 96d2418..1627d7a 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v
1.1 2014/10/19 06:46:41 caster Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
@@ -36,7 +36,7 @@ SLOT="6"
KEYWORDS=""
IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap
+nsplugin
- +nss pax_kernel pulseaudio selinux +source systemtap test +webstart"
+ +nss pax_kernel pulseaudio selinux +source systemtap test zero
+webstart"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
@@ -116,12 +116,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
-PDEPEND="webstart? (
- dev-java/icedtea-web:0
- )
- nsplugin? (
- dev-java/icedtea-web:0[nsplugin]
- )"
+PDEPEND="webstart? ( dev-java/icedtea-web:0 )
+ nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -171,7 +167,7 @@ bootstrap_impossible() {
}
src_configure() {
- local bootstrap config enable_cacao
+ local bootstrap cacao_config config hotspot_port use_cacao use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
# IcedTea6 can't be built using IcedTea7; its class files are too new
@@ -193,18 +189,44 @@ src_configure() {
config+=" --${bootstrap}-bootstrap"
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, sparc and x86.
+ if { use amd64 || use arm || use sparc || use x86; }; then
+ hotspot_port="yes"
+ fi
+
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
- # Otherwise use CACAO
- if ! has "${ARCH}" amd64 sparc x86; then
- enable_cacao=yes
- elif use cacao; then
- ewarn 'Enabling CACAO on an architecture with HotSpot support;
issues may result.'
- ewarn 'If so, please rebuild with USE="-cacao"'
- enable_cacao=yes
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
+ use_cacao="yes"
+ else
+ use_zero="yes"
+ fi
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot
support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ cacao_config="--enable-cacao"
fi
- if [[ ${enable_cacao} ]]; then
- config+=" --enable-cacao"
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ zero_config="--enable-zero"
fi
config+=" --with-parallel-jobs=$(makeopts_jobs)"
@@ -230,7 +252,8 @@ src_configure() {
$(use_enable nss) \
$(use_enable pulseaudio pulse-java) \
$(use_enable systemtap) \
- $(use_with pax_kernel pax paxctl)
+ $(use_with pax_kernel pax paxctl) \
+ ${zero_config} ${cacao_config}
}
src_compile() {
diff --git a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
index 18eea8f..d3bce52 100644
--- a/dev-java/icedtea/icedtea-7.2.5.3.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.3.ebuild
@@ -147,13 +147,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? (
- dev-java/icedtea-web:0[icedtea7]
- )
- nsplugin? (
- dev-java/icedtea-web:0[icedtea7,nsplugin]
- )
- pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -203,7 +199,7 @@ java_prepare() {
}
src_configure() {
- local bootstrap cacao_config config use_cacao use_zero zero_config
+ local bootstrap cacao_config config hotspot_port use_cacao use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
@@ -232,11 +228,16 @@ src_configure() {
use_cacao="yes"
fi
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le),
SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use
x86; }; then
+ hotspot_port="yes"
+ fi
+
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
- # In-tree JIT ports are available for arm, aarch64, amd64, ppc64,
ppc64le, SPARC and x86.
- # Otherwise use CACAO
- if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then
- if has "${ARCH}" ppc ; then
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
use_cacao="yes"
else
use_zero="yes"
@@ -245,6 +246,10 @@ src_configure() {
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot
support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
cacao_config="--enable-cacao"
fi
diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre11.ebuild
b/dev-java/icedtea/icedtea-7.2.6.0_pre11.ebuild
index f775185..b26428a 100644
--- a/dev-java/icedtea/icedtea-7.2.6.0_pre11.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.0_pre11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r3.ebuild,v
1.1 2011/12/02 12:27:17 sera Exp $
# Build written by Andrew John Hughes (gnu_and...@member.fsf.org)
@@ -147,13 +147,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? (
- dev-java/icedtea-web:0[icedtea7]
- )
- nsplugin? (
- dev-java/icedtea-web:0[icedtea7,nsplugin]
- )
- pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
@@ -202,7 +198,7 @@ java_prepare() {
}
src_configure() {
- local bootstrap cacao_config config use_cacao use_zero zero_config
+ local bootstrap cacao_config config hotspot_port use_cacao use_zero
zero_config
local vm=$(java-pkg_get-current-vm)
# Whether to bootstrap
@@ -231,11 +227,16 @@ src_configure() {
use_cacao="yes"
fi
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le),
SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use
x86; }; then
+ hotspot_port="yes"
+ fi
+
# Always use HotSpot as the primary VM if available. #389521 #368669
#357633 ...
- # In-tree JIT ports are available for arm, aarch64, amd64, ppc64,
ppc64le, SPARC and x86.
- # Otherwise use CACAO
- if ! has "${ARCH}" arm aarch64 amd64 ppc64 ppc64le sparc x86 ; then
- if has "${ARCH}" ppc ; then
+ # Otherwise use CACAO on ppc and Zero on anything else
+ if test "x${hotspot_port}" != "xyes"; then
+ if use ppc; then
use_cacao="yes"
else
use_zero="yes"
@@ -244,6 +245,10 @@ src_configure() {
# Turn on CACAO if needed (non-HS archs) or requested
if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot
support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
cacao_config="--enable-cacao"
fi
