Исправление portage

profiles/templates/3.3/2_ac_install_merge/sys-apps/portage/2.2.14/.calculate_directory

@@ -1 +1 @@
-# Calculate pkg(sys-apps/portage)>=2.2.14 append=skip
+# Calculate pkg(sys-apps/portage)>=2.2.14&&pkg(sys-apps/portage)<2.2.18 append=skip

profiles/templates/3.3/2_ac_install_merge/sys-apps/portage/2.2.18/.calculate_directory

@@ -0,0 +1 @@
+# Calculate pkg(sys-apps/portage)>=2.2.18 append=skip

profiles/templates/3.3/2_ac_install_merge/sys-apps/portage/2.2.18/bintree.py

@@ -0,0 +1,3 @@
+# Calculate path=/usr/lib/python2.7/site-packages/portage/dbapi format=patch
+<reg>_unicode\(e</reg>
+<text>_unicode(str(e)</text>

profiles/templates/3.3/6_ac_update_sync/revision/19-rebulid_garcon

@@ -3,7 +3,7 @@
 #-ini(overlay-calculate.revision,19)-#
 
 # key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/garcon"]="0.3.0 0.3.0_beta1" )
+declare -A map_move=( ["xfce-base/garcon"]="0.3.0 0.3.0_rc73" )
 
 PKGDB=/var/db/pkg
 for pkg in ${!map_move[@]}

profiles/templates/3.3/6_ac_update_sync/revision/22-rebuild_plymouth_openrc

@@ -3,7 +3,7 @@
 #-ini(overlay-calculate.revision,22)-#
 
 # key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["sys-boot/plymouth-openrc-plugin"]="0.1.2 0.1.2_beta1" )
+declare -A map_move=( ["sys-boot/plymouth-openrc-plugin"]="0.1.2 0.1.2_rc73" )
 
 PKGDB=/var/db/pkg
 for pkg in ${!map_move[@]}

profiles/templates/3.3/6_ac_update_sync/revision/29-rebuild_xfwm4

@@ -3,7 +3,7 @@
 #-ini(overlay-calculate.revision,29)-#
 
 # key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/xfwm4"]="4.11.2 4.11.2_beta1" )
+declare -A map_move=( ["xfce-base/xfwm4"]="4.11.2 4.11.2_rc73" )
 
 PKGDB=/var/db/pkg
 for pkg in ${!map_move[@]}

profiles/templates/3.3/6_ac_update_sync/revision/35-rebuild_garcon

@@ -3,7 +3,7 @@
 #-ini(overlay-calculate.revision,35)-#
 
 # key is pkg name, value is current version new reduced version split by space
-declare -A map_move=( ["xfce-base/garcon"]="0.5.0 0.5.0_beta1" )
+declare -A map_move=( ["xfce-base/garcon"]="0.5.0 0.5.0_rc73" )
 
 PKGDB=/var/db/pkg
 for pkg in ${!map_move[@]}

profiles/templates/3.3/6_ac_update_sync/revision/37_rebuild_portage

@@ -0,0 +1,15 @@
+# Calculate ini(overlay-calculate.revision)<37 exec=/bin/bash
+
+#-ini(overlay-calculate.revision,37)-#
+
+# key is pkg name, value is current version new reduced version split by space
+declare -A map_move=( ["sys-apps/portage"]="2.2.18 2.2.18_rc73" )
+
+PKGDB=/var/db/pkg
+for pkg in ${!map_move[@]}
+do
+    vers=(${map_move[$pkg]})
+    [[ -d $PKGDB/${pkg}-${vers[0]} ]] && mv $PKGDB/${pkg}-${vers[0]} $PKGDB/${pkg}-${vers[1]}
+done
+
+true