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

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

[Matsuu Takuto (matsuu)]

matsuu      08/11/22 07:28:21

  Modified:             puppet-0.24.6-eix.patch
  Log:
  Fixed dependency. Fixed eix patch.
  (Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

Revision  Changes    Path
1.2                  app-admin/puppet/files/puppet-0.24.6-eix.patch

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

Index: puppet-0.24.6-eix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet-0.24.6-eix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- puppet-0.24.6-eix.patch	21 Nov 2008 17:13:40 -0000	1.1
+++ puppet-0.24.6-eix.patch	22 Nov 2008 07:28:21 -0000	1.2
@@ -1,7 +1,8 @@
-diff -Naur puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb puppet-0.24.6/lib/puppet/provider/package/portage.rb
---- puppet-0.24.6.orig/lib/puppet/provider/package/portage.rb	2008-10-09 22:51:05.000000000 +0900
-+++ puppet-0.24.6/lib/puppet/provider/package/portage.rb	2008-11-22 00:47:35.000000000 +0900
-@@ -12,7 +12,7 @@
+diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
+index ae7194f..5855441 100644
+--- a/lib/puppet/provider/package/portage.rb
++++ b/lib/puppet/provider/package/portage.rb
+@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
      defaultfor :operatingsystem => :gentoo
  
      def self.instances
@@ -10,3 +11,12 @@
          result_fields = [:category, :name, :ensure, :ensure_overlay, :version_available, :slot, :overlay, :vendor, :description]
  
          search_format = "{installedversionsshort}<category> <name> [<installedversionsshort>] [<best>] <homepage> <description>{}"
+@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
+     end
+ 
+     def query
+-        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_field = package_name.count('/') > 0 ? "--category-name" : "--name"