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.

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

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

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