From d2e9ee2300de6a794c5be69f96f09d8005d809d2 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sun, 13 Dec 2009 18:54:21 +0100
Subject: use new require function to get rid of additional dependecies

---
 manifests/activerecord.pp | 3 +--
 manifests/bcrypt.pp       | 3 +--
 manifests/camping.pp      | 3 +--
 manifests/gpgme.pp        | 5 ++---
 manifests/highline.pp     | 3 +--
 manifests/markaby.pp      | 3 +--
 manifests/rack.pp         | 3 +--
 manifests/tmail.pp        | 3 +--
 8 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'manifests')

diff --git a/manifests/activerecord.pp b/manifests/activerecord.pp
index 35f4738..5a7af2b 100644
--- a/manifests/activerecord.pp
+++ b/manifests/activerecord.pp
@@ -1,8 +1,7 @@
 class rubygems::activerecord {
-  include ::rubygems
+  require ::rubygems
   package{'activerecord':
     ensure => present,
     provider => gem,
-    require => Package['rubygems'],
   }
 }
diff --git a/manifests/bcrypt.pp b/manifests/bcrypt.pp
index 052aae5..8fbbc60 100644
--- a/manifests/bcrypt.pp
+++ b/manifests/bcrypt.pp
@@ -1,8 +1,7 @@
 class rubygems::bcrypt {
-  include ::rubygems
+  require ::rubygems
   package{'bcrypt-ruby':
     ensure => present,
     provider => gem,
-    require => Package['rubygems'],
   }
 }
diff --git a/manifests/camping.pp b/manifests/camping.pp
index f0f508a..f79fca1 100644
--- a/manifests/camping.pp
+++ b/manifests/camping.pp
@@ -1,8 +1,7 @@
 class rubygems::camping {
-  include rubygems::rack
+  require rubygems::rack
   package{'camping':
     ensure => present,
     provider => gem,
-    require => [ Package['rubygems'], Package['rack'] ],
   }
 }
diff --git a/manifests/gpgme.pp b/manifests/gpgme.pp
index 7d47883..b2d3d20 100644
--- a/manifests/gpgme.pp
+++ b/manifests/gpgme.pp
@@ -1,10 +1,9 @@
 class rubygems::gpgme{
-  include ::rubygems::devel
-  include gpg::gpgme::devel
+  require ::rubygems::devel
+  require gpg::gpgme::devel
 
   package{'ruby-gpgme':
     ensure => present,
     provider => gem,
-    require => [ Package['rubygems'], Package['gcc'] ],
   }
 }
diff --git a/manifests/highline.pp b/manifests/highline.pp
index 117d0b1..7c4815f 100644
--- a/manifests/highline.pp
+++ b/manifests/highline.pp
@@ -1,7 +1,6 @@
 class rubygems::highline {
-  include ::rubygems
+  require ::rubygems
   package{'rubygem-highline':
     ensure => present,
-    require => Package['rubygems'],
   }
 }
diff --git a/manifests/markaby.pp b/manifests/markaby.pp
index bc2e9d1..76f1eb8 100644
--- a/manifests/markaby.pp
+++ b/manifests/markaby.pp
@@ -1,8 +1,7 @@
 class rubygems::markaby {
-  include ::rubygems
+  require ::rubygems
   package{'markaby':
     ensure => present,
     provider => gem,
-    require => Package['rubygems'],
   }
 }
diff --git a/manifests/rack.pp b/manifests/rack.pp
index 40867f4..1d01639 100644
--- a/manifests/rack.pp
+++ b/manifests/rack.pp
@@ -1,8 +1,7 @@
 class rubygems::rack {
-  include ::rubygems
+  require ::rubygems
   package{'rack':
     ensure => present,
     provider => gem,
-    require => Package['rubygems'],
   }
 }
diff --git a/manifests/tmail.pp b/manifests/tmail.pp
index be1c8da..efff0f2 100644
--- a/manifests/tmail.pp
+++ b/manifests/tmail.pp
@@ -1,8 +1,7 @@
 class rubygems::tmail {
-  include ::rubygems::devel
+  require ::rubygems::devel
   package{'tmail':
     ensure => present,
     provider => gem,
-    require => [ Package['rubygems'], Package['gcc'] ],
   }
 }
-- 
cgit v1.2.3