From: Christian Faulhammer <fauli@gentoo.org>
Date: Tue, 20 Apr 2010 09:54:40 +0000 (+0000)
Subject: stable x86, security bug 314531
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=65a75aab3106da3deda5c1877319a7409b6d0e1a;p=gentoo.git

stable x86, security bug 314531
Package-Manager: portage-2.1.8.3/cvs/Linux i686
---

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index d3abe467d5b8..b2ffa296b00d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.284 2010/04/16 09:34:27 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.285 2010/04/20 09:53:53 fauli Exp $
+
+  20 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  sun-jdk-1.6.0.20.ebuild:
+  stable x86, security bug 314531
 
 *sun-jdk-1.6.0.20 (16 Apr 2010)
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild
index da99fb0b7aa6..05b88633d1ed 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.20.ebuild,v 1.1 2010/04/16 09:34:27 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.20.ebuild,v 1.2 2010/04/20 09:53:53 fauli Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa derby doc examples jce nsplugin odbc"
 
diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 40c9c52aee26..128afabd79ae 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.174 2010/04/16 09:40:16 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.175 2010/04/20 09:54:40 fauli Exp $
+
+  20 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
+  sun-jre-bin-1.6.0.20.ebuild:
+  stable x86, security bug 314531
 
 *sun-jre-bin-1.6.0.20 (16 Apr 2010)
 
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild
index cef749841871..624d450f91bd 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild,v 1.1 2010/04/16 09:40:16 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.20.ebuild,v 1.2 2010/04/20 09:54:40 fauli Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa jce nsplugin odbc"