From a032cfb94d0ccf479b10bd664693852969dc1e78 Mon Sep 17 00:00:00 2001
From: Devan Franchini <twitch153@gentoo.org>
Date: Thu, 19 Mar 2015 17:04:09 -0400
Subject: [PATCH] tools-hardened/desktop - gnome-world: Modifies world file to
 coincide with other build types

This commit removes gnome-base/gnome from the world file in favor of
the more slimmed down gnome-base/gnome-light. Because of this change
several other packages needed to be added to the world file to bring
back functionality that is lost from the slimmer install such as text
editor, email client, video player, etc.

package.gnome.use.{1, 2}: Adds required USE flags for mesa, clutter,
cogl, and libxcb.
---
 tools-hardened/desktop/files/gnome-world               | 10 +++++++++-
 .../desktop/files/portage/package.gnome.use.1          |  5 ++++-
 .../desktop/files/portage/package.gnome.use.2          |  5 ++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tools-hardened/desktop/files/gnome-world b/tools-hardened/desktop/files/gnome-world
index eaeb924c..136dfe4a 100644
--- a/tools-hardened/desktop/files/gnome-world
+++ b/tools-hardened/desktop/files/gnome-world
@@ -1,21 +1,29 @@
 app-admin/metalog
 app-admin/sudo
 app-admin/sysstat
+app-arch/file-roller
 app-arch/sharutils
+app-arch/unrar
 app-cdr/cdrtools
+app-editors/mousepad
 app-editors/nano
 app-editors/vim
 app-office/abiword
 app-office/gnumeric
 app-portage/gentoolkit
 app-text/tree
-gnome-base/gnome
+gnome-base/gnome-light
 mail-client/mailx
+mail-client/sylpheed
 mail-mta/postfix
+media-gfx/ristretto
 media-sound/alsa-utils
+media-video/vlc
+net-irc/hexchat
 net-misc/dhcpcd
 net-misc/openssh
 net-misc/tor
+sci-calculator/galculator
 sys-apps/gradm
 sys-apps/iproute2
 sys-boot/grub
diff --git a/tools-hardened/desktop/files/portage/package.gnome.use.1 b/tools-hardened/desktop/files/portage/package.gnome.use.1
index 3088c607..32316910 100644
--- a/tools-hardened/desktop/files/portage/package.gnome.use.1
+++ b/tools-hardened/desktop/files/portage/package.gnome.use.1
@@ -8,7 +8,7 @@ dev-libs/openssl -bindist
 x11-base/xorg-server xorg
 sys-libs/zlib minizip
 x11-libs/cairo opengl
-media-libs/mesa gbm
+media-libs/mesa gbm gles2
 app-misc/tracker -ffmpeg
 media-libs/grilo playlist
 www-servers/apache apache2_modules_auth_digest
@@ -18,3 +18,6 @@ sys-apps/systemd introspection
 sys-fs/udev introspection
 dev-libs/libgdata gnome
 net-misc/dhcp client
+x11-libs/libxcb xkb
+media-libs/clutter egl
+media-libs/cogl gles2
diff --git a/tools-hardened/desktop/files/portage/package.gnome.use.2 b/tools-hardened/desktop/files/portage/package.gnome.use.2
index 3088c607..32316910 100644
--- a/tools-hardened/desktop/files/portage/package.gnome.use.2
+++ b/tools-hardened/desktop/files/portage/package.gnome.use.2
@@ -8,7 +8,7 @@ dev-libs/openssl -bindist
 x11-base/xorg-server xorg
 sys-libs/zlib minizip
 x11-libs/cairo opengl
-media-libs/mesa gbm
+media-libs/mesa gbm gles2
 app-misc/tracker -ffmpeg
 media-libs/grilo playlist
 www-servers/apache apache2_modules_auth_digest
@@ -18,3 +18,6 @@ sys-apps/systemd introspection
 sys-fs/udev introspection
 dev-libs/libgdata gnome
 net-misc/dhcp client
+x11-libs/libxcb xkb
+media-libs/clutter egl
+media-libs/cogl gles2