6 files changed, 7 insertions, 13 deletions
diff --git a/lib/puppet/provider/package/apple.rb b/lib/puppet/provider/package/apple.rb
index fff83617b..4238447a3 100755
--- a/lib/puppet/provider/package/apple.rb
+++ b/lib/puppet/provider/package/apple.rb
@@ -10,7 +10,7 @@ Puppet::Type.type(:package).provide :apple do
     defaultfor :operatingsystem => :darwin
 
     def self.listbyname
-        Dir.entries("/Library/Receipts").find { |f|
+        Dir.entries("/Library/Receipts").find_all { |f|
             f =~ /\.pkg$/
         }.collect { |f|
             name = f.sub(/\.pkg/, '')
diff --git a/lib/puppet/provider/package/darwinport.rb b/lib/puppet/provider/package/darwinport.rb
index 0dcdcca84..43e9bce5b 100755
--- a/lib/puppet/provider/package/darwinport.rb
+++ b/lib/puppet/provider/package/darwinport.rb
@@ -42,7 +42,7 @@ Puppet::Type.type(:package).provide :darwinport do
     end
 
     def install
-        should = @model[:ensure]
+        should = @model.should(:ensure)
 
         # Seems like you can always say 'upgrade'
         port "upgrade #{@model[:name]}"
diff --git a/lib/puppet/provider/package/freebsd.rb b/lib/puppet/provider/package/freebsd.rb
index f630c66b6..5474ad5ca 100755
--- a/lib/puppet/provider/package/freebsd.rb
+++ b/lib/puppet/provider/package/freebsd.rb
@@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 
     def install
-        should = @model[:ensure]
+        should = @model.should(:ensure)
 
         if @model[:source]
             return super
@@ -34,7 +34,7 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     end
 
     def uninstall
-        pkgdelete "%s-%s" % [@model[:name], @model[:ensure]]
+        pkgdelete "%s-%s" % [@model[:name], @model.should(:ensure)]
     end
 end
 
diff --git a/lib/puppet/provider/package/openbsd.rb b/lib/puppet/provider/package/openbsd.rb
index 6012dcc84..b0d5a2277 100755
--- a/lib/puppet/provider/package/openbsd.rb
+++ b/lib/puppet/provider/package/openbsd.rb
@@ -55,7 +55,7 @@ Puppet::Type.type(:package).provide :openbsd do
     end
 
     def install
-        should = @model[:ensure]
+        should = @model.should(:ensure)
 
         unless @model[:source]
             raise Puppet::Error,
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index 199ba8a83..d311009a6 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -21,13 +21,7 @@ Puppet::Type.type(:package).provide :portage do
                 if( match )
                     package = {}
                     result_fields.zip( match.captures ) { |field, value| package[field] = value unless value.empty? }
-                    if self.is_a? Puppet::Type and type = @model[:type]
-                        package[:type] = type
-                    elsif self.is_a? Module and self.respond_to? :name
-                        package[:type] = self.name
-                    else
-                        raise Puppet::DevError, "Cannot determine package type"
-                    end
+                    package[:provider] = :portage
                     package[:ensure] = package[:ensure].split.last
 
                     packages.push( Puppet.type(:package).installedpkg(package) )
diff --git a/lib/puppet/provider/package/up2date.rb b/lib/puppet/provider/package/up2date.rb
index 1f9fa0ffc..bc3fe0526 100644
--- a/lib/puppet/provider/package/up2date.rb
+++ b/lib/puppet/provider/package/up2date.rb
@@ -28,7 +28,7 @@ Puppet.type(:package).provide :up2date, :parent => :rpm do
         else
             # up2date didn't find updates, pretend the current
             # version is the latest
-            return @model[:ensure]
+            return @model.is(:ensure)
         end
     end