summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-04-15 18:27:18 +0000
committerMike Frysinger <vapier@gentoo.org>2012-04-15 18:27:18 +0000
commitda57d4ac7c0a301fff4a02f80355a9c7f46bfaf9 (patch)
tree3c5f68826ca1b31b3e180764cb06f8281863b00a /virtual/jdk
parentalpha/ia64/s390/sh/sparc stable wrt #411487 (diff)
downloadgentoo-2-da57d4ac7c0a301fff4a02f80355a9c7f46bfaf9.tar.gz
gentoo-2-da57d4ac7c0a301fff4a02f80355a9c7f46bfaf9.tar.bz2
gentoo-2-da57d4ac7c0a301fff4a02f80355a9c7f46bfaf9.zip
Add back ia64 love #349020 by Dennis Schridde.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'virtual/jdk')
-rw-r--r--virtual/jdk/ChangeLog6
-rw-r--r--virtual/jdk/jdk-1.6.0-r1.ebuild6
-rw-r--r--virtual/jdk/jdk-1.7.0.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index 1062e4d3db4e..07194ae4e464 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for virtual/jdk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.45 2012/01/04 09:11:51 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/ChangeLog,v 1.46 2012/04/15 18:27:18 vapier Exp $
+
+ 15 Apr 2012; Mike Frysinger <vapier@gentoo.org> jdk-1.6.0-r1.ebuild,
+ jdk-1.7.0.ebuild:
+ Add back ia64 love #349020 by Dennis Schridde.
04 Jan 2012; Ralph Sennhauser <sera@gentoo.org> jdk-1.5.0.ebuild:
Drop ia64 support #345433
diff --git a/virtual/jdk/jdk-1.6.0-r1.ebuild b/virtual/jdk/jdk-1.6.0-r1.ebuild
index 640f89c224f2..fee5c99dc8a4 100644
--- a/virtual/jdk/jdk-1.6.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r1.ebuild,v 1.1 2011/12/14 09:03:17 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.6.0-r1.ebuild,v 1.2 2012/04/15 18:27:18 vapier Exp $
EAPI="4"
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
# The keyword voodoo below is needed to work around confilcting masking types
diff --git a/virtual/jdk/jdk-1.7.0.ebuild b/virtual/jdk/jdk-1.7.0.ebuild
index 4b7983a6fde9..8f2037d6f459 100644
--- a/virtual/jdk/jdk-1.7.0.ebuild
+++ b/virtual/jdk/jdk-1.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.5 2011/12/16 15:04:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/jdk/jdk-1.7.0.ebuild,v 1.6 2012/04/15 18:27:18 vapier Exp $
DESCRIPTION="Virtual for JDK"
HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
LICENSE=""
SLOT="1.7"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="|| (