Merge branch 'thor-wip' into catalyst3

48 files changed, 116 insertions, 33 deletions

diff --git a/config/stable.keywords b/config/stable.keywords
new file mode 100644
index 00000000..50f772c5
--- /dev/null
+++ b/config/stable.keywords
@@ -0,0 +1,2 @@
+export ACCEPT_KEYWORDS="*"
+
diff --git a/config/unstable.keywords b/config/unstable.keywords
new file mode 100644
index 00000000..8613ff7e
--- /dev/null
+++ b/config/unstable.keywords
@@ -0,0 +1,2 @@
+export ACCEPT_KEYWORDS="~*"
+
diff --git a/releases/weekly/portage/stages/package.use/bindist b/releases/weekly/portage/stages/package.use/bindist
new file mode 100644
index 00000000..f826a95d
--- /dev/null
+++ b/releases/weekly/portage/stages/package.use/bindist
@@ -0,0 +1 @@
+dev-libs/openssl bindist
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
index 041d5fa2..378dfed4 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
+compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
index f5b74675..b49ffeb0 100644
--- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
+compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
diff --git a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
index 15361fdb..1f1e6f60 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-nomultilib.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
index ea0466a7..6e232717 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux-nomultilib.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
index 90ad40f6..b4829421 100644
--- a/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1-selinux.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-selinux-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/hardened/stage1.spec b/releases/weekly/specs/amd64/hardened/stage1.spec
index a02e843b..669c798b 100644
--- a/releases/weekly/specs/amd64/hardened/stage1.spec
+++ b/releases/weekly/specs/amd64/hardened/stage1.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
index 2977a67d..4768ecc9 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
index c753eaa7..fa9614b9 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
index ee93a452..dd3d806d 100644
--- a/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2-selinux.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage2.spec b/releases/weekly/specs/amd64/hardened/stage2.spec
index f81cfa56..9462e8c4 100644
--- a/releases/weekly/specs/amd64/hardened/stage2.spec
+++ b/releases/weekly/specs/amd64/hardened/stage2.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
index 82f38ff4..87f8e9f8 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
index 28a52a42..735e62b7 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib/selinux
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
index 1615cf6b..2d6f876e 100644
--- a/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3-selinux.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64/selinux
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage3.spec b/releases/weekly/specs/amd64/hardened/stage3.spec
index 99e77223..eebf6b90 100644
--- a/releases/weekly/specs/amd64/hardened/stage3.spec
+++ b/releases/weekly/specs/amd64/hardened/stage3.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
index 1769ca33..d263d7c7 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened-latest
+compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
index a57f813d..09e7ddc6 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/amd64/no-multilib
 snapshot: latest
 source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
+compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
index 94eb7bd7..d1a5f3ea 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
+compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
diff --git a/releases/weekly/specs/amd64/stage1-nomultilib.spec b/releases/weekly/specs/amd64/stage1-nomultilib.spec
index b6f28ba0..7f4f7889 100644
--- a/releases/weekly/specs/amd64/stage1-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage1-nomultilib.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-nomultilib-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/stage1-x32.spec b/releases/weekly/specs/amd64/stage1-x32.spec
index 55ebcc91..c90620bf 100644
--- a/releases/weekly/specs/amd64/stage1-x32.spec
+++ b/releases/weekly/specs/amd64/stage1-x32.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/amd64/13.0/x32
 snapshot: latest
 source_subpath: default/stage3-x32-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/stage1.spec b/releases/weekly/specs/amd64/stage1.spec
index 0a006e2c..02459a03 100644
--- a/releases/weekly/specs/amd64/stage1.spec
+++ b/releases/weekly/specs/amd64/stage1.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/amd64/stage2-nomultilib.spec b/releases/weekly/specs/amd64/stage2-nomultilib.spec
index c07365cd..e98da51b 100644
--- a/releases/weekly/specs/amd64/stage2-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage2-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage2-x32.spec b/releases/weekly/specs/amd64/stage2-x32.spec
index aab5cdc9..6685dd7b 100644
--- a/releases/weekly/specs/amd64/stage2-x32.spec
+++ b/releases/weekly/specs/amd64/stage2-x32.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0/x32
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage2.spec b/releases/weekly/specs/amd64/stage2.spec
index 937539f1..9f26ee88 100644
--- a/releases/weekly/specs/amd64/stage2.spec
+++ b/releases/weekly/specs/amd64/stage2.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage3-nomultilib.spec b/releases/weekly/specs/amd64/stage3-nomultilib.spec
index 3eaaf0c2..89ab20d3 100644
--- a/releases/weekly/specs/amd64/stage3-nomultilib.spec
+++ b/releases/weekly/specs/amd64/stage3-nomultilib.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage3-x32.spec b/releases/weekly/specs/amd64/stage3-x32.spec
index d2f6734f..9c295e22 100644
--- a/releases/weekly/specs/amd64/stage3-x32.spec
+++ b/releases/weekly/specs/amd64/stage3-x32.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0/x32
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage3.spec b/releases/weekly/specs/amd64/stage3.spec
index 3b1c6e00..07cf6de7 100644
--- a/releases/weekly/specs/amd64/stage3.spec
+++ b/releases/weekly/specs/amd64/stage3.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: latest
 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
diff --git a/releases/weekly/specs/amd64/stage4-cloud.spec b/releases/weekly/specs/amd64/stage4-cloud.spec
index b25f8cde..999ee4e3 100644
--- a/releases/weekly/specs/amd64/stage4-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-cloud.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/amd64/13.0
 snapshot: latest
 source_subpath: default/stage3-amd64-latest
+compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
index 6043c1ed..86dfd6de 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/amd64/13.0/no-multilib
 snapshot: latest
 source_subpath: default/stage3-amd64-nomultilib-latest
+compression_mode: pixz_x
+decompressor_search_order: tar pixz xz lbzip2 bzip2 gzip
 portage_confdir: @REPO_DIR@/releases/weekly/portage/cloud-stages
 
 stage4/use:
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
index 132cec0f..beafe8b5 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/stage3-i686-hardened-latest
+compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/weekly/specs/x86/hardened/installcd-stage1.spec
index 917167c8..dca5a543 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/stage3-x86-hardened-latest
+compression_mode: pixz_x
 livecd/use:
 	-*
 	deprecated
diff --git a/releases/weekly/specs/x86/hardened/stage1.spec b/releases/weekly/specs/x86/hardened/stage1.spec
index 34cf3f6a..69d04974 100644
--- a/releases/weekly/specs/x86/hardened/stage1.spec
+++ b/releases/weekly/specs/x86/hardened/stage1.spec
@@ -5,6 +5,8 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 source_subpath: hardened/stage3-i686-hardened-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/x86/hardened/stage2.spec b/releases/weekly/specs/x86/hardened/stage2.spec
index 2142ad0d..df8b72a8 100644
--- a/releases/weekly/specs/x86/hardened/stage2.spec
+++ b/releases/weekly/specs/x86/hardened/stage2.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 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
diff --git a/releases/weekly/specs/x86/hardened/stage3.spec b/releases/weekly/specs/x86/hardened/stage3.spec
index 6a7300e6..52b786f7 100644
--- a/releases/weekly/specs/x86/hardened/stage3.spec
+++ b/releases/weekly/specs/x86/hardened/stage3.spec
@@ -5,4 +5,6 @@ rel_type: hardened
 profile: hardened/linux/x86
 snapshot: latest
 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
diff --git a/releases/weekly/specs/x86/i686/stage1.spec b/releases/weekly/specs/x86/i686/stage1.spec
index dd4aa336..cd757316 100644
--- a/releases/weekly/specs/x86/i686/stage1.spec
+++ b/releases/weekly/specs/x86/i686/stage1.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 source_subpath: default/stage3-i686-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/x86/i686/stage2.spec b/releases/weekly/specs/x86/i686/stage2.spec
index 0feca2dc..a8dfddfe 100644
--- a/releases/weekly/specs/x86/i686/stage2.spec
+++ b/releases/weekly/specs/x86/i686/stage2.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 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
diff --git a/releases/weekly/specs/x86/i686/stage3.spec b/releases/weekly/specs/x86/i686/stage3.spec
index e15ae511..43100aab 100644
--- a/releases/weekly/specs/x86/i686/stage3.spec
+++ b/releases/weekly/specs/x86/i686/stage3.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 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
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec
index b1110e82..f0de078c 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/installcd-stage1.spec
@@ -5,6 +5,7 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 source_subpath: default/stage3-i486-latest
+compression_mode: pixz_x
 portage_confdir: @REPO_DIR@/releases/weekly/portage/isos
 
 livecd/use:
diff --git a/releases/weekly/specs/x86/stage1.spec b/releases/weekly/specs/x86/stage1.spec
index d060250e..a1f4c553 100644
--- a/releases/weekly/specs/x86/stage1.spec
+++ b/releases/weekly/specs/x86/stage1.spec
@@ -5,6 +5,8 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 source_subpath: default/stage3-i486-latest
+compression_mode: pixz_x
+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
diff --git a/releases/weekly/specs/x86/stage2.spec b/releases/weekly/specs/x86/stage2.spec
index 99c94e74..67de4d98 100644
--- a/releases/weekly/specs/x86/stage2.spec
+++ b/releases/weekly/specs/x86/stage2.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 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
diff --git a/releases/weekly/specs/x86/stage3.spec b/releases/weekly/specs/x86/stage3.spec
index dbb44c61..18eeb14a 100644
--- a/releases/weekly/specs/x86/stage3.spec
+++ b/releases/weekly/specs/x86/stage3.spec
@@ -5,4 +5,6 @@ rel_type: default
 profile: default/linux/x86/13.0
 snapshot: latest
 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
diff --git a/scripts/update_experimental_tree b/scripts/update_experimental_tree
new file mode 100755
index 00000000..cb880aa8
--- /dev/null
+++ b/scripts/update_experimental_tree
@@ -0,0 +1,14 @@
+#!/bin/bash
+PORTDIR="/release/trees/portage-experimental/"
+TMPREPO=$(mktemp)
+trap "rm -f $TMPREPO" EXIT
+cat >$f <<EOF
+[DEFAULT]
+main-repo = gentoo
+
+[gentoo]
+location = $PORTDIR
+sync-type = rsync
+sync-uri = rsync://rsync.gentoo.org/gentoo-portage
+EOF
+PORTAGE_REPOSITORIES="$(cat $TMPREPO)" FEATURES="$FEATURES -news" emerge --sync -q
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 93176507..dd5e2705 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -69,11 +69,10 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-
-	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
@@ -82,19 +81,15 @@ post_build() {
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-
-	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 		fi
 	done
-
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	fi
-
-
 }
 
 # vim:ft=sh:
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 80bf8b78..8017935a 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -9,7 +9,6 @@ source /etc/catalyst/release/build.env
 
 SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
 
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
 SETS="
 	multilib cloud_multilib minimal_multilib
 	nomultilib cloud_nomultilib minimal_nomultilib
@@ -81,26 +80,26 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-	mkdir -p ${BUILD_DESTDIR_BASE}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-	mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/hardened
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	fi
 }
 
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index f8beb817..9acb6bba 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -56,30 +56,26 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-
-	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 		fi
 	done
-
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-
-	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 		fi
 	done
-
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	fi
 }
 
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index d613264f..34b8ad50 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,26 +56,26 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-	mkdir -p ${BUILD_DESTDIR_BASE}
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-	mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+	mkdir -p ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
-			cp $file* ${BUILD_DESTDIR_BASE}/hardened
+			cp $file* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 		fi
 	done
 	if [ -f *${DATESTAMP}*.iso ]; then
-		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/hardened/${DATESTAMP}
 	fi
 }