From c17900e55d18401f3642eab11a5bff6688d724ee Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Jan 2013 17:10:33 -0200
Subject: Removing old packages

---
 manifests/subsystems/utils/interface.pp | 9 +++++++--
 manifests/subsystems/utils/network.pp   | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'manifests/subsystems')

diff --git a/manifests/subsystems/utils/interface.pp b/manifests/subsystems/utils/interface.pp
index 0ca228d..e5f2045 100644
--- a/manifests/subsystems/utils/interface.pp
+++ b/manifests/subsystems/utils/interface.pp
@@ -3,11 +3,16 @@ class utils::interface {
   package { [ 'awesome',       'eterm',            'fluxbox',           'gnome-terminal', 'conky',
               'xterm',         'bash-completion',  'tmux',              'xscreensaver',   'thunar',
               'mc',            'gtk-theme-switch', 'gtk-smooth-themes', 'rxvt',           'lxappearance',
-              'xtitle',        'xclip',            'conkyforecast',     'awesome-extra',  'numlockx',
-              'weather-util',  'pcmanfm' ]:
+              'xtitle',        'xclip',            'pcmanfm',           'awesome-extra',  'numlockx',
+              'weather-util' ]:
     ensure => installed,
   }
 
+  # Old stuff
+  package { 'conkyforecast':
+    ensure => absent,
+  }
+
   # Fonts
   package { [ 'xfonts-terminus', 'ttf-bitstream-vera', 'ttf-inconsolata' ]:
     ensure => installed,
diff --git a/manifests/subsystems/utils/network.pp b/manifests/subsystems/utils/network.pp
index 19ca18a..6604067 100644
--- a/manifests/subsystems/utils/network.pp
+++ b/manifests/subsystems/utils/network.pp
@@ -37,19 +37,19 @@ class utils::network inherits utils::network::minimal {
   package { [ 'mutt',               'offlineimap',           'epiphany-browser',
               'newsbeuter',         'nicotine',              'sshfs',
               'bogofilter',         'fetchmail',             'procmail',
-              'msmtp',              'mairix',                'konqueror',
-              'bittorrent',         'links',                 'twinkle',
+              'msmtp',              'mairix',                'notmuch-mutt',
+              'bittorrent',         'links',                 'gftp',
               'bittornado',         'iceweasel',             'transmission',
               'openvpn',            'amule',                 'pssh',
               'pidgin',             'pidgin-encryption',     'pidgin-openpgp',
               'pidgin-otr',         'pidgin-privacy-please', 'pidgin-plugin-pack',
               'sslscan',            'muttprofile',           'connect-proxy',
-              'mutt-patched',       'gftp',                  'notmuch-mutt' ]:
+              'mutt-patched' ]:
     ensure => installed,
   }
 
   # Old packages
-  package { 'silc':
+  package { [ 'silc', 'twinkle', 'konqueror']:
     ensure => absent,
   }
 
-- 
cgit v1.2.3