Utils: reorder and cleanup

1 files changed, 33 insertions, 58 deletions

diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp
index c99a896..e4b23b5 100644
--- a/manifests/utils/multimedia.pp
+++ b/manifests/utils/multimedia.pp
@@ -2,74 +2,49 @@
 class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal {
   # Multimedia
   package { [
-    'alsa-tools-gui',
-    'mp3blaster',
-    'netpbm',
-    'audacious',
-    'qjackctl',
     'gimp',
-    'xine-ui',
-    'v4l-utils',
     'inkscape',
-    'easytag',
-    'gstreamer-tools',
-    'vlc',
-    'audacity',
-    'opencubicplayer',
-    'libasound2-plugins',
-    'lame',
     'geeqie',
     'cbrpager',
-    'llgal',
-    'darksnow',
     'pavucontrol',
-    'picard',
-    'ffmpeg2theora',
-    'oggfwd',
     'jhead',
-    'gxine',
-    'totem',
-    'faad',
-    'gmtp',
-    'gphotofs',
-    'jmtpfs',
+    #'alsa-tools-gui',
+    #'v4l-utils',
+    #'gstreamer-tools',
+    #'mp3blaster',
+    #'vlc',
+    #'libasound2-plugins',
+    #'lame',
+    #'llgal',
+    #'darksnow',
+    #'ffmpeg2theora',
+    #'netpbm',
+    #'xine-ui',
+    #'audacious',
+    #'qjackctl',
+    #'easytag',
+    #'audacity',
+    #'opencubicplayer',
+    #'picard',
+    #'gxine',
+    #'oggfwd',
+    #'totem',
+    #'faad',
+    #'gmtp',
+    #'gphotofs',
+    #'jmtpfs',
+    #'landell',
+    #'gqview',
+    #'mencoder',
+    #'tucan',
+    #'orpheus',
+    #'amarok',
+    #'moc',
+    #'cmus',
   ]:
     ensure => installed,
   }
 
-  # Old stuff
-  package { [
-    'amarok',
-    'moc',
-    'cmus',
-  ]:
-    ensure => purged,
-  }
-
-  # Squeeze only
-  package { [
-    'tucan',
-    'orpheus',
-  ]:
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => installed,
-      default   => purged,
-    }
-  }
-
-  # Wheezy only
-  package { [
-    'landell',
-    'gqview',
-    'mencoder',
-  ]:
-    ensure => $::lsbdistcodename ? {
-      'squeeze' => absent,
-      'wheezy'  => installed,
-      default   => absent,
-    }
-  }
-
   # Flash implementation (deprecated)
   #$flash = hiera('nodo::utils::multimedia::flash', 'gnash')
   #class { "nodo::utils::multimedia::${flash}": }