diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2013-04-17 12:37:45 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2013-04-17 12:37:45 +0000 |
commit | b410f3bbe9c82fe48f7da16ca2402aca27c17a93 (patch) | |
tree | 6c3aad5104e826dc51ab165a240bd1eb3f3e86e5 /dev-java/sun-jdk | |
parent | Security bump. #466212 (diff) | |
download | gentoo-2-b410f3bbe9c82fe48f7da16ca2402aca27c17a93.tar.gz gentoo-2-b410f3bbe9c82fe48f7da16ca2402aca27c17a93.tar.bz2 gentoo-2-b410f3bbe9c82fe48f7da16ca2402aca27c17a93.zip |
Security bump. #466212
ia64 has no server vm. #465540
(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)
Diffstat (limited to 'dev-java/sun-jdk')
-rw-r--r-- | dev-java/sun-jdk/ChangeLog | 9 | ||||
-rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild (renamed from dev-java/sun-jdk/sun-jdk-1.6.0.41.ebuild) | 24 |
2 files changed, 24 insertions, 9 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 7798bf7cb393..2f1bc7ecf816 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.355 2013/03/07 18:45:38 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.356 2013/04/17 12:37:45 sera Exp $ + +*sun-jdk-1.6.0.45 (17 Apr 2013) + + 17 Apr 2013; Ralph Sennhauser <sera@gentoo.org> -sun-jdk-1.6.0.41.ebuild, + +sun-jdk-1.6.0.45.ebuild: + Security bump. #466212 + ia64 has no server vm. #465540 07 Mar 2013; Agostino Sarubbo <ago@gentoo.org> sun-jdk-1.6.0.43.ebuild: Stable for x86, wrt bug #460360 diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.41.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild index 25bf2a10583e..182346f5e7f1 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.41.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.45.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/sun-jdk/sun-jdk-1.6.0.41.ebuild,v 1.2 2013/02/24 08:27:32 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.45.ebuild,v 1.1 2013/04/17 12:37:45 sera Exp $ EAPI="5" @@ -50,7 +50,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.6" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="+X alsa derby doc examples jce kernel_SunOS nsplugin pax_kernel source" RESTRICT="fetch strip" @@ -152,12 +152,20 @@ src_compile() { # see bug #207282 einfo "Creating the Class Data Sharing archives" - if use x86; then - bin/java -client -Xshare:dump || die - fi - # 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 + case ${ARCH} in + ia64) + bin/java -client -Xshare:dump || die + ;; + x86) + bin/java -client -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 + ;; + *) + bin/java -server -Xshare:dump || die + ;; + esac } src_install() { |