From 0244424020d8e242e1cdd94057585404251320b1 Mon Sep 17 00:00:00 2001
From: Devan Franchini <twitch153@gentoo.org>
Date: Thu, 23 Oct 2014 10:43:35 -0400
Subject: [PATCH] tools-hardened/desktop: Make USE flag control more granular

In order to give the build system more control over the USE flags
during the first and second phase of rebuilding the world packages
the package.use files have been split into two separate files.
---
 .../desktop/files/portage/package.gnome.use.1 | 20 +++++++++++++++++++
 ...{package.gnome.use => package.gnome.use.2} |  0
 ...{package.xfce4.use => package.xfce4.use.1} |  0
 .../desktop/files/portage/package.xfce4.use.2 |  9 +++++++++
 tools-hardened/desktop/run-base.sh            |  3 ++-
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tools-hardened/desktop/files/portage/package.gnome.use.1
 rename tools-hardened/desktop/files/portage/{package.gnome.use => package.gnome.use.2} (100%)
 rename tools-hardened/desktop/files/portage/{package.xfce4.use => package.xfce4.use.1} (100%)
 create mode 100644 tools-hardened/desktop/files/portage/package.xfce4.use.2

diff --git a/tools-hardened/desktop/files/portage/package.gnome.use.1 b/tools-hardened/desktop/files/portage/package.gnome.use.1
new file mode 100644
index 00000000..3c940f76
--- /dev/null
+++ b/tools-hardened/desktop/files/portage/package.gnome.use.1
@@ -0,0 +1,20 @@
+x11-libs/libdrm libkms
+virtual/udev -static-libs
+sys-fs/lvm2 -static-libs
+sys-fs/cryptsetup -static-libs
+media-sound/cdparanoia -static-libs
+net-misc/openssh -bindist
+dev-libs/openssl -bindist
+x11-base/xorg-server xorg
+sys-libs/zlib minizip
+x11-libs/cairo opengl
+media-libs/mesa gbm
+app-misc/tracker -ffmpeg
+media-libs/grilo playlist
+www-servers/apache apache2_modules_auth_digest
+virtual/libudev -static-libs
+virtual/libgudev -static-libs introspection
+sys-apps/systemd introspection
+sys-fs/udev introspection
+dev-libs/libgdata gnome
+www-client/firefox -gstreamer
diff --git a/tools-hardened/desktop/files/portage/package.gnome.use b/tools-hardened/desktop/files/portage/package.gnome.use.2
similarity index 100%
rename from tools-hardened/desktop/files/portage/package.gnome.use
rename to tools-hardened/desktop/files/portage/package.gnome.use.2
diff --git a/tools-hardened/desktop/files/portage/package.xfce4.use b/tools-hardened/desktop/files/portage/package.xfce4.use.1
similarity index 100%
rename from tools-hardened/desktop/files/portage/package.xfce4.use
rename to tools-hardened/desktop/files/portage/package.xfce4.use.1
diff --git a/tools-hardened/desktop/files/portage/package.xfce4.use.2 b/tools-hardened/desktop/files/portage/package.xfce4.use.2
new file mode 100644
index 00000000..52d3e104
--- /dev/null
+++ b/tools-hardened/desktop/files/portage/package.xfce4.use.2
@@ -0,0 +1,9 @@
+x11-libs/libdrm libkms
+virtual/udev -static-libs
+sys-fs/lvm2 -static-libs
+sys-fs/cryptsetup -static-libs
+media-sound/cdparanoia -static-libs
+x11-base/xorg-server xorg
+sys-libs/zlib minizip
+x11-libs/cairo opengl
+media-libs/mesa gbm
diff --git a/tools-hardened/desktop/run-base.sh b/tools-hardened/desktop/run-base.sh
index 89e9618e..6a61dbf7 100755
--- a/tools-hardened/desktop/run-base.sh
+++ b/tools-hardened/desktop/run-base.sh
@@ -26,7 +26,7 @@ populate_etc() {
 	rm -f "${ROOTFS}"/etc/portage/make.conf.catalyst
 	cp -f files/portage/make."${MAKE_BASE}".1 "${ROOTFS}"/etc/portage/make.conf
 	cp -f files/portage/package."${KEYWORDS_BASE}".accept_keywords "${ROOTFS}"/etc/portage/package.accept_keywords
-	cp -f files/portage/package."${USE_BASE}".use "${ROOTFS}"/etc/portage/package.use
+	cp -f files/portage/package."${USE_BASE}".use.1 "${ROOTFS}"/etc/portage/package.use
 	cp -af files/portage/profile "${ROOTFS}"/etc/portage/profile
 	cp -af files/portage/repos.conf "${ROOTFS}"/etc/portage/repos.conf
 }
@@ -45,6 +45,7 @@ rebuild_world() {
 }
 
 update_world() {
+	cp -f files/portage/package."${USE_BASE}".use.2 "${ROOTFS}"/etc/portage/package.use
 	cp -f files/portage/make."${MAKE_BASE}".2 "${ROOTFS}"/etc/portage/make.conf
 	cp -f update.sh "${ROOTFS}"/tmp/
 	chroot "${ROOTFS}"/ /tmp/update.sh