revert stage4 to consistent naming scheme and add exception for openvz

targets/gentoo/openvz.spec

@@ -1,5 +1,5 @@
 [collect ./source/stage3.spec]
-[collect ./target/stage4.spec]
+[collect ./target/stage4-common.spec]
 [collect ./steps/container.spec]
 [collect ./steps/capture/tar.spec]
 
@@ -10,6 +10,9 @@ target/name: openvz
 [section target]
 
 sys: openvz
+name: $[:build]-$[:subarch]-$[stage4/target/name]-$[:version]
+name/latest: $[:build]-$[stage4/target/name]-$[path/mirror/link/suffix]
+name/full_latest: $[:build]-$[:subarch]-$[stage4/target/name]-$[path/mirror/link/suffix]
 
 [section steps]
 

targets/gentoo/target/stage4-common.spec

@@ -0,0 +1,17 @@
+[collect ./stage.spec]
+[collect ../steps/symlink.spec]
+
+[section trigger]
+
+ok/run: [
+#!/bin/bash
+
+install -d $[path/mirror/target/control]/version/stage4 || exit 1
+echo "$[target/version]" > $[path/mirror/target/control]/version/stage4/$[stage4/target/name] || exit 1
+
+$[[trigger/ok/symlink]]
+]
+
+[section portage]
+
+ROOT: /

targets/gentoo/target/stage4.spec

@@ -1,23 +1,7 @@
-[collect ./stage.spec]
-[collect ../steps/symlink.spec]
+[collect ./stage4-common.spec]
 
 [section target]
 
-name: $[:build]-$[:subarch]-$[stage4/target/name]-$[:version]
-name/latest: $[:build]-$[stage4/target/name]-$[path/mirror/link/suffix]
-name/full_latest: $[:build]-$[:subarch]-$[stage4/target/name]-$[path/mirror/link/suffix]
-
-[section trigger]
-
-ok/run: [
-#!/bin/bash
-
-install -d $[path/mirror/target/control]/version/stage4 || exit 1
-echo "$[target/version]" > $[path/mirror/target/control]/version/stage4/$[stage4/target/name] || exit 1
-
-$[[trigger/ok/symlink]]
-]
-
-[section portage]
-
-ROOT: /
+name: $[stage4/target/name]-$[:subarch]-$[:build]-$[:version]
+name/latest: $[stage4/target/name]-$[path/mirror/link/suffix]
+name/full_latest: $[stage4/target/name]-$[:subarch]-$[:build]-$[path/mirror/link/suffix]