From d520405a9b761ecc52be567589fc219784ef5538 Mon Sep 17 00:00:00 2001 From: Malcolm Lashley Date: Tue, 9 Jan 2007 23:50:31 +0000 Subject: [PATCH] Stable on amd64 wrt bug #158659 Package-Manager: portage-2.1.2_rc4-r7 --- dev-java/sun-jdk/ChangeLog | 6 +++++- dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild | 6 +++--- dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild | 4 ++-- dev-java/sun-jre-bin/ChangeLog | 8 ++++++-- dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild | 6 +++--- dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild | 6 +++--- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 6ffc57a8d54c..25d50116a575 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.175 2007/01/05 23:43:09 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.176 2007/01/09 23:50:31 malc Exp $ + + 09 Jan 2007; sun-jdk-1.4.2.13.ebuild, + sun-jdk-1.5.0.09.ebuild: + Stable on amd64 wrt bug #158659 05 Jan 2007; Vlastimil Babka sun-jdk-1.5.0.08.ebuild, sun-jdk-1.5.0.09.ebuild, sun-jdk-1.5.0.09-r1.ebuild: diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild index 7c29f37c44c5..4798111c4d8b 100644 --- a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.4.2.13.ebuild,v 1.2 2006/12/23 17:50:19 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild,v 1.3 2007/01/09 23:50:31 malc Exp $ JAVA_SUPPORTS_GENERATION_1="true" inherit java-vm-2 eutils @@ -19,7 +19,7 @@ SRC_URI="${At} jce? ( ${jce_policy} )" SLOT="1.4" LICENSE="sun-bcla-java-vm" -KEYWORDS="-* x86" +KEYWORDS="-* amd64 x86" RESTRICT="fetch" IUSE="X alsa doc examples nsplugin jce" diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild index 69287b207543..db0739e28e03 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.5.0.09.ebuild,v 1.3 2007/01/05 23:43:09 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.09.ebuild,v 1.4 2007/01/09 23:50:31 malc Exp $ inherit java-vm-2 eutils @@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" SLOT="1.5" LICENSE="dlj-1.1" -KEYWORDS="-* ~amd64 x86" +KEYWORDS="-* amd64 x86" RESTRICT="nostrip" IUSE="X alsa doc examples jce nsplugin" diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 46ba1c5266ee..e77692c77a6f 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 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.73 2006/12/23 17:51:38 ticho Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.74 2007/01/09 23:46:44 malc Exp $ + + 09 Jan 2007; sun-jre-bin-1.4.2.13.ebuild, + sun-jre-bin-1.5.0.09.ebuild: + Stable on amd64 wrt bug #158659 23 Dec 2006; Andrej Kacian sun-jre-bin-1.4.2.13.ebuild: Stable on x86, bug #158659. diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild index 4ff3df669b00..5e2c615b90d4 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.4.2.13.ebuild,v 1.3 2006/12/23 17:51:38 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.13.ebuild,v 1.4 2007/01/09 23:46:44 malc Exp $ inherit java-vm-2 eutils @@ -13,7 +13,7 @@ HOMEPAGE="http://java.sun.com/j2se/1.4.2/" SRC_URI=${At} SLOT="1.4" LICENSE="sun-bcla-java-vm-1.4.2" -KEYWORDS="-* x86" +KEYWORDS="-* amd64 x86" RESTRICT="fetch" IUSE="X alsa nsplugin" diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild index f7d5e753a9ba..e34cd8eac6e6 100644 --- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.5.0.09.ebuild,v 1.2 2006/12/23 17:48:16 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild,v 1.3 2007/01/09 23:46:44 malc Exp $ inherit java-vm-2 eutils @@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" SLOT="1.5" LICENSE="dlj-1.1" -KEYWORDS="-* ~amd64 x86" +KEYWORDS="-* amd64 x86" RESTRICT="nostrip" IUSE="X alsa nsplugin" -- 2.26.2