Put more software into not-in-use state

diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp
index 9d60383e68be29fa5eda627fb20e9272f6fd2d1f..9dc3faad8c28ea3c1949983a359ba844864809eb 100644 (file)
--- a/manifests/utils/development/ide.pp
+++ b/manifests/utils/development/ide.pp
@@ -1,26 +1,24 @@
 class nodo::utils::development::ide {
-  package { [ 'exuberant-ctags', 'mr', 'doxygen', 'agave', 'hexedit', 'ack-grep', 'markdown', 'python-sphinx' ]:
+  # In use
+  package { [ 'mr', 'hexedit', 'ack-grep', 'markdown', 'python-sphinx' ]:
     ensure => installed,
   }
 
-  # To be considered
-  #package { [ 'ticgit', 'ticgitweb' ]:
-  #  ensure  => present,
-  #}
-
-  # Old packages
-  package { [ 'ditz', 'pnopaste-cli' ]:
-    ensure  => $::lsbdistcodename ? {
-      'wheezy' => present,
-      default  => absent,
-    },
-  }
-
-  # Jessie onwards
-  package { [ 'ttyrec', 'bugs-everywhere', 'silversearcher-ag', 'vit' ]:
-    ensure => $::lsbdistcodename ? {
-      'wheezy' => absent,
-      default  => present,
-    },
+  # Not in use
+  package { [ 'ttyrec',
+              'bugs-everywhere',
+              'silversearcher-ag',
+              'ticgit',
+              'ticgitweb',
+              'ditz',
+              'pnopaste-cli',
+              'exuberant-ctags',
+              'doxygen',
+              'agave',
+              'hexedit',
+              'ack-grep',
+              'markdown',
+              'python-sphinx' ]:
+    ensure => absent,
   }
 }

diff --git a/manifests/utils/office.pp b/manifests/utils/office.pp
index a2928c274d9f58793861191bfec5960378966736..60e1cf2225a5683464342e3f194bd54b83f0f5c2 100644 (file)
--- a/manifests/utils/office.pp
+++ b/manifests/utils/office.pp
@@ -22,7 +22,7 @@ class nodo::utils::office {
   }
 
   # Not in use
-  package { [ 'kalarm', 'gnumeric', 'jekyll', 'taskwarrior', 'hledger', 'dia', 'calibre' ]:
+  package { [ 'kalarm', 'gnumeric', 'jekyll', 'taskwarrior', 'vit', 'hledger', 'dia', 'calibre' ]:
     ensure  => absent,
   }
 }