[gentoo-commits] gentoo-x86 commit in app-admin/puppet/files: puppet-0.24.5-eix-0.14.0.patch

[Matsuu Takuto (matsuu)]

matsuu      08/10/02 17:06:07

  Added:                puppet-0.24.5-eix-0.14.0.patch
  Log:
  Fixed rrdtool dependency, bug #238568. Fixed to work with >=app-portage/eix-0.14.0.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

Revision  Changes    Path
1.1                  app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet-0.24.5-eix-0.14.0.patch?rev=1.1&content-type=text/plain

Index: puppet-0.24.5-eix-0.14.0.patch
===================================================================
diff -Naur puppet-0.24.5.orig/lib/puppet/provider/package/portage.rb puppet-0.24.5/lib/puppet/provider/package/portage.rb
--- puppet-0.24.5.orig/lib/puppet/provider/package/portage.rb	2008-07-08 22:46:19.000000000 +0900
+++ puppet-0.24.5/lib/puppet/provider/package/portage.rb	2008-10-03 01:45:15.000000000 +0900
@@ -10,7 +10,7 @@
     defaultfor :operatingsystem => :gentoo
 
     def self.instances
-        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_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]*)?)(?:\(([^\)]+)\))?(?:\+[ilvs]|![fmpbstuid])*(?:\[([^\]]+)\])?)?\] ([\S]*) (.*)/
         result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
 
         search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"