vpackage update, still not completely sure this is the right path

vpackages/manifests/init.pp

@@ -1,11 +1,25 @@
 class vpackages {
 
-  package { 'htop': }
-  package { 'innotop': }
-  package { 'maatkit': }
-  package { 'mysql-client': }
-  package { 'screen': }
-  package { 'tcpdump': }
-  package { 'whois': }
-
+  include vpackages::params
+
+  @package { 'htop': }
+  @package { 'lynx': }
+  @package { 'screen': }
+  @package { 'strace': }
+  @package { 'tcpdump': }
+  @package { 'wget': }
+  @package { 'whois': name => $vpackages::params::whois, }
+
+  # database packages
+  @package { 'innotop': }
+  @package { 'maatkit': }
+  @package { 'mysql-client': name => $vpackages::params::mysqlclient, }
+
+  # Fedora/rhel/centos
+  @package { 'vim-enhanced': }
+  @package { 'rubygem-rake': }
+
+  # Debian/Ubuntu
+  @package { 'python-software-properties': }
+
 }

vpackages/manifests/params.pp

@@ -0,0 +1,13 @@
+class vpackages::params {
+
+  $whois = $::operatingsystem ? {
+    /(?i:Ubuntu|Debian)/ => 'whois',
+    /(?i:CentOS|Fedora)/ => 'jwhois',
+  }
+
+  $mysqlclient = $::operatingsystem ? {
+    /(?i:Ubuntu|Debian)/ => 'mysql-client',
+    /(?i:CentOS|Fedora)/ => 'mysql',
+  }
+
+}