Use jamvm and replace -Os with -O2 on arm. #IT1266 #IT1267

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

4 files changed, 47 insertions, 32 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index e611ead207e8..2e402e403082 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.85 2013/01/16 21:21:38 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.86 2013/01/23 17:15:27 sera Exp $
+
+  23 Jan 2013; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.11.5.ebuild,
+  icedtea-7.2.3.4.ebuild:
+  Use jamvm and replace -Os with -O2 on arm. #IT1266 #IT1267
 
 *icedtea-7.2.3.4 (16 Jan 2013)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 6a3d4562dad3..3863a7978935 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -44,20 +44,20 @@ DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc
 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20
 DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227 SHA512 a965efa2fbe95a32988f78f1e51c42321ff42c1e631d5062aff204ba42839d6e05455f1ae039540e38ec947b50a635984cd3302eb09e81962575510309374e05 WHIRLPOOL 2dd759c4d8a23f0eb66bb28e1b48842fa3984d9796833bbbb6a3305a49d9cb1f2ce19b59c93b9f2a33d679559bf893fd62b4f831aa76bb053351e219639d9286
 EBUILD icedtea-6.1.11.4.ebuild 10613 SHA256 7729d8cdda82855e6dcdbf4dc04a2ca3bc390bc36a0288a5b0629e0f6b378b0d SHA512 347f5e9cd2ead8d1c845ade9e13eca51ec78f5233f1339ab8c9703448e6602033247c11aef072ee4dcb920d25b1334a43705d1925c6e896106081748fff29c54 WHIRLPOOL 31571a3627f8d00ca69e5c89b2046119a17629b243a36b4788c29959deb5093ec129f9d458dba255933c188b370ad077bc0052a7c6991d381bc70ad52e9df1b7
-EBUILD icedtea-6.1.11.5.ebuild 10613 SHA256 8576fc2cb3aa0f14b91dedf8428032a2f7d077e09e1b65c5e75b4650b46c6a11 SHA512 0fb66f5760ca53d99d3e5c305e455f6b7f30c56c204876f6f20eda5415281e1571851f136183000929efee5b08c58ef6f216d7f55063660ef6ef03cd7caf1702 WHIRLPOOL 7c9509eaae6099261eff3d68d260aa0bddf7ca1ab4e89c3f963fb0b2ff7555774a3afaaf8e336edd64a1e5e11205642332712223bb536fda894f4bb2575b54f1
+EBUILD icedtea-6.1.11.5.ebuild 10670 SHA256 7ec451b5e53b50a634cc026e47ee701695beea59dbd3794bf224e6557d6faa7e SHA512 83bb6f3c0a6fc2fc2c67b16f7e20e2d40b9422f0baf3b872adac8a782a5c93b721a6674f3d204d537c4556d48037f7ced570cb9f4dc75ebcdae84b49da5cb93d WHIRLPOOL d80fabe21656692166851bcb1052d41f4be3245d5956064244fe265205c062593dfd0003d2c1cc66fc2d494c3fae0fc1f6556d10367dbc9577a24f5474a4338b
 EBUILD icedtea-7.2.3.2.ebuild 10829 SHA256 d2f78e1296aac2876f24f5df9eb76b33cc922a3760e6e7555e0e919d0f67e43d SHA512 a783ba4ebeeb403c82e1d8b8b961c0b0785ecae954919d2ce086e5bada20816cc8120ab30f264771c291d6ba4d739435e640eb2d348a8626f767139c3587bc84 WHIRLPOOL d33e76963db1234b1d55b53d21e41dd04a6c9673d4411e7e0e1967187171151ef28ca98423a1dd0e041c549c52cd4d94d1da656f0690c8da805d24970b10cb1a
 EBUILD icedtea-7.2.3.3.ebuild 10805 SHA256 cef6fb9d24eb3ab3d3f2bd89185282125506e526a1c18ae710f8d91fa39fd905 SHA512 0699f66a5c390945fbc85dbbbe22b6a51f3dc6f704814c904f216bf784bacbac3c1506b6aa68fcffe1bedd2a32a2e614033aebf08df21f26841acef645e1aedd WHIRLPOOL 7f3dde9a93899c08ea3327a6932248e2766a5e900eba6343bbdb975ead143cc64c0de3250c0090b9d3de87b4009ba2a7b68e32b68e5e5e3139c0b04536a6d41d
-EBUILD icedtea-7.2.3.4.ebuild 10721 SHA256 66bc95c6b925da44fc2a943b13f25546a7bb73dde249fa66f19b8bc62411860d SHA512 ee6b8f0b8559c51f6aca25a75e44b37e87ed4e127dceb9ccf823cb5e5492af01c0a85ffe211c526a49290190ad9b728bf4fb74e988a3f2e93b2327ce75f9c98c WHIRLPOOL b1bbeb24b588c440425bbed0e182a9aa77bf7ece0bf8116f4e88bb713928bfd025a9870ecf3bc97bc82341c6e6202e946338d4a60315a4803834f302dcb13f90
-MISC ChangeLog 19515 SHA256 3c89f388acc81d84f18fda5025faba83a28a86d2e49a3b363f340b61f95f3181 SHA512 e270b5881857db265d4cbb2c1bc2106fe11efee94b6cb71770af17c165feb564bbab44cf81e12e1d01268e4e9f09ef8ef12a5d24f73654749526dc0ef2d61b20 WHIRLPOOL 972c6c72e736e6fb3418f8730c16bf59415e8665a3b295a048682e8c120bd06c1c4096bfc6932541c6957e75ce634f24750fd6493f1b64f633edb76dbc821334
+EBUILD icedtea-7.2.3.4.ebuild 10774 SHA256 7e1c33dee6601498af0c97410a1fda0206d468ec2cc6acd1c76fd02417ef78e9 SHA512 1dca69bbb2384d7343f327a0dea1864a21bae98c5aaca5f645cb8f643d17fb28428e98bd57b475d08b551fde2018e1fb37ddf47d938d9d85d95b97a60283c23b WHIRLPOOL adcae19fc9b6277dad18ae4381a7a530c9c7fa62ae404d93c7337dca959dd5baaf4a8116ac12c4c50825c9438eafd46f65e8e772cb2379dabd80e2990e10c427
+MISC ChangeLog 19678 SHA256 56a24a0ab5300c9f0dc6ffcb96f9214a2d3bb918f3f05a23d9b14e51b23d3402 SHA512 eeb2b4aecf74e83078c52d9ce7fe9ad8d49666ee0ed86df061c4af9116c38adb8f6d3fda7fb485e8b4cae23ae31264914068e43f29a4021ab37d9fe381a83315 WHIRLPOOL 2954e513a890cdfa2a9282440cdd3f29672e8fc61d35bda9d3b5a922fcd8e0887a575234a23e84cd4f559272ad60dffc56e16563cd467d9f3e47c88f2e078b5d
 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ9xqyAAoJELjwI6Q8XPdaUrEIALTQEgm+s+OWnSde+PwjyL9L
-I3HcOTJ/7sGvWTL+w3tYnnV/ylv5jri81l78mpXMtvHowxCancNY4WLDDubo8Nuk
-EjAkrv/Ti5vdLmsogdjN+duJHWOAFzRAff0HYSHyGCd6C82+bXFk2H4YjhDdF0Zv
-smG1NtlXjL7gnxcdKTXqEmjeIX0ENOlBd5S4tjamx678s0VykJz1QJ+b3om0yQ12
-dUzWscNbF9anRa758vHYnncCXyx9Z9HEEAqn9xeCxzZO23ixlMq6B3yu/FDk1EdG
-OcmxdV0xhsf+bp9xtmu+TA7q3ghi33R+VEVacASy3dkgHX3QLyT0PkpzrwQXdjk=
-=WFnf
+iQEcBAEBCAAGBQJRABuYAAoJELjwI6Q8XPda7CMH/2SZWVv3MvsftojyNgZ61HPc
+P7ifceBtev9ujaA04r5tD+EA7PnnXm1odgAlNued/fwvN8TS2BcOfMyOH1CnArOi
+gnYCx9iHtEzkcul02Z8FOqat8CDzh6Ikue716ryzl9BuqaqE6C2NcI8+yVEK2OaP
+AcD6PSeOtYQ8RPXUHI5LYq78v31ikh4PUP4uz7bxUq7V2sqoaE5QGHTb/xqvKbmc
+Kje7YHkbVZcXOxOChndiOoZoKs9ytySVrZPJMHr2cMMU9jtU6SEEa7LFX24oYZ2+
+0UT2Hy4xceKPIIWyOPOJywkC7/IXdq7TjJTL6GCo2kG2nyDYcfs1wGP2E1VKx7s=
+=e1oS
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.11.5.ebuild b/dev-java/icedtea/icedtea-6.1.11.5.ebuild
index b7ab0275bf69..57c9ea4fec28 100644
--- a/dev-java/icedtea/icedtea-6.1.11.5.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.11.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.5.ebuild,v 1.1 2012/10/18 15:42:21 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.11.5.ebuild,v 1.2 2013/01/23 17:15:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="4"
 
-inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit autotools java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
 
 ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
 OPENJDK_BUILD="24"
@@ -192,18 +192,22 @@ src_configure() {
 	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
-	fi
-
-	if [[ ${enable_cacao} ]]; then
-		config="${config} --enable-cacao"
-	fi
+	case "${ARCH}" in
+		amd64|sparc|x86)
+			if use cacao; then
+				ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+				ewarn 'If so, please rebuild with USE="-cacao"'
+				config+=" --enable-cacao"
+			fi
+			;;
+		arm)
+			config+=" --enable-jamvm" #IT1266
+			replace-flags -Os -O2 #BGO453612 #IT1267
+			;;
+		*)
+			config+=" --enable-cacao"
+			;;
+	esac
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827
 	# Implementation modified from waf-utils.eclass
diff --git a/dev-java/icedtea/icedtea-7.2.3.4.ebuild b/dev-java/icedtea/icedtea-7.2.3.4.ebuild
index ba6e67779a25..3ae16455543b 100644
--- a/dev-java/icedtea/icedtea-7.2.3.4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.1 2013/01/16 21:21:38 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.3.4.ebuild,v 1.2 2013/01/23 17:15:27 sera Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -9,7 +9,7 @@
 
 EAPI="4"
 
-inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx flag-o-matic
 
 ICEDTEA_VER=$(get_version_component_range 2-)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
@@ -188,10 +188,17 @@ src_configure() {
 	config="${config} --${bootstrap}-bootstrap"
 
 	# 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="${config} --enable-jamvm"
-	fi
+	case "${ARCH}" in
+		amd64|sparc|x86)
+			;;
+		arm)
+			config+=" --enable-jamvm" #IT1266
+			replace-flags -Os -O2 #BGO453612 #IT1267
+			;;
+		*)
+			config+=" --enable-jamvm"
+			;;
+	esac
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827
 	# Implementation modified from waf-utils.eclass