[gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/files/portage/, tools-hardened/desktop/

[Devan Franchini]

commit:     0244424020d8e242e1cdd94057585404251320b1
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 23 14:43:35 2014 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 23 14:47:08 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=02444240

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 => package.gnome.use.1}   | 1 +
 .../desktop/files/portage/{package.gnome.use => package.gnome.use.2}   | 0
 .../desktop/files/portage/{package.xfce4.use => package.xfce4.use.1}   | 0
 .../desktop/files/portage/{package.xfce4.use => package.xfce4.use.2}   | 0
 tools-hardened/desktop/run-base.sh                                     | 3 ++-
 5 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools-hardened/desktop/files/portage/package.gnome.use 
b/tools-hardened/desktop/files/portage/package.gnome.use.1
similarity index 94%
copy from tools-hardened/desktop/files/portage/package.gnome.use
copy to tools-hardened/desktop/files/portage/package.gnome.use.1
index cafb813..3c940f7 100644
--- a/tools-hardened/desktop/files/portage/package.gnome.use
+++ b/tools-hardened/desktop/files/portage/package.gnome.use.1
@@ -17,3 +17,4 @@ 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%
copy from tools-hardened/desktop/files/portage/package.xfce4.use
copy to tools-hardened/desktop/files/portage/package.xfce4.use.1

diff --git a/tools-hardened/desktop/files/portage/package.xfce4.use 
b/tools-hardened/desktop/files/portage/package.xfce4.use.2
similarity index 100%
rename from tools-hardened/desktop/files/portage/package.xfce4.use
rename to tools-hardened/desktop/files/portage/package.xfce4.use.2

diff --git a/tools-hardened/desktop/run-base.sh 
b/tools-hardened/desktop/run-base.sh
index 89e9618..6a61dbf 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