Clean up masks following removal of java on ia64.

3 files changed, 12 insertions, 66 deletions

diff --git a/profiles/arch/ia64/ChangeLog b/profiles/arch/ia64/ChangeLog
index c27a1d093610..70c5ebc8e862 100644
--- a/profiles/arch/ia64/ChangeLog
+++ b/profiles/arch/ia64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/ia64 profile
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/ChangeLog,v 1.235 2015/06/28 23:28:35 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/ChangeLog,v 1.236 2015/07/11 10:59:45 chewi Exp $
+
+  11 Jul 2015; James Le Cuirot <chewi@gentoo.org> package.use.mask, use.mask:
+  Clean up masks following removal of java on ia64.
 
   28 Jun 2015; Brian Evans <grknight@gentoo.org> use.stable.mask:
   Mask php_targets_php5-6 until bug 550164 is solved
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 63ff1986a11e..a3fc09bf6919 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,16 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.172 2015/06/13 16:03:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/ia64/package.use.mask,v 1.173 2015/07/11 10:59:45 chewi Exp $
+
+# James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
+# Requires dev-java/fop but we don't support java on ia64.
+gnome-extra/libgda reports
+net-analyzer/wireshark doc-pdf
 
 # Pacho Ramos <pacho@gentoo.org> (13 Jun 2015)
 # Missing keywords, bug #513108
 net-misc/spice-gtk smartcard webdav
 
-# James Le Cuirot <chewi@gentoo.org> (11 Jun 2015)
-# Temporarily mask rdeps of rhino, which has EAPI 1, until I have a
-# chance to drop Java support on ia64 entirely.
-dev-java/icedtea javascript
-
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
 # net-fs/libnfs lacks ia64 keyword, bug #551576
 gnome-base/gvfs nfs
@@ -19,11 +19,6 @@ gnome-base/gvfs nfs
 # dev-lang/luajit and dev-lua/lgi and lack ia64 keyword, bug #551540
 dev-libs/libpeas lua jit
 
-# James Le Cuirot <chewi@gentoo.org> (20 May 2015)
-# Temporarily mask rdeps of icedtea-web to deal with bug #549134 until
-# I have a chance to drop Java support on ia64 entirely.
-dev-java/icedtea nsplugin webstart
-
 # Mike Frysinger <vapier@gentoo.org> (16 Mar 2015)
 # Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
 dev-libs/efl physics sdl
@@ -141,10 +136,6 @@ dev-haskell/dataenc test
 # Fix per-arch mask of phonon[zeitgeist] #460140
 media-libs/phonon zeitgeist
 
-# Tom Wijsman <TomWij@gentoo.org> (9 May 2013)
-# Unmasking dev-java/antlr[java] as per bug #412223, acked by sera.
-dev-java/antlr -java
-
 # Dirkjan Ochtman <djc@gentoo.org> (3 May 2013)
 # depends on net-libs/polarssl
 >=net-misc/openvpn-2.3.1 polarssl
@@ -183,10 +174,6 @@ app-misc/tracker thunderbird
 # keyworded here. Remove mask if this situation changes.
 gnome-extra/sushi office
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Dec 2012)
-# remove mask when dev-java/fop is keyworded here
-gnome-extra/libgda reports
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (26 Dec 2012)
 # remove when app-accessibility/at-spi2-core is stable for ia64
 =net-libs/webkit-gtk-1.8.3-r300 webkit2
@@ -209,40 +196,10 @@ media-libs/phonon gstreamer vlc
 # Needs x11-misc/lightdm(which also requires some other deps)
 x11-misc/xscreensaver new-login
 
-# Mike Frysinger <vapier@gentoo.org> (10 May 2012)
-# We only want java available for unstable ebuilds, but we can't do that
-# currently, so we have to mask it from packages that go stable :(.  #412223
-app-accessibility/brltty java
-app-pda/pilot-link java
-app-text/hyperestraier java
-dev-db/qdbm java
-dev-lang/R java
-dev-libs/beecrypt java
-dev-libs/cyrus-sasl java
-dev-libs/link-grammar java
-dev-ruby/fakeweb java
-dev-ruby/net-scp java
-dev-ruby/net-ssh java
-dev-ruby/test-spec java
-dev-ruby/tmail java
-dev-tex/tex4ht java
-dev-vcs/subversion java
-gnome-extra/libgda java
-media-libs/libcaca java
-net-dns/libidn java
-net-print/cups java
-sys-libs/db java
-www-client/firefox java
-www-client/seamonkey java
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
 # Requires gnutls[pkcs11], which is use.masked on ia64
 net-libs/glib-networking smartcard
 
-# Ralph Sennhauser <sera@gentoo.org> (31 Dec 2011)
-# Needs dev-java/fop which is not available for ia64 due to missing JVM #345433
-net-analyzer/wireshark doc-pdf
-
 # Alexey Shvetsov <alexxy@gentoo.org> (17 Dec 2011)
 # Mask use numa for openmpi
 sys-cluster/openmpi openmpi_fabrics_psm openmpi_fabrics_knem openmpi_fabrics_open-mx openmpi_fabrics_ofed openmpi_fabrics_dapl openmpi_rm_slurm openmpi_fabrics_sctp openmpi_ofed_features_rdmacm
@@ -280,8 +237,6 @@ app-text/asciidoc test
 sys-apps/smartmontools caps
 
 # Raúl Porcel <armin76@gentoo.org> (5 Dec 2010)
-# Mask doc-pdf because of Java dependencies (bug #347259)
-net-analyzer/wireshark doc-pdf
 # Needs testing
 www-client/elinks javascript
 
@@ -307,10 +262,6 @@ x11-wm/fvwm lock
 # net-libs/webkit-gtk segfaults but dev-qt/qtwebkit doesn't
 dev-python/PyQt4 -webkit
 
-# Jean-Noel Rivasseau <elvanor@gentoo.org> (28 Jul 2008)
-# icu4j tests need jdk-1.6
-dev-java/icu4j test
-
 # Raúl Porcel <armin76@gentoo.org> (07 Jul 2008)
 # Make clisp deps minimal
 dev-lisp/clisp hyperspec pari svm
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index a2003caf03b4..c598e2f05850 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -140,18 +140,10 @@ phonon
 # architecture.
 qdbm
 
-# java releated use flags
-# need to get dev-java/ant marked stable stable
-# before unmasking (16 Oct 2006 nichoj)
+# James Le Cuirot <chewi@gentoo.org> (11 Jul 2015)
+# We don't support java on ia64.
 java
 freetts
-# need to keyword openjms-bin, sun-jms
-jms
-# need to keyword sun-jmx
-jmx
-# need to keyword sun-javamail-bin, sun-javamail
-javamail
-# needs java
 pdfannotextractor
 
 # Aggelos Orfanakos <agorf@gentoo.org> (18 Jan 2008)