sys-cluster/charm-6.6.0-rc1: Reorganized some variables.

Package-Manager: portage-2.2.7
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci