calculate-utilities -> calculate-utils

10 years ago · 42fc8c74ba
parent 5a845fbed9
commit 42fc8c74ba
69 changed files with 1260 additions and 1249 deletions
--- a/profiles/templates/2.2/assemble/setup/etc/calculate/calculate2.env
+++ b/profiles/templates/2.2/assemble/setup/etc/calculate/calculate2.env
@ -1,4 +1,4 @@
-# Calculate comment=# format=samba pkg(sys-apps/calculate-utilities)<3.1.0_alpha1
+# Calculate comment=# format=samba pkg(sys-apps/calculate-utils)<3.1.0_alpha1
 [main]
 cl_autoupdate_set = on
 cl_merges = calculate-install
--- a/profiles/templates/2.2/assemble/setup/etc/calculate/calculate3.env
+++ b/profiles/templates/2.2/assemble/setup/etc/calculate/calculate3.env
@ -1,4 +1,4 @@
-# Calculate comment=# format=samba pkg(sys-apps/calculate-utilities)<3.1.0_alpha1
+# Calculate comment=# format=samba pkg(sys-apps/calculate-utils)<3.1.0_alpha1
 [main]
 cl_autoupdate_set = on
 cl_merges = calculate-install
--- a/profiles/templates/2.2/builder/squash/etc/calculate/calculate.env
+++ b/profiles/templates/2.2/builder/squash/etc/calculate/calculate.env
@ -1,4 +1,4 @@
-# Calculate comment=# format=samba cl_ver>=2.2.28.1 pkg(sys-apps/calculate-utilities)>=3.1.0_alpha1
+# Calculate comment=# format=samba cl_ver>=2.2.28.1 pkg(sys-apps/calculate-utils)>=3.1.0_alpha1
 [main]
 os_linux_build = #-os_builder_linux_build-#
 os_linux_files = #-os_builder_linux_filesnum-#
--- a/profiles/templates/2.2/builder/squash/etc/calculate/calculate2.env
+++ b/profiles/templates/2.2/builder/squash/etc/calculate/calculate2.env
@ -1,4 +1,4 @@
-# Calculate comment=# format=samba pkg(sys-apps/calculate-utilities)<3.1.0_alpha1
+# Calculate comment=# format=samba pkg(sys-apps/calculate-utils)<3.1.0_alpha1
 [main]
 !cl_template_path = empty
 !cl_autoupdate_set = empty
--- a/profiles/templates/2.2/builder/squash/etc/calculate/calculate2.env.del
+++ b/profiles/templates/2.2/builder/squash/etc/calculate/calculate2.env.del
@ -1 +1 @@
-# Calculate name=calculate2.env append=remove format=samba pkg(sys-apps/calculate-utilities)>=3.1.0_alpha1
+# Calculate name=calculate2.env append=remove format=samba pkg(sys-apps/calculate-utils)>=3.1.0_alpha1
--- a/profiles/templates/2.2/builder/squash/etc/calculate/calculate3.env
+++ b/profiles/templates/2.2/builder/squash/etc/calculate/calculate3.env
@ -1,4 +1,4 @@
-# Calculate comment=# format=samba cl_ver>=2.2.28.1 pkg(sys-apps/calculate-utilities)<3.1.0_alpha1
+# Calculate comment=# format=samba cl_ver>=2.2.28.1 pkg(sys-apps/calculate-utils)<3.1.0_alpha1
 [main]
 os_linux_build = #-os_builder_linux_build-#
 os_linux_files = #-os_builder_linux_filesnum-#
--- a/profiles/templates/2.2/builder/squash/etc/calculate/calculate3.env.del
+++ b/profiles/templates/2.2/builder/squash/etc/calculate/calculate3.env.del
@ -1 +1 @@
-# Calculate name=calculate3.env append=remove format=samba pkg(sys-apps/calculate-utilities)>=3.1.0_alpha1
+# Calculate name=calculate3.env append=remove format=samba pkg(sys-apps/calculate-utils)>=3.1.0_alpha1
--- a/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.1.6/.calculate_directory
+++ b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.1.6/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip cl_ver>=3.1.5.2&&pkg(sys-apps/calculate-utilities)>3.1.5-r28
+# Calculate append=skip cl_ver>=3.1.5.2&&pkg(sys-apps/calculate-utils)>3.1.5-r28
--- a/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory
+++ b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/3.2.0_beta2/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip cl_ver>=3.2.0.3&&pkg(sys-apps/calculate-utilities)>=3.2.0_beta2
+# Calculate append=skip cl_ver>=3.2.0.3&&pkg(sys-apps/calculate-utils)>=3.2.0_beta2
--- a/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/calculate.env
+++ b/profiles/templates/3.1/1_ac_install_disk/2-system/00-calculate-install/calculate.env
@ -1,4 +1,4 @@
-# Calculate format=raw comment=#  cl_ver<3.1.5.2||pkg(sys-apps/calculate-utilities)<3.1.5-r28
+# Calculate format=raw comment=#  cl_ver<3.1.5.2||pkg(sys-apps/calculate-utils)<3.1.5-r28

 [install]
 #?os_root_type==hdd#
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-utilities
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-utilities
@ -1 +0,0 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!= merge=sys-apps/calculate-install,sys-apps/calculate-desktop,sys-apps/calculate-client,sys-apps/calculate-core,sys-apps/calculate-console,sys-apps/calculate-console-gui,sys-apps/calculate-update,sys-process/vixie-cron,media-gfx/calculate-wallpapers
--- a/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-utils
+++ b/profiles/templates/3.1/2_ac_install_merge/Depends/calculate-utils
@ -0,0 +1 @@
+# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=sys-apps/calculate-install,sys-apps/calculate-desktop,sys-apps/calculate-client,sys-apps/calculate-core,sys-apps/calculate-console,sys-apps/calculate-console-gui,sys-apps/calculate-update,sys-process/vixie-cron,media-gfx/calculate-wallpapers
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/.calculate_directory
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/.calculate_directory
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/40-skip-configure
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/40-skip-configure
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-patch-package
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-patch-package
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-post-setup-package
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-post-setup-package
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-server-distfiles
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-server-distfiles
--- a/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-setup-package
+++ b/profiles/templates/3.1/2_ac_install_merge/sys-apps/calculate-utilities/50-setup-package
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/.calculate_directory
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/00-calculate.env
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/00-calculate.env
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/10-calculate.env
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/10-calculate.env
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/99-calculate2.env.del
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/99-calculate2.env.del
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/99-calculate3.env.del
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/99-calculate3.env.del
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/fixOpenrc
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/fixOpenrc
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/ini.env
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/ini.env
@ -1,4 +1,4 @@
-# Calculate format=samba path=/etc/calculate pkg(sys-apps/calculate-utilities)>=3.2.2
+# Calculate format=samba path=/etc/calculate pkg(sys-apps/calculate-utils)>=3.2.2

 [update]
 !packages = 
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/updateSymlinks
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/calculate-utilities/updateSymlinks
@ -1,4 +1,4 @@
-# Calculate exec=/bin/bash ac_install_disk==off&&pkg(sys-apps/calculate-utilities)>=3.0.0_beta2
+# Calculate exec=/bin/bash ac_install_disk==off&&pkg(sys-apps/calculate-utils)>=3.0.0_beta2

 /usr/sbin/cl-core --create-symlink &>/dev/null
 true
--- a/profiles/templates/3.1/3_ac_install_live/Postmerge/calculate-utilities
+++ b/profiles/templates/3.1/3_ac_install_live/Postmerge/calculate-utilities
@ -1 +0,0 @@
-# Calculate protected path=/var/lib/calculate/calculate-core name=restart cl_ebuild_phase!=&&merge(sys-apps/calculate-utilities)!=
--- a/profiles/templates/3.1/3_ac_install_live/Postmerge/calculate-utils
+++ b/profiles/templates/3.1/3_ac_install_live/Postmerge/calculate-utils
@ -0,0 +1 @@
+# Calculate protected path=/var/lib/calculate/calculate-core name=restart cl_ebuild_phase!=&&merge(sys-apps/calculate-utils)!=
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-04/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-04/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<4
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<4
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-05/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-05/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<5&&main.os_linux_ver>=13
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<5&&main.os_linux_ver>=13
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-06/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-06/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/gnome-shell)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/libgnome)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/gnome-shell)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13||merge(gnome-base/libgnome)!=&&ini(update.patch)!=off&&ini(ver.patch)<6&&main.os_linux_ver>=13
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-07/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-07/.calculate_directory
@ -1 +1 @@
-# Calculate merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<7 path=~/.local/share name=applications
+# Calculate merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<7 path=~/.local/share name=applications
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-09/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-09/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<9
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<9
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-10/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-10/.calculate_directory
@ -1 +1 @@
-# Calculate pkg(kde-base/kdelibs)!=&&merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<10 path=~/.kde4/share name=config
+# Calculate pkg(kde-base/kdelibs)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<10 path=~/.kde4/share name=config
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-11/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-11/.calculate_directory
@ -1 +1 @@
-# Calculate pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<11 path=~/.config/xfce4/xfconf name=xfce-perchannel-xml
+# Calculate pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<11 path=~/.config/xfce4/xfconf name=xfce-perchannel-xml
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-13/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-13/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<12
+# Calculate append=skip pkg(xfce-base/xfce4-panel)!=&&merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<12
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-14/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-14/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<14
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<14
--- a/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-15/.calculate_directory
+++ b/profiles/templates/3.1/6_ac_desktop_profile/2-user/0_Patch/patch-15/.calculate_directory
@ -1 +1 @@
-# Calculate append=skip merge(sys-apps/calculate-utilities)!=&&ini(update.patch)!=off&&ini(ver.patch)<15
+# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<15
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/base
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/base
@ -5,8 +5,8 @@ app-portage/eix
 app-portage/gentoolkit
 app-portage/layman
 dev-vcs/git
-sys-apps/calculate-utilities:0
-sys-apps/calculate-utilities:3
+sys-apps/calculate-utils:0
+sys-apps/calculate-utils:3
 sys-apps/openrc
 sys-apps/v86d
 sys-boot/calcboot
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/02
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/02
@ -0,0 +1,10 @@
+# Calculate format=world name=world ini(overlay-calculate.world)<2
+
+#-ini(overlay-calculate.world,2)-#
+
+#?in(os_linux_pkglist, base)!=#
+!sys-apps/calculate-utilities:0
+!sys-apps/calculate-utilities:3
+sys-apps/calculate-utils:0
+sys-apps/calculate-utils:3
+#in#
--- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/57_1
+++ b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/57_1
@ -33,7 +33,7 @@ net-misc/vino gnome-keyring networkmanager
 net-p2p/deluge webinterface
 net-print/gutenprint gimp
 net-wireless/bluez gstreamer
-sys-apps/calculate-utilities cl_client
+sys-apps/calculate-utils cl_client
 sys-auth/pambase gnome-keyring
 sys-block/gparted dmraid fat jfs ntfs reiserfs xfs
 virtual/notification-daemon gnome
--- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/83
+++ b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/83
@ -1,4 +1,4 @@
-# Calculate ini(update.rev)<83 format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utilities
+# Calculate ini(update.rev)<83 format=samba path=/etc/calculate name=ini.env merge=sys-apps/calculate-utils

 # reconfigure bashrc emerge script
 [update]
--- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/99
+++ b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/revision/000/99
@ -1,4 +1,4 @@
-# Calculate ini(update.rev)<99&&pkg(sys-apps/calculate-utilities)>=3.2.0_beta1-r2 run=/bin/bash
+# Calculate ini(update.rev)<99&&pkg(sys-apps/calculate-utils)>=3.2.0_beta1-r2 run=/bin/bash

 #-ini(update.rev,99)-#

--- a/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base
+++ b/profiles/templates/deprecated/old_revision/3.1/6_ac_update_sync/world/1_create/base
@ -6,8 +6,8 @@ app-portage/gentoolkit
 app-portage/layman
 dev-vcs/git
 media-fonts/terminus-font
-sys-apps/calculate-utilities:0
-sys-apps/calculate-utilities:3
+sys-apps/calculate-utils:0
+sys-apps/calculate-utils:3
 sys-apps/ifplugd
 sys-apps/less
 sys-apps/openrc
--- a/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base
+++ b/profiles/templates/deprecated/old_revision/3.2/6_ac_update_sync/world/1_create/base
@ -7,8 +7,8 @@ app-portage/gentoolkit
 app-portage/layman
 dev-vcs/git
 media-fonts/terminus-font
-sys-apps/calculate-utilities:0
-sys-apps/calculate-utilities:3
+sys-apps/calculate-utils:0
+sys-apps/calculate-utils:3
 sys-apps/ifplugd
 sys-apps/less
 sys-apps/openrc
--- a/profiles/updates/4Q-2014
+++ b/profiles/updates/4Q-2014
@ -0,0 +1 @@
+move sys-apps/calculate-utilities sys-apps/calculate-utils
--- a/sys-apps/calculate-utilities/ChangeLog
+++ b/sys-apps/calculate-utilities/ChangeLog
--- a/sys-apps/calculate-utils/ChangeLog
+++ b/sys-apps/calculate-utils/ChangeLog
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r10.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r10.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r11.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r11.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r6.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r6.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r9.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.32-r9.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-2.2.9999.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-2.2.9999.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.0-r6.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.0-r6.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r4.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r4.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r5.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r5.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r6.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r6.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r7.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.1-r7.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r1.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r1.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r2.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r2.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r3.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r3.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r4.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r4.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r5.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r5.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r6.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r6.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r7.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r7.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r8.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2-r8.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.2.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.2.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.3.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.3.ebuild
--- a/sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild
+++ b/sys-apps/calculate-utilities/calculate-utilities-3.2.9999.ebuild
				`@ -1 +0,0 @@`
				`# Calculate append=skip merge(sys-apps/calculate-utilities)!= merge=sys-apps/calculate-install,sys-apps/calculate-desktop,sys-apps/calculate-client,sys-apps/calculate-core,sys-apps/calculate-console,sys-apps/calculate-console-gui,sys-apps/calculate-update,sys-process/vixie-cron,media-gfx/calculate-wallpapers`
				`@ -0,0 +1 @@`
				`# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=sys-apps/calculate-install,sys-apps/calculate-desktop,sys-apps/calculate-client,sys-apps/calculate-core,sys-apps/calculate-console,sys-apps/calculate-console-gui,sys-apps/calculate-update,sys-process/vixie-cron,media-gfx/calculate-wallpapers`
				`@ -1 +0,0 @@`
				`# Calculate protected path=/var/lib/calculate/calculate-core name=restart cl_ebuild_phase!=&&merge(sys-apps/calculate-utilities)!=`
				`@ -0,0 +1 @@`
				`move sys-apps/calculate-utilities sys-apps/calculate-utils`