Add portage_prefix to the specs to finally clean-up /etc/portage/package.*/releng - fixes bug 547538.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>

39 files changed, 39 insertions, 0 deletions

diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
index 1f1e6f60..1dab9a14 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index 6e232717..e17eebb8 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
index b4829421..c331b30c 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
index 669c798b..744262b2 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
index 4768ecc9..32ed2925 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index fa9614b9..9ef16474 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
index dd3d806d..f5ffab88 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-selinux-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
index 9462e8c4..be3f0ef2 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
index 87f8e9f8..8fe59a8f 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index 735e62b7..a7b0e935 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
index 2d6f876e..77c1d501 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-selinux-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
index eebf6b90..fd9e5859 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-amd64-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
index 7f4f7889..44919051 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage1-systemd.spec b/releases/weekly/specs/amd64/stage1-systemd.spec
index 8bad2571..978e31b3 100644
--- a/releases/weekly/specs/amd64/stage1-systemd.spec
+++ b/releases/weekly/specs/amd64/stage1-systemd.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage3-amd64-latest
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
index c90620bf..d9025c7c 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/weekly/specs/amd64/stage1-x32.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
index 02459a03..ef73ed9d 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/weekly/specs/amd64/stage1.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage2-desktop.spec b/releases/weekly/specs/amd64/stage2-desktop.spec
index 949eef8b..634d9fc5 100644
--- a/releases/weekly/specs/amd64/stage2-desktop.spec
+++ b/releases/weekly/specs/amd64/stage2-desktop.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/desktop
 snapshot: latest
 source_subpath: default/stage1-amd64-latest
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
index e98da51b..f94a22ae 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage2-systemd.spec b/releases/weekly/specs/amd64/stage2-systemd.spec
index 3a083ced..c8d198f0 100644
--- a/releases/weekly/specs/amd64/stage2-systemd.spec
+++ b/releases/weekly/specs/amd64/stage2-systemd.spec
@@ -6,3 +6,4 @@ profile: default/linux/amd64/13.0/systemd
 snapshot: latest
 source_subpath: default/stage1-amd64-systemd-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
index 6685dd7b..1cc03cb7 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/weekly/specs/amd64/stage2-x32.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
index 9f26ee88..b3e31cd6 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/weekly/specs/amd64/stage2.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage3-desktop.spec b/releases/weekly/specs/amd64/stage3-desktop.spec
index bf9519ee..3d068e7d 100644
--- a/releases/weekly/specs/amd64/stage3-desktop.spec
+++ b/releases/weekly/specs/amd64/stage3-desktop.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/amd64/13.0/desktop
 snapshot: latest
 source_subpath: default/stage2-amd64-desktop-latest
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
index 89ab20d3..4921d27b 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage2-amd64-nomultilib-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage3-systemd.spec b/releases/weekly/specs/amd64/stage3-systemd.spec
index 6bf8b1d6..1e20002f 100644
--- a/releases/weekly/specs/amd64/stage3-systemd.spec
+++ b/releases/weekly/specs/amd64/stage3-systemd.spec
@@ -6,3 +6,4 @@ profile: default/linux/amd64/13.0/systemd
 snapshot: latest
 source_subpath: default/stage2-amd64-systemd-latest
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
index 9c295e22..639cf562 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/weekly/specs/amd64/stage3-x32.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage2-x32-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
index 07cf6de7..70527bd4 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/weekly/specs/amd64/stage3.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage2-amd64-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index 69d04974..30e79e9c 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/hardened/stage1.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index df8b72a8..8fc988c2 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage1-i686-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 52b786f7..5928d684 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -8,3 +8,4 @@ source_subpath: hardened/stage2-i686-hardened-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/hardened/stage2.spec b/releases/weekly/specs/x86/i686/hardened/stage2.spec
index f53844d1..29cb8593 100644
--- a/releases/weekly/specs/x86/i686/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/i686/hardened/stage2.spec
@@ -7,3 +7,4 @@ snapshot: latest
 source_subpath: hardened/stage1-x86-hardened-latest
 chost: i686-pc-linux-gnu
 cflags: -mtune=i686 -O2 -pipe -fforce-addr
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/hardened/stage3.spec b/releases/weekly/specs/x86/i686/hardened/stage3.spec
index edcefa1d..4f94449e 100644
--- a/releases/weekly/specs/x86/i686/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/i686/hardened/stage3.spec
@@ -5,3 +5,4 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/stage2-i686-hardened-latest
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
index cd757316..2838184e 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/weekly/specs/x86/i686/stage1.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/stage2-desktop.spec b/releases/weekly/specs/x86/i686/stage2-desktop.spec
index 4e4f5071..4181081d 100644
--- a/releases/weekly/specs/x86/i686/stage2-desktop.spec
+++ b/releases/weekly/specs/x86/i686/stage2-desktop.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0/desktop
 snapshot: latest
 source_subpath: default/stage1-i686-latest
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
index a8dfddfe..e1d5cee4 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/weekly/specs/x86/i686/stage2.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-i686-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/stage3-desktop.spec b/releases/weekly/specs/x86/i686/stage3-desktop.spec
index 630ca478..cd41af3f 100644
--- a/releases/weekly/specs/x86/i686/stage3-desktop.spec
+++ b/releases/weekly/specs/x86/i686/stage3-desktop.spec
@@ -5,3 +5,4 @@ rel_type: default
 profile: default/linux/x86/13.0/desktop
 snapshot: latest
 source_subpath: default/stage2-i686-desktop-latest
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
index 43100aab..aa32ed87 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/weekly/specs/x86/i686/stage3.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage2-i686-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
index a1f4c553..c46c907e 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/weekly/specs/x86/stage1.spec
@@ -10,3 +10,4 @@ decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 update_seed: yes
 update_seed_command: --update --deep @world
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
index 67de4d98..fd5f5907 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/weekly/specs/x86/stage2.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage1-i486-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng
diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
index 18eeb14a..3c47485e 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/weekly/specs/x86/stage3.spec
@@ -8,3 +8,4 @@ source_subpath: default/stage2-i486-latest
 compression_mode: pixz_x
 decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/stages
+portage_prefix: releng