Cleanup nodo::utils::office

diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index 47e92a9182147c637a09139440c445841d4d98e9..9773977ad6f483a06396e6527b682e5830cf4ff1 100644 (file)
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -1,60 +1,28 @@
 class nodo::utils::office {
   # Office
-  package { [ 'vim-gtk',             'gobby',
-              'sc',                  'antiword',            'dia',
-              'kalarm',              'pandoc',              'gnumeric',
-              'gnucash',             'worklog',             'pdftk',
-              'calibre',             'fbreader',            'gobby-0.5',
-              'mat',                 'evince',              'jekyll',
+  package { [ 'vim-gtk',             'gobby',      'libreoffice'
+              'sc',                  'antiword',
+              'pandoc',              'wyrd',
+              'gnucash',             'worklog',    'pdftk',
+              'fbreader',            'gobby',
+              'mat',                 'evince',
               'aewan',               'autocutsel',
               'parcellite' ]:
     ensure => installed,
   }
 
-  package { 'taskwarrior':
-    ensure  => present,
-    name    => $::lsbdistcodename ? {
-      'wheezy' => 'task',
-      default  => 'taskwarrior',
-    },
-  }
-
   # Finance
   package { [ 'ledger', 'clipf', 'misery' ]:
     ensure  => present,
   }
 
-  # Soon
-  #package { 'hledger':
-  #  ensure => present,
-  #}
-
   # LaTeX
   package { [ 'texlive-latex-base',  'texlive-latex-recommended', 'texlive-latex-extra', 'texlive-fonts-extra', 'vim-latexsuite', 'pdfjam' ]:
     ensure => present,
   }
 
-  # Squeeze only
-  package { 'broffice.org':
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => installed,
-      default   => absent,
-    }
-  }
-
-  # Wheezy only
-  package { 'wyrd':
-    ensure => $::lsbdistcodename ? {
-      'wheezy' => present,
-      default  => absent,
-    },
-  }
-
-  # Wheezy onwards
-  package { 'libreoffice':
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => absent,
-      default   => installed,
-    }
+  # Not in use
+  package { [ 'kalarm', 'gnumeric', 'jekyll', 'taskwarrior', 'hledger', 'dia', 'calibre' ]:
+    ensure  => absent,
   }
 }