From ea8b4f0f403a9ae0051ee2e95186ddcd915fce9f Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
Date: Sun, 22 Feb 2015 17:08:53 +0000
Subject: [PATCH] Add update_seed_command to update the seed stages and fix
 some blockers and add portage_confdir to disable caps/filecaps and mask old
 packages to help with the blockers as well.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
---
 releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec     | 2 ++
 .../weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec  | 2 ++
 releases/weekly/specs/amd64/hardened/stage1-selinux.spec        | 2 ++
 releases/weekly/specs/amd64/hardened/stage1.spec                | 2 ++
 releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec     | 1 +
 .../weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec  | 1 +
 releases/weekly/specs/amd64/hardened/stage2-selinux.spec        | 1 +
 releases/weekly/specs/amd64/hardened/stage2.spec                | 1 +
 releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec     | 1 +
 .../weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec  | 1 +
 releases/weekly/specs/amd64/hardened/stage3-selinux.spec        | 1 +
 releases/weekly/specs/amd64/hardened/stage3.spec                | 1 +
 releases/weekly/specs/amd64/stage1-nomultilib.spec              | 2 ++
 releases/weekly/specs/amd64/stage1-x32.spec                     | 2 ++
 releases/weekly/specs/amd64/stage1.spec                         | 2 ++
 releases/weekly/specs/amd64/stage2-nomultilib.spec              | 1 +
 releases/weekly/specs/amd64/stage2-x32.spec                     | 1 +
 releases/weekly/specs/amd64/stage2.spec                         | 1 +
 releases/weekly/specs/amd64/stage3-nomultilib.spec              | 1 +
 releases/weekly/specs/amd64/stage3-x32.spec                     | 1 +
 releases/weekly/specs/amd64/stage3.spec                         | 1 +
 releases/weekly/specs/x86/hardened/stage1.spec                  | 2 ++
 releases/weekly/specs/x86/hardened/stage2.spec                  | 1 +
 releases/weekly/specs/x86/hardened/stage3.spec                  | 1 +
 releases/weekly/specs/x86/i686/stage1.spec                      | 2 ++
 releases/weekly/specs/x86/i686/stage2.spec                      | 1 +
 releases/weekly/specs/x86/i686/stage3.spec                      | 1 +
 releases/weekly/specs/x86/stage1.spec                           | 2 ++
 releases/weekly/specs/x86/stage2.spec                           | 1 +
 releases/weekly/specs/x86/stage3.spec                           | 1 +
 30 files changed, 40 insertions(+)

diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
index d67a8464..50169e8c 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
@@ -6,3 +6,5 @@ profile: hardened/linux/amd64/no-multilib
 snapshot: 2008.0
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index c8e280ab..332ce067 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
@@ -6,3 +6,5 @@ profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
index 01bcd19c..964ebcd1 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
@@ -6,3 +6,5 @@ profile: hardened/linux/amd64/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
index 3834b056..75f1628a 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1.spec
@@ -6,3 +6,5 @@ profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: hardened/stage3-amd64-hardened-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
index 07927a63..358b7982 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: 2008.0
 source_subpath: hardened/stage1-amd64-hardened+nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index 0bfa5e98..d2f1bf03 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
index ccd85490..abd3845a 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage1-amd64-hardened-selinux-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
index 583c589e..498eddce 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: hardened/stage1-amd64-hardened-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
index 1410fb15..82f49165 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: 2008.0
 source_subpath: hardened/stage2-amd64-hardened+nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index 551b7d6f..60332b4e 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
index 39f953f5..4219504d 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: 2008.0
 source_subpath: hardened/stage2-amd64-hardened-selinux-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
index 68ac9dc3..b8f0473b 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: hardened/stage2-amd64-hardened-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
index e972f4f8..6a7ce7d0 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec
@@ -6,3 +6,5 @@ profile: default/linux/amd64/13.0/no-multilib
 snapshot: 2008.0
 source_subpath: default/stage3-amd64-nomultilib-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
index 4c3c8f61..5ec1ed71 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/weekly/specs/amd64/stage1-x32.spec
@@ -6,3 +6,5 @@ profile: default/linux/amd64/13.0/x32
 snapshot: 2008.0
 source_subpath: default/stage3-x32-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
index f9f7e65f..073fbef6 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/weekly/specs/amd64/stage1.spec
@@ -6,3 +6,5 @@ profile: default/linux/amd64/13.0
 snapshot: 2008.0
 source_subpath: default/stage3-amd64-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
index 076ff8ce..2ee4560e 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: 2008.0
 source_subpath: default/stage1-amd64-nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
index db02f44c..1bde42be 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/weekly/specs/amd64/stage2-x32.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/x32
 snapshot: 2008.0
 source_subpath: default/stage1-x32-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
index b78455b6..5fdfe685 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/weekly/specs/amd64/stage2.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: 2008.0
 source_subpath: default/stage1-amd64-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
index edde7b9a..85120bbc 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: 2008.0
 source_subpath: default/stage2-amd64-nomultilib-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
index 258e9d94..2eda1a19 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/weekly/specs/amd64/stage3-x32.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/x32
 snapshot: 2008.0
 source_subpath: default/stage2-x32-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
index cc3d8683..cf2497e5 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/weekly/specs/amd64/stage3.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: 2008.0
 source_subpath: default/stage2-amd64-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index a9ebb065..780c1ca5 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/hardened/stage1.spec
@@ -6,3 +6,5 @@ profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: hardened/stage3-i686-hardened-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index 345e57cd..da78b390 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: hardened/stage1-i686-hardened-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 28b9db91..ef7229f2 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: hardened/stage2-i686-hardened-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
index e9eb859e..b0d99125 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/weekly/specs/x86/i686/stage1.spec
@@ -6,3 +6,5 @@ profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage3-i686-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
index 2fad1bb2..0880175f 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/weekly/specs/x86/i686/stage2.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage1-i686-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
index 35356ff9..f7f6a475 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/weekly/specs/x86/i686/stage3.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage2-i686-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
index 24d9897c..1a27cc6d 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/weekly/specs/x86/stage1.spec
@@ -6,3 +6,5 @@ profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage3-i486-latest
 update_seed: yes
+update_seed_command: --update --deep @world
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
index d79abfa8..aab20986 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/weekly/specs/x86/stage2.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage1-i486-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages
diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
index 8bb04c83..1d5bfccc 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/weekly/specs/x86/stage3.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: 2008.0
 source_subpath: default/stage2-i486-2008.0
+portage_confdir: /release/releng/releases/weekly/portage/stages