Add keywords variable to module managed packages

(cherry-picked from 55653bc4d428fdbdae854a934fa505c9b65c1493)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

manifests/init.pp

@@ -27,22 +27,28 @@ class portage (
   $make_conf_remerge      = $portage::params::make_conf_remerge,
   $portage_ensure         = $portage::params::portage_ensure,
   $portage_keywords       = $portage::params::portage_keywords,
+  $portage_keywords_version = $portage::params::portage_keywords_version,
   $portage_use            = $portage::params::portage_use,
   $eix_ensure             = $portage::params::eix_ensure,
   $eix_keywords           = $portage::params::eix_keywords,
+  $eix_keywords_version   = $portage::params::eix_keywords_version,
   $eix_use                = $portage::params::eix_use,
   $layman_ensure          = $portage::params::layman_ensure,
   $layman_keywords        = $portage::params::layman_keywords,
+  $layman_keywords_version = $portage::params::layman_keywords_version,
   $layman_use             = $portage::params::layman_use,
   $layman_make_conf       = $portage::params::layman_make_conf,
   $webapp_config_ensure   = $portage::params::webapp_config_ensure,
   $webapp_config_keywords = $portage::params::webapp_config_keywords,
+  $webapp_config_keywords_version = $portage::params::webapp_config_keywords_version,
   $webapp_config_use      = $portage::params::webapp_config_use,
   $eselect_ensure         = $portage::params::eselect_ensure,
   $eselect_keywords       = $portage::params::eselect_keywords,
+  $eselect_keywords_version	= $portage::params::eselect_keywords_version,
   $eselect_use            = $portage::params::eselect_use,
   $portage_utils_ensure   = $portage::params::portage_utils_ensure,
   $portage_utils_keywords = $portage::params::portage_utils_keywords,
+  $portage_utils_keywords_version = $portage::params::portage_utils_keywords_version,
   $portage_utils_use      = $portage::params::portage_utils_use,
 ) inherits portage::params {
 

manifests/install.pp

@@ -5,6 +5,7 @@ class portage::install {
   portage::package { 'sys-apps/portage':
     ensure   => $portage::portage_ensure,
     keywords => $portage::portage_keywords,
+    keywords_version => $portage::portage_keywords_version,
     use      => $portage::portage_use,
     target   => 'portage',
   }
@@ -12,6 +13,7 @@ class portage::install {
   portage::package { 'app-portage/eix':
     ensure   => $portage::eix_ensure,
     keywords => $portage::eix_keywords,
+    keywords_version => $portage::eix_keywords_version,
     use      => $portage::eix_use,
     target   => 'portage',
   }
@@ -19,6 +21,7 @@ class portage::install {
   portage::package { 'app-portage/layman':
     ensure   => $portage::layman_ensure,
     keywords => $portage::layman_keywords,
+    keywords_version => $portage::layman_keywords_version,
     use      => $portage::layman_use,
     target   => 'portage',
     notify   => Portage::Makeconf["source ${portage::layman_make_conf}"],
@@ -37,6 +40,7 @@ class portage::install {
   portage::package { 'app-admin/webapp-config':
     ensure   => $portage::webapp_config_ensure,
     keywords => $portage::webapp_config_keywords,
+    keywords_version => $portage::webapp_config_keywords_version,
     use      => $portage::webapp_config_use,
     target   => 'portage',
   }
@@ -44,6 +48,7 @@ class portage::install {
   portage::package { 'app-admin/eselect':
     ensure   => $portage::eselect_ensure,
     keywords => $portage::eselect_keywords,
+    keywords_version => $portage::eselect_keywords_version,
     use      => $portage::eselect_use,
     target   => 'portage',
   }
@@ -51,6 +56,7 @@ class portage::install {
   portage::package { 'app-portage/portage-utils':
     ensure   => $portage::portage_utils_ensure,
     keywords => $portage::portage_utils_keywords,
+    keywords_version => $portage::portage_utils_keywords_version,
     use      => $portage::portage_utils_use,
     target   => 'portage',
   }

manifests/params.pp

@@ -11,21 +11,27 @@ class portage::params {
   $make_conf_remerge      = true
   $portage_ensure         = installed
   $portage_keywords       = undef
+  $portage_keywords_version	= undef
   $portage_use            = undef
   $eix_ensure             = installed
   $eix_keywords           = undef
+  $eix_keywords_version	  = undef
   $eix_use                = undef
   $layman_ensure          = absent
   $layman_keywords        = undef
+  $layman_keywords_version = undef
   $layman_use             = undef
   $layman_make_conf       = '/var/lib/layman/make.conf'
   $webapp_config_ensure   = absent
   $webapp_config_keywords = undef
+  $webapp_config_keywords_version = undef
   $webapp_config_use      = undef
   $eselect_ensure         = absent
   $eselect_keywords       = undef
+  $eselect_keywords_version = undef
   $eselect_use            = undef
   $portage_utils_ensure   = installed
   $portage_utils_keywords = undef
+  $portage_utils_keywords_version = undef
   $portage_utils_use      = undef
 }