profiles: Move mgorny's gcc[awt] mask to the base profile

Also change the gcj-jdk flag from X to awt.

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 38b8f1a3cd97abc09a016bbb6a9e535c6f0f94d7..6250dd81a924917c959442e19acb9d7aafa41106 100644 (file)
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -28,14 +28,6 @@ dev-java/oracle-jre-bin -javafx -nsplugin
 # Hiding the use flag fixes bug #545662 for now.
 media-libs/libsdl2 fusionsound
 
-# Michał Górny <mgorny@gentoo.org> (14 Sep 2014)
-# on behalf of gx86-multilib project <multilib@gentoo.org>
-# gcc[awt] is only used by gcj-jdk[X], and gcj-jdk[X] is not really
-# used by anything. The deps are hard to fix properly thanks
-# to toolchain.eclass.
-sys-devel/gcc awt
-dev-java/gcj-jdk X
-
 # Ben de Groot <yngwin@gentoo.org> (15 Mar 2015)
 # media-libs/libbdplus is keyworded on amd64, so unmask the useflag
 media-libs/libbluray -bdplus

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index c08a18c18f81a7a8e91b87a329d90fef84b274f9..18ced1b10f6dbebaf2a6c8c1f11c29138b085453 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -5,6 +5,14 @@
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# James Le Cuirot <chewi@gentoo.org> (18 Aug 2015)
+# gcc[awt] is only used by gcj-jdk[awt] and that isn't needed by
+# anything in the tree. The toolchain folks aren't keen to support it
+# and it should probably only be used if you really know what you're
+# doing *and* your name is gnu_andrew. ;) See bug #531900.
+sys-devel/gcc awt
+dev-java/gcj-jdk awt
+
 # Johannes Huber <johu@gentoo.org> (18 Aug 2015)
 # No consumer for Qt5 build, qt4/qt5 switch causes conflicts.
 # Qt5 only version will come back with kde-apps/akonadi.