Add workaround for large memory on x86. #405239

Add QA_FLAGS_IGNORED. #405639

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

3 files changed, 127 insertions, 13 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 1328aca6e510..c22777df192c 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.319 2012/02/18 15:07:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.320 2012/05/05 10:26:20 sera Exp $
+
+  05 May 2012; Ralph Sennhauser <sera@gentoo.org> sun-jdk-1.6.0.31.ebuild:
+  Add workaround for large memory on x86. #405239
+  Add QA_FLAGS_IGNORED. #405639
 
   18 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> sun-jdk-1.6.0.31.ebuild:
   x86 stable wrt bug #404071
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 20b72d0b0a41..81ae167f83a6 100644
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1
 AUX fontconfig.Gentoo.properties-r1 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
@@ -8,19 +8,24 @@ AUX sun-jdk-1.6.env-r1 1015 RMD160 07a5d39da299dd2d6e7165e9b32fe00c30e5b4c3 SHA1
 DIST jdk-6u29-linux-i586.bin 85146345 RMD160 fca7a51bf14486a81a684c91152493e8af621647 SHA1 a73580ed8ac42040f1bbcab62617719a31c6f487 SHA256 1117f4dfc45632b68ec0f4d5e61e5cafc1d85dc655ee3df5fa6f50128b8c3faf
 DIST jdk-6u29-linux-x64.bin 85411605 RMD160 7bb1433728c9d263bfe9d968595aac7d73e6c2f3 SHA1 45286e11864285c0d9d5cafd0355dbe04d272951 SHA256 a8603fa62045ce2164b26f7c04859cd548ffe0e33bfc979d9fa73df42e3b3365
 DIST jdk-6u31-linux-i586.bin 85292206 RMD160 a917f6233912b84e3c904220fcb0cf49399486d8 SHA1 8e404a292d85bddb1b39d63f4248094ca05ef0da SHA256 60fdd4083373db919334500b8050b326d45d78703aa2d403eda48cfa5621702b
+DIST jdk-6u31-linux-ia64.bin 71220085 RMD160 4919626f9a515cd4900f2e350ea7cc071e0aeed0 SHA1 d586aea51a04b99999cf038e2c2fcd3aded21b96 SHA256 53ed873098c0dcdf94e3d74ff074005ae1d8aa94c2b75c530df6272a76a3adc9
 DIST jdk-6u31-linux-x64.bin 85581913 RMD160 c96b98671572efcde96512649f62162d46489402 SHA1 51cc34977aef629897dda480558fc78b10166cae SHA256 0219d4feeedb186e5081ab092dfcda20c290fde5463f9a707e12fd63897fd342
 DIST jdk-6u31-solaris-i586.sh 85175121 RMD160 0eacd571f5033527e02444f4ca44feb8dd09f319 SHA1 40b65bded1bbc4088fdf140955378f5fd42e6e69 SHA256 997f9934dd1b32b206c1798824a4bd9e0606bb51f149264bf28d46853f3fe069
 DIST jdk-6u31-solaris-sparc.sh 90382665 RMD160 c138a584946c5aa7ed5f631ca6fac96c4eee8ce1 SHA1 aacac3b11e4a06580e40f406b4573ea0ceec69f0 SHA256 98994aee1009f6fc3364c904bb478816be6454c9296ba4f9f95f350b5871df4a
 DIST jdk-6u31-solaris-sparcv9.sh 12835228 RMD160 74700d0737328862cd509cbcd0cd49461d19e276 SHA1 8e418cf6981f7ac221b80e91ec4faac60edff244 SHA256 67c0ba60eb37cbe8fabf4f1eb64117d82d32772fcce19b77039b8fcf9176df59
 DIST jdk-6u31-solaris-x64.sh 8911566 RMD160 b6c022bff489735747b180ac89899a5c14111b97 SHA1 47151342a06817d69262dd5ff90603b722126e6a SHA256 fbedc2e46f9e2260d876107cb6bbac08378e824f07c34966ab5a14e11f44e9ed
 EBUILD sun-jdk-1.6.0.29.ebuild 4645 RMD160 1d22065eeef6f8b1a9824c056badd9621acec098 SHA1 1099e676a61847bc4a9d8458ab7378f6cdc1ee11 SHA256 2992ec2784417e44ed67100b56de9bdd73e759b1cab63dfe24cf265fb9077e5f
-EBUILD sun-jdk-1.6.0.31.ebuild 5659 RMD160 c9e06b778f6c8e6f8f8653427fa6ed25af335d4d SHA1 ff172cdc853a5d9f1f6bdfed8c5024aadd894192 SHA256 583a7dd8faf7cef7fc0f9fec7b45dabc6a50aa4857c9f0ddfbaa93c0daba0f82
-MISC ChangeLog 58862 RMD160 eaddf4b3a4565cf5c7666355ff4ce390c33a11b3 SHA1 b44d2d5b70eb2743956378ef47149c428cb2c35c SHA256 94ad91d4fca72c52b76f80e2b4e0927579cdbb3942ec570a0d2cc27abf41c47f
+EBUILD sun-jdk-1.6.0.31.ebuild 9582 RMD160 37c5e182f31913f97e0863160e682c94eb4d9774 SHA1 c0a2b72135fec3fc7cd3473315b104e34b221550 SHA256 91985d25d2d9aedf385af30a95ae376ef3c6f1363ffbaa1e3c7cb7989688a070
+MISC ChangeLog 59014 RMD160 d352b53a903d16af6be6ad5b54639d60f9a819a8 SHA1 a42555ca962a5a964a463ad20089b4f93b38adff SHA256 ac2f2721ba1fba8265c6e377233108783a29b43e99494245943098133e666fc7
 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk8/vtUACgkQuUQtlDBCeQIc/gCgg6Y95YpnechH/SvlBDkMHy7F
-t0kAnjDEiEtLKdSE/AAsox0uHOl+hXuu
-=Wr+W
+iQEcBAEBAgAGBQJPpQBcAAoJEIUJ+svaV163nVEH/0UCoE6cS0FDIpjeR93MhnpP
+LFydfkWs1bjrKUztcRXkGJxRrLq/9uO/8MWZCmdWaRigv0sFMY1xDjwFNqJ+6hNn
+o7FUFzjzxaK+ZZ3Hu0mVVUTaerRGMA0xiB7eVAMmC1heeNco+ZGRzNfrR720gtwU
+lS53MX2S+MFiv76IxhLdgCN1wylpS5qkqh+Fhi8mEC2pE4wAy/G7s+G/BIUlXYl6
+6VoHwsyCr7Mnmk+bdmKEkaVWpipzBtfRUNF2StLrC7wfuR3uQzUjOCRYqfcirT3B
+5F6rGaIj4e+gDDOAQBE1ypf22xX2F9Op5iAk2YQgCf7LRL0GxOc071vc3pW1rgY=
+=V1n3
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild
index 9944ff047dd8..d2d1016f16aa 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild,v 1.3 2012/02/18 15:07:58 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.31.ebuild,v 1.4 2012/05/05 10:26:20 sera Exp $
 
 EAPI="4"
 
@@ -24,6 +24,7 @@ DESCRIPTION="Oracle's Java SE Development Kit"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="x86? ( ${X86_AT} )
 	amd64? ( ${AMD64_AT} )
+	ia64? ( ${IA64_AT} )
 	x86-solaris? ( ${SOL_X86_AT} )
 	x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} )
 	sparc-solaris? ( ${SOL_SPARC_AT} )
@@ -36,10 +37,6 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64
 IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin +source"
 
 RESTRICT="fetch strip"
-QA_TEXTRELS_x86="
-	opt/${P}/jre/lib/i386/client/libjvm.so
-	opt/${P}/jre/lib/i386/motif21/libmawt.so
-	opt/${P}/jre/lib/i386/server/libjvm.so"
 
 RDEPEND="
 	X? (
@@ -107,7 +104,9 @@ src_compile() {
 	if use x86; then
 		bin/java -client -Xshare:dump || die
 	fi
-	bin/java -server -Xshare:dump || die
+	# limit heap size for large memory on x86 #405239
+	# this is a workaround and shouldn't be needed.
+	bin/java -server -Xmx64m -Xshare:dump || die
 }
 
 src_install() {
@@ -184,3 +183,109 @@ src_install() {
 	set_java_env "${FILESDIR}/${VMHANDLE}.env-r1"
 	java-vm_revdep-mask
 }
+
+QA_TEXTRELS_x86="
+	opt/${P}/jre/lib/i386/client/libjvm.so
+	opt/${P}/jre/lib/i386/motif21/libmawt.so
+	opt/${P}/jre/lib/i386/server/libjvm.so"
+QA_FLAGS_IGNORED="
+	/opt/${P}/jre/lib/jexec
+	/opt/${P}/jre/bin/orbd
+	/opt/${P}/jre/bin/javaws
+	/opt/${P}/jre/bin/policytool
+	/opt/${P}/jre/bin/keytool
+	/opt/${P}/jre/bin/pack200
+	/opt/${P}/jre/bin/unpack200
+	/opt/${P}/jre/bin/tnameserv
+	/opt/${P}/jre/bin/rmiregistry
+	/opt/${P}/jre/bin/servertool
+	/opt/${P}/jre/bin/java_vm
+	/opt/${P}/jre/bin/java
+	/opt/${P}/jre/bin/rmid
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+	/opt/${P}/lib/jexec
+	/opt/${P}/bin/jmap
+	/opt/${P}/bin/schemagen
+	/opt/${P}/bin/xjc
+	/opt/${P}/bin/orbd
+	/opt/${P}/bin/javah
+	/opt/${P}/bin/javac
+	/opt/${P}/bin/idlj
+	/opt/${P}/bin/javadoc
+	/opt/${P}/bin/javaws
+	/opt/${P}/bin/jps
+	/opt/${P}/bin/jconsole
+	/opt/${P}/bin/jrunscript
+	/opt/${P}/bin/native2ascii
+	/opt/${P}/bin/apt
+	/opt/${P}/bin/wsgen
+	/opt/${P}/bin/policytool
+	/opt/${P}/bin/keytool
+	/opt/${P}/bin/pack200
+	/opt/${P}/bin/jarsigner
+	/opt/${P}/bin/unpack200
+	/opt/${P}/bin/jstat
+	/opt/${P}/bin/tnameserv
+	/opt/${P}/bin/rmiregistry
+	/opt/${P}/bin/jdb
+	/opt/${P}/bin/rmic
+	/opt/${P}/bin/jstatd
+	/opt/${P}/bin/jsadebugd
+	/opt/${P}/bin/servertool
+	/opt/${P}/bin/wsimport
+	/opt/${P}/bin/appletviewer
+	/opt/${P}/bin/jhat
+	/opt/${P}/bin/jinfo
+	/opt/${P}/bin/jar
+	/opt/${P}/bin/extcheck
+	/opt/${P}/bin/serialver
+	/opt/${P}/bin/jstack
+	/opt/${P}/bin/java
+	/opt/${P}/bin/javap
+	/opt/${P}/bin/rmid"
+for java_system_arch in amd64 i386; do
+	QA_FLAGS_IGNORED+="
+		/opt/${P}/jre/lib/${java_system_arch}/libmanagement.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so
+		/opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so
+		/opt/${P}/jre/lib/${java_system_arch}/libawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsig.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjpeg.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so
+		/opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libattach.so
+		/opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava.so
+		/opt/${P}/jre/lib/${java_system_arch}/libhprof.so
+		/opt/${P}/jre/lib/${java_system_arch}/libsaproc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libverify.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdcpr.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjsound.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnio.so
+		/opt/${P}/jre/lib/${java_system_arch}/libzip.so
+		/opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so
+		/opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libcmm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so
+		/opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2gss.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjdwp.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdeploy.so
+		/opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so
+		/opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so
+		/opt/${P}/jre/lib/${java_system_arch}/libioser12.so
+		/opt/${P}/jre/lib/${java_system_arch}/librmi.so
+		/opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnpt.so
+		/opt/${P}/jre/lib/${java_system_arch}/libnet.so
+		/opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so
+		/opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so
+		/opt/${P}/jre/lib/${java_system_arch}/libunpack.so
+		/opt/${P}/jre/lib/${java_system_arch}/libinstrument.so"
+done