summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2015-08-18 23:06:44 +0100
committerJames Le Cuirot <chewi@gentoo.org>2015-08-19 20:06:27 +0100
commitb76e6b8f940fa0ca639e9ade29b3894cfd8d9c79 (patch)
treea0b22baa2c9c204fbc5e0d044422f5e09aa0b0c2 /profiles
parentdev-ruby/mini_magick: version bump (diff)
downloadgentoo-b76e6b8f940fa0ca639e9ade29b3894cfd8d9c79.tar.gz
gentoo-b76e6b8f940fa0ca639e9ade29b3894cfd8d9c79.tar.bz2
gentoo-b76e6b8f940fa0ca639e9ade29b3894cfd8d9c79.zip
profiles: Move mgorny's gcc[awt] mask to the base profile
Also change the gcj-jdk flag from X to awt.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/amd64/package.use.mask8
-rw-r--r--profiles/base/package.use.mask8
2 files changed, 8 insertions, 8 deletions
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 38b8f1a3cd9..6250dd81a92 100644
--- 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 c08a18c18f8..18ced1b10f6 100644
--- 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.