diff --git a/conf/gentoo/puppet/puppet.conf b/conf/gentoo/puppet/puppet.conf
index 1d62c90e4..70dcb02da 100644
--- a/conf/gentoo/puppet/puppet.conf
+++ b/conf/gentoo/puppet/puppet.conf
@@ -1,29 +1,29 @@
-[main] 
-    # Where Puppet stores dynamic and growing data. 
-    # The default value is '/var/puppet'. 
-    vardir = /var/lib/puppet 
- 
-    # The Puppet log directory. 
-    # The default value is '$vardir/log'. 
-    logdir = /var/log/puppet 
- 
-    # Where Puppet PID files are kept. 
-    # The default value is '$vardir/run'. 
-    rundir = /var/run/puppet 
- 
-    # Where SSL certificates are kept. 
-    # The default value is '$confdir/ssl'. 
-    ssldir = $vardir/ssl 
- 
-[puppetd] 
-    # The file in which puppetd stores a list of the classes 
-    # associated with the retrieved configuratiion.  Can be loaded in 
-    # the separate ``puppet`` executable using the ``--loadclasses`` 
-    # option. 
-    # The default value is '$confdir/classes.txt'. 
-    classfile = $vardir/classes.txt 
- 
-    # Where puppetd caches the local configuration.  An 
-    # extension indicating the cache format is added automatically. 
-    # The default value is '$confdir/localconfig'. 
-    localconfig = $vardir/localconfig 
+[main]
+    # Where Puppet stores dynamic and growing data.
+    # The default value is '/var/puppet'.
+    vardir = /var/lib/puppet
+
+    # The Puppet log directory.
+    # The default value is '$vardir/log'.
+    logdir = /var/log/puppet
+
+    # Where Puppet PID files are kept.
+    # The default value is '$vardir/run'.
+    rundir = /var/run/puppet
+
+    # Where SSL certificates are kept.
+    # The default value is '$confdir/ssl'.
+    ssldir = $vardir/ssl
+
+[puppetd]
+    # The file in which puppetd stores a list of the classes
+    # associated with the retrieved configuratiion.  Can be loaded in
+    # the separate ``puppet`` executable using the ``--loadclasses``
+    # option.
+    # The default value is '$confdir/classes.txt'.
+    classfile = $vardir/classes.txt
+
+    # Where puppetd caches the local configuration.  An
+    # extension indicating the cache format is added automatically.
+    # The default value is '$confdir/localconfig'.
+    localconfig = $vardir/localconfig
diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
index dccfeaf56..f795d0302 100644
--- a/lib/puppet/provider/package/portage.rb
+++ b/lib/puppet/provider/package/portage.rb
@@ -1,117 +1,117 @@
 require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
     desc "Provides packaging support for Gentoo's portage system."
 
     has_feature :versionable
 
     commands :emerge => "/usr/bin/emerge", :eix => "/usr/bin/eix", :update_eix => "/usr/bin/update-eix"
 
     defaultfor :operatingsystem => :gentoo
 
     def self.instances
-        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
-        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
+        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
 
         begin
             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
                 update_eix
             end
             search_output = eix "--nocolor", "--format", search_format
 
             packages = []
             search_output.each do |search_result|
                 match = result_format.match( search_result )
 
                 if match
                     package = {}
                     result_fields.zip(match.captures) { |field, value|
                         package[field] = value unless !value or value.empty?
                     }
                     package[:provider] = :portage
                     package[:ensure] = package[:ensure].split.last
 
                     packages << new(package)
                 end
             end
 
             return packages
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error.new(detail)
         end
     end
 
     def install
         should = @resource.should(:ensure)
         name = package_name
         unless should == :present or should == :latest
             # We must install a specific version
             name = "=%s-%s" % [name, should]
         end
         emerge name
     end
 
     # The common package name format.
     def package_name
         @resource[:category] ? "%s/%s" % [@resource[:category], @resource[:name]] : @resource[:name]
     end
 
     def uninstall
         emerge "--unmerge", package_name
     end
 
     def update
         self.install
     end
 
     def query
-        result_format = /(\S+) (\S+) \[([^\[]*)(\[[^\]]*\])?\] \[[^0-9]*([^\s:\[]*)(\[[^\]]*\])?(:\S*)?\] ([\S]*) (.*)/
-        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :overlay, :slot, :vendor, :description]
+        result_format = /(\S+) (\S+) \[(?:([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\([^\)]+\))?(?:\[([^\]]+)\])?[ ]*)*\] \[(?:(?:\{M\})?(?:\([~*]+\))?([0-9.a-zA-Z]+(?:_(?:alpha|beta|pre|rc|p)[0-9]*)*(?:-r[0-9]*)?)(?:\(([^\)]+)\))?(?:![mf])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
+        result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
         search_field = @resource[:category] ? "--category-name" : "--name"
         search_value = package_name
         search_format = "<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>"
 
         begin
             if !FileUtils.uptodate?("/var/cache/eix", %w(/usr/bin/eix /usr/portage/metadata/timestamp))
                 update_eix
             end
             search_output = eix "--nocolor", "--format", search_format, "--exact", search_field, search_value
 
             packages = []
             search_output.each do |search_result|
                 match = result_format.match( search_result )
 
                 if( match )
                     package = {}
                     result_fields.zip( match.captures ) { |field, value| package[field] = value unless !value or value.empty? }
                     if package[:ensure]
                         package[:ensure] = package[:ensure].split.last
                     else
                         package[:ensure] = :absent
                     end
                     packages << package
                 end
             end
 
             case packages.size
                 when 0
 		    not_found_value = "%s/%s" % [@resource[:category] ? @resource[:category] : "<unspecified category>", @resource[:name]]
                     raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
                 when 1
                     return packages[0]
                 else
                     raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
             end
         rescue Puppet::ExecutionFailure => detail
             raise Puppet::Error.new(detail)
         end
     end
 
     def latest
         return self.query[:version_available]
     end
 end